From 9bf9cd8bf0d52f07e7bcb8a1f4d8b792c3274729 Mon Sep 17 00:00:00 2001
From: Kristian Lyngstol <kly@kly@.no>
Date: Mon, 21 Mar 2016 19:10:45 +0100
Subject: FIX FAX APACHE NMS PUBLIC

---
 web/etc/apache2/nms-public.tg15.gathering.org.conf | 21 ---------------------
 web/etc/apache2/nms.tg16.gathering.org.conf        |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 web/etc/apache2/nms-public.tg15.gathering.org.conf

(limited to 'web/etc/apache2')

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.tg16.gathering.org.conf b/web/etc/apache2/nms.tg16.gathering.org.conf
index 9a6d7cd..1c1d7e3 100644
--- a/web/etc/apache2/nms.tg16.gathering.org.conf
+++ b/web/etc/apache2/nms.tg16.gathering.org.conf
@@ -1,7 +1,7 @@
 <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/
-- 
cgit v1.2.3


From 727e4ab31aa6d1a754711d4cd29dbcefae2e952a Mon Sep 17 00:00:00 2001
From: Kristian Lyngstol <kly@kly@.no>
Date: Mon, 21 Mar 2016 20:11:55 +0100
Subject: NMS: NMS Public

---
 web/etc/apache2/nms-public.tg16.gathering.org.conf | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 web/etc/apache2/nms-public.tg16.gathering.org.conf

(limited to 'web/etc/apache2')

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>
-- 
cgit v1.2.3