commit 1182e176da9e8be5993db01bba81e78028e4c444
Author: David Sorber <david.sorber@gmail.com>
Date:   Sat Jul 17 18:16:47 2021 -0400

    Updating phalanx apache configs for Ubuntu 20.04 install.

diff --git a/configs/apache/baikal.conf b/configs/apache/baikal.conf
deleted file mode 100644
index 2524508..0000000
--- a/configs/apache/baikal.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-Alias /calendar /var/www/baikal/html
-Alias /calendar/ /var/www/baikal/html/
-
-<Directory "/var/www/baikal">
-	Options -Indexes
-</Directory>
-
-<Directory "/var/www/baikal/html">
-        Options None
-        Options +FollowSymlinks
-        AllowOverride All
-</Directory>
diff --git a/configs/apache/main.conf b/configs/apache/main.conf
index 86c9e4b..97565f7 100644
--- a/configs/apache/main.conf
+++ b/configs/apache/main.conf
@@ -1,9 +1,10 @@
+
 <VirtualHost *:80>
-	Redirect permanent / https://10.0.0.6
+        Redirect permanent / https://phalanx.homelinuxserver.org
 </VirtualHost>
 
 <VirtualHost _default_:443>
-	ServerName https://10.0.0.6:443
+        ServerName https://phalanx.homelinuxserver.org
         ServerAdmin webmaster@localhost
 
         DocumentRoot /var/www
@@ -14,29 +15,60 @@
         <Directory /var/www/>
                 Options Indexes FollowSymLinks MultiViews
                 AllowOverride None
-		Require all granted
+                Require all granted
         </Directory>
 
         Alias /htdocs /var/htdocs
         <Directory /var/htdocs>
-		Require all granted
+                Require all granted
         </Directory>
 
-        #WSGIScriptAlias /bfcs /home/dsorber/bfcs/app.wsgi
-	
-	ErrorDocument 403 /error_pages/404.html
-	ErrorDocument 404 /error_pages/404.html
+        ErrorDocument 403 /error_pages/404.html
+        ErrorDocument 404 /error_pages/404.html
 
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
+        CustomLog ${APACHE_LOG_DIR}/access.log combined
         ErrorLog ${APACHE_LOG_DIR}/error.log
 
         # Possible values include: debug, info, notice, warn, error, crit,
         # alert, emerg.
         LogLevel warn
 
-	SSLEngine On
-	SSLCertificateFile /etc/apache2/ssl/baranovich.crt
-	SSLCertificateKeyFile /etc/apache2/ssl/baranovich.key
-	SSLProtocol -all +TLSv1.2
-	SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+        SSLEngine On
+        SSLCertificateFile /etc/apache2/ssl/phalanx.crt
+        SSLCertificateKeyFile /etc/apache2/ssl/phalanx.key
+        SSLProtocol -all +TLSv1.2 +TLSv1.3
+        SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+
+        # --- Redmine ---------------------------------------------------
+        PassengerAppRoot /srv/redmine
+        RailsBaseURI /redmine
+        Alias /redmine /var/www/redmine
+        <Directory /var/www/redmine>
+                Options Indexes FollowSymLinks MultiViews
+                AllowOverride None
+                Order allow,deny
+                allow from all
+                RailsBaseURI /redmine
+        </Directory>
+
+        # --- Nextcloud ------------------------------------------------
+        Alias /nextcloud "/var/www/nextcloud/"
+        <Directory /var/www/nextcloud/>
+                Options +FollowSymlinks
+                AllowOverride All
+
+                <IfModule mod_dav.c>
+                        Dav off
+                </IfModule>
+
+                <IfModule mod_headers.c>
+                        Header always set Strict-Transport-Security "max-age=15552000; includeSubDomains"
+                </IfModule>
+
+                SetEnv HOME /var/www/nextcloud
+                SetEnv HTTP_HOME /var/www/nextcloud
+        </Directory>
+
 </VirtualHost>
+
+
diff --git a/configs/apache/old/baikal.conf b/configs/apache/old/baikal.conf
new file mode 100644
index 0000000..2524508
--- /dev/null
+++ b/configs/apache/old/baikal.conf
@@ -0,0 +1,12 @@
+Alias /calendar /var/www/baikal/html
+Alias /calendar/ /var/www/baikal/html/
+
+<Directory "/var/www/baikal">
+	Options -Indexes
+</Directory>
+
+<Directory "/var/www/baikal/html">
+        Options None
+        Options +FollowSymlinks
+        AllowOverride All
+</Directory>
diff --git a/configs/apache/old/stuff.conf b/configs/apache/old/stuff.conf
new file mode 100644
index 0000000..9d9900b
--- /dev/null
+++ b/configs/apache/old/stuff.conf
@@ -0,0 +1,7 @@
+<Location /stuff>
+	AuthType Digest
+	AuthName "stuff"
+	AuthDigestProvider file
+	AuthUserFile /home/dsorber/web_users
+	Require valid-user
+</Location>
diff --git a/configs/apache/old/trac.conf b/configs/apache/old/trac.conf
new file mode 100644
index 0000000..1e02b65
--- /dev/null
+++ b/configs/apache/old/trac.conf
@@ -0,0 +1,21 @@
+WSGIScriptAlias /trac /home/dsorber/trac/projects/headquarters/trac.wsgi
+
+<Directory /home/dsorber/trac/projects/headquarters/>
+    	WSGIApplicationGroup %{GLOBAL}
+    	Require all granted
+</Directory>
+
+<Location "/trac/login">
+        AuthType Digest
+        AuthName "trac"
+        AuthDigestProvider file
+        AuthUserFile /home/dsorber/web_users
+        Require valid-user
+</Location>
+
+Alias /trac/chrome/common /home/dsorber/trac/projects/headquarters/htdocs/common
+Alias /trac/chrome/site /home/dsorber/trac/projects/headquarters/htdocs/site
+
+<Directory "/home/dsorber/trac/projects/headquarters/htdocs">
+  Require all granted
+</Directory>
diff --git a/configs/apache/stuff.conf b/configs/apache/stuff.conf
deleted file mode 100644
index 9d9900b..0000000
--- a/configs/apache/stuff.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-<Location /stuff>
-	AuthType Digest
-	AuthName "stuff"
-	AuthDigestProvider file
-	AuthUserFile /home/dsorber/web_users
-	Require valid-user
-</Location>
diff --git a/configs/apache/trac.conf b/configs/apache/trac.conf
deleted file mode 100644
index 1e02b65..0000000
--- a/configs/apache/trac.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-WSGIScriptAlias /trac /home/dsorber/trac/projects/headquarters/trac.wsgi
-
-<Directory /home/dsorber/trac/projects/headquarters/>
-    	WSGIApplicationGroup %{GLOBAL}
-    	Require all granted
-</Directory>
-
-<Location "/trac/login">
-        AuthType Digest
-        AuthName "trac"
-        AuthDigestProvider file
-        AuthUserFile /home/dsorber/web_users
-        Require valid-user
-</Location>
-
-Alias /trac/chrome/common /home/dsorber/trac/projects/headquarters/htdocs/common
-Alias /trac/chrome/site /home/dsorber/trac/projects/headquarters/htdocs/site
-
-<Directory "/home/dsorber/trac/projects/headquarters/htdocs">
-  Require all granted
-</Directory>