ctucx.git: ansible-configs

update playbook

diff --git a/playbooks.yml b/playbooks.yml
@@ -7,7 +7,6 @@
       raw: test -e /usr/bin/python || (apk update && apk add python3)
 
 
-
 - hosts: wanderduene
   name:  Install wanderduene
   roles: 

@@ -21,10 +20,11 @@
 #    - maddy
 #    - prometheus
 #    - radicale
-#    - websites
-    - pleroma
+    - websites
+#    - pleroma
 #    - synapse
 #    - grafana
+#    - frps
   vars:
     network:
       interface: eth0

@@ -111,6 +111,43 @@
         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:
+        dns_names:
+          - 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
+        renew_tasks:
+          - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/archrepo.frp.ctu.cx
+          - sudo rc-service nginx restart
+      isa.frp.ctu.cx:
+        dns_names:
+          - isa.frp.ctu.cx
+        renew_tasks:
+          - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/isa.frp.ctu.cx
+          - sudo rc-service nginx restart
+      repo.f2k1.de:
+        dns_names:
+          - repo.f2k1.de
+        renew_tasks:
+          - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/repo.f2k1.de
+          - sudo rc-service nginx restart
       oeffisear.ch:
         dns_names:
           - oeffisear.ch

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

@@ -159,7 +210,7 @@
   name: Install taurus
   roles:
 #    - common
-#    - bind
+    - bind
 #    - acme-redirect
 #    - nginx
 #    - syncthing