From 824a5cf9831d0ee8a8f6123c64fab3a9deadea86 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 11 Oct 2020 19:23:41 +0200 Subject: fix add extension .conf to apache2 site snippets --- apache2/sites-available/00_virtual | 1 - apache2/sites-available/00_virtual.conf | 1 + apache2/sites-available/0_default | 19 ------ apache2/sites-available/0_default.conf | 19 ++++++ apache2/sites-available/chat.secure-example.com | 55 --------------- .../sites-available/chat.secure-example.com.conf | 55 +++++++++++++++ apache2/sites-available/django.secure-example.com | 27 -------- .../sites-available/django.secure-example.com.conf | 27 ++++++++ apache2/sites-available/issues.secure-example.com | 26 ------- .../sites-available/issues.secure-example.com.conf | 26 +++++++ apache2/sites-available/lists.secure-example.com | 39 ----------- .../sites-available/lists.secure-example.com.conf | 39 +++++++++++ apache2/sites-available/mail.secure-example.com | 41 ----------- .../sites-available/mail.secure-example.com.conf | 41 +++++++++++ apache2/sites-available/php.example.com | 26 ------- apache2/sites-available/php.example.com.conf | 26 +++++++ apache2/sites-available/users.secure-example.com | 79 ---------------------- .../sites-available/users.secure-example.com.conf | 79 ++++++++++++++++++++++ apache2/sites-available/wiki.secure-example.com | 1 - .../sites-available/wiki.secure-example.com.conf | 1 + apache2/sites-available/www.secure-example.com | 36 ---------- .../sites-available/www.secure-example.com.conf | 36 ++++++++++ 22 files changed, 350 insertions(+), 350 deletions(-) delete mode 100644 apache2/sites-available/00_virtual create mode 100644 apache2/sites-available/00_virtual.conf delete mode 100644 apache2/sites-available/0_default create mode 100644 apache2/sites-available/0_default.conf delete mode 100644 apache2/sites-available/chat.secure-example.com create mode 100644 apache2/sites-available/chat.secure-example.com.conf delete mode 100644 apache2/sites-available/django.secure-example.com create mode 100644 apache2/sites-available/django.secure-example.com.conf delete mode 100644 apache2/sites-available/issues.secure-example.com create mode 100644 apache2/sites-available/issues.secure-example.com.conf delete mode 100644 apache2/sites-available/lists.secure-example.com create mode 100644 apache2/sites-available/lists.secure-example.com.conf delete mode 100644 apache2/sites-available/mail.secure-example.com create mode 100644 apache2/sites-available/mail.secure-example.com.conf delete mode 100644 apache2/sites-available/php.example.com create mode 100644 apache2/sites-available/php.example.com.conf delete mode 100644 apache2/sites-available/users.secure-example.com create mode 100644 apache2/sites-available/users.secure-example.com.conf delete mode 120000 apache2/sites-available/wiki.secure-example.com create mode 120000 apache2/sites-available/wiki.secure-example.com.conf delete mode 100644 apache2/sites-available/www.secure-example.com create mode 100644 apache2/sites-available/www.secure-example.com.conf (limited to 'apache2') diff --git a/apache2/sites-available/00_virtual b/apache2/sites-available/00_virtual deleted file mode 100644 index 2dc37fb..0000000 --- a/apache2/sites-available/00_virtual +++ /dev/null @@ -1 +0,0 @@ -UseCanonicalName On diff --git a/apache2/sites-available/00_virtual.conf b/apache2/sites-available/00_virtual.conf new file mode 100644 index 0000000..2dc37fb --- /dev/null +++ b/apache2/sites-available/00_virtual.conf @@ -0,0 +1 @@ +UseCanonicalName On diff --git a/apache2/sites-available/0_default b/apache2/sites-available/0_default deleted file mode 100644 index ce390fb..0000000 --- a/apache2/sites-available/0_default +++ /dev/null @@ -1,19 +0,0 @@ - - ServerName wrong.example.com - ServerAdmin webmaster@example.com - DocumentRoot /home/webmaster/public_websites/wrong.example.com - - Include conf.d/local-ssl.conf - - ErrorLog ${APACHE_LOG_DIR}/wrong.example.com-error.log - CustomLog ${APACHE_LOG_DIR}/wrong.example.com-access.log combined - - - ServerName wrong.example.com - ServerAlias wrong - ServerAdmin webmaster@example.com - DocumentRoot /home/webmaster/public_websites/wrong.example.com - - ErrorLog ${APACHE_LOG_DIR}/wrong.example.com-error.log - CustomLog ${APACHE_LOG_DIR}/wrong.example.com-access.log combined - diff --git a/apache2/sites-available/0_default.conf b/apache2/sites-available/0_default.conf new file mode 100644 index 0000000..ce390fb --- /dev/null +++ b/apache2/sites-available/0_default.conf @@ -0,0 +1,19 @@ + + ServerName wrong.example.com + ServerAdmin webmaster@example.com + DocumentRoot /home/webmaster/public_websites/wrong.example.com + + Include conf.d/local-ssl.conf + + ErrorLog ${APACHE_LOG_DIR}/wrong.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/wrong.example.com-access.log combined + + + ServerName wrong.example.com + ServerAlias wrong + ServerAdmin webmaster@example.com + DocumentRoot /home/webmaster/public_websites/wrong.example.com + + ErrorLog ${APACHE_LOG_DIR}/wrong.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/wrong.example.com-access.log combined + diff --git a/apache2/sites-available/chat.secure-example.com b/apache2/sites-available/chat.secure-example.com deleted file mode 100644 index 1b27bbf..0000000 --- a/apache2/sites-available/chat.secure-example.com +++ /dev/null @@ -1,55 +0,0 @@ - - ServerName chat.example.com:443 - ServerAdmin webmaster@example.com - DocumentRoot /var/www/vhosts/web-static/chat.example.com/ - - Include conf.d/local-ssl.conf - Include conf.d/javascript-common.conf - Include conf.d/local-jabber.conf - -# RewriteEngine On -# RewriteRule ^/$ /xmppchat/ [R] - - Alias /jwchat /usr/share/jwchat/www - - Options +Indexes +Multiviews +FollowSymLinks - - - Alias /logs /var/www/vhosts/www-ejabberd/conference - - Options Indexes - DirectoryIndex index.html - - - ErrorLog ${APACHE_LOG_DIR}/chat.example.com-error.log - CustomLog ${APACHE_LOG_DIR}/chat.example.com-access.log combined - - - ServerName www.chat.example.com:443 - ServerName *.chat.example.com:443 - ServerName chat:443 - ServerName *.chat:443 - - Include conf.d/local-ssl.conf - Include conf.d/local-log-origin.conf - - RewriteEngine On - RewriteRule / https://chat.example.com/[R] -# RewriteRule /(.*) https://chat.example.com/$1 [R] - - CustomLog ${APACHE_LOG_DIR}/redirect.log origin - - - ServerName chat.example.com - ServerAlias *.chat.example.com - ServerAlias chat - ServerAlias *.chat - - Include conf.d/local-log-origin.conf - - RewriteEngine On - RewriteRule / https://chat.example.com/ [R] -# RewriteRule /(.*) https://chat.example.com/$1 [R] - - CustomLog ${APACHE_LOG_DIR}/redirect.log origin - diff --git a/apache2/sites-available/chat.secure-example.com.conf b/apache2/sites-available/chat.secure-example.com.conf new file mode 100644 index 0000000..1b27bbf --- /dev/null +++ b/apache2/sites-available/chat.secure-example.com.conf @@ -0,0 +1,55 @@ + + ServerName chat.example.com:443 + ServerAdmin webmaster@example.com + DocumentRoot /var/www/vhosts/web-static/chat.example.com/ + + Include conf.d/local-ssl.conf + Include conf.d/javascript-common.conf + Include conf.d/local-jabber.conf + +# RewriteEngine On +# RewriteRule ^/$ /xmppchat/ [R] + + Alias /jwchat /usr/share/jwchat/www + + Options +Indexes +Multiviews +FollowSymLinks + + + Alias /logs /var/www/vhosts/www-ejabberd/conference + + Options Indexes + DirectoryIndex index.html + + + ErrorLog ${APACHE_LOG_DIR}/chat.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/chat.example.com-access.log combined + + + ServerName www.chat.example.com:443 + ServerName *.chat.example.com:443 + ServerName chat:443 + ServerName *.chat:443 + + Include conf.d/local-ssl.conf + Include conf.d/local-log-origin.conf + + RewriteEngine On + RewriteRule / https://chat.example.com/[R] +# RewriteRule /(.*) https://chat.example.com/$1 [R] + + CustomLog ${APACHE_LOG_DIR}/redirect.log origin + + + ServerName chat.example.com + ServerAlias *.chat.example.com + ServerAlias chat + ServerAlias *.chat + + Include conf.d/local-log-origin.conf + + RewriteEngine On + RewriteRule / https://chat.example.com/ [R] +# RewriteRule /(.*) https://chat.example.com/$1 [R] + + CustomLog ${APACHE_LOG_DIR}/redirect.log origin + diff --git a/apache2/sites-available/django.secure-example.com b/apache2/sites-available/django.secure-example.com deleted file mode 100644 index 5424420..0000000 --- a/apache2/sites-available/django.secure-example.com +++ /dev/null @@ -1,27 +0,0 @@ - - ServerName django.example.com - ServerAdmin webmaster@example.com - DocumentRoot /var/www/nowhere - - Include conf.d/local-ssl.conf - - - SetHandler uwsgi-handler - uWSGISocket /run/uwsgi/app/local-django-app/socket - uWSGImaxVars 512 - - - ErrorLog ${APACHE_LOG_DIR}/django.example.com-error.log - CustomLog ${APACHE_LOG_DIR}/django.example.com-access.log combined - - - ServerName django.example.com - ServerAlias *.django.example.com - - Include conf.d/local-log-origin.conf - - RedirectMatch permanent .* https://django.example.com/ - - ErrorLog ${APACHE_LOG_DIR}/django.example.com-error.log - CustomLog ${APACHE_LOG_DIR}/django.example.com-access.log origin - diff --git a/apache2/sites-available/django.secure-example.com.conf b/apache2/sites-available/django.secure-example.com.conf new file mode 100644 index 0000000..5424420 --- /dev/null +++ b/apache2/sites-available/django.secure-example.com.conf @@ -0,0 +1,27 @@ + + ServerName django.example.com + ServerAdmin webmaster@example.com + DocumentRoot /var/www/nowhere + + Include conf.d/local-ssl.conf + + + SetHandler uwsgi-handler + uWSGISocket /run/uwsgi/app/local-django-app/socket + uWSGImaxVars 512 + + + ErrorLog ${APACHE_LOG_DIR}/django.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/django.example.com-access.log combined + + + ServerName django.example.com + ServerAlias *.django.example.com + + Include conf.d/local-log-origin.conf + + RedirectMatch permanent .* https://django.example.com/ + + ErrorLog ${APACHE_LOG_DIR}/django.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/django.example.com-access.log origin + diff --git a/apache2/sites-available/issues.secure-example.com b/apache2/sites-available/issues.secure-example.com deleted file mode 100644 index 1ba61f0..0000000 --- a/apache2/sites-available/issues.secure-example.com +++ /dev/null @@ -1,26 +0,0 @@ - - ServerName issues.example.com - ServerAdmin webmaster@example.com - DocumentRoot /var/www/nowhere - - Include conf.d/local-ssl.conf - - - SetHandler uwsgi-handler - uWSGISocket /run/uwsgi/app/local-rt4/socket - - - ErrorLog ${APACHE_LOG_DIR}/issues.example.com-error.log - CustomLog ${APACHE_LOG_DIR}/issues.example.com-access.log combined - - - ServerName issues.example.com - ServerAlias *.issues.example.com - - Include conf.d/local-log-origin.conf - - RedirectMatch permanent .* https://issues.example.com/ - - ErrorLog ${APACHE_LOG_DIR}/issues.example.com-error.log - CustomLog ${APACHE_LOG_DIR}/issues.example.com-access.log origin - diff --git a/apache2/sites-available/issues.secure-example.com.conf b/apache2/sites-available/issues.secure-example.com.conf new file mode 100644 index 0000000..1ba61f0 --- /dev/null +++ b/apache2/sites-available/issues.secure-example.com.conf @@ -0,0 +1,26 @@ + + ServerName issues.example.com + ServerAdmin webmaster@example.com + DocumentRoot /var/www/nowhere + + Include conf.d/local-ssl.conf + + + SetHandler uwsgi-handler + uWSGISocket /run/uwsgi/app/local-rt4/socket + + + ErrorLog ${APACHE_LOG_DIR}/issues.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/issues.example.com-access.log combined + + + ServerName issues.example.com + ServerAlias *.issues.example.com + + Include conf.d/local-log-origin.conf + + RedirectMatch permanent .* https://issues.example.com/ + + ErrorLog ${APACHE_LOG_DIR}/issues.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/issues.example.com-access.log origin + diff --git a/apache2/sites-available/lists.secure-example.com b/apache2/sites-available/lists.secure-example.com deleted file mode 100644 index 1dc7bc9..0000000 --- a/apache2/sites-available/lists.secure-example.com +++ /dev/null @@ -1,39 +0,0 @@ - - ServerName lists.example.com:443 - ServerAlias lists - ServerAdmin webmaster@example.com - DocumentRoot /home/webmaster/public_websites/lists.example.com/ - - Include conf.d/local-ssl.conf - Include conf.d/local-log-vhosts.conf - Include conf.d/local-mailman.conf - Include conf.d/local-mailman-root.conf - - ErrorLog ${APACHE_LOG_DIR}/lists.example.com-error.log - CustomLog ${APACHE_LOG_DIR}/lists.example.com-access.log combined - - - ServerName www.lists.example.com:443 - ServerName *.lists.example.com:443 - - Include conf.d/local-ssl.conf - Include conf.d/local-log-origin.conf - - RewriteEngine On - RewriteRule / https://lists.example.com/ [R] -# RewriteRule /(.*) https://lists.example.com/$1 [R] - - CustomLog ${APACHE_LOG_DIR}/redirect.log origin - - - ServerName lists.example.com - ServerAlias *.lists.example.com - - Include conf.d/local-log-origin.conf - - RewriteEngine On - RewriteRule / https://lists.example.com/ [R] -# RewriteRule /(.*) https://lists.example.com/$1 [R] - - CustomLog ${APACHE_LOG_DIR}/redirect.log origin - diff --git a/apache2/sites-available/lists.secure-example.com.conf b/apache2/sites-available/lists.secure-example.com.conf new file mode 100644 index 0000000..1dc7bc9 --- /dev/null +++ b/apache2/sites-available/lists.secure-example.com.conf @@ -0,0 +1,39 @@ + + ServerName lists.example.com:443 + ServerAlias lists + ServerAdmin webmaster@example.com + DocumentRoot /home/webmaster/public_websites/lists.example.com/ + + Include conf.d/local-ssl.conf + Include conf.d/local-log-vhosts.conf + Include conf.d/local-mailman.conf + Include conf.d/local-mailman-root.conf + + ErrorLog ${APACHE_LOG_DIR}/lists.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/lists.example.com-access.log combined + + + ServerName www.lists.example.com:443 + ServerName *.lists.example.com:443 + + Include conf.d/local-ssl.conf + Include conf.d/local-log-origin.conf + + RewriteEngine On + RewriteRule / https://lists.example.com/ [R] +# RewriteRule /(.*) https://lists.example.com/$1 [R] + + CustomLog ${APACHE_LOG_DIR}/redirect.log origin + + + ServerName lists.example.com + ServerAlias *.lists.example.com + + Include conf.d/local-log-origin.conf + + RewriteEngine On + RewriteRule / https://lists.example.com/ [R] +# RewriteRule /(.*) https://lists.example.com/$1 [R] + + CustomLog ${APACHE_LOG_DIR}/redirect.log origin + diff --git a/apache2/sites-available/mail.secure-example.com b/apache2/sites-available/mail.secure-example.com deleted file mode 100644 index 3ba1a3a..0000000 --- a/apache2/sites-available/mail.secure-example.com +++ /dev/null @@ -1,41 +0,0 @@ - - ServerName mail.example.com:443 - ServerAdmin webmaster@example.com - DocumentRoot /home/webmaster/public_websites/mail.example.com/ - - Include conf.d/local-ssl.conf - Include conf.d/local-php.conf - Include conf.d/local-horde3.conf - - ErrorLog ${APACHE_LOG_DIR}/mail.example.com-error.log - CustomLog ${APACHE_LOG_DIR}/mail.example.com-access.log combined - - - ServerName www.mail.example.com:443 - ServerName *.mail.example.com:443 - ServerName mail:443 - ServerName *.mail:443 - - Include conf.d/local-ssl.conf - Include conf.d/local-log-origin.conf - - RewriteEngine On - RewriteRule / https://mail.example.com/ [R] -# RewriteRule /(.*) https://mail.example.com/$1 [R] - - CustomLog ${APACHE_LOG_DIR}/redirect.log origin - - - ServerName mail.example.com - ServerAlias *.mail.example.com - ServerAlias mail - ServerAlias *.mail - - Include /etc/apache2/conf.d/local-log-origin.conf - - RewriteEngine On - RewriteRule / https://mail.example.com/ [R] -# RewriteRule /(.*) https://mail.example.com/$1 [R] - - CustomLog ${APACHE_LOG_DIR}/redirect.log origin - diff --git a/apache2/sites-available/mail.secure-example.com.conf b/apache2/sites-available/mail.secure-example.com.conf new file mode 100644 index 0000000..3ba1a3a --- /dev/null +++ b/apache2/sites-available/mail.secure-example.com.conf @@ -0,0 +1,41 @@ + + ServerName mail.example.com:443 + ServerAdmin webmaster@example.com + DocumentRoot /home/webmaster/public_websites/mail.example.com/ + + Include conf.d/local-ssl.conf + Include conf.d/local-php.conf + Include conf.d/local-horde3.conf + + ErrorLog ${APACHE_LOG_DIR}/mail.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/mail.example.com-access.log combined + + + ServerName www.mail.example.com:443 + ServerName *.mail.example.com:443 + ServerName mail:443 + ServerName *.mail:443 + + Include conf.d/local-ssl.conf + Include conf.d/local-log-origin.conf + + RewriteEngine On + RewriteRule / https://mail.example.com/ [R] +# RewriteRule /(.*) https://mail.example.com/$1 [R] + + CustomLog ${APACHE_LOG_DIR}/redirect.log origin + + + ServerName mail.example.com + ServerAlias *.mail.example.com + ServerAlias mail + ServerAlias *.mail + + Include /etc/apache2/conf.d/local-log-origin.conf + + RewriteEngine On + RewriteRule / https://mail.example.com/ [R] +# RewriteRule /(.*) https://mail.example.com/$1 [R] + + CustomLog ${APACHE_LOG_DIR}/redirect.log origin + diff --git a/apache2/sites-available/php.example.com b/apache2/sites-available/php.example.com deleted file mode 100644 index 259d5f1..0000000 --- a/apache2/sites-available/php.example.com +++ /dev/null @@ -1,26 +0,0 @@ - - ServerName php.example.com - ServerAdmin webmaster@example.com - DocumentRoot /var/www-php-app/foo - - - DirectoryIndex index.php - SetHandler uwsgi-handler - uWSGISocket /run/uwsgi/app/local-php-app/socket - uWSGImodifier1 9 - - - ErrorLog ${APACHE_LOG_DIR}/www.example.com-error.log - CustomLog ${APACHE_LOG_DIR}/www.example.com-access.log combined - - - ServerName www.php.example.com - ServerAlias *.php.example.com - - Include conf.d/local-log-origin.conf - - RedirectMatch permanent .* http://php.example.com/ - - ErrorLog ${APACHE_LOG_DIR}/django.example.com-error.log - CustomLog ${APACHE_LOG_DIR}/django.example.com-access.log origin - diff --git a/apache2/sites-available/php.example.com.conf b/apache2/sites-available/php.example.com.conf new file mode 100644 index 0000000..259d5f1 --- /dev/null +++ b/apache2/sites-available/php.example.com.conf @@ -0,0 +1,26 @@ + + ServerName php.example.com + ServerAdmin webmaster@example.com + DocumentRoot /var/www-php-app/foo + + + DirectoryIndex index.php + SetHandler uwsgi-handler + uWSGISocket /run/uwsgi/app/local-php-app/socket + uWSGImodifier1 9 + + + ErrorLog ${APACHE_LOG_DIR}/www.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/www.example.com-access.log combined + + + ServerName www.php.example.com + ServerAlias *.php.example.com + + Include conf.d/local-log-origin.conf + + RedirectMatch permanent .* http://php.example.com/ + + ErrorLog ${APACHE_LOG_DIR}/django.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/django.example.com-access.log origin + diff --git a/apache2/sites-available/users.secure-example.com b/apache2/sites-available/users.secure-example.com deleted file mode 100644 index 939ad4c..0000000 --- a/apache2/sites-available/users.secure-example.com +++ /dev/null @@ -1,79 +0,0 @@ - - ServerName users.example.com:443 - ServerAdmin webmaster@example.com - DocumentRoot /var/www/vhosts/web-static/users.example.com/ - - Include conf.d/local-ssl.conf -# Include conf.d/local-userdir.conf -# Include conf.d/local-macvolumes.conf - - # Support OpenID using Gracie - RewriteEngine On - RewriteRule ^/(login|id/.*) http://localhost:8000/$1 [L,P] - RewriteRule ^/-(.*) https://users.example.com/~$1 [R] - RewriteRule ^/([^~].*) https://users.example.com/~$1 [R] - - # prevent the webserver from beeing used as proxy - - Deny from all - - - - Order deny,allow - Allow from all - - - ErrorLog ${APACHE_LOG_DIR}/users.example.com-error.log - CustomLog ${APACHE_LOG_DIR}/users.example.com-access.log combined - -# -# ServerName users.example.com -# ServerAlias users -# ServerAdmin webmaster@example.com -# DocumentRoot /var/www/vhosts/web-static/users.example.com/ -# -# Include conf.d/local-userdir.conf -# Include conf.d/local-macvolumes.conf -# -# # Support OpenID using Gracie -# RewriteEngine On -# RewriteRule ^/(login|id/.*) https://users.example.com/$1 [R] -# RewriteRule ^/-(.*) http://users.example.com/~$1 [R] -# RewriteRule ^/([^~].*) http://users.example.com/~$1 [R] -# -# TransferLog /dev/null -# ErrorLog ${APACHE_LOG_DIR}/users.example.com-error.log -# CustomLog ${APACHE_LOG_DIR}/users.example.com-access.log combined -# - - ServerName www.users.example.com:443 - ServerName *.users.example.com:443 - ServerName users:443 - ServerName *.users:443 - - Include conf.d/local-ssl.conf - Include conf.d/local-log-origin.conf - - RewriteEngine On - RewriteRule / https://users.example.com/[R] -# RewriteRule /(.*) https://users.example.com/$1 [R] - - CustomLog ${APACHE_LOG_DIR}/redirect.log origin - - -# ServerName www.users.example.com - ServerName users.example.com - ServerAlias *.users.example.com - ServerAlias users - ServerAlias *.users - - Include conf.d/local-log-origin.conf - - RewriteEngine On -# RewriteRule / http://users.example.com/ [R] -# RewriteRule /(.*) http://users.example.com/$1 [R] - RewriteRule / https://users.example.com/ [R] -# RewriteRule /(.*) https://users.example.com/$1 [R] - - CustomLog ${APACHE_LOG_DIR}/redirect.log origin - diff --git a/apache2/sites-available/users.secure-example.com.conf b/apache2/sites-available/users.secure-example.com.conf new file mode 100644 index 0000000..939ad4c --- /dev/null +++ b/apache2/sites-available/users.secure-example.com.conf @@ -0,0 +1,79 @@ + + ServerName users.example.com:443 + ServerAdmin webmaster@example.com + DocumentRoot /var/www/vhosts/web-static/users.example.com/ + + Include conf.d/local-ssl.conf +# Include conf.d/local-userdir.conf +# Include conf.d/local-macvolumes.conf + + # Support OpenID using Gracie + RewriteEngine On + RewriteRule ^/(login|id/.*) http://localhost:8000/$1 [L,P] + RewriteRule ^/-(.*) https://users.example.com/~$1 [R] + RewriteRule ^/([^~].*) https://users.example.com/~$1 [R] + + # prevent the webserver from beeing used as proxy + + Deny from all + + + + Order deny,allow + Allow from all + + + ErrorLog ${APACHE_LOG_DIR}/users.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/users.example.com-access.log combined + +# +# ServerName users.example.com +# ServerAlias users +# ServerAdmin webmaster@example.com +# DocumentRoot /var/www/vhosts/web-static/users.example.com/ +# +# Include conf.d/local-userdir.conf +# Include conf.d/local-macvolumes.conf +# +# # Support OpenID using Gracie +# RewriteEngine On +# RewriteRule ^/(login|id/.*) https://users.example.com/$1 [R] +# RewriteRule ^/-(.*) http://users.example.com/~$1 [R] +# RewriteRule ^/([^~].*) http://users.example.com/~$1 [R] +# +# TransferLog /dev/null +# ErrorLog ${APACHE_LOG_DIR}/users.example.com-error.log +# CustomLog ${APACHE_LOG_DIR}/users.example.com-access.log combined +# + + ServerName www.users.example.com:443 + ServerName *.users.example.com:443 + ServerName users:443 + ServerName *.users:443 + + Include conf.d/local-ssl.conf + Include conf.d/local-log-origin.conf + + RewriteEngine On + RewriteRule / https://users.example.com/[R] +# RewriteRule /(.*) https://users.example.com/$1 [R] + + CustomLog ${APACHE_LOG_DIR}/redirect.log origin + + +# ServerName www.users.example.com + ServerName users.example.com + ServerAlias *.users.example.com + ServerAlias users + ServerAlias *.users + + Include conf.d/local-log-origin.conf + + RewriteEngine On +# RewriteRule / http://users.example.com/ [R] +# RewriteRule /(.*) http://users.example.com/$1 [R] + RewriteRule / https://users.example.com/ [R] +# RewriteRule /(.*) https://users.example.com/$1 [R] + + CustomLog ${APACHE_LOG_DIR}/redirect.log origin + diff --git a/apache2/sites-available/wiki.secure-example.com b/apache2/sites-available/wiki.secure-example.com deleted file mode 120000 index 45a2897..0000000 --- a/apache2/sites-available/wiki.secure-example.com +++ /dev/null @@ -1 +0,0 @@ -../../moin/apache2/sites-available/wiki.secure-example.com \ No newline at end of file diff --git a/apache2/sites-available/wiki.secure-example.com.conf b/apache2/sites-available/wiki.secure-example.com.conf new file mode 120000 index 0000000..a92d506 --- /dev/null +++ b/apache2/sites-available/wiki.secure-example.com.conf @@ -0,0 +1 @@ +../../moin/apache2/sites-available/wiki.secure-example.com.conf \ No newline at end of file diff --git a/apache2/sites-available/www.secure-example.com b/apache2/sites-available/www.secure-example.com deleted file mode 100644 index 8aebebf..0000000 --- a/apache2/sites-available/www.secure-example.com +++ /dev/null @@ -1,36 +0,0 @@ - - ServerName www.example.com - ServerAlias www - ServerAdmin webmaster@example.com - DocumentRoot /home/webmaster/public_websites/www.example.com/ - - ErrorLog ${APACHE_LOG_DIR}/www.example.com-error.log - CustomLog ${APACHE_LOG_DIR}/www.example.com-access.log combined - - - ServerName example.com - ServerAlias *.www.example.com - - Include conf.d/local-log-origin.conf - - RewriteEngine On - RewriteRule / http://www.example.com/ [R] -# RewriteRule /(.*) http://www.example.com/$1 [R] - - CustomLog ${APACHE_LOG_DIR}/redirect.log origin - - - ServerName www.example.com:443 - ServerName *.example.com:443 - ServerName www:443 - ServerName *.www:443 - - Include conf.d/local-ssl.conf - Include conf.d/local-log-origin.conf - - RewriteEngine On - RewriteRule / http://www.example.com/ [R] -# RewriteRule /(.*) http://www.example.com/$1 [R] - - CustomLog ${APACHE_LOG_DIR}/redirect.log origin - diff --git a/apache2/sites-available/www.secure-example.com.conf b/apache2/sites-available/www.secure-example.com.conf new file mode 100644 index 0000000..8aebebf --- /dev/null +++ b/apache2/sites-available/www.secure-example.com.conf @@ -0,0 +1,36 @@ + + ServerName www.example.com + ServerAlias www + ServerAdmin webmaster@example.com + DocumentRoot /home/webmaster/public_websites/www.example.com/ + + ErrorLog ${APACHE_LOG_DIR}/www.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/www.example.com-access.log combined + + + ServerName example.com + ServerAlias *.www.example.com + + Include conf.d/local-log-origin.conf + + RewriteEngine On + RewriteRule / http://www.example.com/ [R] +# RewriteRule /(.*) http://www.example.com/$1 [R] + + CustomLog ${APACHE_LOG_DIR}/redirect.log origin + + + ServerName www.example.com:443 + ServerName *.example.com:443 + ServerName www:443 + ServerName *.www:443 + + Include conf.d/local-ssl.conf + Include conf.d/local-log-origin.conf + + RewriteEngine On + RewriteRule / http://www.example.com/ [R] +# RewriteRule /(.*) http://www.example.com/$1 [R] + + CustomLog ${APACHE_LOG_DIR}/redirect.log origin + -- cgit v1.2.3