diff --git a/horizon/.gitignore b/horizon/.gitignore
deleted file mode 100644
index f432e90..0000000
--- a/horizon/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# ---> Vim
-[._]*.s[a-w][a-z]
-[._]s[a-w][a-z]
-*.un~
-Session.vim
-.netrwhist
-*~
-
diff --git a/horizon/openstack-dashboard.conf b/horizon/openstack-dashboard.conf
index 3b591e0..2dc4b2c 100644
--- a/horizon/openstack-dashboard.conf
+++ b/horizon/openstack-dashboard.conf
@@ -1,17 +1,17 @@
RedirectMatch "^/$" "/horizon"
- ServerName oscloudtest01.hpc.rug.nl
+ ServerName merlin.hpc.rug.nl
RewriteEngine On
RewriteCond %{HTTPS} off
RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
RedirectMatch "^/$" "/horizon"
- ServerName oscloudtest01.hpc.rug.nl
+ ServerName merlin.hpc.rug.nl
SSLEngine On
- SSLCertificateFile "/certs/oscloudtest01.hpc.rug.nl.crt"
- SSLCertificateKeyFile "/certs/oscloudtest01.hpc.rug.nl.key"
+ SSLCertificateFile "/certs/merlin.hpc.rug.nl.crt"
+ SSLCertificateKeyFile "/certs/merlin.hpc.rug.nl.key"
SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
# HTTP Strict Transport Security (HSTS) enforces that all communications