22 files changed, 39 insertions, 23 deletions

diff --git a/articles/2009/20090602_socket_pt1.rhtml.config b/articles/2009/20090602_socket_pt1.rhtml.config
index 81d27bf..c446ba0 100644
--- a/articles/2009/20090602_socket_pt1.rhtml.config
+++ b/articles/2009/20090602_socket_pt1.rhtml.config
@@ -3,4 +3,5 @@ category: home
 description: "La socket (in inglese \"presa\") è una particolare astrazione \
             software che permette ai processi messi in comunicazione di inviare e \
             ricevere dati. Le socket sono nate intorno agli anni ’80, il primo kernel \
-            a implementarle fu BSD 4.2 nel 1983."
\ No newline at end of file
+            a implementarle fu BSD 4.2 nel 1983."
+master: master.rhtml
diff --git a/articles/2021/20210420_install-certificates-with-certbot.rhtml.config b/articles/2021/20210420_install-certificates-with-certbot.rhtml.config
index d412327..24801ff 100644
--- a/articles/2021/20210420_install-certificates-with-certbot.rhtml.config
+++ b/articles/2021/20210420_install-certificates-with-certbot.rhtml.config
@@ -1,3 +1,4 @@
 title: "Installare certificati con certbot"
 category: home
-description: "Come installere i certificati su un server web utilizzando certbot."
\ No newline at end of file
+description: "Come installere i certificati su un server web utilizzando certbot."
+master: master.rhtml
diff --git a/articles/2021/20211213_log4shell-0-day-vulnerability.rhtml.config b/articles/2021/20211213_log4shell-0-day-vulnerability.rhtml.config
index b617d57..d6181a2 100644
--- a/articles/2021/20211213_log4shell-0-day-vulnerability.rhtml.config
+++ b/articles/2021/20211213_log4shell-0-day-vulnerability.rhtml.config
@@ -3,4 +3,5 @@ category: home
 description: "Le vulnerabilità sfruttano le funzionalità \
              JNDI di Log4j consentendo ad un attaccante di utilizzare un \
              servizio LDAP per eseguire codice malevolo da remoto."
-classes: critical
\ No newline at end of file
+classes: critical
+master: master.rhtml
diff --git a/docs/clang/index.rhtml.config b/docs/clang/index.rhtml.config
index e501178..04bd2c2 100644
--- a/docs/clang/index.rhtml.config
+++ b/docs/clang/index.rhtml.config
@@ -1,3 +1,4 @@
 title: Linguaggio di programmazione C
 category: notes
-pageNames: [clang]
\ No newline at end of file
+pageNames: [clang]
+master: master.rhtml
diff --git a/docs/freebsd/index.rhtml.config b/docs/freebsd/index.rhtml.config
index 8cdcfd4..be5265e 100644
--- a/docs/freebsd/index.rhtml.config
+++ b/docs/freebsd/index.rhtml.config
@@ -1,3 +1,4 @@
 title: FreeBSD
 category: notes
-pageNames: [freebsd]
\ No newline at end of file
+pageNames: [freebsd]
+master: master.rhtml
diff --git a/docs/git/git.rhtml.config b/docs/git/git.rhtml.config
index fca9788..2c08ee9 100644
--- a/docs/git/git.rhtml.config
+++ b/docs/git/git.rhtml.config
@@ -1,3 +1,4 @@
 title: "git"
 category: notes
-pageNames: [git]
\ No newline at end of file
+pageNames: [git]
+master: master.rhtml
diff --git a/docs/java/index.rhtml.config b/docs/java/index.rhtml.config
index 527a868..a0379bc 100644
--- a/docs/java/index.rhtml.config
+++ b/docs/java/index.rhtml.config
@@ -1,3 +1,4 @@
 title: Java
 category: notes
-pageNames: [java]
\ No newline at end of file
+pageNames: [java]
+master: master.rhtml
diff --git a/docs/postgresql/index.rhtml.config b/docs/postgresql/index.rhtml.config
index 6c29f30..34610af 100644
--- a/docs/postgresql/index.rhtml.config
+++ b/docs/postgresql/index.rhtml.config
@@ -1,3 +1,4 @@
 title: PostgreSQL
 category: notes
-pageNames: [postgresql]
\ No newline at end of file
+pageNames: [postgresql]
+master: master.rhtml
diff --git a/docs/querydsl/querydsl.rhtml.config b/docs/querydsl/querydsl.rhtml.config
index 1708a39..c144d91 100644
--- a/docs/querydsl/querydsl.rhtml.config
+++ b/docs/querydsl/querydsl.rhtml.config
@@ -1,3 +1,4 @@
 title: "QueryDSL"
 category: notes
-pageNames: [querydsl]
\ No newline at end of file
+pageNames: [querydsl]
+master: master.rhtml
diff --git a/docs/shell/commands.rhtml.config b/docs/shell/commands.rhtml.config
index 9664c1b..50ca872 100644
--- a/docs/shell/commands.rhtml.config
+++ b/docs/shell/commands.rhtml.config
@@ -1,4 +1,4 @@
 title: "Shell"
 category: notes
 pageNames: [shell, shell-commands, Comandi]
-master: [docs/shell/shell.tmpl, master.rhtml]
\ No newline at end of file
+master: docs/shell/shell.rhtml
diff --git a/docs/shell/grep.rhtml.config b/docs/shell/grep.rhtml.config
index 8b44c53..ba01d17 100644
--- a/docs/shell/grep.rhtml.config
+++ b/docs/shell/grep.rhtml.config
@@ -1,4 +1,4 @@
 title: "Shell [grep]"
 category: notes
 pageNames: [shell, shell-commands, grep]
-master: [docs/shell/shell.tmpl, master.rhtml]
+master: docs/shell/shell.rhtml
diff --git a/docs/shell/index.rhtml.config b/docs/shell/index.rhtml.config
index 35b84b0..fbe9e2c 100644
--- a/docs/shell/index.rhtml.config
+++ b/docs/shell/index.rhtml.config
@@ -1,4 +1,4 @@
 title: "Shell"
 category: notes
 pageNames: [shell, shell-index, Indice]
-master: [docs/shell/shell.tmpl, master.rhtml]
\ No newline at end of file
+master: docs/shell/shell.rhtml
diff --git a/docs/shell/jq.rhtml.config b/docs/shell/jq.rhtml.config
index c937145..be0752e 100644
--- a/docs/shell/jq.rhtml.config
+++ b/docs/shell/jq.rhtml.config
@@ -1,4 +1,4 @@
 title: "Shell [jq]"
 category: notes
 pageNames: [shell, shell-commands, jq]
-master: [docs/shell/shell.tmpl, master.rhtml]
\ No newline at end of file
+master: docs/shell/shell.rhtml
diff --git a/docs/shell/shell.tmpl b/docs/shell/shell.rhtml
index f8915a8..3cbf740 100644
--- a/docs/shell/shell.tmpl
+++ b/docs/shell/shell.rhtml
@@ -31,8 +31,8 @@
           </button>
           <div class="collapse show" id="commands-collapse">
             <ul class="btn-toggle-nav list-unstyled fw-normal pb-1 small">
-              <li><a href="/docs/shell/grep.html" class="link-dark rounded"><b>grep</b></a></li>
-              <li><a href="/docs/shell/jq.html" class="link-dark rounded"><b>jq</b> - Command-line JSON processor</a></li>
+              <li><a href="docs/shell/grep.html" class="link-dark rounded"><b>grep</b></a></li>
+              <li><a href="docs/shell/jq.html" class="link-dark rounded"><b>jq</b> - Command-line JSON processor</a></li>
             <li><a href="#" class="link-dark rounded">Updates</a></li>
             <li><a href="#" class="link-dark rounded">Reports</a></li>
           </ul>
@@ -87,4 +87,4 @@
 </div>
 
 
-<%= render @pageFileName %>
+<%= renderContent %>
diff --git a/docs/shell/shell.rhtml.config b/docs/shell/shell.rhtml.config
new file mode 100644
index 0000000..dd83b7b
--- /dev/null
+++ b/docs/shell/shell.rhtml.config
@@ -0,0 +1 @@
+master: master.rhtml
diff --git a/index.rhtml b/index.rhtml
index 0ad6a1b..2236d46 100644
--- a/index.rhtml
+++ b/index.rhtml
@@ -36,7 +36,7 @@
 
 <div class="container hyphens">
   <div class="row">
-    <% listarticles("articles/**/*", 6).each { |p| %>
+    <% Hyde.listarticles("articles/**/*", 6).each { |p| %>
     <div class="col-lg-4 col-sm-12" style="margin-bottom: 20pt">
       <div class="card <%= p.classes %> h-100">
         <!-- <div class="card-header">Featured</div> -->
@@ -46,7 +46,7 @@
           <p class="card-text"><%= p.description %></p>
         </div>
         <div class="card-footer">
-          <a href="<%= p.pageFileName %>"
+          <a href="<%= p.url %>"
              class="btn btn-primary">Dettagli &raquo;</a>
         </div>
       </div>
diff --git a/index.rhtml.config b/index.rhtml.config
index cfb888b..d956305 100644
--- a/index.rhtml.config
+++ b/index.rhtml.config
@@ -1,2 +1,3 @@
 title: "Home"
 category: "home"
+master: master.rhtml
diff --git a/ip.rhtml.php.config b/ip.rhtml.php.config
index d843803..ad50284 100644
--- a/ip.rhtml.php.config
+++ b/ip.rhtml.php.config
@@ -1,2 +1,3 @@
 title: Il tuo IP
-category: ip
\ No newline at end of file
+category: ip
+master: master.rhtml
diff --git a/products/geco/index.rhtml.config b/products/geco/index.rhtml.config
index e3b0713..345c205 100644
--- a/products/geco/index.rhtml.config
+++ b/products/geco/index.rhtml.config
@@ -1,3 +1,4 @@
 title: GECO (GEstione COntabile)
 category: products
-pageNames: [geco]
\ No newline at end of file
+pageNames: [geco]
+master: master.rhtml
diff --git a/products/hyde/index.rhtml.config b/products/hyde/index.rhtml.config
index a7b02ce..1a36081 100644
--- a/products/hyde/index.rhtml.config
+++ b/products/hyde/index.rhtml.config
@@ -1,3 +1,4 @@
 title: Hyde
 category: products
-pageNames: [hyde]
\ No newline at end of file
+pageNames: [hyde]
+master: master.rhtml
diff --git a/search/index.rhtml.config b/search/index.rhtml.config
index 3c92471..68cc45b 100644
--- a/search/index.rhtml.config
+++ b/search/index.rhtml.config
@@ -1 +1,2 @@
-title = "Cerca"
\ No newline at end of file
+title: "Cerca"
+master: master.rhtml
diff --git a/weblabels.rhtml.config b/weblabels.rhtml.config
index 975b9f9..a9a49b4 100644
--- a/weblabels.rhtml.config
+++ b/weblabels.rhtml.config
@@ -1,2 +1,3 @@
 title: "Licenze JavaScript"
-category: home
\ No newline at end of file
+category: home
+master: master.rhtml