From c93824de7cd17f884654c35708fcc657eb867206 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 27 Mar 2022 17:26:48 -0400 Subject: [PATCH 1/4] Add quotes to fix formatting --- app/frontend/templates/panel/server_schedules.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/frontend/templates/panel/server_schedules.html b/app/frontend/templates/panel/server_schedules.html index fb679e9e..cfc72596 100644 --- a/app/frontend/templates/panel/server_schedules.html +++ b/app/frontend/templates/panel/server_schedules.html @@ -24,14 +24,14 @@ - {% include "parts/details_stats.html %} + {% include "parts/details_stats.html" %}
- {% include "parts/server_controls_list.html %} + {% include "parts/server_controls_list.html" %}
From 0f78c4b2a3a85cc0d47ca5adc6cc43d026055e20 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 27 Mar 2022 17:27:03 -0400 Subject: [PATCH 2/4] Add apache2.conf.example for rev proxy --- config_examples/apache2.conf.example | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 config_examples/apache2.conf.example diff --git a/config_examples/apache2.conf.example b/config_examples/apache2.conf.example new file mode 100755 index 00000000..d5eeb49e --- /dev/null +++ b/config_examples/apache2.conf.example @@ -0,0 +1,36 @@ + + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + RewriteEngine on + RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] + + + + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + ProxyPreserveHost On + SSLProxyEngine On + SSLProxyVerify none + SSLProxyCheckPeerCN off + SSLProxyCheckPeerName off + SSLProxyCheckPeerExpire off + +#This is important for web sockets which are required by crafty to run! + + RewriteEngine on + RewriteCond %{HTTP:Upgrade} websocket [NC] + RewriteCond %{HTTP:Connection} upgrade [NC] + RewriteRule .* "wss://127.0.0.1:8443%{REQUEST_URI}" [P] + + SSLCertificateFile /var/opt/minecraft/crafty-commander/app/config/web/certs/commander.cert.pem + + SSLCertificateKeyFile /var/opt/minecraft/crafty-commander/app/config/web/certs/commander.key.pem + + ProxyPass / https://127.0.0.1:8443/ + ProxyPassReverse / https://127.0.0.1:8443/ + ProxyRequests off + From cf42ff72ebf2278fee88f3d15b0deddf4ff45139 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 27 Mar 2022 17:30:01 -0400 Subject: [PATCH 3/4] Add apache requirement notes --- config_examples/apache2.conf.example | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config_examples/apache2.conf.example b/config_examples/apache2.conf.example index d5eeb49e..5bef85f2 100755 --- a/config_examples/apache2.conf.example +++ b/config_examples/apache2.conf.example @@ -1,3 +1,11 @@ +#Base config made by Justman10000 +#Adapted for WSS by Andrew McManus https://gitlab.com/amcmanu3 +#For this config you need to add the following mods +#mod_ssl +#mod_rewrite +#mod_http_upgrade +#mod_wss + ErrorLog ${APACHE_LOG_DIR}/error.log From d15bae8df7c17aafa2196e4246060beebc4f22fc Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Wed, 30 Mar 2022 14:56:50 -0400 Subject: [PATCH 4/4] Add credit for Zedifus --- config_examples/apache2.conf.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_examples/apache2.conf.example b/config_examples/apache2.conf.example index 5bef85f2..fc8c02a2 100755 --- a/config_examples/apache2.conf.example +++ b/config_examples/apache2.conf.example @@ -1,4 +1,4 @@ -#Base config made by Justman10000 +#Base config made by Justman10000 and Zedifus (https://gitlab.com/Zedifus) #Adapted for WSS by Andrew McManus https://gitlab.com/amcmanu3 #For this config you need to add the following mods #mod_ssl