commit b9381291ee10ec9b1455e66690497349c80e8701 Author: David Sorber Date: Tue Jul 5 11:02:32 2022 -0400 Long overdue update of phalanx configuration files. diff --git a/configs/phalanx/01-netcfg.yaml b/configs/phalanx/01-netcfg.yaml index 97cfbc7..c96859d 100644 --- a/configs/phalanx/01-netcfg.yaml +++ b/configs/phalanx/01-netcfg.yaml @@ -1,19 +1,23 @@ -# This file describes the network interfaces available on your system -# For more information, see netplan(5). +# This is the network config written by 'subiquity' network: - version: 2 - renderer: networkd ethernets: - enp1s0f1: - dhcp4: yes - mtu: 9000 enp1s0f0: - dhcp4: yes - mtu: 9000 - routes: - - to: 192.168.250.0/24 - via: 0.0.0.0 - metric: 20 + link-local: [ ipv4 ] + dhcp4: true + dhcp4-overrides: + route-metric: 200 + enp1s0f1: + link-local: [ ipv4 ] + dhcp4: false + optional: true enp4s0: - dhcp4: yes + link-local: [ ipv4 ] + dhcp4: true + dhcp4-overrides: + route-metric: 100 + enp5s0: + link-local: [ ipv4 ] + dhcp4: false + optional: true + version: 2 diff --git a/configs/phalanx/apache/baikal.conf b/configs/phalanx/apache/baikal.conf deleted file mode 100644 index 2524508..0000000 --- a/configs/phalanx/apache/baikal.conf +++ /dev/null @@ -1,12 +0,0 @@ -Alias /calendar /var/www/baikal/html -Alias /calendar/ /var/www/baikal/html/ - - - Options -Indexes - - - - Options None - Options +FollowSymlinks - AllowOverride All - diff --git a/configs/phalanx/apache/git.conf b/configs/phalanx/apache/git.conf new file mode 100644 index 0000000..fb0577a --- /dev/null +++ b/configs/phalanx/apache/git.conf @@ -0,0 +1,33 @@ +PerlLoadModule Apache2::Redmine + +Alias /git /var/www/grack/public + + 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 + + + + Options None + AllowOverride None + + Order allow,deny + Allow from all + + = 2.3> + Require all granted + + + diff --git a/configs/phalanx/apache/main.conf b/configs/phalanx/apache/main.conf index 86c9e4b..667d5d9 100644 --- a/configs/phalanx/apache/main.conf +++ b/configs/phalanx/apache/main.conf @@ -1,9 +1,9 @@ - Redirect permanent / https://10.0.0.6 + Redirect permanent / https://phalanx.homelinuxserver.org - ServerName https://10.0.0.6:443 + ServerName https://phalanx.homelinuxserver.org ServerAdmin webmaster@localhost DocumentRoot /var/www @@ -14,29 +14,58 @@ Options Indexes FollowSymLinks MultiViews AllowOverride None - Require all granted + Require all granted Alias /htdocs /var/htdocs - Require all granted + Require all granted - #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.3 + SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown + + # --- Redmine --------------------------------------------------- + PassengerAppRoot /srv/redmine + RailsBaseURI /redmine + Alias /redmine /var/www/redmine + + Options Indexes FollowSymLinks MultiViews + AllowOverride None + Order allow,deny + allow from all + RailsBaseURI /redmine + + + # --- Nextcloud ------------------------------------------------ + Alias /nextcloud "/var/www/nextcloud/" + + Options +FollowSymlinks + AllowOverride All + + + Dav off + + + + Header always set Strict-Transport-Security "max-age=15552000; includeSubDomains" + + + SetEnv HOME /var/www/nextcloud + SetEnv HTTP_HOME /var/www/nextcloud + + diff --git a/configs/phalanx/apache/nextcloud.conf b/configs/phalanx/apache/nextcloud.conf deleted file mode 100644 index b693da9..0000000 --- a/configs/phalanx/apache/nextcloud.conf +++ /dev/null @@ -1,14 +0,0 @@ -Alias /nextcloud "/var/www/nextcloud/" - - - Options +FollowSymlinks - AllowOverride All - - - Dav off - - - SetEnv HOME /var/www/nextcloud - SetEnv HTTP_HOME /var/www/nextcloud - - diff --git a/configs/phalanx/apache/stuff.conf b/configs/phalanx/apache/stuff.conf deleted file mode 100644 index 9d9900b..0000000 --- a/configs/phalanx/apache/stuff.conf +++ /dev/null @@ -1,7 +0,0 @@ - - AuthType Digest - AuthName "stuff" - AuthDigestProvider file - AuthUserFile /home/dsorber/web_users - Require valid-user - diff --git a/configs/phalanx/apache/trac.conf b/configs/phalanx/apache/trac.conf deleted file mode 100644 index 1e02b65..0000000 --- a/configs/phalanx/apache/trac.conf +++ /dev/null @@ -1,21 +0,0 @@ -WSGIScriptAlias /trac /home/dsorber/trac/projects/headquarters/trac.wsgi - - - WSGIApplicationGroup %{GLOBAL} - Require all granted - - - - AuthType Digest - AuthName "trac" - AuthDigestProvider file - AuthUserFile /home/dsorber/web_users - Require valid-user - - -Alias /trac/chrome/common /home/dsorber/trac/projects/headquarters/htdocs/common -Alias /trac/chrome/site /home/dsorber/trac/projects/headquarters/htdocs/site - - - Require all granted - diff --git a/configs/phalanx/apache/transmission.conf b/configs/phalanx/apache/transmission.conf index e72b064..7623751 100644 --- a/configs/phalanx/apache/transmission.conf +++ b/configs/phalanx/apache/transmission.conf @@ -1,10 +1,10 @@ ProxyRequests Off - 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 + 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 diff --git a/configs/phalanx/network_tweaks_phalanx.sh b/configs/phalanx/network_tweaks_phalanx.sh deleted file mode 100755 index 4c02eba..0000000 --- a/configs/phalanx/network_tweaks_phalanx.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -sleep 2 - -# Delete the default route for enp1s0f0, we only want to use it for 10G -# traffic. NOTE: netplan/networkd correctly is setting the route. -/sbin/route del -net 192.168.0.0 netmask 255.255.0.0 dev enp1s0f0 - -# Set 9000 MTU for the 10G interface enp1s0f0 -/sbin/ifconfig enp1s0f0 mtu 9000 - -exit 0 diff --git a/configs/phalanx/networking-tweaks.service b/configs/phalanx/networking-tweaks.service deleted file mode 100644 index 0ed4f3e..0000000 --- a/configs/phalanx/networking-tweaks.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Tweak Some Networking Settings -Wants=network-online.target -After=network-online.target - -[Service] -ExecStart=/home/dsorber/network_tweaks_phalanx.sh - -[Install] -WantedBy=multi-user.target - -# Setup -# -# Install network_tweaks_phalanx.sh script. -# Copy networking-tweaks.service to /lib/systemd/system/ -# Start it: sudo systemctl start networking-tweaks.service -# Enable it: sudo systemctl enable networking-tweaks.service