From 5ab6999d393cbdf65cd5fd3ab40e02c33849f9c4 Mon Sep 17 00:00:00 2001
From: Joe Rayhawk <jrayhawk@cobain.omgwallhack.org>
Date: Mon, 24 Sep 2018 22:44:29 -0700
Subject: pinyconfig: Modernizing configuration files.

---
 pinyconfigs/etc/apache2/sites-available/piny      | 85 -----------------------
 pinyconfigs/etc/apache2/sites-available/piny.conf | 81 +++++++++++++++++++++
 2 files changed, 81 insertions(+), 85 deletions(-)
 delete mode 100644 pinyconfigs/etc/apache2/sites-available/piny
 create mode 100644 pinyconfigs/etc/apache2/sites-available/piny.conf

(limited to 'pinyconfigs/etc/apache2/sites-available')

diff --git a/pinyconfigs/etc/apache2/sites-available/piny b/pinyconfigs/etc/apache2/sites-available/piny
deleted file mode 100644
index a3c38c9..0000000
--- a/pinyconfigs/etc/apache2/sites-available/piny
+++ /dev/null
@@ -1,85 +0,0 @@
-<VirtualHost *:80>
-	ServerName piny.be
-
-	DocumentRoot /srv/http/piny.be
-
-	<Directory />
-		Options Indexes FollowSymLinks MultiViews
-		AllowOverride None
-	</Directory>
-
-	Alias /js /usr/share/javascript
-
-	RedirectMatch 301 ^/$ http://piny.be/piny-hosting/
-
-	Include /etc/apache2/piny/www
-</VirtualHost>
-
-<VirtualHost *:80>
-	ServerName www.piny.be
-	RedirectMatch 301 (.*) http://piny.be$1
-</VirtualHost>
-
-<VirtualHost *:443>
-	ServerName piny.be
-	DocumentRoot /srv/https/piny.be
-
-	<Directory />
-		Options Indexes FollowSymLinks MultiViews
-		AllowOverride None
-	</Directory>
-
-	Alias /js /usr/share/javascript
-
-	RedirectMatch 301 ^/$ http://piny.be/piny-hosting/
-
-	SSLEngine On
-	SSLCertificateFile /etc/ssl/private/secure.piny.be.pem
-	SSLCertificateChainFile /etc/ssl/private/GandiStandardSSLCA.pem
-
-	Include /etc/apache2/piny/www
-</VirtualHost>
-
-<VirtualHost *:80>
-	ServerName secure.piny.be
-	RedirectMatch 301 (.*) https://secure.piny.be$1
-</VirtualHost>
-
-<VirtualHost *:443>
-	ServerName secure.piny.be
-	DocumentRoot /srv/https/secure.piny.be
-	RedirectMatch 301 ^/$ http://piny.be/
-
-	<Directory />
-		SSLRequireSSL
-		Options Indexes FollowSymLinks MultiViews
-		AllowOverride None
-	</Directory>
-
-	<Directory "/srv/https/secure.piny.be/write">
-		SetHandler cgi-script
-		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-	</Directory>
-
-	<Directory "/usr/lib/cgi-bin/piny/auth">
-		AuthBasicProvider PAM
-		AuthPAMService other
-	        AuthBasicAuthoritative off
-	        AuthType Basic
-	        AuthName "User account for piny.be needed."
-	        Require valid-user
-	</Directory>
-
-	Alias /_cgit /usr/share/cgit
-
-        ScriptAlias /cgit /usr/lib/cgi-bin/cgit.cgi
-        ScriptAlias /piny-newuser /usr/lib/cgi-bin/piny/newuser.cgi
-        ScriptAlias /piny-validate /usr/lib/cgi-bin/piny/checkconstraint.cgi
-        ScriptAlias /auth /usr/lib/cgi-bin/piny/auth
-
-	SSLEngine On
-	SSLCertificateFile /etc/ssl/private/secure.piny.be.pem
-	SSLCertificateChainFile /etc/ssl/private/GandiStandardSSLCA.pem
-
-	Include /etc/apache2/piny/secure
-</VirtualHost>
diff --git a/pinyconfigs/etc/apache2/sites-available/piny.conf b/pinyconfigs/etc/apache2/sites-available/piny.conf
new file mode 100644
index 0000000..6702a3d
--- /dev/null
+++ b/pinyconfigs/etc/apache2/sites-available/piny.conf
@@ -0,0 +1,81 @@
+<VirtualHost *:80>
+	ServerName piny.be
+
+	DocumentRoot /srv/http/piny.be
+
+	<Directory />
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride None
+	</Directory>
+
+	Alias /js /usr/share/javascript
+
+	RedirectMatch 301 ^/$ http://piny.be/piny-hosting/
+
+	Include /etc/apache2/piny/www
+</VirtualHost>
+
+<VirtualHost *:80>
+	ServerName www.piny.be
+	RedirectMatch 301 (.*) http://piny.be$1
+</VirtualHost>
+
+<VirtualHost *:443>
+	ServerName piny.be
+	DocumentRoot /srv/https/piny.be
+
+	<Directory />
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride None
+	</Directory>
+
+	Alias /js /usr/share/javascript
+
+	RedirectMatch 301 ^/$ http://piny.be/piny-hosting/
+
+	SSLEngine On
+
+	Include /etc/apache2/piny/www
+</VirtualHost>
+
+<VirtualHost *:80>
+	ServerName secure.piny.be
+	RedirectMatch 301 (.*) https://secure.piny.be$1
+</VirtualHost>
+
+<VirtualHost *:443>
+	ServerName secure.piny.be
+	DocumentRoot /srv/https/secure.piny.be
+	RedirectMatch 301 ^/$ http://piny.be/
+
+	<Directory />
+		SSLRequireSSL
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride None
+	</Directory>
+
+	<Directory "/srv/https/secure.piny.be/write">
+		SetHandler cgi-script
+		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+	</Directory>
+
+	<Directory "/usr/lib/cgi-bin/piny/auth">
+		AuthBasicProvider PAM
+		AuthPAMService other
+	        AuthBasicAuthoritative off
+	        AuthType Basic
+	        AuthName "User account for piny.be needed."
+	        Require valid-user
+	</Directory>
+
+	Alias /_cgit /usr/share/cgit
+
+        ScriptAlias /cgit /usr/lib/cgi-bin/cgit.cgi
+        ScriptAlias /piny-newuser /usr/lib/cgi-bin/piny/newuser.cgi
+        ScriptAlias /piny-validate /usr/lib/cgi-bin/piny/checkconstraint.cgi
+        ScriptAlias /auth /usr/lib/cgi-bin/piny/auth
+
+	SSLEngine On
+
+	Include /etc/apache2/piny/secure
+</VirtualHost>
-- 
cgit v1.2.3