3 files changed, 1 insertions, 25 deletions
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/
diff --git a/web/etc/varnish/nms.vcl b/web/etc/varnish/nms.vcl
index 6349238..93da9de 100644
--- a/web/etc/varnish/nms.vcl
+++ b/web/etc/varnish/nms.vcl
@@ -22,9 +22,6 @@ sub vcl_recv {
         return (synth(418,"LOLOLOL"));
     }
 
-    # Hardcoded for testing
-    set req.http.host = "nms.tg16.gathering.org"; 
-
     if (req.method != "GET" && req.method != "HEAD") {
         /* We only deal with GET and HEAD by default */
         return (pass);