From 0f001083314fb62c15be19732260e5b841c6bb51 Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Fri, 28 Aug 2015 18:13:09 +0200 Subject: Don't hardcode some urls on the installed systems --- roles/sublab_web/templates/website-rebuild.sh.j2 | 2 +- site.yaml | 5 +++++ staging | 4 ++-- vars/main.yaml | 2 ++ 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 vars/main.yaml diff --git a/roles/sublab_web/templates/website-rebuild.sh.j2 b/roles/sublab_web/templates/website-rebuild.sh.j2 index 227fb65..1e4bc0b 100644 --- a/roles/sublab_web/templates/website-rebuild.sh.j2 +++ b/roles/sublab_web/templates/website-rebuild.sh.j2 @@ -4,7 +4,7 @@ # cd /var/www/{{sublab_web_server_name}}/htdocs -git fetch git://git.sublab.org/website.git master +git fetch git://{{ groups['gitservers'][0] }}/website.git master git reset --hard FETCH_HEAD cd scripts python template.py diff --git a/site.yaml b/site.yaml index ba1f1eb..a0e7b28 100644 --- a/site.yaml +++ b/site.yaml @@ -1,3 +1,8 @@ --- - include: gitservers.yaml + vars_files: + - vars/main.yaml + - include: webservers.yaml + vars_files: + - vars/main.yaml diff --git a/staging b/staging index 0f2f16f..eb0a5a4 100644 --- a/staging +++ b/staging @@ -4,5 +4,5 @@ wolpertinger.nowhere.ws ansible_ssh_user=root [gitservers] git-test.nowhere.ws ansible_ssh_user=root -[all:vars] -ldap_url=ldap://oberon.local.sublab.org +[authservers] +thorus.nowhere.ws ansible_ssh_user=root diff --git a/vars/main.yaml b/vars/main.yaml new file mode 100644 index 0000000..448afa4 --- /dev/null +++ b/vars/main.yaml @@ -0,0 +1,2 @@ +--- +ldap_url: "ldaps://{{ groups['authservers'][0] }}" -- cgit v1.2.1