[tandoor] Update tandoor jail

lab/ansible/hosts

@@ -1,3 +1,6 @@
+[rhea]
+rhea.local
+
 [jails]
 bastion1.local ansible_become=true
 bookwyrm1.local
@@ -36,7 +39,7 @@ redis1-master.local
 searxng1.local
 sure-porchpals0.local
 syncthing.local
-tandoor1.local
+tandoor0.local
 tor1.local
 unbound1.local
 vrobbler1.local
@@ -114,7 +117,7 @@ bastion1.local ansible_become=true
 dendrite1.local
 
 [recipes]
-tandoor1.local
+tandoor0.local
 
 [paper]
 paperless1.local

lab/ansible/roles/tandoor/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: Dependencies installed
   community.general.pkgng:
-    name: py38-pip,py38-cryptography,py38-pillow,rust,libxslt,libxml2,py38-ldap,yarn,git-tiny,py38-cffi,py38-psycopg2
+    name: py39-pip,py39-cryptography,py39-ldap,py39-pillow,rust,libxslt,libxml2,py39-ldap,yarn,git-tiny,py39-cffi,py39-psycopg2
     state: latest
 
 - name: Source folder exists
@@ -34,6 +34,22 @@
     owner: root
     mode: 0644
 
+- name: Libraries for ldap linked
+  file: src=/usr/local/include/lber.h dest=/usr/include/lber.h state=link
+
+- name: Libraries for ldap linked
+  file: src=/usr/local/include/lber_types.h dest=/usr/include/lber_types.h state=link
+
+- name: Libraries for ldap linked
+  file: src=/usr/local/include/ldap_cdefs.h dest=/usr/include/ldap_cdefs.h state=link
+
+- name: Libraries for ldap linked
+  file: src=/usr/local/include/openldap.h dest=/usr/include/openldap.h state=link
+
+- name: Libraries for sasl linked
+  file: src=/usr/local/include/sasl dest=/usr/include/sasl state=link
+
+
 - name: Tandoor requirements up to date
   pip:
     requirements: /usr/local/src/tandoor/requirements.txt
@@ -43,10 +59,10 @@
 
 
 - name: Tandoor migrations up to date
-  command: python3.8 /usr/local/src/tandoor/manage.py migrate
+  command: python3.9 /usr/local/src/tandoor/manage.py migrate
 
 - name: Tandoor static files copied
-  command: python3.8 /usr/local/src/tandoor/manage.py collectstatic --noinput
+  command: python3.9 /usr/local/src/tandoor/manage.py collectstatic --noinput
 
 - name: Tandoor immortal file installed
   template:

lab/ansible/roles/unbound/files/service.zones

@@ -31,7 +31,7 @@ local-data: "tor.service        IN      A       192.168.1.127"
 local-data: "db.service         IN      A       192.168.1.107"
 local-data: "timelapse.service  IN      A       192.168.1.99"
 local-data: "hauk.service       IN      A       192.168.1.122"
-local-data: "tandoor.service    IN      A       192.168.1.173"
+local-data: "tandoor.service    IN      A       192.168.1.108"
 local-data: "kibana.service     IN      A       192.168.1.226"
 local-data: "elastic.service    IN      A       192.168.1.199"
 local-data: "logstash.service   IN      A       192.168.1.191"

lab/cli.py

@@ -38,7 +38,7 @@ def roles() -> list:
             print(role)
     return sorted_roles
 
-def push(roles):
+def update(roles):
 
     if len(roles) == 1:
         roles = roles[0]
@@ -52,6 +52,18 @@ def push(roles):
     if sys.stdin and sys.stdin.isatty():
         subprocess.run(call_list, cwd=DEFAULT_ANSIBLE_DIR)
 
+def newjail(jail_name) -> None:
+    if len(jail_name) == 1:
+        jail_name = jail_name[0]
+    else:
+        print('Requires a single new jail name')
+        return
+
+    call_list = ["ansible", "rhea", "-m", "ansible.builtin.shell",  "-a", f'"/usr/local/bin/newjail {jail_name}"', "--become", "-K"]
+    print(call_list)
+    if sys.stdin and sys.stdin.isatty():
+        subprocess.run(call_list, cwd=DEFAULT_ANSIBLE_DIR)
+
 def main():
     del sys.argv[0]