Bump lots of changes

5 files changed, 62 insertions, 13 deletions

diff --git a/web/etc/apache2/munin.tg15.gathering.org b/web/etc/apache2/munin.tg15.gathering.org
index 3e8eca4..aaa3848 100644
--- a/web/etc/apache2/munin.tg15.gathering.org
+++ b/web/etc/apache2/munin.tg15.gathering.org
@@ -1,7 +1,6 @@
 <VirtualHost *:8080>
         ServerAdmin drift@gathering.org
         ServerName munin.tg15.gathering.org
-        ServerAlias munin.tg15.gathering.org
 
 	# Enable this for template generation
 	Alias /munin /var/cache/munin/www
@@ -47,11 +46,18 @@
 		# that time. 
 		#
 
-		AuthUserFile /root/tgmanage/web/.htpasswd
-                AuthName "Tech:Server Secret Volcano Lair"
-                AuthType Basic
-                require valid-user
-	
+		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
diff --git a/web/etc/apache2/nms-public.tg15.gathering.org b/web/etc/apache2/nms-public.tg15.gathering.org
index 4c4798c..6ca255d 100644
--- a/web/etc/apache2/nms-public.tg15.gathering.org
+++ b/web/etc/apache2/nms-public.tg15.gathering.org
@@ -2,10 +2,20 @@
         ServerAdmin drift@gathering.org
         ServerName nms-public.tg15.gathering.org
 
-	DocumentRoot /srv/www/nms-public.tg15.gathering.org
+	DocumentRoot /root/tgmanage/web/nms-public.gathering.org
 	AddHandler cgi-script .cgi .sh .pl .py
 	
         LogLevel warn
         ErrorLog /var/log/apache2/error-nms-public.tg15.gathering.org.log
         CustomLog /var/log/apache2/access-nms-public.tg15.gathering.org.log combined
+
+	<Directory "/root/tgmanage/web/nms-public.gathering.org">
+                AllowOverride None
+                Options Indexes FollowSymLinks ExecCGI MultiViews
+
+                Require all granted
+        </Directory>
+
+	ServerSignature On
+
 </VirtualHost>
diff --git a/web/etc/apache2/nms.tg15.gathering.org b/web/etc/apache2/nms.tg15.gathering.org
index e177d44..a671c0a 100644
--- a/web/etc/apache2/nms.tg15.gathering.org
+++ b/web/etc/apache2/nms.tg15.gathering.org
@@ -11,10 +11,22 @@
                 AddHandler cgi-script .cgi .sh .pl .py
                 AddDefaultCharset UTF-8
 
-                AuthUserFile /root/tgmanage/web/.htpasswd
-                AuthName "Tech:Server Secret Volcano Lair"
-                AuthType Basic
-                require valid-user
+		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>
+
+                #AuthUserFile /root/tgmanage/web/.htpasswd
+                #AuthName "Tech:Server Secret Volcano Lair"
+                #AuthType Basic
+                #require valid-user
         </Directory>
 
         ErrorLog /var/log/apache2/error-nms.tg15.gathering.org.log
diff --git a/web/etc/apache2/stats.tg15.gathering.org b/web/etc/apache2/stats.tg15.gathering.org
new file mode 100644
index 0000000..2dc99a4
--- /dev/null
+++ b/web/etc/apache2/stats.tg15.gathering.org
@@ -0,0 +1,21 @@
+<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 b/web/etc/apache2/stream.tg15.gathering.org
index 52d879c..1f92f47 100644
--- a/web/etc/apache2/stream.tg15.gathering.org
+++ b/web/etc/apache2/stream.tg15.gathering.org
@@ -3,8 +3,8 @@
         ServerName stream.tg15.gathering.org
         ServerAlias krosus.tg15.gathering.org
 
-        DocumentRoot /srv/stream.tg15.gathering.org
-        <Directory "/srv/stream.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