Merge branch 'master' of github.com:tech-server/tgmanage

6 files changed, 47 insertions, 196 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/nms-public.tg15.gathering.org.conf b/web/etc/apache2/nms-public.tg15.gathering.org.conf
deleted file mode 100644
index 6ca255d..0000000
--- a/web/etc/apache2/nms-public.tg15.gathering.org.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-<VirtualHost *:8080>
-        ServerAdmin drift@gathering.org
-        ServerName 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-public.tg16.gathering.org.conf b/web/etc/apache2/nms-public.tg16.gathering.org.conf
new file mode 100644
index 0000000..7e24b5c
--- /dev/null
+++ b/web/etc/apache2/nms-public.tg16.gathering.org.conf
@@ -0,0 +1,30 @@
+<VirtualHost *:8080>
+        ServerAdmin drift@gathering.org
+        ServerName nms-public.tg16.gathering.org
+        ServerAlias nms-public.tg16.gathering.org
+
+        DocumentRoot /srv/tgmanage/web/nms-public.gathering.org
+	ScriptAlias /api/public/ /srv/tgmanage/web/nms-public.gathering.org/api/public/
+	<Directory "/srv/tgmanage/web/nms-public.gathering.org/api/public/">
+		AllowOverride None
+		Options +ExecCGI -MultiViews +Indexes +SymLinksIfOwnerMatch
+		Require all granted
+	</Directory>
+        <Directory "/srv/tgmanage/web/nms-public.gathering.org">
+                AllowOverride None
+                Options Indexes FollowSymLinks MultiViews
+		Require all granted
+
+                AddDefaultCharset UTF-8
+        </Directory>
+
+        ErrorLog /var/log/apache2/error-nms-public.tg16.gathering.org.log
+
+        # Possible values include: debug, info, notice, warn, error, crit,
+        # alert, emerg.
+        LogLevel warn
+
+        CustomLog /var/log/apache2/access-nms-public.tg16.gathering.org.log combined
+        ServerSignature On
+
+</VirtualHost>
diff --git a/web/etc/apache2/nms.tg16.gathering.org.conf b/web/etc/apache2/nms.tg16.gathering.org.conf
index 9a6d7cd..08471e0 100644
--- a/web/etc/apache2/nms.tg16.gathering.org.conf
+++ b/web/etc/apache2/nms.tg16.gathering.org.conf
@@ -1,21 +1,32 @@
 <VirtualHost *:8080>
         ServerAdmin drift@gathering.org
         ServerName nms.tg16.gathering.org
-        ServerAlias einstein.tg16.gathering.org
+        ServerAlias nms.tg16.gathering.org
 
         DocumentRoot /srv/tgmanage/web/nms.gathering.org
-	ScriptAlias /api/private/ /srv/tgmanage/web/nms.gathering.org/api/private/
+	ScriptAlias /api/write/ /srv/tgmanage/web/nms.gathering.org/api/write/
+	ScriptAlias /api/read/ /srv/tgmanage/web/nms.gathering.org/api/read/
 	ScriptAlias /api/public/ /srv/tgmanage/web/nms.gathering.org/api/public/
-	<Directory "/srv/tgmanage/web/nms.gathering.org/api/private/">
+	<Directory "/srv/tgmanage/web/nms.gathering.org/api/write/">
 		AllowOverride None
 		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
 		<RequireAny>
-			AuthUserFile /srv/tgmanage/web/.htpasswd
+			AuthUserFile /srv/tgmanage/web/htpasswd-write
 	                AuthName "Tech:Server Secret Volcano Lair"
         	        AuthType Basic
 			Require valid-user
 		</RequireAny>
 	</Directory>
+	<Directory "/srv/tgmanage/web/nms.gathering.org/api/read/">
+		AllowOverride None
+		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+		<RequireAny>
+			AuthUserFile /srv/tgmanage/web/htpasswd-read
+	                AuthName "The Gathering Network Management System"
+        	        AuthType Basic
+			Require valid-user
+		</RequireAny>
+	</Directory>
 	<Directory "/srv/tgmanage/web/nms.gathering.org/api/public/">
 		AllowOverride None
 		Options +ExecCGI -MultiViews +Indexes +SymLinksIfOwnerMatch
@@ -24,16 +35,13 @@
         <Directory "/srv/tgmanage/web/nms.gathering.org">
                 AllowOverride None
                 Options Indexes FollowSymLinks MultiViews
-
                 AddDefaultCharset UTF-8
-
 		<RequireAny>
-			AuthUserFile /srv/tgmanage/web/.htpasswd
-	                AuthName "Tech:Server Secret Volcano Lair"
+			AuthUserFile /srv/tgmanage/web/htpasswd-read
+	                AuthName "The Gathering Network Management System"
         	        AuthType Basic
 			Require valid-user
 		</RequireAny>
-
         </Directory>
 
         ErrorLog /var/log/apache2/error-nms.tg16.gathering.org.log
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>