More changes for WKD. master
authorNIIBE Yutaka <gniibe@fsij.org>
Mon, 8 Jul 2019 09:08:21 +0000 (18:08 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Mon, 8 Jul 2019 09:08:21 +0000 (18:08 +0900)
Makefile
opengpgkey-fsij-org.conf [deleted file]
openpgpkey/fsij.org/hu/gu9mp83yp7z6a4x5jxm3arux3xxn3duk [deleted file]
openpgpkey/fsij.org/policy [deleted file]
wkd-fsij-org.conf [new file with mode: 0644]
wkd/.well-known/openpgpkey/fsij.org/hu/gu9mp83yp7z6a4x5jxm3arux3xxn3duk [new file with mode: 0755]
wkd/.well-known/openpgpkey/fsij.org/policy [new file with mode: 0644]
www-fsij-org.conf

index 174bbfd..18f88ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ help:
 
 html:
        $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
-       rm -rf $(OUTPUTDIR)/openpgpkey && cp -a openpgpkey $(OUTPUTDIR)/
+       rm -rf $(OUTPUTDIR)/wkd && cp -a wkd $(OUTPUTDIR)/
 
 clean:
        [ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR)
diff --git a/opengpgkey-fsij-org.conf b/opengpgkey-fsij-org.conf
deleted file mode 100644 (file)
index 8b4f659..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<VirtualHost *:80>
-       ServerAdmin webmaster@fsij.org
-       ServerName openpgpkey.fsij.org
-
-       DocumentRoot "/home/www/fsij-homepage-html/openpgpkey"
-       <Directory "/home/www/fsij-homepage-html/openpgpkey">
-         Options None
-         AllowOverride None
-         Order allow,deny
-         allow from all
-       </Directory>
-       ServerSignature On
-
-        LogLevel error
-        ErrorLog /var/log/apache2/error-fsij-openpgp.log
-        CustomLog /var/log/apache2/access-fsij-openpgp.log combined
-
-       RedirectMatch ^/.well-known/openpgpkey$ /
-</VirtualHost>
diff --git a/openpgpkey/fsij.org/hu/gu9mp83yp7z6a4x5jxm3arux3xxn3duk b/openpgpkey/fsij.org/hu/gu9mp83yp7z6a4x5jxm3arux3xxn3duk
deleted file mode 100755 (executable)
index 91a814d..0000000
Binary files a/openpgpkey/fsij.org/hu/gu9mp83yp7z6a4x5jxm3arux3xxn3duk and /dev/null differ
diff --git a/openpgpkey/fsij.org/policy b/openpgpkey/fsij.org/policy
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/wkd-fsij-org.conf b/wkd-fsij-org.conf
new file mode 100644 (file)
index 0000000..f36ff99
--- /dev/null
@@ -0,0 +1,17 @@
+<VirtualHost *:80>
+       ServerAdmin webmaster@fsij.org
+       ServerName openpgpkey.fsij.org
+
+       DocumentRoot "/home/www/fsij-homepage-html/openpgpkey"
+       <Directory "/home/www/fsij-homepage-html/openpgpkey">
+         Options None
+         AllowOverride None
+       </Directory>
+       ServerSignature On
+
+       Protocols h2 http/1.1
+
+       LogLevel error
+       ErrorLog /var/log/apache2/error-openpgp.log
+       CustomLog /var/log/apache2/access-openpgp.log combined
+</VirtualHost>
diff --git a/wkd/.well-known/openpgpkey/fsij.org/hu/gu9mp83yp7z6a4x5jxm3arux3xxn3duk b/wkd/.well-known/openpgpkey/fsij.org/hu/gu9mp83yp7z6a4x5jxm3arux3xxn3duk
new file mode 100755 (executable)
index 0000000..720b431
Binary files /dev/null and b/wkd/.well-known/openpgpkey/fsij.org/hu/gu9mp83yp7z6a4x5jxm3arux3xxn3duk differ
diff --git a/wkd/.well-known/openpgpkey/fsij.org/policy b/wkd/.well-known/openpgpkey/fsij.org/policy
new file mode 100644 (file)
index 0000000..e69de29
index d478a41..7a031d1 100644 (file)
@@ -3,30 +3,32 @@
        ServerName www.fsij.org
 
        DocumentRoot "/home/www/fsij-homepage-html/"
-       <Directory "/home/www/fsij-homepage-html/">
+       <Directory "/home/www/fsij-homepage-html/">
          DirectoryIndex index.html
-         Options None
-         AllowOverride None
-         Order allow,deny
-         allow from all
-       </Directory>
-       <Directory "/home/www/fsij-homepage-html/.git">
-         Options None
-         AllowOverride None
-         Order deny,allow
-         deny from all
-       </Directory>
-       <Directory "/home/www/fsij-homepage-html/openpgpkey">
-         Options None
-         AllowOverride None
-         Order deny,allow
-         deny from all
-       </Directory>
+         Options None
+         AllowOverride None
+         Order allow,deny
+         allow from all
+       </Directory>
+       <Directory "/home/www/fsij-homepage-html/.git">
+         Options None
+         AllowOverride None
+         Order deny,allow
+         deny from all
+       </Directory>
+       <Directory "/home/www/fsij-homepage-html/openpgpkey">
+         Options None
+         AllowOverride None
+         Order deny,allow
+         deny from all
+       </Directory>
        ServerSignature On
 
-        LogLevel error
-        ErrorLog /var/log/apache2/error-fsij.log
-        CustomLog /var/log/apache2/access-fsij.log combined
+       Protocols h2 http/1.1
+
+       LogLevel error
+       ErrorLog /var/log/apache2/error-fsij.log
+       CustomLog /var/log/apache2/access-fsij.log combined
 
        # Historical
        RedirectMatch ^/wiki$ /