commit 9af489b173f313d987626317ff5639db6269aaea
Author: David Sorber <david.sorber@gmail.com>
Date:   Wed Apr 24 21:12:26 2024 -0400

    Updating phalanx apache2 configs. Consolidated everything into
    main.conf.

diff --git a/configs/phalanx/apache/git.conf b/configs/phalanx/apache/git.conf
deleted file mode 100644
index fb0577a..0000000
--- a/configs/phalanx/apache/git.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-PerlLoadModule Apache2::Redmine
-
-Alias /git /var/www/grack/public
-<Location /git>
-   PassengerBaseURI /git
-   PassengerAppRoot /var/www/grack
-
-   AuthType Basic
-   AuthName "Redmine git repositories"
-   Require valid-user
-   AuthUserFile /dev/null
-
-   PerlAccessHandler Apache::Authn::Redmine::access_handler
-   PerlAuthenHandler Apache::Authn::Redmine::authen_handler
-   #RedmineDSN "DBI:mysql:database=bitnami_redmine;host=localhost;mysql_socket=/opt/bitnami/mysql/tmp/mysql.sock"
-   RedmineDSN "DBI:Pg:dbname=redmine;host=localhost"
-   RedmineDbUser "redmine"
-   RedmineDbPass "PASSWORD_GOES_HERE"
-   RedmineGitSmartHttp yes
-</Location>
-
-<Directory "/var/www/grack/public">
-    Options None
-    AllowOverride None
-    <IfVersion < 2.3 >
-        Order allow,deny
-        Allow from all
-    </IfVersion>
-    <IfVersion >= 2.3>
-        Require all granted
-   </IfVersion>
-</Directory>
-
diff --git a/configs/phalanx/apache/main.conf b/configs/phalanx/apache/main.conf
index 4748e77..9c31b9c 100644
--- a/configs/phalanx/apache/main.conf
+++ b/configs/phalanx/apache/main.conf
@@ -1,9 +1,10 @@
+
 <VirtualHost *:80>
-        Redirect permanent / https://phalanx.homelinuxserver.org
+	Redirect permanent / https://phalanx.homelinuxserver.org
 </VirtualHost>
 
 <VirtualHost _default_:443>
-        ServerName https://phalanx.homelinuxserver.org
+	ServerName https://phalanx.homelinuxserver.org
         ServerAdmin webmaster@localhost
 
         DocumentRoot /var/www
@@ -14,30 +15,30 @@
         <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>
 
-        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/phalanx.crt
-        SSLCertificateKeyFile /etc/apache2/ssl/phalanx.key
-        SSLProtocol -all +TLSv1.3
-        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.3
+	SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+	
         # --- Nextcloud ------------------------------------------------
         Alias /nextcloud/ "/var/www/nextcloud/"
         <Directory /var/www/nextcloud/>
@@ -57,8 +58,8 @@
                 SetEnv HTTP_HOME /var/www/nextcloud
         </Directory>
 
-        # --- Redmine ---------------------------------------------------
-        Alias /redmine /var/www/redmine/
+	# --- Redmine ---------------------------------------------------
+	Alias /redmine /var/www/redmine/
         <Directory /var/www/redmine/>
                 Options Indexes FollowSymLinks MultiViews
                 AllowOverride None
@@ -68,5 +69,64 @@
                 RailsBaseURI /redmine
         </Directory>
 
-</VirtualHost>
+	# --- Redmine Git ----------------------------------------------
+       PerlLoadModule Apache2::Redmine
+
+	Alias /git /var/www/grack/public
+	<Location /git>
+		PassengerBaseURI /git
+	   	PassengerAppRoot /var/www/grack
+	
+	   	AuthType Basic
+	   	AuthName "Redmine git repositories"
+	   	Require valid-user
+	   	AuthUserFile /dev/null
 
+	   	PerlAccessHandler Apache::Authn::Redmine::access_handler
+	   	PerlAuthenHandler Apache::Authn::Redmine::authen_handler
+	   	#RedmineDSN "DBI:mysql:database=bitnami_redmine;host=localhost;mysql_socket=/opt/bitnami/mysql/tmp/mysql.sock"
+	   	RedmineDSN "DBI:Pg:dbname=redmine;host=localhost"
+	   	RedmineDbUser "redmine"
+	   	RedmineDbPass "SemolinaPilchardPornographicPriestess"
+	   	RedmineGitSmartHttp yes
+	</Location>
+
+	<Directory "/var/www/grack/public">
+		Options None
+	    	AllowOverride None
+	    	<IfVersion < 2.3 >
+	        	Order allow,deny
+	        	Allow from all
+	    	</IfVersion>
+	    	<IfVersion >= 2.3>
+	        	Require all granted
+	   	</IfVersion>
+	</Directory>
+
+	# --- Transmission ---------------------------------------------
+        ProxyRequests Off
+	<Location /transmission>
+        	AuthType Digest
+	        AuthName "engine"
+        	AuthDigestProvider file
+	        AuthUserFile /home/dsorber/web_users
+        	Require valid-user
+	        ProxyPass http://192.168.8.6:9565/transmission
+	        ProxyPassReverse http://192.168.8.6:9565/transmission
+	</Location>
+
+	# --- ttyd -----------------------------------------------------
+        #ProxyRequests Off
+	<Location /terminal>
+        	ProxyPreserveHost On
+	        RewriteEngine on
+        	RewriteCond %{HTTP:Upgrade} websocket [NC]
+	        RewriteCond %{HTTP:Connection} upgrade [NC]
+        	RewriteRule /terminal/?(.*) "ws://localhost:9772/$1" [P,L]
+#	        ProxyPass /terminal http://localhost:9772/
+#          	ProxyPassReverse /terminal http://localhost:9772/
+		ProxyPass http://localhost:9772/
+		ProxyPassReverse http://localhost:9772/
+	</Location>
+
+</VirtualHost>
diff --git a/configs/phalanx/apache/transmission.conf b/configs/phalanx/apache/transmission.conf
deleted file mode 100644
index 7623751..0000000
--- a/configs/phalanx/apache/transmission.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-ProxyRequests Off
-<Location /transmission>
-        AuthType Digest
-        AuthName "engine"
-        AuthDigestProvider file
-        AuthUserFile /home/dsorber/web_users
-        Require valid-user
-        ProxyPass http://192.168.8.6:9565/transmission
-        ProxyPassReverse http://192.168.8.6:9565/transmission
-</Location>