From 349860f597f9038289c7528a255c140c8b3bc418 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 8 Mar 2019 16:36:31 +0100
Subject: [PATCH] add config

---
 etc/apache2.conf  | 31 +++++++++++++++++++++++++++++++
 public/index.html | 10 +++++-----
 2 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 etc/apache2.conf

diff --git a/etc/apache2.conf b/etc/apache2.conf
new file mode 100644
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 b9036dd..e576259 100644
--- a/public/index.html
+++ b/public/index.html
@@ -175,20 +175,20 @@
 			<section>
 				<h2 id="opensource">Open source</h2>
 				<table>
-					<!-- tr>
+					<tr>
 						<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>,
-							<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"
-								>Docs</a>
+								>Docs</a -->
 						</td>
-					</tr -->
+					</tr>
 					<tr>
 						<th>pecl/http</th>
 						<td>PHP HTTP Extension</td>
-- 
2.30.2