add config

diff --git a/etc/apache2.conf b/etc/apache2.conf
new file mode 100644 (file)
index 0000000..c9cf3f8
--- /dev/null
+++ b/etc/apache2.conf
@@ -0,0 +1,31 @@
+<Macro m6w6_host_defs>
+       ServerName m6w6.name
+       ServerAlias www.m6w6.name
+       ServerAdmin webmaster@m6w6.name
+
+       DocumentRoot /var/www/m6w6
+
+       <Directory /var/www/m6w6>
+               Options Indexes FollowSymLinks MultiViews
+               AllowOverride None
+               Require all granted
+       </Directory>
+</Macro>
+
+<VirtualHost *:80>
+       Use m6w6_host_defs
+       RedirectPermanent / https://m6w6.name/
+</VirtualHost>
+
+<IfModule mod_ssl.c>
+       <VirtualHost *:443>
+               Use m6w6_host_defs
+               Include "bits/hsts-nosub"
+               SSLEngine on
+               SSLUseStapling on
+               SSLCertificateFile /etc/letsencrypt/live/m6w6.name/fullchain.pem
+               SSLCertificateKeyFile /etc/letsencrypt/live/m6w6.name/privkey.pem
+       </VirtualHost>
+</IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

diff --git a/public/index.html b/public/index.html
index b9036ddb9c8b4906b5812d4e42a4fa0af22fef74..e57625953c424633dba8223b48da80a27eb78cf9 100644 (file)
--- a/public/index.html
+++ b/public/index.html
@@ -175,20 +175,20 @@
                        <section>
                                <h2 id="opensource">Open source</h2>
                                <table>
                        <section>
                                <h2 id="opensource">Open source</h2>
                                <table>

-                                       <!-- tr>
+                                       <tr>

                                                <th>pecl/psi</th>
                                                <th>pecl/psi</th>

-                                               <td>PHP System Interface</td>
+                                               <td>PHP System Interface (FFI)</td>

                                                <td>
                                                        <a href="https://github.com/m6w6/ext-psi" rel="external"
                                                                >Github</a>,
                                                        <a href="https://git.m6w6.name/?p=m6w6/ext-psi" rel="external"
                                                                >Mirror</a>,
                                                <td>
                                                        <a href="https://github.com/m6w6/ext-psi" rel="external"
                                                                >Github</a>,
                                                        <a href="https://git.m6w6.name/?p=m6w6/ext-psi" rel="external"
                                                                >Mirror</a>,

-                                                       <a href="http://pecl.php.net/package/psi" rel="external"
+                                                       <!-- a href="http://pecl.php.net/package/psi" rel="external"

                                                                >PECL</a>,
                                                        <a href="https://mdref.m6w6.name/psi" rel="external"
                                                                >PECL</a>,
                                                        <a href="https://mdref.m6w6.name/psi" rel="external"

-                                                               >Docs</a>
+                                                               >Docs</a -->

                                                </td>
                                                </td>

-                                       </tr -->
+                                       </tr>

                                        <tr>
                                                <th>pecl/http</th>
                                                <td>PHP HTTP Extension</td>
                                        <tr>
                                                <th>pecl/http</th>
                                                <td>PHP HTTP Extension</td>