diff --git a/etc/apache/httpd.conf b/etc/apache/httpd.conf index 44b76df..4ac4a1d 100644 --- a/etc/apache/httpd.conf +++ b/etc/apache/httpd.conf @@ -42,7 +42,7 @@ LoadModule authz_user_module /usr/libexec/httpd/mod_authz_user.so #LoadModule autoindex_module /usr/libexec/httpd/mod_autoindex.so # Custom headers. -#LoadModule headers_module /usr/libexec/httpd/mod_headers.so +LoadModule headers_module /usr/libexec/httpd/mod_headers.so # Expires headers. #LoadModule expires_module /usr/libexec/httpd/mod_expires.so @@ -55,6 +55,7 @@ LoadModule authz_user_module /usr/libexec/httpd/mod_authz_user.so LoadModule proxy_module /usr/libexec/httpd/mod_proxy.so LoadModule proxy_http_module /usr/libexec/httpd/mod_proxy_http.so +LoadModule proxy_uwsgi_module /usr/libexec/httpd/mod_proxy_uwsgi.so # Server status. # LoadModule status_module /usr/libexec/httpd/mod_status.so diff --git a/etc/apache/sites.d/_default_.conf b/etc/apache/sites.d/_default_.conf index b74c490..17bd100 100644 --- a/etc/apache/sites.d/_default_.conf +++ b/etc/apache/sites.d/_default_.conf @@ -9,20 +9,35 @@ RedirectMatch permanent ^/(?!(\.well-known|httpd-errordocs)/)(.*) https://afterdark.org.uk/$2 - ScriptAlias /cgi-bin/ /srv/www/cgi-bin/ + ScriptAlias /cgi-bin /srv/www/cgi-bin - DocumentRoot /srv/www/html/ + DocumentRoot /srv/www/html + + # Alias /racktables /srv/www/html/racktables/wwwroot + Alias /netbox/static /opt/netbox/netbox/static + + + Options Indexes FollowSymLinks MultiViews + AllowOverride None + Require all granted + Require all granted + ProxyPreserveHost On # Do NOT add backslashes to the end of the urls. #ProxyPass /git http://127.0.0.1:9100 #ProxyPassReverse /git http://127.0.0.1:9100 + #ProxyPass /terrastate http://127.0.0.1:9200 #ProxyPassReverse /terrastate http://127.0.0.1:9200 - Alias /racktables /srv/www/html/racktables/wwwroot + RequestHeader set "X-Forwarded-Proto" expr=%{REQUEST_SCHEME} + ProxyPassMatch ^/netbox(?!/static) http://127.0.0.1:9300 + ProxyPassReverse /netbox http://127.0.0.1:9300 + + UserDir /data/home/*/www/html @@ -31,6 +46,25 @@ +Listen 0.0.0.0:9097 + + DocumentRoot /srv/www/html/bacularis/htdocs + ServerName void.coventry +# +# RewriteEngine On +# RewriteCond %{REQUEST_FILENAME} !-d +# RewriteCond %{REQUEST_FILENAME} !-f +# RewriteRule ^(.*)$ https://google.co.uk/ +#http://void.coventry:9097/index.php/$1 +# [L] +# +# Require all granted +# +# + + + + ServerName void.coventry diff --git a/etc/sysctl.conf b/etc/sysctl.conf deleted file mode 100644 index 2fc0ea2..0000000 --- a/etc/sysctl.conf +++ /dev/null @@ -1,6 +0,0 @@ -# See sysctl.conf(5) - -# Enable keyboard mouse button emulation. -dev.mac_hid.mouse_button_emulation = 1 -dev.mac_hid.mouse_button2_keycode = 100 -dev.mac_hid.mouse_button3_keycode = 97