ctucx.git: ansible-configs

update playbook

diff --git a/playbooks.yml b/playbooks.yml
@@ -17,14 +17,16 @@
 #    - gitolite
 #    - cgit
 #    - oeffisearch
+#    - oeffi-web
 #    - maddy
 #    - prometheus
 #    - radicale
-    - websites
+#    - websites
 #    - pleroma
 #    - synapse
 #    - grafana
 #    - frps
+    - backup 
   vars:
     network:
       interface: eth0

@@ -111,36 +113,24 @@
         renew_tasks:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/pleroma.ctu.cx
           - sudo rc-service nginx restart
-      #frp
-      stasicontainer.frp.ctu.cx:
+      frp.ctu.cx:
         dns_names:
+          - frp.ctu.cx
+          - stasicontainer-mac.frp.ctu.cx
           - stasicontainer.frp.ctu.cx
-        renew_tasks:
-          - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/stasicontainer.frp.ctu.cx
-          - sudo rc-service nginx restart
-      coladose.frp.ctu.cx:
-        dns_names:
           - coladose.frp.ctu.cx
-        renew_tasks:
-          - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/coladose.frp.ctu.cx
-          - sudo rc-service nginx restart
-      toaster.frp.ctu.cx:
-        dns_names:
           - toaster.frp.ctu.cx
-        renew_tasks:
-          - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/toaster.frp.ctu.cx
-          - sudo rc-service nginx restart
-      archrepo.frp.ctu.cx:
-        dns_names:
           - archrepo.frp.ctu.cx
+          - isa.frp.ctu.cx
+          - isa-mac.frp.ctu.cx
         renew_tasks:
-          - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/archrepo.frp.ctu.cx
+          - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/frp.ctu.cx
           - sudo rc-service nginx restart
-      isa.frp.ctu.cx:
+      oeffi.ctu.cx:
         dns_names:
-          - isa.frp.ctu.cx
+          - oeffi.ctu.cx
         renew_tasks:
-          - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/isa.frp.ctu.cx
+          - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/oeffi.ctu.cx
           - sudo rc-service nginx restart
       repo.f2k1.de:
         dns_names:

@@ -165,6 +155,10 @@
       domain: "oeffisear.ch"
       ssl_cert: "/var/lib/acme-redirect/live/oeffisear.ch/fullchain"
       ssl_privkey: "/var/lib/acme-redirect/live/oeffisear.ch/privkey"
+    oeffi_web:
+      domain: "oeffi.ctu.cx"
+      ssl_cert: "/var/lib/acme-redirect/live/oeffi.ctu.cx/fullchain"
+      ssl_privkey: "/var/lib/acme-redirect/live/oeffi.ctu.cx/privkey"
     maddy:
       hostname: "wanderduene.ctu.cx"
       ssl_cert: "/var/lib/acme-redirect/live/wanderduene.ctu.cx/fullchain"

@@ -192,17 +186,18 @@
     frps:
       token: "foobar123"
       port: 5050
-      sslDir: "/var/lib/acme-redirect/live"
-      sslCertFile: "fullchain"
-      sslPrivkeyFile: "privkey"
+      ssl_cert: "/var/lib/acme-redirect/live/frp.ctu.cx/fullchain"
+      ssl_privkey: "/var/lib/acme-redirect/live/frp.ctu.cx/privkey"
       vhost_domain: "frp.ctu.cx"
       vhost_port: 8088
       vhosts:
+        - stasicontainer-mac
         - stasicontainer
         - coladose
         - toaster
         - archrepo
         - isa
+        - isa-mac
     gitolite_initialKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCw/G6x8H3ojvHx3NsTswBMMmOhp48F3rea0GUniKSvRLMRIti5b7Q4P4FXnkQEtuNSR3u7gE5r4EacaLaIx7Az9SgHRoE+hdzSo4mPAwKTx/E3HZgIjdZhTDL8PAn4SZZT6RBqr/uGb+x9fdIjY0FbdNBLjq0MNnG3T+qd1joUL8JXoS7F//ac52RhHlsA5qJXFDOhpqR/7hRMwOFNH0GKaLN1xQKcOjhpIcdswpOf8kRDVpT7xOYwfXCFF4MaY2M8047WKarvEnGdADIIw6bvWsdJINehtOQmYEFRaMuaWp1d9bglZXZKPQKNubv5lqneMP4AI7ImDYjgW6eNLIT1 cardno:000603502829"
 
 

@@ -215,6 +210,7 @@
 #    - nginx
 #    - syncthing
 #    - websites
+    - rest-server
   vars:
     network:
       interface: eth0

@@ -260,6 +256,12 @@
         renew_tasks:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/syncthing.ctu.cx
           - sudo rc-service nginx restart
+      restic.ctu.cx:
+        dns_names: 
+          - restic.ctu.cx
+        renew_tasks:
+          - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/restic.ctu.cx
+          - sudo rc-service nginx restart
       photos.ctu.cx:
         dns_names: 
           - photos.ctu.cx

@@ -270,3 +272,8 @@
       domain: "syncthing.ctu.cx"
       ssl_cert: "/var/lib/acme-redirect/live/syncthing.ctu.cx/fullchain"
       ssl_privkey: "/var/lib/acme-redirect/live/syncthing.ctu.cx/privkey"
+    rest_server:
+      domain: "restic.ctu.cx"
+      ssl_cert: "/var/lib/acme-redirect/live/restic.ctu.cx/fullchain"
+      ssl_privkey: "/var/lib/acme-redirect/live/restic.ctu.cx/privkey"
+      passwd: "{{ lookup('community.general.passwordstore', 'server/taurus/rest-server.htpasswd returnall=true')}}"