Add required pip packages.

Reviewed-on: data.coop/ansible#54

group_vars/all/secrets.yml

@@ -1,58 +1,73 @@
 $ANSIBLE_VAULT;1.1;AES256
-32393230646466336565653530386632356235653437356237393163313033663066393963343031
+34376131343263336262656463373830643861336631626539643663333239313831626236306530
-3339346530316430666632666230316165663564313464390a666539666265326235666266306231
+3335623130653432636133356363656465346366303062370a346130326536366638633536613161
-38383466343364646333343132333338306434613961663765353566353166626539306335653537
+62623334363537636634373231353564396362343330623562383939373538633066616565306235
-3466326433316166370a376639363235326363323234313630336330613733616362653838396464
+3332323863353334640a396462313862366362366535383737376333383361303065383937396530
-36623733643261633730306537613132333432333239353638636363646464633665643832646238
+38326331396333396263363762346331356431623532343938613834663830393337646666336435
-34663635343437643534633232346466373336316664343335313435366636303136303239643834
+66356439333434356165613030306138666163653934386233663362646534303737323030636234
-63623436323831613862343938303137643735336637306433376237643032633738376563666265
+31616132613830363136666639386462363135656432373236393034316664363637663336366435
-33383032643461653763653231333132633034383431303165646439393266616634386431313565
+64373238633064623735666335636231656231666434383066313336303137333663333031363638
-38656530306538343239323864303538376165313330623231646265626261303235343130653665
+31643733336535383338376631656439633962653262356335383638373764353530643234303935
-62363839346630343461323136363037666135373733303864623737313634316136336537323464
+62383930393634613530643739643335616164633038326638356135623561326165376530363461
-37633539396462313462386364373733313566373332343834353164393161636161356537303237
+37373032393331653261373538633065333662393366666161396638383932393331623766343035
-39646561376138613433633431626530346430356264653932636163393663356565393464393161
+30333335663039323931306162313538373334393335306132626336643363323839633761383063
-37313661633466636437623233623937353234313962633131383365396631643631346261386439
+35343632363837383132656437303138303764316439343663303964396463363638336533653930
-65393162633965353538626133636534336635623364353963626135333637343662353765633161
+39303236353766373131623363653835666439333164366563346164626464633633363163323864
-34373337653730333032396663306663653830643761633730663432366433346631363463323464
+65363961393237666433623565343832306663323862666333343665376135646132363466616364
-38356163363836636562376431373933623930643236636239663065306536396236633130306165
+62356331666432336661343762333961333634396466333465633164326239386266643230393566
-62343730306465333361663530363462666439343438633965393965623239623836333335366438
+36376461373631636630303861313538333834646461663539623738636636626537656438646431
-65336463333539303366376635303432643538666362643335393834336231646562366234623832
+38383436393238363038313563633634396335346138626666366437333433383039363332623639
-33623632653932636662653933623362356431393739646166353136346235333231643530323738
+31396165346431333838393164616339656634346561313737306562343562323030613266633263
-62643135386563353933616632363664363430393035343263393736393736623831666239363866
+61333263653938653034356631333664323630306461346532626533363665363133376232316132
-63333163646631396266366164633562653633333536663763643364616666323262666633663265
+61346431383230656134373630653264363430383561313866363235333435633966386266653964
-65386238366131343432646164383061373635346165303064626632303234663730356130636436
+33363534343634343232373036633330613038303437333033313061313932373739343663303931
-63396237313338656533393062363133643631346563303139306230333137383734333764616165
+34333833386638353436653831623835323032303134366635613735643662636336616464313330
-61303632393363396565383731353066633666353835313665303532656635356465343861613132
+36633335613630663233326166633565386238656236633261396235363165656333333235643137
-38613530376165376666303536303263383039613533393731396663376431616561656564316336
+32623461663562313533333835396233383330613661646431646365343430626662326638653330
-39613134666531303638323230316365333432376165303361303361383339363539353938633931
+38646232386263356566373561353130616539346630613363313163363262356264653233313862
-61373765366133643263373233626436333735393130373461383333613363626135666663633637
+34386331363236386534353534616531643264613764343362646366393435383332653664353363
-33633061316661313930333133343262666636343835633234383264613966656438646430316636
+62333935363132373434613038353632643336633136656266316466373734646234636638316265
-34333866616634306239333238356261333336343930353361656263326135656163353937316434
+62646261396465623561633964313065626361316630353965616233356565343834656563353830
-63623831333939653264326638366230333636663234303762393966386539653932346436303965
+38346361336237646331366632633130613330336637326163663463386233643734356165666431
-35383137323661663862313764653064353030626662353365623663653565623866626266333335
+61396263656237333138356231306437653337656133663031303031616437633564613733316264
-39633538303566333061383938383739396266396533666231316534323161666331333632663963
+63633930353033636235653961393330326635626666626235336334653762373262633739356263
-38383332623561383164336633316534326635323435356135383736303536643133383631393339
+32323532333463653937386430663437303238313130643435353739393639303033343865323736
-36353732393263626661346563356663356436363465393639613631366332353938663535356137
+35366139643166626364373663333266376133636433653261316566366630396666336637326664
-32393138323662646166386139653833313536656434363461383565636232333630653462343934
+30343039633133626435363364346666613732666335313865326234366136366130616334396338
-61363535363332353131393265353031643964303766363431343332666634353166303435303165
+61663461623432303930623261336464643830303631396430363637383838616432356634303332
-34356363326539383139396536643338316631333630393839623339616263666661366462313236
+61346536313035376139313638393737393136643366366364363862383335353533313534366534
-34303939623335353366613865363530333338643364633862336337373737653863643239386132
+61356136366465373530393835613834366665653334376539303462336138646438653039306261
-38633065623365326136656538663839313563313435653733336633613737393739623334303938
+36613736323566636634666331396463623439323063356232306631616135623231336439303739
-39623161353939663935373838316137633262373435353335323537363637623834363030343839
+65393837653837336235396532323465656463636238643038383363616633383866333633663831
-64666565633534326662636530383733396531613939613431646136396366323764393363343231
+61363634356634636265663837306232303362313564323463303363323931396438646337363161
-38393239663762623932626537613763353065643564303766663932346666393938616562376666
+61313033343532336563393632373830326631616462616263346363636566663966396330386464
-38383939643632313931343063323838613461633161643434353532623433303434396262363764
+62613039323065343838653439303333396536366537313335353834613338623961646235633764
-30303361303832363765316265346534313637663462303362633039363163356535356565343964
+30333032323333663530613736313765343364363433366436666134623663653336386632333437
-66653639356661373231653630646338393835656435386566623263353363376365353565333961
+64386639636237333138323431333234316432366236613530376234636438356531636630396431
-62646634323730633364366137326434663661383165373066303062396432373361346436316338
+63643833366136363962346632616161363565336163313764383030303337346565613939383563
-38663264663235333938363538353736636161633639383937336365323732353161643365616264
+65306137633965326534356666346238363137323233336561643333386265613863396338383134
-39643234643238646332613934343666323736666261366164383034303637623133303365313062
+35363135303232376364306234323435356330333061613663326563343533636165356537336536
-38353832353366383637626532386339306438333035313563333464326539363661633564316534
+61656131343966346365396133666662393930663237643134383963303766306534633034356335
-62613538356366343566303339383863343265633161396162353962356366333432623438343039
+37633732393266633965616330643061616664336430643630633033326335643438373737653164
-63303662643339636366623630616339363363633434383731376334323736373265326138356161
+34633737303533666335306466306330343233326531343065666138633166383664333130653864
-66336636613138666465623635343163386537376263353437333765323832333539386336326564
+37623730333532633936316461333066313065316664383934343731616430366135346138663531
-37356331343139653339313337383461333834353166353838643666376439376237353032363164
+33353134333934376663336366663036383630393031303731653332373335333131633136616537
-66613530633538666436366563343232326334613432363162383163383031343763653864646331
+33666266373439346633373735643339653333626237623530346436306438396332613863346264
-36303463316637336132353832643761386332643130353839363833346532626162643661366464
+30346431393735326566393633626535383538343866653262653330366330623930646631663961
-34336438306661343961663163386361316338303930343364656561326363623630303036616264
+38656138313932623131613537376139666137653063313339666333313364343738306439656264
-3232
+32346533646465376135376531383132396337653966393133316436616563613135353863653064
+31373466616135393036333037623164346539323463333037613030386666396363353364396439
+39616536646638623739623834363662643566393430623632646434336162316362653434343337
+36623334303866343533623538663531303366343136636631376334653636313264376330313836
+66333131343062373138663330313633623166303337306466313362343034316364666666373965
+36373933343338646333373962623034353631623535306230346663373530346438386334303536
+62366666646263303764303330353835633163363666303133333730343263613039346162356532
+37323133613037313430366238313261633165643563666239623730653164666264633964626461
+31323536623335636333393338333166346336323132373466396432613133613933356232373532
+30653564323031636231343232646165653163393663663731313033323763663965356466366562
+33303830656238653164646161366265636566393436323135356630393033316337363361306363
+30393766636237336466353431616130653961326431323161313234333963643032393061303265
+33396664336535353164643462303636616265306338333634376664323837303238623638313266
+37643861343034646532626164353238373031633861623663316638333039643036353932323962
+39616136653639313232326362663834333363633562646563393561396464383765616230333230
+39663939326332333362

group_vars/all/secrets.yml.contents

@@ -0,0 +1,32 @@
+# These are the variables contained in secrets.yml
+# Secrets are usually 32 characters or more, matching [a-Z0-9]
+
+postgres_passwords:
+  fider: xxx
+  nextcloud: xxx
+  passit: xxx
+  gitea: xxx
+  matrix: xxx
+  codimd: xxx
+  mailu: xxx
+  ttrss: xxx
+
+fider_jwt_secret: xxx
+
+ldap_admin_password: xxx
+ldap_config_password: xxx
+
+passit_secret_key: xxx
+
+docker_password: xxx
+
+mailu_secret_key: xxx
+
+drone_secrets:
+  oauth_client_id: xxx
+  oauth_client_secret: xxx
+  rpc_shared_secret: xxx
+
+restic_secrets:
+  user_secret: xxx
+  encryption_secret: xxx

group_vars/all/vars.yml

@@ -21,11 +21,4 @@ users:
     groups:
       - sudo
 
-  deni:
-    comment: Denis Smajlović
-    key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC0pB42dtqruXr2Ha8Rdp3QoSrMOLU5cbLMfuNTNmgwPZmprhGGRTAsz8E0aG+5HCFBmW6JxiTGyHGdIZrhYWpKYshxxn4zODfitP7IzDgvg9Pz0Ugw/c5i5eKjkVfw9xLZKjO/H3Ql8R+wFMawpdw7j+Q9G+J3eIidEI6TmSvJVWijBxpLI4qrLceL084qg93XpJENYBOcvx9fYQQ+Es0jo4hmPuHWq5VIkIoIfvVvdhwjlaBsqv2je5BNx8uTMVIyV34ZHpJc95wJ6MOcqpQunW2bR4mGc9FLh67eP2ba9nDoQ0pnnlWGqAIKx5P1ELIg7RM3HhuwfRVh4DxCfjXpMz3l1gr1dA1wVD9bOtzbPWLjo7LNkRcT/loba/jpznTNIEv+kawmm/H0aTZZdlofkGHuX0iOpLV1c1tCDMH1s/MCqwosSRihrXhSOozsABvaaZpJiHcpE4DcNr+xJhe1XrHMqR30KU0r7ulIP8JdhzMNEsq3HxZQh9s8XLIUukrpcpOgJYyGuQK3kG6li5kYbmVqjLDQ1xHi/4r/4TXjJYpsFCZ71SURLzxoF1nauHpBLKcHI3MPFvqr27SQcM92fO14wKDAmAtHINwzMQjlda6B0jFNC+2xUfHrH7yIhwSktytq5qbhiFKK71DSLiMKFvOqoTVWRckO2+Zw1HZB+Q== deni@deni.dk
-    password: $6$ooKtdqASOxYJN2CJ$ziMrGG/qIOeyiTGjx.hPYjVBlHpzM9YY6qCJB9/L8aR33feUvXxZNBCgME93ZhbwDBjblS/tP796LsCF4i17D.
-    groups:
-      - sudo
-
 volume_root_folder: "/docker-volumes"

playbook.yml

@@ -27,7 +27,7 @@
       - ouroboros
       - mailu
       - portainer
-      - tt-rss
+#      - tt-rss
 
     smtp_host: "postfix"
     smtp_port: "587"

roles/docker/defaults/main.yml

@@ -19,6 +19,7 @@ gitea:
 
 passit:
   domain: "passit.{{ base_domain }}"
+  volume_folder: "{{ volume_root_folder }}/passit"
 
 fider:
   domain: "feedback.{{ base_domain }}"
@@ -28,7 +29,9 @@ matrix:
   volume_folder: "{{ volume_root_folder }}/matrix"
 
 riot:
-  domain: "riot.{{ base_domain }}"
+  domains: 
+  - "riot.{{ base_domain }}"
+  - "element.{{ base_domain }}"
   volume_folder: "{{ volume_root_folder }}/riot"
 
 privatebin:
@@ -49,13 +52,25 @@ docker_registry:
   password: "{{ docker_password }}"
 
 data_coop_website:
-  domain: "{{ base_domain }},www.{{ base_domain }}"
+  domains: 
+  - "{{ base_domain }}"
+  - "www.{{ base_domain }}"
 
 cryptohagen_website:
-  domain: "cryptohagen.dk,www.cryptohagen.dk"
+  domains: 
+  - "cryptohagen.dk"
+  - "www.cryptohagen.dk"
 
 ulovliglogning_website:
-  domain: "ulovliglogning.dk,www.ulovliglogning.dk"
+  domains: 
+  - "ulovliglogning.dk"
+  - "www.ulovliglogning.dk"
+  - "ulovlig-logning.dk"
+
+cryptoaarhus_website:
+  domains: 
+  - "cryptoaarhus.dk"
+  - "www.cryptoaarhus.dk"
 
 drone:
   domain: "drone.{{ base_domain }}"
@@ -75,4 +90,3 @@ portainer:
 ttrss:
   domain: rss.{{ base_domain }}
   volume_folder: "{{ volume_root_folder }}/tt-rss"
-

roles/docker/files/configs/matrix/homeserver.yaml

@@ -54,6 +54,10 @@ soft_file_limit: 0
 # Set to false to disable presence tracking on this homeserver.
 use_presence: true
 
+# If set to 'false', forbids any other homeserver to fetch the server's public
+# rooms directory via federation.
+allow_public_rooms_over_federation: true
+
 # The GC threshold parameters to pass to `gc.set_threshold`, if defined
 #
 #gc_thresholds: [700, 10, 10]
@@ -411,7 +415,7 @@ uploads_path: "/data/uploads"
 
 # The largest allowed upload size in bytes
 #
-max_upload_size: "10M"
+max_upload_size: "50M"
 
 # Maximum number of pixels that will be thumbnailed
 #

roles/docker/files/configs/matrix/vhost-matrix

@@ -1 +1,2 @@
-listen 8008;
+listen 8008;
+client_max_body_size 50M; # default is 1M

roles/docker/files/configs/matrix/vhost-riot

@@ -0,0 +1 @@
+client_max_body_size 50M; # default is 1M

roles/docker/files/configs/riot/config.json

@@ -1,7 +1,7 @@
 {
     "default_hs_url": "https://{{ matrix.domain }}",
     "default_is_url": "https://vector.im",
-    "brand": "riot.data.coop",
+    "brand": "element.data.coop",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
     "integrations_widgets_urls": [

roles/docker/tasks/services.yml

@@ -3,14 +3,6 @@
   docker_network:
     name: external_services
 
-- name: setup network for postfix
-  docker_network:
-    name: postfix
-    ipam_options:
-      subnet: '172.16.0.0/16'
-      gateway: 172.16.0.1
-
-
 - name: setup services
   include_tasks: "services/{{ item }}.yml"
   with_items: "{{ services }}"

roles/docker/tasks/services/drone.yml

@@ -1,21 +1,51 @@
 ---
-- name: Drone container
+- name: set up drone with docker runner
-  docker_container:
+  docker_compose:
-    name: drone
+    project_name: drone
-    image: drone/drone@sha256:eb7e35bc1cb5ca797304aff65fe24031d26d8d3e2ee4671a8fe9e0fc6f479455
+    pull: yes
-    restart_policy: unless-stopped
+    definition:
-    networks:
+      version: "3.6"
-      - name: external_services
+      services:
-    volumes:
+        drone:
-      - "{{ drone.volume_folder }}:/data"
+          container_name: "drone"
-      - "/var/run/docker.sock:/var/run/docker.sock"
+          image: drone/drone:1
-    env:
+          restart: unless-stopped
-      DRONE_GITEA_SERVER: "https://{{ gitea.domain }}"
+          networks:
-      DRONE_GITEA_ALWAYS_AUTH: "False"
+            - external_services
-      DRONE_RUNNER_CAPACITY: "2"
+            - drone
-      DRONE_SERVER_HOST: "{{ drone.domain }}"
+          volumes:
-      DRONE_SERVER_PROTO: "https"
+            - "{{ drone.volume_folder }}:/data"
-      PLUGIN_CUSTOM_DNS: "91.239.100.100"
+            - "/var/run/docker.sock:/var/run/docker.sock"
-      VIRTUAL_HOST: "{{ drone.domain }}"
+          environment:
-      LETSENCRYPT_HOST: "{{ drone.domain }}"
+            DRONE_GITEA_SERVER: "https://{{ gitea.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+            DRONE_GITEA_CLIENT_ID: "{{ drone_secrets.oauth_client_id }}"
+            DRONE_GITEA_CLIENT_SECRET: "{{ drone_secrets.oauth_client_secret }}"
+            DRONE_GIT_ALWAYS_AUTH: "true"
+            DRONE_SERVER_HOST: "{{ drone.domain }}"
+            DRONE_SERVER_PROTO: "https"
+            DRONE_RPC_SECRET: "{{ drone_secrets.rpc_shared_secret }}"
+            PLUGIN_CUSTOM_DNS: "91.239.100.100"
+            VIRTUAL_HOST: "{{ drone.domain }}"
+            LETSENCRYPT_HOST: "{{ drone.domain }}"
+            LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+
+        drone-runner-docker:
+          container_name: "drone-runner-docker"
+          image: "drone/drone-runner-docker:1"
+          restart: unless-stopped
+          networks:
+            - drone
+          volumes:
+            - "/var/run/docker.sock:/var/run/docker.sock"
+          environment:
+            DRONE_RPC_HOST: "{{ drone.domain }}"
+            DRONE_RPC_PROTO: "https"
+            DRONE_RPC_SECRET: "{{ drone_secrets.rpc_shared_secret }}"
+            DRONE_RUNNER_CAPACITY: 2
+            DRONE_RUNNER_NAME: "data.coop_drone_runner"
+
+      networks:
+        drone:
+        external_services:
+          external:
+            name: external_services

roles/docker/tasks/services/gitea.yml

@@ -1,9 +1,13 @@
 ---
+- name: gitea network
+  docker_network:
+    name: gitea
+
 # old DNS: 138.68.71.153
 - name: gitea container
   docker_container:
     name: gitea
-    image: gitea/gitea:1.11.1
+    image: gitea/gitea:1.12.3
     restart_policy: unless-stopped
     networks:
       - name: gitea

roles/docker/tasks/services/mailu.yml

@@ -38,7 +38,7 @@
     force: yes
 
 - name: run mail server containers
-  docker_service:
+  docker_compose:
     project_name: mail_server
     pull: yes
     definition:

roles/docker/tasks/services/matrix_riot.yml

@@ -46,6 +46,11 @@
     src: files/configs/matrix/vhost-matrix
     dest: "{{ nginx.volume_folder }}/vhost/{{ matrix.domain }}"
 
+- name: upload vhost config for riot domain
+  template:
+    src: files/configs/matrix/vhost-riot
+    dest: "{{ nginx.volume_folder }}/vhost/{{ riot.domains[0] }}"
+
 - name: upload homeserver.yaml
   template:
     src: "files/configs/matrix/homeserver.yaml"
@@ -57,7 +62,7 @@
     dest: "{{ matrix.volume_folder }}/data/matrix.data.coop.log.config"
 
 - name: set up matrix and riot
-  docker_service:
+  docker_compose:
     project_name: matrix
     pull: yes
     definition:
@@ -77,7 +82,7 @@
 
         matrix_app:
           container_name: matrix
-          image: matrixdotorg/synapse:v1.11.0
+          image: matrixdotorg/synapse:v1.18.0
           restart: unless-stopped
           networks:
             - matrix
@@ -97,7 +102,7 @@
 
         riot:
           container_name: riot_app
-          image: avhost/docker-matrix-riot:v1.5.10
+          image: avhost/docker-matrix-riot:v1.7.3
           restart: unless-stopped
           networks:
             - matrix
@@ -107,9 +112,9 @@
           volumes:
             - "{{ riot.volume_folder }}/data:/data"
           environment:
-            VIRTUAL_HOST: "{{ riot.domain }}"
+            VIRTUAL_HOST: "{{ riot.domains|join(',') }}"
             VIRTUAL_PORT: "8080"
-            LETSENCRYPT_HOST: "{{ riot.domain }}"
+            LETSENCRYPT_HOST: "{{ riot.domains|join(',') }}"
             LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
 
       networks:

roles/docker/tasks/services/ouroboros.yml

@@ -14,5 +14,5 @@
       LABELS_ONLY: "true"
       CLEANUP: "true"
       LATEST: "true"
-      CRON: "*/1 * * * *"
+      CRON: "*/10 * * * *"
       

roles/docker/tasks/services/passit.yml

@@ -1,45 +1,47 @@
 ---
 
-- name: passit network
+- name: setup passit containers
-  docker_network:
+  docker_compose:
-    name: passit
+    project_name: "passit"
+    pull: "yes"
+    definition:
+      version: "3.6"
+      services:
 
-- name: passit database volume
+        passit_db:
-  docker_volume:
+          image: "postgres:10"
-    name: passit_db
+          restart: "always"
+          networks:
+            - "passit"
+          volumes:
+            - "{{ passit.volume_folder }}/data:/var/lib/postgresql/data"
+          environment:
+            POSTGRES_USER: "passit"
+            POSTGRES_PASSWORD: "{{ postgres_passwords.passit }}"
 
-- name: passit database container
+        passit_app:
-  docker_container:
+          image: "passit/passit:stable"
-    name: passit_db
+          command: "bin/start.sh"
-    image: postgres:10
+          restart: "always"
-    state: started
+          networks:
-    restart_policy: always
+            - "passit"
-    networks:
+            - "postfix"
-      - name: passit
+            - "external_services"
-    volumes:
+          environment:
-      - passit_db:/var/lib/postgresql/data
+            DATABASE_URL: "postgres://passit:{{ postgres_passwords.passit }}@passit_db:5432/passit"
-    env:
+            SECRET_KEY: "{{ passit_secret_key }}"
-      POSTGRES_USER: passit
+            IS_DEBUG: 'False'
-      POSTGRES_PASSWORD: "{{ postgres_passwords.passit }}"
+            EMAIL_URL: "smtp://noop@{{ smtp_host }}:{{ smtp_port }}"
+            DEFAULT_FROM_EMAIL: "noreply@{{ passit.domain }}"
+            EMAIL_CONFIRMATION_HOST: "https://{{ passit.domain }}"
 
-- name: passit app container
+            VIRTUAL_HOST: "{{ passit.domain }}"
-  docker_container:
+            LETSENCRYPT_HOST: "{{ passit.domain }}"
-    name: passit
+            LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-    image: passit/passit:stable
-    command: bin/start.sh
-    restart_policy: always
-    networks:
-      - name: passit
-      - name: postfix
-      - name: external_services
-    env:
-      DATABASE_URL: "postgres://passit:{{ postgres_passwords.passit }}@passit_db:5432/passit"
-      SECRET_KEY: "{{ passit_secret_key }}"
-      IS_DEBUG: 'False'
-      EMAIL_URL: smtp://noop@{{ smtp_host }}:{{ smtp_port }}
-      DEFAULT_FROM_EMAIL: "noreply@{{ passit.domain }}"
-      EMAIL_CONFIRMATION_HOST: "https://{{ passit.domain }}"
 
-      VIRTUAL_HOST: "{{ passit.domain }}"
+      networks:
-      LETSENCRYPT_HOST: "{{ passit.domain }}"
+        passit:
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+        postfix:
+          external: true
+        external_services:
+          external: true

roles/docker/tasks/services/portainer.yml

@@ -8,7 +8,7 @@
 - name: run portainer
   docker_container:
     name: portainer
-    image: portainer/portainer:1.23.1
+    image: portainer/portainer-ce:2.0.1
     restart_policy: always
     networks:
       - name: external_services
@@ -19,5 +19,6 @@
       - 9001:9000
     env:
       VIRTUAL_HOST: "{{ portainer.domain }}"
+      VIRTUAL_PORT: "9000"
       LETSENCRYPT_HOST: "{{ portainer.domain }}"
       LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"

roles/docker/tasks/services/postfix.yml

@@ -1,5 +1,12 @@
 ---
 
+- name: setup network for postfix
+  docker_network:
+    name: postfix
+    ipam_config:
+      - subnet: '172.16.0.0/16'
+        gateway: 172.16.0.1
+
 - name: setup postfix docker container for outgoing mail
   docker_container:
     name: postfix

roles/docker/tasks/services/restic-backup.yml

@@ -0,0 +1,38 @@
+---
+- name: setup restic backup
+  docker_compose:
+    project_name: restic_backup
+    pull: yes
+    definition:
+      version: '3.6'
+      services:
+        restic-backup:
+          image: mazzolino/restic
+          restart: always
+          environment:
+            RUN_ON_STARTUP: "true"
+            BACKUP_CRON: "0 30 3 * * *"
+            RESTIC_REPOSITORY: "rest:https://datacoop:{{ restic_secrets.user_secret }}@restic.graffen.io/datacoop-hevonen" 
+            RESTIC_PASSWORD: "{{ restic_secrets.encryption_secret }}"
+            RESTIC_BACKUP_SOURCES: "/mnt/volumes"
+            RESTIC_BACKUP_ARGS: >-
+              --tag datacoop-volumes
+              --exclude='*.tmp'
+              --verbose
+            RESTIC_FORGET_ARGS: >-
+              --keep-last 10
+              --keep-daily 7
+              --keep-weekly 5
+              --keep-monthly 12
+            TZ: Europe/Copenhagen
+          volumes:
+            - /docker-volumes:/mnt/volumes:ro
+        
+        restic-prune:
+          image: "mazzolino/restic"
+          environment:
+            RUN_ON_STARTUP: "true"
+            PRUNE_CRON: "0 0 4 * * *"
+            RESTIC_REPOSITORY: "rest:https://datacoop:{{ restic_secrets.user_secret }}@restic.graffen.io/datacoop-hevonen"
+            RESTIC_PASSWORD: "{{ restic_secrets.encryption_secret }}"
+            TZ: Europe/copenhagen

roles/docker/tasks/services/tt-rss.yml

@@ -10,7 +10,7 @@
     loop_var: volume
 
 - name: "set up tt-rss"
-  docker_service:
+  docker_compose:
     project_name: "tt-rss"
     pull: yes
     definition:

roles/docker/tasks/services/ulovliglogning-dk.yml

@@ -6,8 +6,8 @@
     networks:
       - name: external_services
     env:
-      VIRTUAL_HOST: "{{ ulovliglogning_website.domain }}"
+      VIRTUAL_HOST: "{{ ulovliglogning_website.domains|join(',') }}"
-      LETSENCRYPT_HOST: "{{ ulovliglogning_website.domain }}"
+      LETSENCRYPT_HOST: "{{ ulovliglogning_website.domains|join(',') }}"
       LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
     labels:
       com.ouroboros.enable: "true"

roles/docker/tasks/services/websites.yml

@@ -8,11 +8,25 @@
     networks:
       - name: external_services
     env:
-      VIRTUAL_HOST : "{{ data_coop_website.domain }}"
+      VIRTUAL_HOST : "{{ data_coop_website.domains|join(',') }}"
-      LETSENCRYPT_HOST: "{{ data_coop_website.domain }}"
+      LETSENCRYPT_HOST: "{{ data_coop_website.domains|join(',') }}"
       LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
     labels:
-      com.ouroboros.enable: "true"    
+      com.ouroboros.enable: "true"
+
+- name: setup new data.coop website using hugo
+  docker_container:
+    name: new.data.coop_website
+    image: docker.data.coop/data-coop-website:hugo
+    restart_policy: unless-stopped
+    networks:
+      - name: external_services
+    env:
+      VIRTUAL_HOST : "new.{{ data_coop_website.domains|join(',') }}"
+      LETSENCRYPT_HOST: "new.{{ data_coop_website.domains|join(',') }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+    labels:
+      com.ouroboros.enable: "true"
 
 - name: setup cryptohagen.dk website docker container
   docker_container:
@@ -22,8 +36,22 @@
     networks:
       - name: external_services
     env:
-      VIRTUAL_HOST : "{{ cryptohagen_website.domain }}"
+      VIRTUAL_HOST : "{{ cryptohagen_website.domains|join(',') }}"
-      LETSENCRYPT_HOST: "{{ cryptohagen_website.domain }}"
+      LETSENCRYPT_HOST: "{{ cryptohagen_website.domains|join(',') }}"
       LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
     labels:
       com.ouroboros.enable: "true"  
+
+- name: setup cryptoaarhus.dk website docker container
+  docker_container:
+    name: cryptoaarhus_website
+    restart_policy: unless-stopped
+    image: docker.data.coop/cryptoaarhus-website
+    networks:
+      - name: external_services
+    env:
+      VIRTUAL_HOST : "{{ cryptoaarhus_website.domains|join(',') }}"
+      LETSENCRYPT_HOST: "{{ cryptoaarhus_website.domains|join(',') }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+    labels:
+      com.ouroboros.enable: "true"

roles/ubuntu_base/tasks/base.yml

@@ -1,5 +1,5 @@
 ---
-- name: Install necessary packages
+- name: Install necessary packages via apt
   apt:
     name: "{{ packages }}"
   vars:
@@ -8,4 +8,11 @@
     - python3-pip
     - apparmor
     - haveged
-    
+
+- name: Install necessary packages via pip
+  pip:
+    name: "{{ packages }}"
+  vars:
+    packages:
+      - docker
+      - docker-compose