From c8026dcffc135fdfbd003b552139b56e1c7c6268 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 25 Nov 2013 14:16:21 +0100 Subject: [PATCH] change idp-test to idp-test in all domain name references --- amue.conf | 2 +- debian/changelog | 6 ++++++ haproxy.cfg | 8 ++++---- idp.amue.fr.nginx | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/amue.conf b/amue.conf index fd85fe5..e5d24f5 100644 --- a/amue.conf +++ b/amue.conf @@ -4,7 +4,7 @@ export A2_HOMEPAGE_URL=http://www.amue.fr/ export CACHE_BACKEND='{"BACKEND": "django.core.cache.backends.memcached.MemcachedCache", "LOCATION": "127.0.0.1:11211"}' export USE_X_FORWARDER_HOST=1 -export ALLOWED_HOSTS="idp-test.amue.fr:idp.amue.fr" +export ALLOWED_HOSTS="idptest.amue.fr:idp.amue.fr" export LDAP_AUTH_SETTINGS='[{ "url": "ldap://194.167.237.11", "basedn": "OU=AMUE,DC=wan,DC=amue,DC=fr", diff --git a/debian/changelog b/debian/changelog index e1397f1..02433de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +amue-authentic2 (0.8) stable; urgency=low + + * Change idp-test to idptest in all domain name references + + -- Benjamin Dauvergne Mon, 25 Nov 2013 14:13:21 +0100 + amue-authentic2 (0.7) stable; urgency=low * Fix config and postinst scripts diff --git a/haproxy.cfg b/haproxy.cfg index b2e9a7e..7383b3f 100644 --- a/haproxy.cfg +++ b/haproxy.cfg @@ -23,10 +23,10 @@ defaults frontend unsecured bind *:80 - acl idp_test hdr(host) -i idp-test.amue.fr + acl idp_test hdr(host) -i idptest.amue.fr acl idp hdr(host) -i idp.amue.fr - redirect location https://idp-test.amue.fr if idp_test - redirect location https://idp-test.amue.fr if idp + redirect location https://idptest.amue.fr if idp_test + redirect location https://idptest.amue.fr if idp frontend http_frontend bind *:8100 @@ -34,7 +34,7 @@ frontend http_frontend option httpclose option forwardfor reqadd X-Forwarded-Proto:\ https - acl idp_test hdr(host) -i idp-test.amue.fr + acl idp_test hdr(host) -i idptest.amue.fr acl idp hdr(host) -i idp.amue.fr use_backend idp_test_backend if idp_test use_backend idp_backend if idp diff --git a/idp.amue.fr.nginx b/idp.amue.fr.nginx index 7d0c4bd..0878dd3 100644 --- a/idp.amue.fr.nginx +++ b/idp.amue.fr.nginx @@ -1,6 +1,6 @@ server { listen 80; - server_name idp-test.amue.fr; + server_name idptest.amue.fr; server_name idp.amue.fr; root html;