X-Git-Url: https://git.draconx.ca/gitweb/homepage.git/blobdiff_plain/fe387389cf437d11a969d51b5625cd6bc4ddb79f..e39d97fade755e9b53e7dc0f7bd4320ade1b7b83:/Rules

diff --git a/Rules b/Rules
index 7acf71d..365e83a 100644
--- a/Rules
+++ b/Rules
@@ -70,20 +70,22 @@ preprocess do
     end
 
     create_wkd_items(@items["/pubring.gpg"])
+    create_hkp_items(@items["/pubring.gpg"])
 end
 
 postprocess do
     # Gzip all text items for nginx http_static
-    if !ENV['GZIP_SITE'].to_s.empty?
+    gzip_site = !ENV['GZIP_SITE'].to_s.empty?
+    if gzip_site
         reps = @items.flat_map(&:reps).each do |rep|
-            file = rep.raw_path
-            next if !file or rep.binary?
-
-            if system("gzip", "-ck9", file, [:out]=>[file + ".gz.tmp", "wb"])
-                system("touch", "-r", file, file + ".gz.tmp")
-                File.rename(file + ".gz.tmp", file + ".gz")
-            else
-                File.unlink(file + ".gz.tmp")
+            next if rep.binary?
+            rep.instance_variable_get(:@item_rep).raw_paths[:last].each do |f|
+                if system("gzip", "-nck9", f, [:out]=>["#{f}.gz.tmp", "wb"])
+                    system("touch", "-r", f, "#{f}.gz.tmp")
+                    File.rename("#{f}.gz.tmp", "#{f}.gz")
+                else
+                    File.unlink("#{f}.gz.tmp")
+                end
             end
         end
     end
@@ -219,17 +221,19 @@ compile '/**/*.scss' do
 end
 
 compile '/gpg/*' do
-    filter :wkd_export, armor: true
-    write "/pubring/" + @item.identifier.components.last + ".asc"
+    filter :wkd_export_armor
+    write "/pubring/#{@item.identifier.components.last}.asc"
+    write "/pubring/#{@item[:id64]}.asc" if @item[:id64]
+    write "/pubring/#{@item[:id32]}.asc" if @item[:id32]
 end
 
 compile '/gpg/*', rep: :hu do
-    filter :wkd_export
-    write "/pubring/wkd/" + @item[:wkd_hash]
-end
-
-compile '/*.gpg' do
+    if @item[:wkd_hash]
+        filter :wkd_export
+        write "/pubring/wkd/" + @item[:wkd_hash]
+    end
 end
+ignore '/*.gpg'
 
 compile '/**/*.svg' do
     filter :scour, comment_stripping: true