additional fixes for sites-available

roles/webserver/files/etc/apache2/sites-available/deb.thunix.net.conf

@@ -10,3 +10,17 @@
 		Deny from all
     </Directorymatch>
 </VirtualHost>
+<IfModule mod_ssl.c>
+<VirtualHost *:443>
+    ServerAdmin webmaster@thunix.net
+    ServerName deb.thunix.net
+    ServerAlias deb.thunixme5v4rnoby.onion
+    DocumentRoot /var/www/deb.thunix.net
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+    <Directorymatch "^/.*/\.git/">
+                Order deny,allow
+                Deny from all
+    </Directorymatch>
+</VirtualHost>
+</IfModule>

roles/webserver/files/etc/apache2/sites-available/rpm.thunix.net.conf

@@ -10,3 +10,20 @@
 		Deny from all
     </Directorymatch>
 </VirtualHost>
+<IfModule mod_ssl.c>
+<VirtualHost *:443>
+    ServerAdmin webmaster@thunix.net
+    ServerName rpm.thunix.net
+    ServerAlias rpm.thunixme5v4rnoby.onion
+    DocumentRoot /var/www/rpm.thunix.net
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+    <Directorymatch "^/.*/\.git/">
+                Order deny,allow
+                Deny from all
+    </Directorymatch>
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem
+</VirtualHost>
+</IfModule>

roles/webserver/files/etc/apache2/sites-available/staticadventures.netlib.re.conf

@@ -11,7 +11,7 @@
 </VirtualHost>
 
 <IfModule mod_ssl.c>
-    <VirtualHost *:443>
+<VirtualHost *:443>
     ServerAdmin staticadventures@riseup.net
     ServerName staticadventures.netlib.re
     DocumentRoot /var/www/staticadventures.netlib.re

roles/webserver/files/etc/apache2/sites-available/thunix.net-le-ssl.conf

@@ -1,31 +0,0 @@
-<IfModule mod_ssl.c>
-<VirtualHost *:443>
-    ServerAdmin webmaster@thunix.net 
-    ServerName thunix.net
-    ServerAlias thunixme5v4rnoby.onion
-    DocumentRoot /var/www/thunix.cf
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-		Order deny,allow
-		Deny from all
-	</Directorymatch>
-RewriteEngine on
-# Some rewrite rules in this file were disabled on your HTTPS site,
-# because they have the potential to create redirection loops.
-
- RewriteCond %{SERVER_NAME} =thunix.net
- RewriteRule ^ https://www.%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
-
-Include /etc/letsencrypt/options-ssl-apache.conf
-SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem
-
-  <Location /shell>
-    ProxyPass  http://localhost:4200/
-    Order      allow,deny
-    Allow      from all
-  </Location>
-
-</VirtualHost>
-</IfModule>

roles/webserver/files/etc/apache2/sites-available/thunix.net.conf

@@ -13,3 +13,28 @@ RewriteEngine on
 RewriteCond %{SERVER_NAME} =thunix.net
 RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
 </VirtualHost>
+<IfModule mod_ssl.c>
+<VirtualHost *:443>
+    ServerAdmin webmaster@thunix.net
+    ServerName thunix.net
+    ServerAlias thunixme5v4rnoby.onion
+    DocumentRoot /var/www/thunix.cf
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+    <Directorymatch "^/.*/\.git/">
+                Order deny,allow
+                Deny from all
+        </Directorymatch>
+RewriteEngine on
+# Some rewrite rules in this file were disabled on your HTTPS site,
+# because they have the potential to create redirection loops.
+
+ RewriteCond %{SERVER_NAME} =thunix.net
+ RewriteRule ^ https://www.%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
+
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem
+
+</VirtualHost>
+</IfModule>