From 824a5cf9831d0ee8a8f6123c64fab3a9deadea86 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sun, 11 Oct 2020 19:23:41 +0200
Subject: fix add extension .conf to apache2 site snippets

---
 .../sites-available/wiki.secure-example.com        | 43 ----------------------
 .../sites-available/wiki.secure-example.com.conf   | 43 ++++++++++++++++++++++
 2 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 moin/apache2/sites-available/wiki.secure-example.com
 create mode 100644 moin/apache2/sites-available/wiki.secure-example.com.conf

(limited to 'moin')

diff --git a/moin/apache2/sites-available/wiki.secure-example.com b/moin/apache2/sites-available/wiki.secure-example.com
deleted file mode 100644
index 5ccca1b..0000000
--- a/moin/apache2/sites-available/wiki.secure-example.com
+++ /dev/null
@@ -1,43 +0,0 @@
-<VirtualHost *:443>
-	ServerName wiki.example.com
-	ServerAdmin webmaster@example.com
-	DocumentRoot /usr/share/moin/htdocs
-
-	Include conf.d/local-ssl.conf
-
-	<Location />
-		SetHandler uwsgi-handler
-		uWSGISocket /run/uwsgi/app/local-moin/socket
-	</Location>
-
-	ErrorLog ${APACHE_LOG_DIR}/wiki.example.com-error.log
-	CustomLog ${APACHE_LOG_DIR}/wiki.example.com-access.log combined
-</VirtualHost>
-<VirtualHost *:443>
-	ServerName www.wiki.example.com:443
-	ServerName wiki:443
-	ServerName *.wiki:443
-
-	Include conf.d/local-ssl.conf
-	Include conf.d/local-log-origin.conf
-
-	RewriteEngine On
-	RewriteRule / https://wiki.example.com/ [R]
-#	RewriteRule /(.*)? https://wiki.example.com/$1 [R]
-
-	CustomLog ${APACHE_LOG_DIR}/redirect.log origin
-</VirtualHost>
-<VirtualHost *:80>
-	ServerName wiki.example.com
-	ServerAlias *.wiki.example.com
-	ServerAlias wiki
-	ServerAlias *.wiki
-
-	Include conf.d/local-log-origin.conf
-
-	RewriteEngine On
-	RewriteRule / https://wiki.example.com/ [R]
-#	RewriteRule /(.*)? https://wiki.example.com/$1 [R]
-
-	CustomLog ${APACHE_LOG_DIR}/redirect.log origin
-</VirtualHost>
diff --git a/moin/apache2/sites-available/wiki.secure-example.com.conf b/moin/apache2/sites-available/wiki.secure-example.com.conf
new file mode 100644
index 0000000..5ccca1b
--- /dev/null
+++ b/moin/apache2/sites-available/wiki.secure-example.com.conf
@@ -0,0 +1,43 @@
+<VirtualHost *:443>
+	ServerName wiki.example.com
+	ServerAdmin webmaster@example.com
+	DocumentRoot /usr/share/moin/htdocs
+
+	Include conf.d/local-ssl.conf
+
+	<Location />
+		SetHandler uwsgi-handler
+		uWSGISocket /run/uwsgi/app/local-moin/socket
+	</Location>
+
+	ErrorLog ${APACHE_LOG_DIR}/wiki.example.com-error.log
+	CustomLog ${APACHE_LOG_DIR}/wiki.example.com-access.log combined
+</VirtualHost>
+<VirtualHost *:443>
+	ServerName www.wiki.example.com:443
+	ServerName wiki:443
+	ServerName *.wiki:443
+
+	Include conf.d/local-ssl.conf
+	Include conf.d/local-log-origin.conf
+
+	RewriteEngine On
+	RewriteRule / https://wiki.example.com/ [R]
+#	RewriteRule /(.*)? https://wiki.example.com/$1 [R]
+
+	CustomLog ${APACHE_LOG_DIR}/redirect.log origin
+</VirtualHost>
+<VirtualHost *:80>
+	ServerName wiki.example.com
+	ServerAlias *.wiki.example.com
+	ServerAlias wiki
+	ServerAlias *.wiki
+
+	Include conf.d/local-log-origin.conf
+
+	RewriteEngine On
+	RewriteRule / https://wiki.example.com/ [R]
+#	RewriteRule /(.*)? https://wiki.example.com/$1 [R]
+
+	CustomLog ${APACHE_LOG_DIR}/redirect.log origin
+</VirtualHost>
-- 
cgit v1.2.3