Merge branch 'linx' into 'newinfra'

[linx] pepcrans :)

See merge request nounous/ansible!207

group_vars/linx.yml

@@ -0,0 +1,4 @@
+---
+glob_linx:
+  siteurl: "https://linx.crans.org/"
+  name: "CRANS Linx"

host_vars/linx.adm.crans.org.yml

@@ -0,0 +1,3 @@
+---
+loc_linx:
+  ip: "{{ query('ldap', 'ip', 'linx', 'adm') | first }}"

hosts

@@ -67,6 +67,9 @@ sam.adm.crans.org
 daniel.adm.crans.org
 jack.adm.crans.org
 
+[linx]
+linx.adm.crans.org
+
 [monitoring]
 monitoring.adm.crans.org
 

plays/linx.yml

@@ -1,9 +1,7 @@
 #!/usr/bin/env ansible-playbook
 ---
-- hosts: linx.adm.crans.org
+- hosts: linx
   vars:
-    linx:
+    linx: "{{ glob_linx | default({}) | combine(loc_linx | default({})) }}"
-      ip: "{{ query('ldap', 'ip', 'linx', 'adm') }}"
-      siteurl: "https://linx.crans.org/"
   roles:
     - linx

roles/linx/templates/linx/server.conf.j2

@@ -1,7 +1,7 @@
 {{ ansible_header | comment }}
 
 bind = {{ linx.ip }}:8080
-sitename = CRANS Linx
+sitename = {{ linx.name }}
 siteurl = {{ linx.siteurl }}
 maxsize = 10000000
 maxexpiry = 604800