From 5ab6999d393cbdf65cd5fd3ab40e02c33849f9c4 Mon Sep 17 00:00:00 2001 From: Joe Rayhawk Date: Mon, 24 Sep 2018 22:44:29 -0700 Subject: pinyconfig: Modernizing configuration files. --- pinyconfigs/etc/apache2/conf-available/piny.conf | 1 + pinyconfigs/etc/apache2/conf.d/piny | 1 - pinyconfigs/etc/apache2/sites-available/piny | 85 ----------------------- pinyconfigs/etc/apache2/sites-available/piny.conf | 81 +++++++++++++++++++++ pinyconfigs/etc/sv/git-daemon/run | 4 -- 5 files changed, 82 insertions(+), 90 deletions(-) create mode 100644 pinyconfigs/etc/apache2/conf-available/piny.conf delete mode 100644 pinyconfigs/etc/apache2/conf.d/piny delete mode 100644 pinyconfigs/etc/apache2/sites-available/piny create mode 100644 pinyconfigs/etc/apache2/sites-available/piny.conf delete mode 100755 pinyconfigs/etc/sv/git-daemon/run diff --git a/pinyconfigs/etc/apache2/conf-available/piny.conf b/pinyconfigs/etc/apache2/conf-available/piny.conf new file mode 100644 index 0000000..70fde20 --- /dev/null +++ b/pinyconfigs/etc/apache2/conf-available/piny.conf @@ -0,0 +1 @@ +Include /etc/apache2/piny/global diff --git a/pinyconfigs/etc/apache2/conf.d/piny b/pinyconfigs/etc/apache2/conf.d/piny deleted file mode 100644 index 70fde20..0000000 --- a/pinyconfigs/etc/apache2/conf.d/piny +++ /dev/null @@ -1 +0,0 @@ -Include /etc/apache2/piny/global diff --git a/pinyconfigs/etc/apache2/sites-available/piny b/pinyconfigs/etc/apache2/sites-available/piny deleted file mode 100644 index a3c38c9..0000000 --- a/pinyconfigs/etc/apache2/sites-available/piny +++ /dev/null @@ -1,85 +0,0 @@ - - ServerName piny.be - - DocumentRoot /srv/http/piny.be - - - Options Indexes FollowSymLinks MultiViews - AllowOverride None - - - Alias /js /usr/share/javascript - - RedirectMatch 301 ^/$ http://piny.be/piny-hosting/ - - Include /etc/apache2/piny/www - - - - ServerName www.piny.be - RedirectMatch 301 (.*) http://piny.be$1 - - - - ServerName piny.be - DocumentRoot /srv/https/piny.be - - - Options Indexes FollowSymLinks MultiViews - AllowOverride None - - - Alias /js /usr/share/javascript - - RedirectMatch 301 ^/$ http://piny.be/piny-hosting/ - - SSLEngine On - SSLCertificateFile /etc/ssl/private/secure.piny.be.pem - SSLCertificateChainFile /etc/ssl/private/GandiStandardSSLCA.pem - - Include /etc/apache2/piny/www - - - - ServerName secure.piny.be - RedirectMatch 301 (.*) https://secure.piny.be$1 - - - - ServerName secure.piny.be - DocumentRoot /srv/https/secure.piny.be - RedirectMatch 301 ^/$ http://piny.be/ - - - SSLRequireSSL - Options Indexes FollowSymLinks MultiViews - AllowOverride None - - - - SetHandler cgi-script - Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch - - - - AuthBasicProvider PAM - AuthPAMService other - AuthBasicAuthoritative off - AuthType Basic - AuthName "User account for piny.be needed." - Require valid-user - - - Alias /_cgit /usr/share/cgit - - ScriptAlias /cgit /usr/lib/cgi-bin/cgit.cgi - ScriptAlias /piny-newuser /usr/lib/cgi-bin/piny/newuser.cgi - ScriptAlias /piny-validate /usr/lib/cgi-bin/piny/checkconstraint.cgi - ScriptAlias /auth /usr/lib/cgi-bin/piny/auth - - SSLEngine On - SSLCertificateFile /etc/ssl/private/secure.piny.be.pem - SSLCertificateChainFile /etc/ssl/private/GandiStandardSSLCA.pem - - Include /etc/apache2/piny/secure - diff --git a/pinyconfigs/etc/apache2/sites-available/piny.conf b/pinyconfigs/etc/apache2/sites-available/piny.conf new file mode 100644 index 0000000..6702a3d --- /dev/null +++ b/pinyconfigs/etc/apache2/sites-available/piny.conf @@ -0,0 +1,81 @@ + + ServerName piny.be + + DocumentRoot /srv/http/piny.be + + + Options Indexes FollowSymLinks MultiViews + AllowOverride None + + + Alias /js /usr/share/javascript + + RedirectMatch 301 ^/$ http://piny.be/piny-hosting/ + + Include /etc/apache2/piny/www + + + + ServerName www.piny.be + RedirectMatch 301 (.*) http://piny.be$1 + + + + ServerName piny.be + DocumentRoot /srv/https/piny.be + + + Options Indexes FollowSymLinks MultiViews + AllowOverride None + + + Alias /js /usr/share/javascript + + RedirectMatch 301 ^/$ http://piny.be/piny-hosting/ + + SSLEngine On + + Include /etc/apache2/piny/www + + + + ServerName secure.piny.be + RedirectMatch 301 (.*) https://secure.piny.be$1 + + + + ServerName secure.piny.be + DocumentRoot /srv/https/secure.piny.be + RedirectMatch 301 ^/$ http://piny.be/ + + + SSLRequireSSL + Options Indexes FollowSymLinks MultiViews + AllowOverride None + + + + SetHandler cgi-script + Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch + + + + AuthBasicProvider PAM + AuthPAMService other + AuthBasicAuthoritative off + AuthType Basic + AuthName "User account for piny.be needed." + Require valid-user + + + Alias /_cgit /usr/share/cgit + + ScriptAlias /cgit /usr/lib/cgi-bin/cgit.cgi + ScriptAlias /piny-newuser /usr/lib/cgi-bin/piny/newuser.cgi + ScriptAlias /piny-validate /usr/lib/cgi-bin/piny/checkconstraint.cgi + ScriptAlias /auth /usr/lib/cgi-bin/piny/auth + + SSLEngine On + + Include /etc/apache2/piny/secure + diff --git a/pinyconfigs/etc/sv/git-daemon/run b/pinyconfigs/etc/sv/git-daemon/run deleted file mode 100755 index 307377e..0000000 --- a/pinyconfigs/etc/sv/git-daemon/run +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -exec 2>&1 -echo 'git daemon starting.' -exec chpst -ugitdaemon git daemon --verbose --base-path=/srv/git -- cgit v1.2.3