aboutsummaryrefslogtreecommitdiffstats
path: root/web/etc/apache2
diff options
context:
space:
mode:
authorJoachim Tingvold <joachim@tingvold.com>2016-03-26 14:45:02 +0100
committerKristian Lyngstol <kly@kly@.no>2016-03-26 14:45:02 +0100
commit8a7803625d47d375d79beb6968c1905a4f235384 (patch)
tree0010b8f7286115767a46f51d03a822bdd78ead56 /web/etc/apache2
parentb8f28a570e9d37c9b5e445c85a50640022184fe9 (diff)
Cleaning.
Diffstat (limited to 'web/etc/apache2')
-rw-r--r--web/etc/apache2/munin.tg15.gathering.org.conf120
-rw-r--r--web/etc/apache2/stats.tg15.gathering.org.conf21
-rw-r--r--web/etc/apache2/stream.tg15.gathering.org.conf25
3 files changed, 0 insertions, 166 deletions
diff --git a/web/etc/apache2/munin.tg15.gathering.org.conf b/web/etc/apache2/munin.tg15.gathering.org.conf
deleted file mode 100644
index aaa3848..0000000
--- a/web/etc/apache2/munin.tg15.gathering.org.conf
+++ /dev/null
@@ -1,120 +0,0 @@
-<VirtualHost *:8080>
- ServerAdmin drift@gathering.org
- ServerName munin.tg15.gathering.org
-
- # Enable this for template generation
- Alias /munin /var/cache/munin/www
-
- # Enable this for cgi-based templates
- #Alias /munin-cgi/static /var/cache/munin/www/static
- #ScriptAlias /munin-cgi /usr/lib/munin/cgi/munin-cgi-html
- #<Location /munin-cgi>
- # Order allow,deny
- # Allow from localhost 127.0.0.0/8 ::1
- # AuthUserFile /etc/munin/munin-htpasswd
- # AuthName "Munin"
- # AuthType Basic
- # require valid-user
- #</Location>
-
- DocumentRoot /var/cache/munin/www
- <Directory /var/cache/munin/www>
- AllowOverride None
- Order allow,deny
- Allow from all
- Options Indexes
- #Require all granted
-
- # This file can be used as a .htaccess file, or a part of your apache
- # config file.
- #
- # For the .htaccess file option to work the munin www directory
- # (/var/cache/munin/www) must have "AllowOverride all" or something
- # close to that set.
- #
-
- # AuthUserFile /etc/munin/munin-htpasswd
- # AuthName "Munin"
- # AuthType Basic
- # require valid-user
-
- # This next part requires mod_expires to be enabled.
- #
-
- # Set the default expiration time for files to 5 minutes 10 seconds from
- # their creation (modification) time. There are probably new files by
- # that time.
- #
-
- SetEnvIF ^X-Forwarded-For$ "^185\.12\.59\.12$" AllowIP
- SetEnvIF ^X-Forwarded-For$ "^2a02:ed02:1337::12$" AllowIP
-
- <RequireAny>
- AuthUserFile /root/tgmanage/web/.htpasswd
- AuthName "Tech:Server Secret Volcano Lair"
- AuthType Basic
- Require valid-user
-
- Require env AllowIP
- </RequireAny>
-
- <IfModule mod_expires.c>
- ExpiresActive On
- ExpiresDefault M310
- </IfModule>
-
- </Directory>
-
- # Enables fastcgi for munin-cgi-html if present
- #<Location /munin-cgi>
- # <IfModule mod_fastcgi.c>
- # SetHandler fastcgi-script
- # </IfModule>
- #</Location>
-
- #<Location /munin-cgi/static>
- # SetHandler None
- #</Location>
-
- # Enables fastcgi for munin-cgi-graph if present
- ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/munin/cgi/munin-cgi-graph
- <Location /munin-cgi/munin-cgi-graph>
- Order allow,deny
- Allow from localhost 127.0.0.0/8 ::1
- # AuthUserFile /etc/munin/munin-htpasswd
- # AuthName "Munin"
- # AuthType Basic
- # require valid-user
- <IfModule mod_fcgid.c>
- SetHandler fcgid-script
- </IfModule>
- <IfModule !mod_fcgid.c>
- SetHandler cgi-script
- </IfModule>
- </Location>
-
- ScriptAlias /munin-cgi/munin-cgi-html /usr/lib/munin/cgi/munin-cgi-html
- <Location /munin-cgi/munin-cgi-html>
- Order allow,deny
- Allow from localhost 127.0.0.0/8 ::1
- # AuthUserFile /etc/munin/munin-htpasswd
- # AuthName "Munin"
- # AuthType Basic
- # require valid-user
- <IfModule mod_fcgid.c>
- SetHandler fcgid-script
- </IfModule>
- <IfModule !mod_fcgid.c>
- SetHandler cgi-script
- </IfModule>
- </Location>
-
- ErrorLog /var/log/apache2/error-munin.tg15.gathering.org.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel debug
-
- CustomLog /var/log/apache2/access-munin.tg15.gathering.org.log combined
- ServerSignature On
-</VirtualHost>
diff --git a/web/etc/apache2/stats.tg15.gathering.org.conf b/web/etc/apache2/stats.tg15.gathering.org.conf
deleted file mode 100644
index 2dc99a4..0000000
--- a/web/etc/apache2/stats.tg15.gathering.org.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-<VirtualHost *:8080>
- ServerAdmin drift@gathering.org
- ServerName stats.tg15.gathering.org
-
- DocumentRoot /root/tgmanage/web/stats.gathering.org
- <Directory "/root/tgmanage/web/stats.gathering.org">
- AllowOverride None
- Options Indexes FollowSymLinks ExecCGI MultiViews
-
- Require all granted
- </Directory>
-
- ErrorLog /var/log/apache2/error-stats.tg15.gathering.org.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
-
- CustomLog /var/log/apache2/access-stats.tg15.gathering.org.log combined
- ServerSignature On
-</VirtualHost>
diff --git a/web/etc/apache2/stream.tg15.gathering.org.conf b/web/etc/apache2/stream.tg15.gathering.org.conf
deleted file mode 100644
index 1f92f47..0000000
--- a/web/etc/apache2/stream.tg15.gathering.org.conf
+++ /dev/null
@@ -1,25 +0,0 @@
- <VirtualHost *:8080>
- ServerAdmin drift@gathering.org
- ServerName stream.tg15.gathering.org
- ServerAlias krosus.tg15.gathering.org
-
- DocumentRoot /root/tgmanage/web/stream.gathering.org
- <Directory "/root/tgmanage/web/stream.gathering.org/">
- AllowOverride None
- Options Indexes FollowSymLinks ExecCGI MultiViews
- Order allow,deny
- Allow from all
- Require all granted
- AddHandler cgi-script .cgi .sh .pl .py
- AddDefaultCharset UTF-8
- </Directory>
-
- ErrorLog /var/log/apache2/error-stream.tg15.gathering.org.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel info
-
- CustomLog /var/log/apache2/access-stream.tg15.gathering.org.log combined
- ServerSignature On
-</VirtualHost>