Don't add SSH keys to root

.gitignore

@@ -1,6 +1,7 @@
-*.retry
+playbook.retry
 *.sw*
 .vagrant/
 *.log
 .idea/
 venv/
+/ansible.cfg

Makefile

@@ -1,4 +1,10 @@
-init: create_venv install_pre_commit install_ansible_galaxy_modules
+init: create_ansible_cfg create_venv install_pre_commit install_ansible_galaxy_modules
+
+.ONESHELL:
+create_ansible_cfg:
+	read -rp "Enter remote username: " REMOTE_USER
+	cp ansible.cfg.sample ansible.cfg
+	sed -i "s/REMOTE_USER/$$REMOTE_USER/g" ansible.cfg
 
 create_venv:
 	python3 -m venv venv
@@ -9,4 +15,4 @@ install_pre_commit:
 	venv/bin/pre-commit install
 
 install_ansible_galaxy_modules:
-	venv/bin/ansible-galaxy collection install community.general
+	venv/bin/ansible-galaxy collection install community.general

README.md

@@ -26,9 +26,6 @@ Here is a summary of the options that can be used with the script:
 # deploy the ubuntu_base role only
 ./deploy.sh base
 
-# deploy user setup only
-./deploy.sh users
-
 # deploy the docker role only
 ./deploy.sh services
 

Vagrantfile

@@ -13,8 +13,7 @@ Vagrant.configure(2) do |config|
   config.vm.hostname = "datacoop"
 
   config.vm.provider :virtualbox do |v|
-    v.cpus = 8
-    v.memory = 16384
+    v.memory = 8192
   end
 
   config.vm.provision :ansible do |ansible|
@@ -27,12 +26,7 @@ Vagrant.configure(2) do |config|
     if provisioned?
       config.ssh.guest_port = PORT
       ansible.extra_vars = {
-        ansible_port: PORT,
-        from_vagrant: true
-      }
-    else
-      ansible.extra_vars = {
-        from_vagrant: true
+        ansible_port: PORT
       }
     end
   end

ansible.cfg

@@ -1,8 +0,0 @@
-[defaults]
-ask_vault_pass = True
-inventory = datacoop_hosts
-interpreter_python = /usr/bin/python3
-remote_user = root
-retry_files_enabled = True
-use_persistent_connections = True
-forks = 10

ansible.cfg.sample

@@ -0,0 +1,4 @@
+[defaults]
+remote_user = REMOTE_USER
+inventory = datacoop_hosts
+use_persistent_connections = True

datacoop_hosts

@@ -1,5 +1,3 @@
-[production]
-hevonen.servers.data.coop ansible_port=19022
-
-[monitoring]
-uptime.data.coop
+######################################
+### All hosts
+hevonen.servers.data.coop ansible_port=19022 ansible_python_interpreter=/usr/bin/python3

deploy.sh

@@ -4,16 +4,14 @@ usage () {
     {
         echo "Usage: $0 [--vagrant]"
         echo "Usage: $0 [--vagrant] base"
-        echo "Usage: $0 [--vagrant] users"
         echo "Usage: $0 [--vagrant] services [SERVICE]"
     } >&2
 }
 
-BASE_CMD="ansible-playbook playbook.yml"
+BASE_CMD="ansible-playbook playbook.yml --ask-become-pass --ask-vault-pass"
 
 if [ "$1" = "--vagrant" ]; then
     BASE_CMD="$BASE_CMD --verbose --inventory=vagrant_host"
-    VAGRANT_VAR="from_vagrant"
     shift
 fi
 
@@ -30,17 +28,17 @@ else
         "services")
             if [ -z "$2" ]; then
                 echo "Deploying all services!"
-                eval "$BASE_CMD --tags setup_services $(test -z "$VAGRANT_VAR" || printf '%s' "$VAGRANT_VAR=true")"
+                $BASE_CMD --tags setup_services
             else
                 echo "Deploying service: $2"
-                $BASE_CMD --tags setup_services --extra-vars '{"single_service": "'"$2"'"'"$(test -z "$VAGRANT_VAR" || printf '%s' ', "'"$VAGRANT_VAR"'": true')"'}'
+                $BASE_CMD --tags setup_services --extra-vars "single_service=$2"
             fi
         ;;
         "base")
-            eval "$BASE_CMD --tags base_only $(test -z "$VAGRANT_VAR" || printf '%s' "$VAGRANT_VAR=true")"
+            $BASE_CMD --tags base_only
         ;;
         "users")
-            eval "$BASE_CMD --tags setup-users $(test -z "$VAGRANT_VAR" || printf '%s' "$VAGRANT_VAR=true")"
+            $BASE_CMD --tags setup-users
         ;;
         *)
             usage

group_vars/all/secrets.yml

@@ -1,185 +1,161 @@
 $ANSIBLE_VAULT;1.1;AES256
-31303330643235313132323363306532616164646565636532646131386663633330333335353938
-6632373337386339323566373163306435663562303663320a666438653936356335653534353464
-37373932623562326430396132316138373930383365313433646536343839636637386232306235
-6566393031643037340a643463373163663062643932353931646366306566346230336362623561
-30323138333636343165666239393138653462396538386139376432346335373066363366613535
-38623130333434386266393363306139333666393537663161626666323262646364636136393736
-37656438373365353335633237326635636263653534353961396562646535303764613564306133
-39373362343133643536383937386633373437333763636331663761646432663636373738373332
-36383638363539663034303536636264336230636630636331336438333338356431666332313931
-66653738656263613739333835366139633335643661373135396333346361343032303832353562
-61376531343861656532626630623330336362373666343863373738306430616530373565663438
-37373131646233656533633466356162326162616433613964616530393734336438326133373763
-65663266313939363361396231663564663664393363373061646436653535663338336138373961
-66303662323930376564313562376661336162316430316439313565633935323835386561356333
-61393330333965633764633364366336646166353031613438373234333436326330336537643464
-32383732336166303535393837353061353333386363356162323966336138363864663464356430
-62396530393234666339346537616637323334383365663732663365653636383036616263303362
-38623063623035616336346562396263336236376435386264336632336165336463613932383465
-37323634633831363938616137373335653130303465383939303332333131363866303863383965
-62333866333830666361613637333230363566333035366664353034303766633264643365343566
-30326530383562633764643630363963646337363865343431353530353036616434363062313132
-37393661326139613732636236633239653837333063646566653861643635363537386137393434
-64616437363666653664303132666630376665646666323733376164653636623465623964336638
-33623838616330353265333733343261356462613665653530333431343732646136346164626534
-34343463646262623464613832393963633366353835393531653634623234393230343430666161
-62306164616636616461306464333536333265313765326665626331363463363038393935653334
-64646132393835656366643239303063333233303331373961346631633034343136623663666462
-64306262636636346131333662626639323865343435373037306130366566343230656338626537
-62336234373136326330306633306637326239356439326339373839383130623836383338373561
-32646163616336623838373436303464643937333164643639623631393764623064626235303733
-61633063303962343931333437313031653435636432393531393130336234613462343838366363
-35383134303137633833363233376365666538333535306434373139333633386630636161636261
-63373339386364326231366634303962636437353336346461336661396566623034306132326332
-33633434326365353438313362616664393264633937393762336264633061313134656536363062
-37303861663732336238386331363164363436363966393534613332393230666266616364303661
-31323633656332643839616434313066643833616639353562386432663538366563633766393639
-33636534363263633261323533666366366665323437346431653464646233303636366231626535
-33373134333163373633313739626636303830383232616663636639646564643436313331643334
-37663132343030666566333431633136653064626466626362373864613334663737326233313138
-38336261663765633331393766333965613364306136333362626466623235303033396362346365
-36633963333561366265633633303262393832336364333365313336383066363065316133303634
-65363037646566323831363365653937623966323735353439353339616439306534663831653663
-34623537666435313661326631326235313130363938643635666531636165306539663630366265
-65323234613133663337363466336663633464316361656564326136633064373365373239363662
-37323834633163653938633435323763333539396532393664653162643832646535353262336631
-61386237663136336338663165613238663035386361643135333361383666643432396363363132
-66323832643339346534373066326333396232386166383161383764633338373533623236346366
-33373138303864323532363761313762376439343130316432613933353033363536336337363566
-31396133663330323665313033656436396238623630633465313734343063633537323939356337
-62306364633765323834333836316161366531643763333434383062363032653164353037336562
-61653332333062643362386665633665306662356532653031383365356632643861363038383137
-36326666356231396433363538666131353839353366323934343532306532633866623733663138
-33376665333430653533383439373463323661666165333636353434643739386363356536333837
-39313365643039386638623731386635363632376139666638643734303035386564376136656537
-39356162346164313839373931653139386464653232633339616166306235323232336139306538
-32623135666535633462613430646637313030343933653461333230656564396663653364633238
-30336161323431323337636135323539663466323637313366376535666132663662356239366339
-66373830336132336439653637366664656230323834623039306337636433663931373138616466
-30616437376435643535303237313831383534656634353265386565376564623431616263643334
-65613633656533646138663138393831623330363635313662653264646636396461326664633362
-38633765316333373363616563346230393866363365623862333162306263613938373663633963
-31363639613238316334333437326631353830383734393765303037346436343036386437653637
-32636139313464383264376663393730363038343831336565663565383135653139663765303239
-31653036623138316566666461313665663462383662343461353332366634666437363263373864
-30323564343934386666666338373238383333303939626237363131346261386562663566323365
-37316563653231346336343166646661393431363739346237303161363838613237666533353034
-64623435376462613961326333393930346663353737386130346461616638363639386364313266
-34353465326632356233343633636331343638333937303562356133363432323939633865316630
-33353539653162333734653338363764313439376439656435313932626431313930346662633838
-39636463393861396531633833343264393339323133316566356562613932663131633631303065
-31323937663764613563333736313733326639643961653161303237353165343939666461396263
-34323136356632336138643162326163653331616561626263616132393734396237666434326264
-65653837383063306436643466383964386661643336343230393436326139313963633036613065
-31393930386463626131653565393932386462313236623531616235393064656237663837346539
-34333730666337353537613564363531363831323035353532363366363731306335316138366361
-37353438326130366439303136356636653030666464366436366566626464626262663838393462
-34626662396239636536666433636436316535363539636261343131313430613765353836643133
-38653839336663353663313535633231363765636633666363386561303039313438353838643561
-32643131623162386661653464623461623434313733643564343435386636326531633136306139
-38613937336132653238616561356338303264393962306431356463613764613364363738323366
-31326562613764386533353135643737323161616363656362326262653765353764626166363338
-34646231633764383962326135323164326565343034656430326531653231666633666465336231
-62366635356566613766643832386234383766363236306638623133643036643662396430623330
-31396239366338656565346563313430353463366465373534636536393131303166333263613663
-36393864663636333666396566303638646166346665303765343531313661376632623137613131
-32653031343861363831646635356232353836363536613834343663326261623262336336393838
-35623638636538626566353864343362633264366435383633333562366365326432663839613934
-34323466396565303963333531346362363338623537343439666265353332303230356533323834
-61333838356665653138346337336532333931616432353936306261356537663036643064333964
-39643065303032393932323136363264316264386131353035383933386535303632613033633363
-66346437333465653633626235336336353738343036326265376162383163326530373032663335
-66643663666166366165396137383133396635336237343161303666393437303538316661336335
-32396434323532303238303538303864393031303832346161303535386461666161316565646539
-37303261336435323139663962316562346265343064346562393633616666653066623466316634
-61346263366161366232386138666131323162333031623533303739646336623864613333323662
-35363539646433323430313839633363393936356438313037613434663161653964366635363464
-62643539393631386531313966643339383865623065393936666235653035376139656663616336
-65663136326466616161376232316463643834356531336362336163343637326238663836363734
-30363032653962306530633562636161396634363131633065326433363136316666633738343966
-66303939383232373738373965393934653439396666623039353933633935393731653839623737
-35376338363338306332353539313664303962353064306434323530623161323064633766643035
-38363234343036616335393461643964386664616134313831663565633366616633626266393937
-31623435646138646131356164313936656639393532343630663933613066333432666132363338
-30356136303763376465396637613565386661333265633636643435313035313064383936306437
-39626265643862313435343465643063656266373035356538393262363561356433323134333537
-66663233313832326136366163623337373835663961313938636134613933663534333730333761
-39313334346364623431646439386162633961316161393636656139303966626265623035366335
-66666634363036326631376562623039303961663136366461313637343932303338356334383139
-38383133306436303261643535353532383538613764616233363864656665633264623236623537
-31353335343064626465626130356433366531306338623830623139316462316662633665663164
-38363363656237326239633930623862663230623464663031363463356133626166353433633535
-63343231326438383535356235343530393361636465363933356164323565326566303034383466
-63323136643835623563393666333030656534333565316466333266663365346561363937336665
-32323637366138303233373565333932626435306130633064656336623764366130323534333039
-64613934383530343036343334396439373066326264353638353462613266663935343436353130
-38616238313133363732343634663962666435656330396536643836326636373032623734353832
-32313064663164626534336363376131656438623035646263666336633862613833323565656437
-63616463613732663966643039653761633231616462363761336231313335363165646134356137
-38633963393264653139356333626534303936326563326433363164623131393562393533383564
-62646532643366376333373364646139363635323034613262386265383066303365323134633836
-66666536653264393138326436393037373537393561613864343730366135353166633765323938
-38306562326238613331343337306239376165636562666433356266313030613136656162646166
-36303966373931363463383631386136313262633136383637626562353336306465613435336434
-32303136393638396233393232386534643733626539653961366637316135373439386432643264
-63663837306461376461306664366538396436386234366638626263303735323661393839343938
-36393264306132313130326435636266643363616438613538303530306434636331333033323138
-39656337666635363263316363363133616538356336646337373762613666323663656665383733
-31623433396466383939306666373562303330373731323864363266323261383736353465633662
-38356130353233663161623139653465646238363630643239386634623262303836333232303239
-61313930346263643565333534373430653430363965373037646639633638333861346262373433
-65346133636162396332373130356238346438626330373163326632323137333862373436363133
-37373663396461613062616664336662373432383863333536366465313838333835653966353661
-38343336316136316532613661306336636131653236663336396638316136626434303533323365
-38356534353530633766646466663266613735396333386263356662613939373030396436363530
-38333939623534356266323237623835373038663534616532326665346631616665616665666663
-33633266333630646563363637666562336339393138326435373836336566346661646464613730
-39616438373062656130393134353535313232376266386262623862383162366662626231373338
-37373561376435323361316337636239366263656336303636346436373363663164343333656538
-32633835353436623565393538643563646630366633343632633532396433616139303766666435
-30373235373262633134383033363137316366316563613662313437663832356165353661666533
-63343138393230333335323938666566623365623762643563633036613339636537366264333138
-62656265363261663233396266616466333332633266326661373736353135383563313666633765
-37316430633763326438326263643766396137363333353035623036346662303834376463613162
-30363938396638336565303535663831326135393061383634646430343931373135636638333866
-64623032366163386530313563656266376334343835366665633362643339643534643738373839
-34323134636330383963353439376436323530373066623435376230306435333832633964653639
-39373235353262383864303430336635393435656430646233613461306135643230666437393361
-36616134356461616534646535396338656138616636396538373031626136323264323936366633
-61373631306538363437323934316434663735323533656364393135613761326337303833383934
-37383162356162373737336666663430343334356532333335363463623238643662333232333336
-31376639386632626161303232653363626637376630333733343035323539623463626132373763
-36613535623064636163643236383336653934663739326264653362333237303237393335613339
-30323030353632613434393636336562363064306332663931393061393964393661363163326632
-37353434656464333532343263363961613866643338396335656131373134333665353437613837
-37336533366635616138366566666635366634613633616533373966336637303334613731316436
-66376565643033383162373166373665633362313164643530356561383630343531346436343663
-62313836323530623535356532303362333436643434663131653539646331346535666133336162
-37653036376165333364373661386262633030363165353638386139646266623365306338383963
-36373732356364333166386566653835663466346630356438323866636564663966363832613862
-64623831646261333064663939613763323466336431343861386537633337396637383330333633
-32636436343564633365616331626465613163333465373961656631373736373430396633393733
-64386534353131666438346362376462636331353761636535663234613731356130666534323735
-35636162323234386435646132396366326165663234653637363139303162613832346333383665
-64323737306634613530633636643761346461326130663234373363326230616331336430353261
-38346630356136333966656562343730356234643537323635653532396337373331363537393662
-33373862336232623563636436643239623837623862386638353361383830303365333362353665
-33666236363035616363326462376337363736333234613133383636396464306236386238333863
-39316237326638663535646361393939393938656335653262633063326132663331343235626364
-35366532333161343562383763653130306235633934393066356239653565633962343235643036
-62333363323065663137393736383964613061393131376637363031393335306534626230383139
-35333437613963386664646336383637323534366635336264333039643861396561373461636439
-30323831333335393365383834386138626664653531333830363862363330346466646432656663
-62383534343131636331353763356166386339303564353035383466353636636335653333383431
-30616133383565623430326534396432376331636161393930366263366539343332666631616530
-36383937313164663631626163646339623365653937616634656235303039636439646335616561
-31623135366136333766663833333932383032343438376336366533636466353666633437353338
-33386166386231353430646665323164363961666538343537313734343465366333383763666666
-33326363656134613031393033646435333937353865316161626137633939333934316536643830
-37386364356233353964326661386564656132643937366665353139653533336331323138356633
-35656562663961343238386132636331636439383236383761306337626262303764656431303964
-62646133323361643162313231376633663231313833633964613862353265336538633261643834
-62353230316334363363343133626530643832356631353937353334613538616366396438383338
-39336366623332363966383535373365666263383231356532346533386262643465306430336462
-64623764333861663031
+66636338343431616564613639346264306161343566303835363432623939376366353962656631
+3530626163323838363236356534353065346535333666320a353662643837623033353237313234
+33653766303862653535343935306261353131623834343230386437356666643839643334623063
+6131626436313434310a623730633262636162623232323632366564613037313232626364633936
+37346365366537663763623535633234316538643766386566396636653634363432383932333135
+65396435363665613562663861373237343633616637386234303831653130353332623731643737
+38613238386164393762646631383333363035643338626364386161306162383933623433616564
+61383966636438653434356466323835313562313633346663643639643632343131353761656233
+39336262333036306230383038373031633036313564343135353264383963656366353665386139
+30626636336336363634316632356434353436613236626264323531326533656637366436656265
+37613230303530303836616533393035343064663139376261363837626637646365353364373165
+35326462393961313234643866336638393364613863653565616438656565353061633564393134
+66643735303631373665613866643230353462623936656561643961613765323039613531656336
+34643432323131626536623065616137333365623666383438653936396131386566356265313033
+65613765353732666232656433353035363030623461353134393463663362646464616632633931
+35373632623432303930633566626333343465346563643435656537623336373235323637386166
+37356535386564363131643162383835633331363961313636343262333863613765306130353266
+39313566653735646438663739386433313735383730366530336533346465643166323765393334
+34653436653133393665303265373535353430366464653030386234386332343230646263393766
+38363532303761636666346436313539363935626635356166653739643139386138616230313663
+66636634663936616537386332346437363163636465653365643263666164633530623532303331
+31373661303737626632663339306430633037306161313166323430373266643833306365386234
+37663937356333626335653737303634396137303738396533633537653461393630613739363762
+30323739633265303634626237643066626631393639353039306438353830313634333866656461
+62396637656635623466626665353064646233636366313239626438343333353139316432373162
+33373831613937323738383332346364623863613861616538626639633039306232363063653439
+63383132323534633966333730363730653132336261666363323433303339633636336261393863
+61386637656232656161306264313230353161613936313632613066613930376339623530386438
+63306335363031323532303937636432663165366137663339333635653166306538313433306664
+30353536353163393139643032393363623930323834623139316532303363316239303531623165
+34326263643935396239366133353565303039393333303736346434376237313533623034626238
+63356538373238396162323263313262326234653230373866653335396530646439626437393438
+37616565333632343766623065646139653261336438346330383539313235626166313863303530
+62353138333866666331663861346632343232376234633965323138343763626434383163633263
+30313634653535396632393932636236626361623530363563373266353534363431313436663034
+37633763656133666637326138386364336365363735326161393562373364633637636633666539
+61353135613465653031343035303334303532306533383936626565366434343464623766353661
+39623231343033313662643837633735313666313038316162643232366566626333636231613838
+36646630653265633631326535653463613232336265393061313732303833376637363362333134
+62356531373363656335356365373462383263386364353539383938323763323437313530666137
+34353962613930626663343064383235393333343061363039663535653564613331323662313035
+37623466333863613737393738316663303238303164653265366433303864353466313866663762
+37623863633163643139393934333764643261333835663639653664613166336635653236353065
+39363063313264616332386562626130323664643839316334313461643162323130366432343663
+32663637373061383636366663326163656637663366326436396639373332393330393030396262
+62323162646236343764333466343466326530653136653937663866613131663136323133386461
+62336665316232666630623235666566313561333563383133613539303032363736613831353562
+30636433323631386363623062666530623364643437383764613532646331343237646638643665
+66343334643061363764656532623836646231396664616332326436333831663636333763653634
+34646637613961333063363635376137343533336263656661643234626563343035343131643863
+61653031396361623436343336383730373563363666633266626131316538386335623532646533
+31623837383336333263643834613936373835336163616530636661623161346463343565336533
+39653039376437313037393435393634336666383634313534636632656533643433633966366530
+36613139323831383331633232636130333836313831343336376466663532336263363634323837
+38306635613861316234343232303161373531356339613661666434626335313231383439656361
+31353730343965323934666466626439386536323434333266643161613230336133383531643734
+65326133373134306439626138316361313865646663333936383731333336333437376661356639
+39303462653464646231303965313437353161333931306335363864623165366565306331366563
+39383031353866646336363836643735666264636562643838626230393339653362303861333431
+64653930353964653339396562653033373463303431303362313861663064333763306638643839
+66333461316230353433616361313961353637323062623431306635376435346238303962353638
+66356662386631616230336337336366336335613935313535393030373761343465316539303436
+33366136636261336537333964623033383733656666366233363361616365613531383866306538
+37353866396535653166303133333736616537333565613062336330303636376361633537663962
+36613532346330346161303461616365386133303362303739636563633362393837653733323333
+31363264353762316564313362663563653862626164306533636335623631303139343161643863
+34613462313732303830313738323563353338303164306137306535363531353534653061326361
+36653837613264383537643634356537353737373166356366363664333361643038303965313633
+36323839343634383762373636383732643936616661333133353036396464616635626663643230
+35333239323034326435643335393239326230303833363338353865396366313736303836663762
+36353536633630323734356239656339623432366463653365643163393030613466303066613435
+64333934633136313361656435636531646264643138376532353239643537313765636237383332
+33323363353630383431656437353435396638353438343162356538356636353364333839316633
+63623433346437663932663437333338366161346238343166306635653833666564323834623662
+64643633616330626234396564356433383535363733353135393230366630343665633736373031
+63306563623464366230326166373462366361333563636431353736376632323835393363383037
+32656632336335346131613537343665393461323834346564653263613031386366616432353131
+65386461313235663263353561383163366130356631336438333837303234373362343430396462
+64383733616166653465646333633666633138613038373561356634653330626236306631393166
+37636333393762326336643339326232653964646161656161643134386264333764316336643636
+62323032633462633339346665633461303362333232643837653834646463653733663831323233
+35306261323332356531393466383932353239613639383938323731336564336133316237656237
+35613932386132306630626631393434363231356531313338633632633966623965643764376239
+32623033336161323164343364346465376166653432356166343537373630653230646566306463
+35353066653337363136313937336436623266353234666361616265666161383265323936613265
+30303962646436303130373666383062363261326363373761616261613366346438386138653832
+62313065633664306564316638383565363134326662306434363262613435666138623639366533
+62323762636363653161366238343862326364633130313037643838383538323134633031323732
+61326537383730343463363266636332623936343465383466653765333666393133623062383563
+32336138316466383930373966623364353531663533326335626334323530393635656530623865
+37313437333235346438663532316336346261333331363635666166366330636234353966316132
+32613932366561643864376138323233303333633935666561383130363939393063303663393566
+61376331353962363962653738666237646136626163343961343931613861393730373530616461
+62353032656636636237633935343334326637313931313232353632666236326264346330656139
+35376366323732343161303464356231623431616630666131313831636236356532383733313338
+65346664626563633639633266653636323532333338353261396538306364616164356337636534
+62386165373263353935663037656464393235393732376362653136373730316138383630323434
+32333864663861623033343665656633363639326364616466616137313264646236366435323337
+31356266633737666235333761376432333138393931326136633338333836353163383539313335
+36646466333566626336336663356530313936653239383265326538373136636162323132326539
+65373939646663333962366263376631653661633164663766316463303163386236666366303439
+37636432663661613064616137333665633161393733383132316138623062646136623630613535
+31393439343930356437656539653535613264336333346132396463633734333164363065363232
+38623438346632306161646633383534653534353164616532633934363036373338633234373934
+64623933303336346663616166366262383033393633373963356565316461346564623832356639
+37353561343430646361353937613236656232626565346437373236636636376334393262613666
+65356634613165613831376366323732336434303864643435353835376533356539643030613464
+62386635646633633462303163306632323238633938363638363431356637306430313061333632
+63393333336361336161313064376466636135313061363238623965613338343738343030616436
+35633334656362646137313366353564383337346263636164323461613761316464396538363463
+30363461666362653938393637623531636136613538663437306463316562616133633237303035
+32626161393332313331623363653730313763643335393436393265643834303330303836666661
+32623633626563643661353936636335386465373038323466653562333332393433663034643164
+32646234386438313138356530353536656532323730626164636332663663383337633137326461
+64303939323336326630326561623031393634363965636265333033663732643265363638356536
+32323434633262366361306334623835316237353964316438333161366431386633616431343236
+33643436306362363362386631346237393235323366633033323532346366333437303336626139
+33323637663838316635386536306261313135316231643031636536303237353261313638656137
+31636231313763613465663038623462613466383965386665373133343466386563646131643035
+32353430336536653834646638623963306338366663353265623437336433393865336663623637
+62353330646464663532356336393366356137373064383261336632626361653435356361336133
+31383838623637643334373537613763393564373730313465616433316339646163323765346138
+32643837643331363234323661616234383863316262666532376236346362323731303634313765
+36643364346561393834316262663932313034633261343663613965356663633466346461666136
+32376137323066303339316163633732366439333135306564626231366562313662363966633465
+32366135313830663331323132346536363063326338653730396662636532393233626566636565
+39303337346261303738393163366361663565373661663438643934353633643836616430623036
+31333234383964343337383631306537353232656664363665616665393365326135646139646431
+61643663313466636263353933386339613932323565323866376664356332643430373566653666
+65646437343234306333306535633835633130353732376333393234303331313662323332356632
+39303963383061336239616439366165326537336631353330353664386435383763623431313235
+35373330353339363461353138623733316436303137313564333865313032633033393133343265
+31353866306538303630363136373832383339376231303363396338306534333639366663626466
+65383833616163633763636561643135316166373730663236303034643864663632656636623430
+66303466623635353239303163363630303166393335646331653033316338386138326634666537
+32303433306562353838346530326362383935643339383634333263623664386265636235393533
+30323139653236393330373465663463353230356463623434636161666262343437656164623961
+32386535346639663138656534313863373830343464353438316337613562623833333236633135
+31396266353564346464353135636131666664666637616562366165396433363061353132393330
+36363165346363633665353262323964363931343133336435636433363138623666633962323536
+30316334393736383235616465663536373938623732353934336662393437623337386263336365
+37373035373234396130663634666264326433653164303331313965363831393033643737386435
+30653935623166363435623932666637643264343764396334613331303437663333346636633539
+33333331663163373435373437333661633033313566306165623362653764623361383264373331
+36396462386231313834316635643136306435346666666235376636303662616366643832346339
+64393336323663303237613839303739333438653032396432626130323363383961313533326638
+65303837303762313239633238323665363634373161666461363665663437643032326330623730
+32613431653634646437333637393864383030623932346262313563646266373731323163386338
+39383731376135383431653763643931373438386133633837636231653530623566323832663265
+34313065656264633635393633353632333138366436366234386262633030613739656130653062
+36366633376163613735633938316230363031306634326531633938613465323533383730613761
+64356530393761326266646165326131633864653565616464363162353635646434643934656631
+38333835653861653634633361396561663864363331613966653663373838646262633732626366
+64366434346166383339323830383537653365666536376635643031363636333830396537363561
+66343966663062623064356237363933313165656631386461306563343762643237373437613839
+62633034616366366565316264356665343764663162323264393665313261323032303164613230
+66316137636363356337663462346637346435306337323164393166626339343337376661313738
+33393761636239666230306633346462396561353333643262393561356439616338646466383537
+65383037663364623361346161373264396364346537663034643930316135623030353865316630
+38356537633761383238

group_vars/all/secrets.yml.contents

@@ -6,6 +6,7 @@ postgres_passwords:
   passit: xxx
   gitea: xxx
   matrix: xxx
+  codimd: xxx
   mailu: xxx
   keycloak: xxx
   hedgedoc: xxx
@@ -33,7 +34,6 @@ drone_secrets:
 restic_secrets:
   repository_password: xxx
   ssh_privkey: xxx
-  uptime_kuma_url: xxx
 
 matrix_secrets:
   registration_shared_secret: xxx
@@ -55,8 +55,3 @@ rallly_secrets:
 
 membersystem_secrets:
   secret_key: xxx
-  stripe_api_key: xxx
-  stripe_endpoint_secret: xxx
-
-diun:
-  matrix_password: xxx

group_vars/all/vars.yml

@@ -31,5 +31,4 @@ users:
     groups:
       - sudo
     ssh_keys:
-      - sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIFWZGLov8wPBNxuvnaPK+8vv6wK5hHUVEFzXKsN9QeuBAAAADHNzaDpzYW1zYXB0aQ== ssh:samsapti
-      - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPd/4fQV7CL8/KVwbo/phiV5UdXFBIDlkZ+ps8C7FeRf cardno:14 336 332
+      - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPd/4fQV7CL8/KVwbo/phiV5UdXFBIDlkZ+ps8C7FeRf

playbook.yml

@@ -1,12 +1,12 @@
 # vim: ft=yaml.ansible
 ---
-- hosts: production
+- hosts: all
   gather_facts: true
   become: true
   vars:
     ldap_dn: "dc=data,dc=coop"
 
-    vagrant: "{{ from_vagrant is defined and from_vagrant }}"
+    vagrant: "{{ ansible_virtualization_role == 'guest' }}"
     letsencrypt_enabled: "{{ not vagrant }}"
 
     base_domain: "{{ 'datacoop.devel' if vagrant else 'data.coop' }}"
@@ -15,9 +15,6 @@
     smtp_host: "postfix"
     smtp_port: "587"
 
-    services_exclude:
-      - uptime_kuma
-
   tasks:
     - import_role:
         name: ubuntu_base

roles/docker/defaults/main.yml

@@ -1,86 +1,90 @@
 # vim: ft=yaml.ansible
 ---
 volume_root_folder: "/docker-volumes"
-volume_website_folder: "{{ volume_root_folder }}/websites"
 
 services:
+
   ### Internal services ###
   postfix:
+    file: postfix.yml
     domain: "smtp.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/postfix"
-    pre_deploy_tasks: true
-    version: "v3.6.1-alpine"
+    version: "v3.5.1-alpine"
 
   nginx_proxy:
+    file: nginx_proxy.yml
+    version: "1.0-alpine"
     volume_folder: "{{ volume_root_folder }}/nginx"
-    pre_deploy_tasks: true
-    version: "1.3-alpine"
-    acme_companion_version: "2.2"
+
+  nginx_acme_companion:
+    version: "2.2"
 
   openldap:
+    file: openldap.yml
     domain: "ldap.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/openldap"
-    pre_deploy_tasks: true
     version: "1.5.0"
-    phpldapadmin_version: "0.9.0"
+
+  phpldapadmin:
+    version: "0.9.0"
 
   netdata:
+    file: netdata.yml
     domain: "netdata.{{ base_domain }}"
-    volume_folder: "{{ volume_root_folder }}/netdata"
     version: "v1"
 
   portainer:
+    file: portainer.yml
     domain: "portainer.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/portainer"
-    version: "2.19.0"
+    version: "2.16.2"
 
   keycloak:
+    file: keycloak.yml
     domain: sso.{{ base_domain }}
     volume_folder: "{{ volume_root_folder }}/keycloak"
-    version: "22.0"
+    version: "20.0"
     postgres_version: "10"
     allowed_sender_domain: true
 
   restic:
-    volume_folder: "{{ volume_root_folder }}/restic"
-    pre_deploy_tasks: true
-    remote_user: dc-user
-    remote_domain: rynkeby.skovgaard.tel
+    file: restic_backup.yml
+    user: dc-user
+    domain: rynkeby.skovgaard.tel
     host_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBLGol2G+a87ssy0nu/STKBZSiGyhZhZKx/ujfe9IeFo
+    volume_folder: "{{ volume_root_folder }}/restic"
     repository: restic
-    version: "1.7.0"
+    version: "1.6.0"
     disabled_in_vagrant: true
-    # mail dance
-    domain: "noreply.{{ base_domain }}"
-    allowed_sender_domain: true
-    mail_from: "backup@noreply.{{ base_domain }}"
 
   docker_registry:
+    file: docker_registry.yml
     domain: "docker.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/docker-registry"
-    pre_deploy_tasks: true
-    post_deploy_tasks: true
     username: "docker"
     password: "{{ docker_password }}"
     version: "2"
 
   ### External services ###
+
   nextcloud:
+    file: nextcloud.yml
     domain: "cloud.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/nextcloud"
-    pre_deploy_tasks: true
-    version: 28-apache
+    version: 25-apache
     postgres_version: "10"
     redis_version: 7-alpine
     allowed_sender_domain: true
 
-  forgejo:
+  gitea:
+    file: gitea.yml
     domain: "git.{{ base_domain }}"
-    volume_folder: "{{ volume_root_folder }}/forgejo"
-    version: "7.0.5"
+    volume_folder: "{{ volume_root_folder }}/gitea"
+    version: 1.18
     allowed_sender_domain: true
 
   passit:
+    file: passit.yml
     domain: "passit.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/passit"
     version: stable
@@ -88,142 +92,122 @@ services:
     allowed_sender_domain: true
 
   matrix:
+    file: matrix_riot.yml
     domain: "matrix.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/matrix"
-    pre_deploy_tasks: true
-    version: v1.114.0
-    postgres_version: 15-alpine
+    version: v1.63.1
+    postgres_version: "10"
     allowed_sender_domain: true
 
-  element:
-    domain: "element.{{ base_domain }}"
-    volume_folder: "{{ volume_root_folder }}/element"
-    pre_deploy_tasks: true
-    version: v1.11.80
+  riot:
+    domains:
+      - "riot.{{ base_domain }}"
+      - "element.{{ base_domain }}"
+    volume_folder: "{{ volume_root_folder }}/riot"
+    version: v1.11.8
 
   privatebin:
+    file: privatebin.yml
     domain: "paste.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/privatebin"
-    pre_deploy_tasks: true
-    version: "20221009"
+    version: 20221009
+
+  codimd:
+    file: codimd.yml
+    domain: "oldpad.{{ base_domain }}"
+    volume_folder: "{{ volume_root_folder }}/codimd"
 
   hedgedoc:
+    file: hedgedoc.yml
     domain: "pad.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/hedgedoc"
-    pre_deploy_tasks: true
-    version: 1.9.9-alpine
+    version: 1.9.6-alpine
     postgres_version: 10-alpine
 
   data_coop_website:
-    domain: "{{ base_domain }}"
-    www_domain: "www.{{ base_domain }}"
-    volume_folder: "{{ volume_website_folder }}/datacoop"
-    pre_deploy_tasks: true
-    version: stable
-    staging_domain: "staging.{{ base_domain }}"
-    staging_version: staging
+    file: websites/data.coop.yml
+    domains:
+      - "{{ base_domain }}"
+      - "www.{{ base_domain }}"
+
+  new_data_coop_website:
+    file: websites/new.data.coop.yml
+    domain: "new.{{ base_domain }}"
+    version: hugo
 
   slides_2022_website:
+    file: websites/2022.slides.data.coop.yml
     domain: "2022.slides.{{ base_domain }}"
-    volume_folder: "{{ volume_website_folder }}/slides-2022"
     version: latest
 
   fedi_dk_website:
+    file: websites/fedi.dk.yaml
     domain: fedi.dk
-    volume_folder: "{{ volume_website_folder }}/fedidk"
     version: latest
 
   vhs_website:
+    file: websites/vhs.data.coop.yaml
     domain: vhs.data.coop
-    volume_folder: "{{ volume_website_folder }}/vhs"
     version: latest
 
   cryptohagen_website:
+    file: websites/cryptohagen.dk.yml
     domains:
       - "cryptohagen.dk"
       - "www.cryptohagen.dk"
-    volume_folder: "{{ volume_website_folder }}/cryptohagen"
 
   ulovliglogning_website:
+    file: websites/ulovliglogning.dk.yml
     domains:
       - "ulovliglogning.dk"
       - "www.ulovliglogning.dk"
       - "ulovlig-logning.dk"
-      - "www.ulovlig-logning.dk"
-    volume_folder: "{{ volume_website_folder }}/ulovliglogning"
 
   cryptoaarhus_website:
+    file: websites/cryptoaarhus.dk.yml
     domains:
       - "cryptoaarhus.dk"
       - "www.cryptoaarhus.dk"
-    volume_folder: "{{ volume_website_folder }}/cryptoaarhus"
 
   drone:
+    file: drone.yml
     domain: "drone.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/drone"
-    version: "1"
+    version: 1
 
   mailu:
+    file: mailu.yml
+    version: 1.9
     domain: "mail.{{ base_domain }}"
-    volume_folder: "{{ volume_root_folder }}/mailu"
-    pre_deploy_tasks: true
     dns: 192.168.203.254
     subnet: 192.168.203.0/24
-    version: "2.0"
-    postgres_version: 14-alpine
-    redis_version: alpine
+    volume_folder: "{{ volume_root_folder }}/mailu"
 
   mastodon:
+    file: mastodon.yml
     domain: "social.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/mastodon"
-    pre_deploy_tasks: true
-    post_deploy_tasks: true
-    version: v4.2.10
+    version: v4.0.2
     postgres_version: 14-alpine
     redis_version: 6-alpine
     allowed_sender_domain: true
 
   rallly:
+    file: rallly.yml
     domain: "when.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/rallly"
-    pre_deploy_tasks: true
     version: "2"
     postgres_version: 14-alpine
     allowed_sender_domain: true
 
   membersystem:
+    file: membersystem.yml
     domain: "member.{{ base_domain }}"
-    django_admins: "Vidir:valberg@orn.li,Balder:benjaoming@data.coop"
-    volume_folder: "{{ volume_root_folder }}/membersystem"
+    django_admins: "Vidir:valberg@orn.li"
     version: latest
     postgres_version: 13-alpine
     allowed_sender_domain: true
 
-  writefreely:
-    domain: "write.{{ base_domain }}"
-    volume_folder: "{{ volume_root_folder }}/writefreely"
-    pre_deploy_tasks: true
-    version: v0.15.0
-    mariadb_version: "11.2"
-    allowed_sender_domain: true
-
   watchtower:
-    volume_folder: "{{ volume_root_folder }}/watchtower"
-    version: "1.5.3"
-
-  diun:
-    version: "4.28"
-    volume_folder: "{{ volume_root_folder }}/diun"
-    matrix_user: "@diun:data.coop"
-    matrix_room: "#datacoop-services-update:data.coop"
-
-  ### Uptime monitoring ###
-  uptime_kuma:
-    domain: "uptime.{{ base_domain }}"
-    status_domain: "status.{{ base_domain }}"
-    volume_folder: "{{ volume_root_folder }}/uptime_kuma"
-    pre_deploy_tasks: true
-    version: "latest"
-
-services_exclude: []
-services_include: "{{ services | dict2items | map(attribute='key') | list | difference(services_exclude) }}"
+    file: watchtower.yml
+    version: amd64-1.5.3

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

@@ -339,7 +339,7 @@ database:
     user: "synapse"
     password: "{{ postgres_passwords.matrix }}"
     database: "synapse"
-    host: "postgres"
+    host: "matrix_db"
     port: "5432"
     cp_min: 5
     cp_max: 10
@@ -676,8 +676,15 @@ report_stats: false
 
 ## API Configuration ##
 
-room_prejoin_state:
-  disable_default_event_types: false
+# A list of event types that will be included in the room_invite_state
+#
+room_invite_state_types:
+    - "m.room.join_rules"
+    - "m.room.canonical_alias"
+    - "m.room.avatar"
+    - "m.room.encryption"
+    - "m.room.name"
+
 
 # A list of application service config file to use
 #
@@ -820,10 +827,23 @@ password_config:
 # If your SMTP server requires authentication, the optional smtp_user &
 # smtp_pass variables should be used
 #
-email:
-  smtp_host: "{{ smtp_host }}"
-  smtp_port: {{ smtp_port }}
-  notif_from: "{{ services.matrix.domain }} <no-reply@{{ services.matrix.domain }}>"
+#email:
+#   enable_notifs: false
+#   smtp_host: "localhost"
+#   smtp_port: 25
+#   smtp_user: "exampleusername"
+#   smtp_pass: "examplepassword"
+#   require_transport_security: False
+#   notif_from: "Your Friendly %(app)s Home Server <noreply@example.com>"
+#   app_name: Matrix
+#   # if template_dir is unset, uses the example templates that are part of
+#   # the Synapse distribution.
+#   #template_dir: res/templates
+#   notif_template_html: notif_mail.html
+#   notif_template_text: notif_mail.txt
+#   notif_for_new_users: True
+#   riot_base_url: "http://localhost/riot"
+
 
 #password_providers:
 #    - module: "ldap_auth_provider.LdapAuthProvider"

roles/docker/files/configs/rallly/env_file.j2

@@ -1,5 +1,5 @@
 NEXT_PUBLIC_BASE_URL="https://{{ services.rallly.domain }}"
-DATABASE_URL="postgres://postgres:{{ postgres_passwords.rallly }}@db:5432/rallly_db"
+DATABASE_URL="postgres://postgres:{{ postgres_passwords.rallly }}@rallly_db:5432/rallly_db"
 SECRET_PASSWORD="{{ rallly_secrets.secret_password }}"
 SUPPORT_EMAIL="noreply@{{ services.rallly.domain }}"
 SMTP_HOST="{{ smtp_host }}"

roles/docker/files/vhost/uptime_kuma

@@ -1,4 +0,0 @@
-proxy_set_header   Upgrade $http_upgrade;
-proxy_set_header   Connection "upgrade";
-proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-proxy_set_header   Host $host;

roles/docker/handlers/main.yml

@@ -1,6 +1,8 @@
 # vim: ft=yaml.ansible
 ---
-- name: restart nginx
-  command: docker compose restart proxy
-  args:
-    chdir: "{{ services.nginx_proxy.volume_folder }}"
+- name: "restart nginx"
+  community.docker.docker_container:
+    name: "nginx-proxy"
+    restart: "yes"
+    state: "started"
+  

roles/docker/tasks/block.yml

@@ -1,26 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Create volume folder for service {{ service.name }}
-  file:
-    name: "{{ service.vars.volume_folder }}"
-    state: directory
-
-- name: Upload Compose file for service {{ service.name }}
-  template:
-    src: compose-files/{{ service.name }}.yml.j2
-    dest: "{{ service.vars.volume_folder }}/docker-compose.yml"
-    owner: root
-    mode: u=rw,go=
-
-- name: Run pre-deployment tasks for service {{ service.name }}
-  include_tasks: pre_deploy/{{ service.name }}.yml
-  when: service.vars.pre_deploy_tasks is defined and service.vars.pre_deploy_tasks
-
-- name: Deploy Compose stack for service {{ service.name }}
-  command: docker compose up -d --remove-orphans --pull always
-  args:
-    chdir: "{{ service.vars.volume_folder }}"
-
-- name: Run post-deployment tasks for service {{ service.name }}
-  include_tasks: post_deploy/{{ service.name }}.yml
-  when: service.vars.post_deploy_tasks is defined and service.vars.post_deploy_tasks

roles/docker/tasks/main.yml

@@ -1,44 +1,38 @@
 # vim: ft=yaml.ansible
 ---
-- name: Add Docker PGP key
+- name: add docker gpg key
   apt_key:
     keyserver: pgp.mit.edu
     id: 8D81803C0EBFCD88
     state: present
 
-- name: Add Docker apt repository
+- name: add docker apt repository
   apt_repository:
     repo: deb https://download.docker.com/linux/ubuntu bionic stable
     state: present
     update_cache: yes
 
-- name: Install Docker
+- name: install docker-ce
   apt:
-    name: "{{ pkgs }}"
+    name: docker-ce
+    state: present
+
+- name: install docker python bindings
+  pip:
+    executable: pip3
+    name: "{{ packages }}"
     state: present
   vars:
-    pkgs:
-      - docker-ce
-      - docker-compose-plugin
+    packages:
+      - docker
+      - docker-compose
 
-- name: Configure cron job to prune unused Docker data weekly
-  cron:
-    name: Prune unused Docker data
-    cron_file: ansible_docker_prune
-    job: 'docker system prune -fa && docker volume prune -fa'
-    special_time: weekly
-    user: root
-    state: present
-
-- name: Create folder structure for bind mounts
+- name: create folder structure for bind mounts
   file:
-    name: "{{ item }}"
+    name: "{{ volume_root_folder }}"
     state: directory
-  loop:
-    - "{{ volume_root_folder }}"
-    - "{{ volume_website_folder }}"
 
-- name: Set up services
+- name: setup services
   import_tasks: services.yml
   tags:
     - setup_services

roles/docker/tasks/post_deploy/docker_registry.yml

@@ -1,13 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Generate htpasswd file
-  shell: docker compose exec registry htpasswd -Bbn docker {{ docker_password }} > auth/htpasswd
-  args:
-    chdir: "{{ services.docker_registry.volume_folder }}"
-    creates: "{{ services.docker_registry.volume_folder }}/auth/htpasswd"
-
-- name: log in to registry
-  docker_login:
-    registry: "{{ 'docker.data.coop' if vagrant else services.docker_registry.domain }}"
-    username: docker
-    password: "{{ docker_password }}"

roles/docker/tasks/post_deploy/mastodon.yml

@@ -1,19 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Configure cron job to remove old Mastodon media daily
-  cron:
-    name: Clean Mastodon media data older than a week
-    cron_file: ansible_mastodon_clean_media
-    job: docker exec mastodon-web-1 tootctl media remove --days 7
-    special_time: daily
-    user: root
-    state: present
-
-- name: Configure cron job to remove old Mastodon preview cards daily
-  cron:
-    name: Clean Mastodon preview card data older than two weeks
-    cron_file: ansible_mastodon_clean_preview_cards
-    job: docker exec mastodon-web-1 tootctl preview_cards remove --days 14
-    special_time: daily
-    user: root
-    state: present

roles/docker/tasks/pre_deploy/data_coop_website.yml

@@ -1,11 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Upload vhost config for root domain
-  copy:
-    src: vhost/base_domain
-    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.data_coop_website.domain }}"
-
-- name: Upload vhost config for WWW domain
-  copy:
-    src: vhost/www.base_domain
-    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.data_coop_website.www_domain }}"

roles/docker/tasks/pre_deploy/docker_registry.yml

@@ -1,17 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Create subfolders
-  file:
-    path: "{{ services.docker_registry.volume_folder }}/{{ volume }}"
-    state: directory
-  loop:
-    - auth
-    - registry
-  loop_control:
-    loop_var: volume
-
-- name: Copy docker registry vhost configuration
-  copy:
-    src: vhost/docker_registry
-    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.docker_registry.domain }}"
-    mode: "0644"

roles/docker/tasks/pre_deploy/element.yml

@@ -1,21 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Create subfolder
-  file:
-    name: "{{ services.element.volume_folder }}/data"
-    state: directory
-
-- name: Upload config.json
-  template:
-    src: element/config.json.j2
-    dest: "{{ services.element.volume_folder }}/data/config.json"
-
-- name: Upload riot.im.conf
-  copy:
-    src: element/riot.im.conf
-    dest: "{{ services.element.volume_folder }}/data/riot.im.conf"
-
-- name: Upload vhost config for Element domain
-  copy:
-    src: vhost/element
-    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.element.domain }}"

roles/docker/tasks/pre_deploy/hedgedoc.yml

@@ -1,17 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Create subfolders
-  file:
-    name: "{{ services.hedgedoc.volume_folder }}/{{ volume }}"
-    state: directory
-  loop:
-    - db
-    - hedgedoc/uploads
-  loop_control:
-    loop_var: volume
-
-- name: Copy SSO certificate
-  copy:
-    src: sso/sso.data.coop.pem
-    dest: "{{ services.hedgedoc.volume_folder }}/sso.data.coop.pem"
-    mode: "0644"

roles/docker/tasks/pre_deploy/mailu.yml

@@ -1,45 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Create subfolders
-  file:
-    name: "{{ services.mailu.volume_folder }}/{{ volume }}"
-    state: directory
-  loop:
-    - redis
-    - certs
-    - data
-    - dkim
-    - mail
-    - mailqueue
-    - filter
-    - postgres
-    - webmail
-    - overrides
-    - overrides/nginx
-    - overrides/dovecot
-    - overrides/postfix
-    - overrides/rspamd
-    - overrides/snappymail
-  loop_control:
-    loop_var: volume
-
-- name: Upload mailu.env file
-  template:
-    src: mailu/env.j2
-    dest: "{{ services.mailu.volume_folder }}/mailu.env"
-
-- name: Hard link to Let's Encrypt TLS certificate
-  file:
-    src: "{{ services.nginx_proxy.volume_folder }}/certs/{{ services.mailu.domain }}/fullchain.pem"
-    dest: "{{ services.mailu.volume_folder }}/certs/cert.pem"
-    state: hard
-    force: true
-  when: letsencrypt_enabled
-
-- name: Hard link to Let's Encrypt TLS key
-  file:
-    src: "{{ services.nginx_proxy.volume_folder }}/certs/{{ services.mailu.domain }}/key.pem"
-    dest: "{{ services.mailu.volume_folder }}/certs/key.pem"
-    state: hard
-    force: true
-  when: letsencrypt_enabled

roles/docker/tasks/pre_deploy/mastodon.yml

@@ -1,45 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Create subfolder for Mastodon data
-  file:
-    name: "{{ services.mastodon.volume_folder }}/mastodon_data"
-    state: directory
-    owner: "991"
-    mode: u=rwx,g=rx,o=rx
-
-- name: Create subfolder for PostgreSQL data
-  file:
-    name: "{{ services.mastodon.volume_folder }}/postgres_data"
-    state: directory
-    owner: "70"
-    mode: u=rwx,go=
-
-- name: Create subfolder for PostgreSQL config
-  file:
-    name: "{{ services.mastodon.volume_folder }}/postgres_config"
-    state: directory
-    owner: root
-    mode: u=rwx,g=rx,o=rx
-
-- name: Create subfolder for Redis data
-  file:
-    name: "{{ services.mastodon.volume_folder }}/redis_data"
-    state: directory
-    owner: "999"
-    group: "1000"
-    mode: u=rwx,g=rx,o=rx
-
-- name: Upload mastodon.env file
-  template:
-    src: mastodon/env.j2
-    dest: "{{ services.mastodon.volume_folder }}/mastodon.env"
-
-- name: Upload vhost config for Mastodon domain
-  copy:
-    src: vhost/mastodon
-    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.mastodon.domain }}"
-
-- name: Upload PostgreSQL config
-  copy:
-    src: mastodon/postgresql.conf
-    dest: "{{ services.mastodon.volume_folder }}/postgres_config/postgresql.conf"

roles/docker/tasks/pre_deploy/matrix.yml

@@ -1,34 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Create subfolders
-  file:
-    name: "{{ services.matrix.volume_folder }}/{{ volume }}"
-    state: directory
-    owner: "991"
-    group: "991"
-  loop:
-    - data
-    - data/uploads
-    - data/media
-  loop_control:
-    loop_var: volume
-
-- name: Create Matrix DB subfolder
-  file:
-    name: "{{ services.matrix.volume_folder }}/db"
-    state: directory
-
-- name: Upload vhost config for Matrix domain
-  copy:
-    src: vhost/matrix
-    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.matrix.domain }}"
-
-- name: Upload homeserver.yaml
-  template:
-    src: matrix/homeserver.yaml.j2
-    dest: "{{ services.matrix.volume_folder }}/data/homeserver.yaml"
-
-- name: Upload Matrix logging config
-  copy:
-    src: matrix/log.config
-    dest: "{{ services.matrix.volume_folder }}/data/matrix.data.coop.log.config"

roles/docker/tasks/pre_deploy/nextcloud.yml

@@ -1,17 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Create subfolders
-  file:
-    path: "{{ services.nextcloud.volume_folder }}/{{ volume }}"
-    state: directory
-  loop:
-    - app
-    - postgres
-  loop_control:
-    loop_var: volume
-
-- name: Upload vhost config for Nextcloud domain
-  copy:
-    src: vhost/nextcloud
-    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.nextcloud.domain }}"
-  notify: "restart nginx"

roles/docker/tasks/pre_deploy/nginx_proxy.yml

@@ -1,14 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Create subfolders
-  file:
-    name: "{{ services.nginx_proxy.volume_folder }}/{{ volume }}"
-    state: directory
-  loop:
-    - conf
-    - vhost
-    - html
-    - dhparam
-    - certs
-  loop_control:
-    loop_var: volume

roles/docker/tasks/pre_deploy/openldap.yml

@@ -1,12 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Create subfolders
-  file:
-    name: "{{ services.openldap.volume_folder }}/{{ volume }}"
-    state: directory
-  loop:
-    - var/lib/ldap
-    - etc/slapd
-    - certs
-  loop_control:
-    loop_var: volume

roles/docker/tasks/pre_deploy/postfix.yml

@@ -1,13 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Set up network for Postfix
-  docker_network:
-    name: postfix
-    ipam_config:
-      - subnet: '172.16.0.0/16'
-        gateway: 172.16.0.1
-
-- name: Create subfolder
-  file:
-    name: "{{ services.postfix.volume_folder }}/dkim"
-    state: directory

roles/docker/tasks/pre_deploy/privatebin.yml

@@ -1,16 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Create subfolders
-  file:
-    name: "{{ services.privatebin.volume_folder }}/{{ volume }}"
-    state: directory
-  loop:
-    - cfg
-    - data
-  loop_control:
-    loop_var: volume
-
-- name: Upload PrivateBin config
-  copy:
-    src: privatebin/conf.php
-    dest: "{{ services.privatebin.volume_folder }}/cfg/conf.php"

roles/docker/tasks/pre_deploy/rallly.yml

@@ -1,11 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Create subfolder
-  file:
-    name: "{{ services.rallly.volume_folder }}/postgres"
-    state: directory
-
-- name: Copy rallly.env file
-  template:
-    src: rallly/env.j2
-    dest: "{{ services.rallly.volume_folder }}/rallly.env"

roles/docker/tasks/pre_deploy/restic.yml

@@ -1,72 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Create SSH directory
-  file:
-    path: "{{ services.restic.volume_folder }}/ssh"
-    owner: root
-    group: root
-    mode: '0755'
-    state: directory
-
-- name: Upload private SSH key
-  copy:
-    dest: "{{ services.restic.volume_folder }}/ssh/id_ed25519"
-    owner: root
-    group: root
-    mode: '0600'
-    content: "{{ restic_secrets.ssh_privkey }}"
-
-- name: Derive public SSH key
-  shell: >-
-    ssh-keygen -f {{ services.restic.volume_folder }}/ssh/id_ed25519 -y
-      > {{ services.restic.volume_folder }}/ssh/id_ed25519.pub
-  args:
-    creates: "{{ services.restic.volume_folder }}/ssh/id_ed25519.pub"
-
-- name: Set file permissions on public SSH key
-  file:
-    path: "{{ services.restic.volume_folder }}/ssh/id_ed25519.pub"
-    owner: root
-    group: root
-    mode: '0644'
-    state: touch
-
-- name: Upload SSH config
-  template:
-    src: restic/ssh.config.j2
-    dest: "{{ services.restic.volume_folder }}/ssh/config"
-    owner: root
-    group: root
-    mode: '0600'
-
-- name: Upload SSH known_hosts file
-  template:
-    src: restic/ssh.known_hosts.j2
-    dest: "{{ services.restic.volume_folder }}/ssh/known_hosts"
-    owner: root
-    group: root
-    mode: '0600'
-
-- name: Create scripts directory
-  file:
-    path: "{{ services.restic.volume_folder }}/scripts"
-    owner: root
-    group: root
-    mode: '0755'
-    state: directory
-
-- name: Upload failure.sh script
-  template:
-    src: restic/failure.sh.j2
-    dest: "{{ services.restic.volume_folder }}/scripts/failure.sh"
-    owner: root
-    group: root
-    mode: '0755'
-
-- name: Upload success.sh script
-  template:
-    src: restic/success.sh.j2
-    dest: "{{ services.restic.volume_folder }}/scripts/success.sh"
-    owner: root
-    group: root
-    mode: '0755'

roles/docker/tasks/pre_deploy/uptime_kuma.yml

@@ -1,9 +0,0 @@
-- name: Upload vhost config for uptime domain
-  copy:
-    src: vhost/uptime_kuma
-    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.uptime_kuma.domain }}_location"
-
-- name: Upload vhost config for status domain
-  copy:
-    src: vhost/uptime_kuma
-    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.uptime_kuma.status_domain }}_location"

roles/docker/tasks/pre_deploy/writefreely.yml

@@ -1,20 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: Create subfolder for MariaDB data
-  file:
-    name: "{{ services.writefreely.volume_folder }}/db"
-    owner: "999"
-    group: "999"
-    state: directory
-
-- name: Create subfolder for encryption keys
-  file:
-    name: "{{ services.writefreely.volume_folder }}/keys"
-    owner: "2"
-    group: "2"
-    state: directory
-
-- name: Upload config.ini
-  template:
-    src: "writefreely/config.ini.j2"
-    dest: "{{ services.writefreely.volume_folder }}/config.ini"

roles/docker/tasks/services.yml

@@ -1,28 +1,21 @@
 # vim: ft=yaml.ansible
 ---
-- name: Set up external services network
+- name: setup external services network
   docker_network:
     name: external_services
 
-- name: Deploy all services
-  include_tasks:
-    file: block.yml
-  vars:
-    service:
-      name: "{{ item }}"
-      vars: "{{ services[item] }}"
-  loop: "{{ services_include }}"
+- name: setup services
+  include_tasks: "services/{{ item.service.file }}"
+  loop: "{{ services | dict2items(value_name='service') }}"
   when: single_service is not defined and
-        (item.vars.disabled_in_vagrant is not defined or
-        not (item.vars.disabled_in_vagrant and vagrant))
+        item.service.file is defined and
+        (item.service.disabled_in_vagrant is not defined or
+        not (item.service.disabled_in_vagrant and vagrant))
 
-- name: Deploy single service
-  include_tasks:
-    file: block.yml
-  vars:
-    service:
-      name: "{{ single_service }}"
-      vars: "{{ services[single_service] }}"
-  when: single_service is defined and single_service in services and
+- name: setup single service
+  include_tasks: "services/{{ services[single_service].file }}"
+  when: single_service is defined and
+        single_service in services and
+        services[single_service].file is defined and
         (services[single_service].disabled_in_vagrant is not defined or
         not (services[single_service].disabled_in_vagrant and vagrant))

roles/docker/tasks/services/codimd.yml

@@ -0,0 +1,55 @@
+# vim: ft=yaml.ansible
+---
+- name: codimd network
+  docker_network:
+    name: codimd
+
+- name: create codimd volume folders
+  file:
+    name: "{{ services.codimd.volume_folder }}/{{ volume }}"
+    state: directory
+  loop:
+    - "db"
+    - "codimd/uploads"
+  loop_control:
+    loop_var: volume
+
+- name: codimd database container
+  docker_container:
+    name: codimd_db
+    image: postgres:10
+    state: started
+    restart_policy: unless-stopped
+    networks:
+      - name: codimd
+    volumes:
+      - "{{ services.codimd.volume_folder }}/db:/var/lib/postgresql/data"
+    env:
+      POSTGRES_USER: "codimd"
+      POSTGRES_PASSWORD: "{{ postgres_passwords.codimd }}"
+
+- name: codimd app container
+  docker_container:
+    name: codimd_app
+    image: hackmdio/hackmd:1.3.0
+    restart_policy: unless-stopped
+    networks:
+      - name: codimd
+      - name: ldap
+      - name: external_services
+    volumes:
+      - "{{ services.codimd.volume_folder }}/codimd/uploads:/codimd/public/uploads"
+    env:
+      CMD_DB_URL: "postgres://codimd:{{ postgres_passwords.codimd }}@codimd_db:5432/codimd"
+      CMD_ALLOW_EMAIL_REGISTER: "False"
+      CMD_IMAGE_UPLOAD_TYPE: "filesystem"
+      CMD_EMAIL: "False"
+      CMD_LDAP_URL: "ldap://openldap"
+      CMD_LDAP_BINDDN: "cn=admin,dc=data,dc=coop"
+      CMD_LDAP_BINDCREDENTIALS: "{{ ldap_admin_password }}"
+      CMD_LDAP_SEARCHBASE: "dc=data,dc=coop"
+      CMD_LDAP_SEARCHFILTER: "(&(uid={{ '{{username}}' }})(objectClass=inetOrgPerson))"
+      CMD_USECDN: "false"
+      VIRTUAL_HOST: "{{ services.codimd.domain }}"
+      LETSENCRYPT_HOST: "{{ services.codimd.domain }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"

roles/docker/tasks/services/docker_registry.yml

@@ -0,0 +1,36 @@
+# vim: ft=yaml.ansible
+---
+- name: copy docker registry nginx configuration
+  copy:
+    src: "files/configs/docker_registry/nginx.conf"
+    dest: "/docker-volumes/nginx/vhost/{{ services.docker_registry.domain }}"
+    mode: "0644"
+
+- name: docker registry container
+  docker_container:
+    name: registry
+    image: registry:{{ services.docker_registry.version }}
+    restart_policy: always
+    volumes:
+      - "{{ services.docker_registry.volume_folder }}/registry:/var/lib/registry"
+      - "{{ services.docker_registry.volume_folder }}/auth:/auth"
+    networks:
+      - name: external_services
+    env:
+      VIRTUAL_HOST: "{{ services.docker_registry.domain }}"
+      LETSENCRYPT_HOST: "{{ services.docker_registry.domain }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+      REGISTRY_AUTH: "htpasswd"
+      REGISTRY_AUTH_HTPASSWD_PATH: "/auth/htpasswd"
+      REGISTRY_AUTH_HTPASSWD_REALM: "data.coop docker registry"
+
+- name: generate htpasswd file
+  shell: "docker exec -it registry htpasswd -Bbn docker {{ docker_password }} > {{ services.docker_registry.volume_folder }}/auth/htpasswd"
+  args:
+    creates: "{{ services.docker_registry.volume_folder }}/auth/htpasswd"
+
+- name: log in to registry
+  docker_login:
+    registry: "{{ 'docker.data.coop' if vagrant else services.docker_registry.domain  }}"
+    username: "docker"
+    password: "{{ docker_password }}"

roles/docker/tasks/services/drone.yml

@@ -0,0 +1,52 @@
+# vim: ft=yaml.ansible
+---
+- name: set up drone with docker runner
+  docker_compose:
+    project_name: drone
+    pull: yes
+    definition:
+      version: "3.6"
+      services:
+        drone:
+          container_name: "drone"
+          image: "drone/drone:{{ services.drone.version }}"
+          restart: unless-stopped
+          networks:
+            - external_services
+            - drone
+          volumes:
+            - "{{ services.drone.volume_folder }}:/data"
+            - "/var/run/docker.sock:/var/run/docker.sock"
+          environment:
+            DRONE_GITEA_SERVER: "https://{{ services.gitea.domain }}"
+            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: "{{ services.drone.domain }}"
+            DRONE_SERVER_PROTO: "https"
+            DRONE_RPC_SECRET: "{{ drone_secrets.rpc_shared_secret }}"
+            PLUGIN_CUSTOM_DNS: "91.239.100.100"
+            VIRTUAL_HOST: "{{ services.drone.domain }}"
+            LETSENCRYPT_HOST: "{{ services.drone.domain }}"
+            LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+
+        drone-runner-docker:
+          container_name: "drone-runner-docker"
+          image: "drone/drone-runner-docker:{{ services.drone.version }}"
+          restart: unless-stopped
+          networks:
+            - drone
+          volumes:
+            - "/var/run/docker.sock:/var/run/docker.sock"
+          environment:
+            DRONE_RPC_HOST: "{{ services.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

@@ -0,0 +1,37 @@
+# vim: ft=yaml.ansible
+---
+- name: gitea network
+  docker_network:
+    name: gitea
+
+# old DNS: 138.68.71.153
+- name: gitea container
+  docker_container:
+    name: gitea
+    image: gitea/gitea:{{ services.gitea.version }}
+    restart_policy: unless-stopped
+    networks:
+      - name: gitea
+      - name: postfix
+      - name: external_services
+    volumes:
+      - "{{ services.gitea.volume_folder }}:/data"
+    published_ports:
+      - "22:22"
+    env:
+      VIRTUAL_HOST: "{{ services.gitea.domain }}"
+      VIRTUAL_PORT: "3000"
+      LETSENCRYPT_HOST: "{{ services.gitea.domain }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+      # Gitea customization, see: https://docs.gitea.io/en-us/install-with-docker/#customization
+      # https://docs.gitea.io/en-us/config-cheat-sheet/#security-security
+      GITEA__mailer__ENABLED: "true"
+      GITEA__mailer__FROM: "noreply@{{ services.gitea.domain }}"
+      GITEA__mailer__MAILER_TYPE: "smtp"
+      GITEA__mailer__HOST: "{{ smtp_host }}:{{ smtp_port }}"
+      GITEA__security__LOGIN_REMEMBER_DAYS: "60"
+      GITEA__security__PASSWORD_COMPLEXITY: "off"
+      GITEA__security__MIN_PASSWORD_LENGTH: "8"
+      GITEA__security__PASSWORD_CHECK_PWN: "true"
+      GITEA__service__ENABLE_NOTIFY_MAIL: "true"
+      GITEA__service__REGISTER_EMAIL_CONFIRM: "true"

roles/docker/tasks/services/hedgedoc.yml

@@ -0,0 +1,67 @@
+# vim: ft=yaml.ansible
+---
+- name: create hedgedoc volume folders
+  file:
+    name: "{{ services.hedgedoc.volume_folder }}/{{ volume }}"
+    state: directory
+  loop:
+    - "db"
+    - "hedgedoc/uploads"
+  loop_control:
+    loop_var: volume
+
+- name: copy sso public certificate
+  copy:
+    src: "files/sso/sso.data.coop.pem"
+    dest: "{{ services.hedgedoc.volume_folder }}/sso.data.coop.pem"
+    mode: "0644"
+
+- name: setup hedgedoc
+  docker_compose:
+    project_name: "hedgedoc"
+    pull: "yes"
+    definition:
+      services:
+        database:
+          image: "postgres:{{ services.hedgedoc.postgres_version }}"
+          environment:
+            POSTGRES_USER: "codimd"
+            POSTGRES_PASSWORD: "{{ postgres_passwords.hedgedoc }}"
+            POSTGRES_DB: "codimd"
+          restart: "unless-stopped"
+          networks:
+            - "hedgedoc"
+          volumes:
+            - "{{ services.hedgedoc.volume_folder }}/db:/var/lib/postgresql/data"
+        
+        app:
+          image: "quay.io/hedgedoc/hedgedoc:{{ services.hedgedoc.version }}"
+          environment:
+            CMD_DB_URL: "postgres://codimd:{{ postgres_passwords.hedgedoc }}@hedgedoc_database_1:5432/codimd"
+            CMD_DOMAIN: "{{ services.hedgedoc.domain }}"
+            CMD_ALLOW_EMAIL_REGISTER: "False"
+            CMD_IMAGE_UPLOAD_TYPE: "filesystem"
+            CMD_EMAIL: "False"
+            CMD_SAML_IDPCERT: "/sso.data.coop.pem"
+            CMD_SAML_IDPSSOURL: "https://sso.data.coop/auth/realms/datacoop/protocol/saml"
+            CMD_SAML_ISSUER: "hedgedoc"
+            CMD_SAML_IDENTIFIERFORMAT: "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"
+            CMD_USECDN: "false"
+            CMD_PROTOCOL_USESSL: "true"
+            VIRTUAL_HOST: "{{ services.hedgedoc.domain }}"
+            LETSENCRYPT_HOST: "{{ services.hedgedoc.domain }}"
+            LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+          volumes:
+            - "{{ services.hedgedoc.volume_folder }}/hedgedoc/uploads:/hedgedoc/public/uploads"
+            - "{{ services.hedgedoc.volume_folder }}/sso.data.coop.pem:/sso.data.coop.pem"
+          restart: "unless-stopped"
+          networks: 
+            - "hedgedoc"
+            - "external_services"
+          depends_on:
+            - database
+
+      networks: 
+        hedgedoc:
+        external_services:
+          external: true

roles/docker/tasks/services/keycloak.yml

@@ -0,0 +1,50 @@
+# vim: ft=yaml.ansible
+---
+- name: setup keycloak containers for sso.data.coop
+  docker_compose:
+    project_name: "keycloak"
+    pull: "yes"
+    definition:
+      version: "3.6"
+      services:
+        postgres:
+          image: "postgres:{{ services.keycloak.postgres_version }}"
+          restart: "unless-stopped"
+          networks:
+            - "keycloak"
+          volumes:
+            - "{{ services.keycloak.volume_folder }}/data:/var/lib/postgresql/data"
+          environment:
+            POSTGRES_USER: "keycloak"
+            POSTGRES_PASSWORD: "{{ postgres_passwords.keycloak }}"
+            POSTGRES_DB: "keycloak"
+
+        app:
+          image: "quay.io/keycloak/keycloak:{{ services.keycloak.version }}"
+          restart: "unless-stopped"
+          networks:
+            - "keycloak"
+            - "postfix"
+            - "external_services"
+          command:
+            - "start"
+            - "--db=postgres"
+            - "--db-url=jdbc:postgresql://postgres:5432/keycloak"
+            - "--db-username=keycloak"
+            - "--db-password={{ postgres_passwords.keycloak }}"
+            - "--hostname={{ services.keycloak.domain }}"
+            - "--proxy=edge"
+            - "--https-port=8080"
+            - "--http-relative-path=/auth"
+          environment:
+            VIRTUAL_HOST: "{{ services.keycloak.domain }}"
+            VIRTUAL_PORT: "8080"
+            LETSENCRYPT_HOST: "{{ services.keycloak.domain }}"
+            LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+
+      networks:
+        keycloak:
+        postfix:
+          external: true
+        external_services:
+          external: true

roles/docker/tasks/services/mailu.yml

@@ -0,0 +1,181 @@
+# vim: ft=yaml.ansible
+---
+- name: create mailu volume folders
+  file:
+    name: "{{ services.mailu.volume_folder }}/{{ volume }}"
+    state: directory
+  loop:
+    - redis
+    - certs
+    - data
+    - dkim
+    - mail
+    - mailqueue
+    - filter
+    - postgres
+    - webmail
+    - overrides
+    - overrides/nginx
+    - overrides/dovecot
+    - overrides/postfix
+    - overrides/rspamd
+    - overrides/rainloop
+  loop_control:
+    loop_var: volume
+
+- name: upload mailu.env file
+  template:
+    src: mailu.env.j2
+    dest: "{{ services.mailu.volume_folder}}/mailu.env"
+
+- name: hard link to Let's Encrypt TLS certificate
+  file:
+    src: "{{ services.nginx_proxy.volume_folder }}/certs/{{ services.mailu.domain }}/fullchain.pem"
+    dest: "{{ services.mailu.volume_folder }}/certs/cert.pem"
+    state: hard
+    force: yes
+  when: letsencrypt_enabled
+
+- name: hard link to Let's Encrypt TLS key
+  file:
+    src: "{{ services.nginx_proxy.volume_folder }}/certs/{{ services.mailu.domain }}/key.pem"
+    dest: "{{ services.mailu.volume_folder }}/certs/key.pem"
+    state: hard
+    force: yes
+  when: letsencrypt_enabled
+
+- name: run mail server containers
+  docker_compose:
+    project_name: mail_server
+    pull: yes
+    definition:
+      version: '3.6'
+      services:
+        postgres:
+          image: postgres:14-alpine
+          restart: always
+          environment:
+            POSTGRES_DB: mailu
+            POSTGRES_USER: mailu
+            POSTGRES_PASSWORD: "{{ postgres_passwords.mailu }}"
+          volumes:
+            - "{{ services.mailu.volume_folder }}/postgres:/var/lib/postgresql/data"
+          dns:
+            - "{{ services.mailu.dns }}"
+
+        redis:
+          image: redis:alpine
+          restart: always
+          volumes:
+            - "{{ services.mailu.volume_folder }}/redis:/data"
+          depends_on:
+            - resolver
+          dns:
+            - "{{ services.mailu.dns }}"
+
+        front:
+          image: mailu/nginx:{{ services.mailu.version }}
+          restart: always
+          env_file: "{{ services.mailu.volume_folder}}/mailu.env"
+          environment:
+            VIRTUAL_HOST: "{{ services.mailu.domain }}"
+            LETSENCRYPT_HOST: "{{ services.mailu.domain }}"
+            LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+          volumes:
+            - "{{ services.mailu.volume_folder }}/certs:/certs"
+            - "{{ services.mailu.volume_folder }}/overrides/nginx:/overrides:ro"
+          expose:
+            - "80"
+          ports:
+            - "993:993"
+            - "25:25"
+            - "587:587"
+            - "465:465"
+          networks:
+            - default
+            - external_services
+
+        resolver:
+          image: mailu/unbound:{{ services.mailu.version }}
+          restart: always
+          env_file: "{{ services.mailu.volume_folder}}/mailu.env"
+          networks:
+            default:
+              ipv4_address: "{{ services.mailu.dns }}"
+
+        admin:
+          image: mailu/admin:{{ services.mailu.version }}
+          restart: always
+          env_file: "{{ services.mailu.volume_folder}}/mailu.env"
+          volumes:
+            - "{{ services.mailu.volume_folder }}/data:/data"
+            - "{{ services.mailu.volume_folder }}/dkim:/dkim"
+          depends_on:
+            - redis
+            - resolver
+          dns:
+            - "{{ services.mailu.dns }}"
+
+        imap:
+          image: mailu/dovecot:{{ services.mailu.version }}
+          restart: always
+          env_file: "{{ services.mailu.volume_folder}}/mailu.env"
+          volumes:
+            - "{{ services.mailu.volume_folder }}/mail:/mail"
+            - "{{ services.mailu.volume_folder }}/overrides/dovecot:/overrides:ro"
+          depends_on:
+            - front
+            - resolver
+          dns:
+            - "{{ services.mailu.dns }}"
+
+        smtp:
+          image: mailu/postfix:{{ services.mailu.version }}
+          restart: always
+          env_file: "{{ services.mailu.volume_folder}}/mailu.env"
+          volumes:
+            - "{{ services.mailu.volume_folder }}/mailqueue:/queue"
+            - "{{ services.mailu.volume_folder }}/overrides/postfix:/overrides:ro"
+          depends_on:
+            - front
+            - resolver
+          dns:
+            - "{{ services.mailu.dns }}"
+
+        antispam:
+          image: mailu/rspamd:{{ services.mailu.version }}
+          hostname: antispam
+          restart: always
+          env_file: "{{ services.mailu.volume_folder}}/mailu.env"
+          volumes:
+            - "{{ services.mailu.volume_folder }}/filter:/var/lib/rspamd"
+            - "{{ services.mailu.volume_folder }}/overrides/rspamd:/etc/rspamd/override.d:ro"
+          depends_on:
+            - front
+            - resolver
+          dns:
+            - "{{ services.mailu.dns }}"
+
+        webmail:
+          image: mailu/rainloop:{{ services.mailu.version }}
+          restart: always
+          env_file: "{{ services.mailu.volume_folder}}/mailu.env"
+          volumes:
+            - "{{ services.mailu.volume_folder }}/webmail:/data"
+            - "{{ services.mailu.volume_folder }}/overrides/rainloop:/overrides:ro"
+          depends_on:
+            - imap
+            - resolver
+          dns:
+            - "{{ services.mailu.dns }}"
+
+      networks:
+        default:
+          driver: bridge
+          ipam:
+            driver: default
+            config:
+              - subnet: "{{ services.mailu.subnet }}"
+        external_services:
+          external:
+            name: external_services

roles/docker/tasks/services/mastodon.yml

@@ -0,0 +1,189 @@
+# vim: ft=yaml.ansible
+---
+- name: create mastodon volume folders
+  file:
+    name: "{{ services.mastodon.volume_folder }}/{{ volume }}"
+    state: directory
+    owner: "991"
+    group: "991"
+  loop:
+    - "postgres_data"
+    - "postgres_config"
+    - "redis_data"
+    - "mastodon_data"
+  loop_control:
+    loop_var: volume
+
+- name: Copy mastodon environment file
+  template:
+    src: files/configs/mastodon/env_file.j2
+    dest: "{{ services.mastodon.volume_folder }}/env_file"
+
+- name: Upload vhost config for root domain
+  template:
+    src: files/configs/mastodon/vhost-mastodon
+    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.mastodon.domain }}"
+
+- name: Copy PostgreSQL config
+  copy:
+    src: files/configs/mastodon/postgresql.conf
+    dest: "{{ services.mastodon.volume_folder }}/postgres_config/postgresql.conf"
+
+- name: Set up Mastodon
+  docker_compose:
+    project_name: mastodon
+    pull: true
+    restarted: true
+    definition:
+      x-sidekiq: &sidekiq
+        image: "tootsuite/mastodon:{{ services.mastodon.version }}"
+        restart: always
+        env_file: "{{ services.mastodon.volume_folder }}/env_file"
+        depends_on:
+          db:
+            condition: "service_healthy"
+          redis:
+            condition: "service_healthy"
+        networks:
+          - postfix
+          - external_services
+          - internal_network
+        volumes:
+          - "{{ services.mastodon.volume_folder }}/mastodon_data:/mastodon/public/system"
+        healthcheck:
+          test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
+
+      version: '3'
+      services:
+        db:
+          restart: always
+          image: "postgres:{{ services.mastodon.postgres_version }}"
+          shm_size: 256mb
+          networks:
+            - internal_network
+          healthcheck:
+            test: ['CMD', 'pg_isready', '-U', 'postgres']
+          volumes:
+            - "{{ services.mastodon.volume_folder }}/postgres_data:/var/lib/postgresql/data"
+            - "{{ services.mastodon.volume_folder }}/postgres_config:/config:ro"
+          command: postgres -c config_file=/config/postgresql.conf
+          environment:
+            - 'POSTGRES_HOST_AUTH_METHOD=trust'
+
+        redis:
+          restart: always
+          image: "redis:{{ services.mastodon.redis_version }}"
+          networks:
+            - internal_network
+          healthcheck:
+            test: ['CMD', 'redis-cli', 'ping']
+          volumes:
+            - "{{ services.mastodon.volume_folder }}/redis_data:/data"
+
+        web:
+          image: "tootsuite/mastodon:{{ services.mastodon.version }}"
+          restart: always
+          env_file: "{{ services.mastodon.volume_folder }}/env_file"
+          command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
+          networks:
+            - external_services
+            - internal_network
+          healthcheck:
+            # prettier-ignore
+            test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:3000/health || exit 1']
+          depends_on:
+            db:
+              condition: "service_healthy"
+            redis:
+              condition: "service_healthy"
+          volumes:
+            - "{{ services.mastodon.volume_folder }}/mastodon_data:/mastodon/public/system"
+          environment:
+            MAX_THREADS: 10
+            WEB_CONCURRENCY: 3
+            VIRTUAL_HOST: "{{ services.mastodon.domain }}"
+            VIRTUAL_PORT: "3000"
+            VIRTUAL_PATH: "/"
+            LETSENCRYPT_HOST: "{{ services.mastodon.domain }}"
+            LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+
+        streaming:
+          image: "tootsuite/mastodon:{{ services.mastodon.version }}"
+          restart: always
+          env_file: "{{ services.mastodon.volume_folder }}/env_file"
+          command: node ./streaming
+          networks:
+            - external_services
+            - internal_network
+          healthcheck:
+            # prettier-ignore
+            test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1']
+          ports:
+            - '127.0.0.1:4000:4000'
+          depends_on:
+            db:
+              condition: "service_healthy"
+            redis:
+              condition: "service_healthy"
+          environment:
+            DB_POOL: 15
+            VIRTUAL_HOST: "{{ services.mastodon.domain }}"
+            VIRTUAL_PORT: "4000"
+            VIRTUAL_PATH: "/api/v1/streaming"
+
+        # sidekiq-default-push-pull: DB_POOL = 25, -c 25 for 25 connections
+        sidekiq-default-push-pull:
+          <<: *sidekiq
+          command: bundle exec sidekiq -c 25 -q default -q push -q pull
+          environment:
+            DB_POOL: 25
+
+        # sidekiq-default-pull-push: DB_POOL = 25, -c 25 for 25 connections
+        sidekiq-default-pull-push:
+          <<: *sidekiq
+          command: bundle exec sidekiq -c 25 -q default -q pull -q push
+          environment:
+            DB_POOL: 25
+
+        # sidekiq-pull-default-push: DB_POOL = 25, -c 25 for 25 connections
+        sidekiq-pull-default-push:
+          <<: *sidekiq
+          command: bundle exec sidekiq -c 25 -q pull -q default -q push
+          environment:
+            DB_POOL: 25
+
+        # sidekiq-push-default-pull: DB_POOL = 25, -c 25 for 25 connections
+        sidekiq-push-default-pull:
+          <<: *sidekiq
+          command: bundle exec sidekiq -c 25 -q push -q default -q pull
+          environment:
+            DB_POOL: 25
+
+        # sidekiq-push-scheduler: DB_POOL = 5, -c 5 for 5 connections
+        sidekiq-push-scheduler:
+          <<: *sidekiq
+          command: bundle exec sidekiq -c 5 -q push -q scheduler
+          environment:
+            DB_POOL: 5
+
+        # sidekiq-push-mailers: DB_POOL = 5, -c 5 for 5 connections
+        sidekiq-push-mailers:
+          <<: *sidekiq
+          command: bundle exec sidekiq -c 5 -q push -q mailers
+          environment:
+            DB_POOL: 5
+
+        # sidekiq-push-ingress: DB_POOL = 10, -c 10 for 10 connections
+        sidekiq-push-ingress:
+          <<: *sidekiq
+          command: bundle exec sidekiq -c 10 -q push -q ingress
+          environment:
+            DB_POOL: 10
+
+      networks:
+        external_services:
+          external: true
+        postfix:
+          external: true
+        internal_network:
+          internal: true

roles/docker/tasks/services/matrix_riot.yml

@@ -0,0 +1,120 @@
+# vim: ft=yaml.ansible
+---
+- name: create matrix volume folders
+  file:
+    name: "{{ services.matrix.volume_folder }}/{{ volume }}"
+    state: directory
+    owner: "991"
+    group: "991"
+  loop:
+    - "data"
+    - "data/uploads"
+    - "data/media"
+  loop_control:
+    loop_var: volume
+
+- name: create matrix DB folder
+  file:
+    name: "{{ services.matrix.volume_folder }}/db"
+    state: "directory"
+
+- name: create riot volume folders
+  file:
+    name: "{{ services.riot.volume_folder }}/{{ volume }}"
+    state: directory
+  loop:
+    - "data"
+  loop_control:
+    loop_var: volume
+
+- name: upload riot config.json
+  template:
+    src: files/configs/riot/config.json
+    dest: "{{ services.riot.volume_folder }}/data/config.json"
+
+- name: upload riot.im.conf
+  template:
+    src: files/configs/riot/riot.im.conf
+    dest: "{{ services.riot.volume_folder }}/data/riot.im.conf"
+
+- name: upload vhost config for matrix domain
+  template:
+    src: files/configs/matrix/vhost-matrix
+    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.matrix.domain }}"
+
+- name: upload vhost config for riot domain
+  template:
+    src: files/configs/matrix/vhost-riot
+    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ item }}"
+  loop: "{{ services.riot.domains }}"
+
+- name: upload homeserver.yaml
+  template:
+    src: "files/configs/matrix/homeserver.yaml.j2"
+    dest: "{{ services.matrix.volume_folder }}/data/homeserver.yaml"
+
+- name: upload matrix logging config
+  template:
+    src: "files/configs/matrix/matrix.data.coop.log.config"
+    dest: "{{ services.matrix.volume_folder }}/data/matrix.data.coop.log.config"
+
+- name: set up matrix and riot
+  docker_compose:
+    project_name: matrix
+    pull: yes
+    definition:
+      version: "3.6"
+      services:
+        matrix_db:
+          container_name: matrix_db
+          image: "postgres:{{ services.matrix.postgres_version }}"
+          restart: unless-stopped
+          networks:
+            - matrix
+          volumes:
+            - "{{ services.matrix.volume_folder }}/db:/var/lib/postgresql/data"
+          environment:
+            POSTGRES_USER: "synapse"
+            POSTGRES_PASSWORD: "{{ postgres_passwords.matrix }}"
+
+        matrix_app:
+          container_name: matrix
+          image: "matrixdotorg/synapse:{{ services.matrix.version }}"
+          restart: unless-stopped
+          networks:
+            - matrix
+            - external_services
+          volumes:
+            - "{{ services.matrix.volume_folder }}/data:/data"
+          environment:
+            SYNAPSE_CONFIG_PATH: "/data/homeserver.yaml"
+            SYNAPSE_CACHE_FACTOR: "2"
+            SYNAPSE_LOG_LEVEL: "INFO"
+            VIRTUAL_HOST: "{{ services.matrix.domain }}"
+            VIRTUAL_PORT: "8008"
+            LETSENCRYPT_HOST: "{{ services.matrix.domain }}"
+            LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+
+        riot:
+          container_name: riot_app
+          image: "avhost/docker-matrix-riot:{{ services.riot.version }}"
+          restart: unless-stopped
+          networks:
+            - matrix
+            - external_services
+          expose:
+            - 8080
+          volumes:
+            - "{{ services.riot.volume_folder }}/data:/data"
+          environment:
+            VIRTUAL_HOST: "{{ services.riot.domains|join(',') }}"
+            VIRTUAL_PORT: "8080"
+            LETSENCRYPT_HOST: "{{ services.riot.domains|join(',') }}"
+            LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+
+      networks:
+        external_services:
+          external:
+            name: external_services
+        matrix:
+          name: "matrix"

roles/docker/tasks/services/membersystem.yml

@@ -0,0 +1,52 @@
+# vim: ft=yaml.ansible
+---
+- name: run membersystem containers
+  docker_compose:
+    project_name: "member.data.coop"
+    pull: yes
+    definition:
+      version: "3"
+      services:
+        backend:
+          image: "docker.data.coop/membersystem:{{ services.membersystem.version }}"
+          restart: always
+          user: $UID:$GID
+          tty: true
+          depends_on:
+            - postgres
+          networks:
+            - membersystem
+            - external_services
+            - postfix
+          environment:
+            SECRET_KEY: "{{ membersystem_secrets.secret_key }}"
+            DATABASE_URL: postgres://postgres:{{ postgres_passwords.membersystem }}@postgres:5432/postgres
+            POSTGRES_HOST: postgres
+            POSTGRES_PORT: 5432
+            EMAIL_BACKEND: "django.core.mail.backends.smtp.EmailBackend"
+            EMAIL_URL: "smtp://noop@{{ smtp_host }}:{{ smtp_port }}"
+            VIRTUAL_HOST: "{{ services.membersystem.domain }}"
+            VIRTUAL_PORT: "8000"
+            LETSENCRYPT_HOST: "{{ services.membersystem.domain }}"
+            LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+            ALLOWED_HOSTS: "{{ services.membersystem.domain }}"
+            CSRF_TRUSTED_ORIGINS: "https://{{ services.membersystem.domain }}"
+            DJANGO_ADMINS: "{{ services.membersystem.django_admins }}"
+            DEFAULT_FROM_EMAIL: "noreply@{{ services.membersystem.domain }}"
+
+        postgres:
+          image: "postgres:{{ services.membersystem.postgres_version }}"
+          restart: always
+          volumes:
+            - "{{ volume_root_folder }}/membersystem/postgres/data:/var/lib/postgresql/data"
+          networks:
+            - membersystem
+          environment:
+            POSTGRES_PASSWORD: "{{ postgres_passwords.membersystem }}"
+
+      networks:
+        membersystem:
+        external_services:
+          external: true
+        postfix:
+          external: true

roles/docker/tasks/services/netdata.yml

@@ -0,0 +1,23 @@
+# vim: ft=yaml.ansible
+---
+- name: setup netdata docker container for system monitoring
+  docker_container:
+    name: netdata
+    image: netdata/netdata:{{ services.netdata.version }}
+    restart_policy: unless-stopped
+    hostname: "hevonen.servers.{{ base_domain }}"
+    capabilities:
+      - SYS_PTRACE
+    security_opts:
+      - apparmor:unconfined
+    volumes:
+      - /proc:/host/proc:ro
+      - /sys:/host/sys:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    networks:
+      - name: external_services
+    env:
+      VIRTUAL_HOST : "{{ services.netdata.domain }}"
+      LETSENCRYPT_HOST: "{{ services.netdata.domain }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+      PGID: "999"

roles/docker/tasks/services/nextcloud.yml

@@ -0,0 +1,76 @@
+# vim: ft=yaml.ansible
+---
+- name: upload vhost config for cloud.data.coop
+  template:
+    src: files/configs/nextcloud/vhost
+    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.nextcloud.domain }}"
+  notify: "restart nginx"
+
+- name: setup nextcloud containers
+  docker_compose:
+    project_name: "nextcloud"
+    pull: "yes"
+    definition:
+      services:
+        postgres:
+          image: "postgres:{{ services.nextcloud.postgres_version }}"
+          restart: "unless-stopped"
+          networks:
+            - "nextcloud"
+          volumes:
+            - "{{ services.nextcloud.volume_folder }}/postgres:/var/lib/postgresql/data"
+          environment: 
+            POSTGRES_DB: "nextcloud"
+            POSTGRES_PASSWORD: "{{ postgres_passwords.nextcloud }}"
+            POSTGRES_USER: "nextcloud"
+
+        redis:
+          image: "redis:{{ services.nextcloud.redis_version }}"
+          restart: "unless-stopped"
+          command: "redis-server --requirepass {{ nextcloud_secrets.redis_password }}"
+          tmpfs:
+            - /var/lib/redis
+          networks:
+            - "nextcloud"
+
+        cron:
+          image: "nextcloud:{{ services.nextcloud.version }}"
+          restart: "unless-stopped"
+          entrypoint: "/cron.sh"
+          networks:
+            - "nextcloud"
+          volumes:
+            - "{{ services.nextcloud.volume_folder }}/app:/var/www/html"
+          depends_on:
+            - "postgres"
+            - "redis"
+        
+        app:
+          image: "nextcloud:{{ services.nextcloud.version }}"
+          restart: "unless-stopped"
+          networks:
+            - "nextcloud"
+            - "postfix"
+            - "external_services"
+          volumes:
+            - "{{ services.nextcloud.volume_folder }}/app:/var/www/html"
+          environment:
+            VIRTUAL_HOST: "{{ services.nextcloud.domain }}"
+            LETSENCRYPT_HOST: "{{ services.nextcloud.domain }}"
+            LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+            POSTGRES_HOST: "postgres"
+            POSTGRES_DB: "nextcloud"
+            POSTGRES_USER: "nextcloud"
+            POSTGRES_PASSWORD: "{{ postgres_passwords.nextcloud }}"
+            REDIS_HOST: "redis"
+            REDIS_HOST_PASSWORD: "{{ nextcloud_secrets.redis_password }}"
+          depends_on:
+            - "postgres"
+            - "redis"
+
+      networks:
+          nextcloud:
+          postfix:
+            external: true
+          external_services:
+            external: true

roles/docker/tasks/services/nginx_proxy.yml

@@ -0,0 +1,48 @@
+# vim: ft=yaml.ansible
+---
+- name: create nginx-proxy volume folders
+  file:
+    name: "{{ services.nginx_proxy.volume_folder }}/{{ volume }}"
+    state: directory
+  loop:
+    - conf
+    - vhost
+    - html
+    - dhparam
+    - certs
+  loop_control:
+    loop_var: volume
+
+- name: nginx proxy container
+  docker_container:
+    name: nginx-proxy
+    image: nginxproxy/nginx-proxy:{{ services.nginx_proxy.version }}
+    restart_policy: always
+    networks:
+      - name: external_services
+    published_ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - "{{ services.nginx_proxy.volume_folder }}/conf:/etc/nginx/conf.d"
+      - "{{ services.nginx_proxy.volume_folder }}/vhost:/etc/nginx/vhost.d"
+      - "{{ services.nginx_proxy.volume_folder }}/html:/usr/share/nginx/html"
+      - "{{ services.nginx_proxy.volume_folder }}/dhparam:/etc/nginx/dhparam"
+      - "{{ services.nginx_proxy.volume_folder }}/certs:/etc/nginx/certs:ro"
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+
+- name: nginx letsencrypt container
+  docker_container:
+    name: nginx-proxy-le
+    image: nginxproxy/acme-companion:{{ services.nginx_acme_companion.version }}
+    restart_policy: always
+    volumes:
+      - "{{ services.nginx_proxy.volume_folder }}/vhost:/etc/nginx/vhost.d"
+      - "{{ services.nginx_proxy.volume_folder }}/html:/usr/share/nginx/html"
+      - "{{ services.nginx_proxy.volume_folder }}/dhparam:/etc/nginx/dhparam:ro"
+      - "{{ services.nginx_proxy.volume_folder }}/certs:/etc/nginx/certs"
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    env:
+      NGINX_PROXY_CONTAINER: nginx-proxy
+  when: letsencrypt_enabled
+

roles/docker/tasks/services/openldap.yml

@@ -0,0 +1,74 @@
+# vim: ft=yaml.ansible
+---
+- name: create ldap volume folders
+  file:
+    name: "{{ services.openldap.volume_folder }}/{{ volume }}"
+    state: directory
+  loop:
+    - "var/lib/ldap"
+    - "etc/slapd"
+    - "certs"
+  loop_control:
+    loop_var: volume
+
+- name: Create a network for ldap
+  docker_network:
+    name: ldap
+
+- name: openLDAP container
+  docker_container:
+    name: openldap
+    image: osixia/openldap:{{ services.openldap.version }}
+    tty: true
+    interactive: true
+    restart_policy: unless-stopped
+    volumes:
+      - "{{ services.openldap.volume_folder }}/var/lib/ldap:/var/lib/ldap"
+      - "{{ services.openldap.volume_folder }}/etc/slapd.d:/etc/ldap/slapd.d"
+      - "{{ services.openldap.volume_folder }}/certs:/container/service/slapd/assets/certs/"
+    published_ports:
+      - "389:389"
+      - "636:636"
+    hostname: "{{ services.openldap.domain }}"
+    domainname: "{{ services.openldap.domain }}" # important: same as hostname
+    networks:
+      - name: ldap
+    env:
+      LDAP_LOG_LEVEL: "256"
+      LDAP_ORGANISATION: "{{ base_domain }}"
+      LDAP_DOMAIN: "{{ base_domain }}"
+      LDAP_BASE_DN: ""
+      LDAP_ADMIN_PASSWORD: "{{ ldap_admin_password }}"
+      LDAP_CONFIG_PASSWORD: "{{ ldap_config_password }}"
+      LDAP_READONLY_USER: "false"
+      LDAP_RFC2307BIS_SCHEMA: "false"
+      LDAP_BACKEND: "mdb"
+      LDAP_TLS: "true"
+      LDAP_TLS_CRT_FILENAME: "ldap.crt"
+      LDAP_TLS_KEY_FILENAME: "ldap.key"
+      LDAP_TLS_CA_CRT_FILENAME: "ca.crt"
+      LDAP_TLS_ENFORCE: "false"
+      LDAP_TLS_CIPHER_SUITE: "SECURE256:-VERS-SSL3.0"
+      LDAP_TLS_PROTOCOL_MIN: "3.1"
+      LDAP_TLS_VERIFY_CLIENT: "demand"
+      LDAP_REPLICATION: "false"
+      KEEP_EXISTING_CONFIG: "false"
+      LDAP_REMOVE_CONFIG_AFTER_SETUP: "true"
+      LDAP_SSL_HELPER_PREFIX: "ldap"
+
+- name: phpLDAPadmin container
+  docker_container:
+    name: phpldapadmin
+    image: osixia/phpldapadmin:{{ services.phpldapadmin.version }}
+    restart_policy: unless-stopped
+    networks:
+      - name: external_services
+      - name: ldap
+    env:
+      PHPLDAPADMIN_LDAP_HOSTS: "openldap"
+      PHPLDAPADMIN_HTTPS: "false"
+      PHPLDAPADMIN_TRUST_PROXY_SSL: "true"
+
+      VIRTUAL_HOST: "{{ services.openldap.domain }}"
+      LETSENCRYPT_HOST: "{{ services.openldap.domain }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"

roles/docker/tasks/services/passit.yml

@@ -0,0 +1,53 @@
+# vim: ft=yaml.ansible
+---
+- name: Create directory for Passit data
+  file:
+    name: "{{ services.passit.volume_folder }}/data"
+    owner: '70'
+    group: root
+    state: directory
+
+- name: setup passit containers
+  docker_compose:
+    project_name: "passit"
+    pull: "yes"
+    definition:
+      version: "3.6"
+      services:
+        passit_db:
+          image: "postgres:{{ services.passit.postgres_version }}"
+          restart: "always"
+          networks:
+            - "passit"
+          volumes:
+            - "{{ services.passit.volume_folder }}/data:/var/lib/postgresql/data"
+          environment:
+            POSTGRES_USER: "passit"
+            POSTGRES_PASSWORD: "{{ postgres_passwords.passit }}"
+
+        passit_app:
+          image: "passit/passit@sha256:c4b96bc67222936f58f344d5dd1020227ad8e11ad5f82ed3cbf0bcfa8fe9b2e7" #:{{ services.passit.version }}"
+          command: "bin/start.sh"
+          restart: "always"
+          networks:
+            - "passit"
+            - "postfix"
+            - "external_services"
+          environment:
+            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@{{ services.passit.domain }}"
+            EMAIL_CONFIRMATION_HOST: "https://{{ services.passit.domain }}"
+            FIDO_SERVER_ID: "{{ services.passit.domain }}"
+            VIRTUAL_HOST: "{{ services.passit.domain }}"
+            LETSENCRYPT_HOST: "{{ services.passit.domain }}"
+            LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+
+      networks:
+        passit:
+        postfix:
+          external: true
+        external_services:
+          external: true

roles/docker/tasks/services/portainer.yml

@@ -0,0 +1,22 @@
+# vim: ft=yaml.ansible
+---
+- name: create portainer volume folder
+  file:
+    name: "{{ services.portainer.volume_folder }}"
+    state: directory
+
+- name: run portainer
+  docker_container:
+    name: portainer
+    image: portainer/portainer-ee:{{ services.portainer.version }}
+    restart_policy: always
+    networks:
+      - name: external_services
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - "{{ services.portainer.volume_folder }}:/data"
+    env:
+      VIRTUAL_HOST: "{{ services.portainer.domain }}"
+      VIRTUAL_PORT: "9000"
+      LETSENCRYPT_HOST: "{{ services.portainer.domain }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"

roles/docker/tasks/services/postfix.yml

@@ -0,0 +1,28 @@
+# vim: ft=yaml.ansible
+---
+- name: Set up network for postfix
+  docker_network:
+    name: postfix
+    ipam_config:
+      - subnet: '172.16.0.0/16'
+        gateway: 172.16.0.1
+
+- name: Create volume folders for Postfix
+  file:
+    name: "{{ services.postfix.volume_folder }}/dkim"
+    state: directory
+
+- name: Set up Postfix Docker container for outgoing mail from services
+  docker_container:
+    name: postfix
+    image: boky/postfix:{{ services.postfix.version }}
+    restart_policy: always
+    networks:
+      - name: postfix
+    volumes:
+      - "{{ services.postfix.volume_folder }}/dkim:/etc/opendkim/keys"
+    env:
+      # Get all services which have allowed_sender_domain defined
+      ALLOWED_SENDER_DOMAINS: "{{ services | dict2items | selectattr('value.allowed_sender_domain', 'true') | map(attribute='value.domain') | join(' ') }}"
+      HOSTNAME: "{{ services.postfix.domain }}" # the name the smtp server will identify itself as
+      DKIM_AUTOGENERATE: "true"

roles/docker/tasks/services/privatebin.yml

@@ -0,0 +1,31 @@
+# vim: ft=yaml.ansible
+---
+- name: create privatebin volume folders
+  file:
+    name: "{{ services.privatebin.volume_folder }}/{{ volume }}"
+    state: directory
+  loop:
+    - cfg
+    - data
+  loop_control:
+    loop_var: volume
+
+- name: upload privatebin config
+  template:
+    src: files/configs/privatebin-conf.php
+    dest: "{{ services.privatebin.volume_folder }}/cfg/conf.php"
+
+- name: privatebin app container
+  docker_container:
+    name: privatebin
+    image: jgeusebroek/privatebin:{{ services.privatebin.version }}
+    restart_policy: unless-stopped
+    volumes:
+      - "{{ services.privatebin.volume_folder }}/cfg:/privatebin/cfg"
+      - "{{ services.privatebin.volume_folder }}/data:/privatebin/data"
+    networks:
+      - name: external_services
+    env:
+      VIRTUAL_HOST: "{{ services.privatebin.domain }}"
+      LETSENCRYPT_HOST: "{{ services.privatebin.domain }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"

roles/docker/tasks/services/rallly.yml

@@ -0,0 +1,61 @@
+# vim: ft=yaml.ansible
+---
+- name: Create rallly volume folders
+  file:
+    name: "{{ services.rallly.volume_folder }}/postgres"
+    state: directory
+
+- name: Copy Rallly environment file
+  template:
+    src: files/configs/rallly/env_file.j2
+    dest: "{{ services.rallly.volume_folder }}/env_file"
+
+- name: Set up Rallly
+  docker_compose:
+    project_name: "rallly"
+    pull: "yes"
+    definition:
+      version: "3.8"
+      services:
+        rallly_db:
+          image: "postgres:{{ services.rallly.postgres_version }}"
+          restart: "always"
+          shm_size: "256mb"
+          networks:
+            rallly_internal:
+          volumes:
+            - "{{ services.rallly.volume_folder }}/postgres:/var/lib/postgresql/data"
+          environment:
+            POSTGRES_PASSWORD: "{{ postgres_passwords.rallly }}"
+            POSTGRES_DB: "rallly_db"
+          healthcheck:
+            test: ["CMD-SHELL", "pg_isready -U postgres"]
+            interval: 5s
+            timeout: 5s
+            retries: 5
+
+        rallly:
+          image: "lukevella/rallly:{{ services.rallly.version }}"
+          restart: "always"
+          networks:
+            rallly_internal:
+            external_services:
+            postfix:
+          depends_on:
+            rallly_db:
+              condition: "service_healthy"
+          env_file:
+            - "{{ services.rallly.volume_folder }}/env_file"
+          environment:
+            VIRTUAL_HOST: "{{ services.rallly.domain }}"
+            VIRTUAL_PORT: "3000"
+            LETSENCRYPT_HOST: "{{ services.rallly.domain }}"
+            LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+
+      networks:
+        rallly_internal:
+          internal: true
+        external_services:
+          external: true
+        postfix:
+          external: true

roles/docker/tasks/services/restic_backup.yml

@@ -0,0 +1,89 @@
+# vim: ft=yaml.ansible
+---
+- name: Create SSH directory
+  file:
+    path: "{{ services.restic.volume_folder }}/ssh"
+    owner: root
+    group: root
+    mode: '0755'
+    state: directory
+
+- name: Copy private SSH key
+  copy:
+    dest: "{{ services.restic.volume_folder }}/ssh/id_ed25519"
+    owner: root
+    group: root
+    mode: '0600'
+    content: "{{ restic_secrets.ssh_privkey }}"
+
+- name: Derive public SSH key
+  shell: >-
+    ssh-keygen -f {{ services.restic.volume_folder }}/ssh/id_ed25519 -y
+      > {{ services.restic.volume_folder }}/ssh/id_ed25519.pub
+  args:
+    creates: "{{ services.restic.volume_folder }}/ssh/id_ed25519.pub"
+
+- name: Set file permissions on public SSH key
+  file:
+    path: "{{ services.restic.volume_folder }}/ssh/id_ed25519.pub"
+    owner: root
+    group: root
+    mode: '0644'
+    state: touch
+
+- name: Create SSH config
+  template:
+    src: restic.ssh.config.j2
+    dest: "{{ services.restic.volume_folder }}/ssh/config"
+    owner: root
+    group: root
+    mode: '0600'
+
+- name: Create SSH known_hosts file
+  template:
+    src: restic.ssh.known_hosts.j2
+    dest: "{{ services.restic.volume_folder }}/ssh/known_hosts"
+    owner: root
+    group: root
+    mode: '0600'
+
+- name: Setup restic backup
+  docker_compose:
+    project_name: restic_backup
+    pull: true
+    definition:
+      version: '3.6'
+      services:
+        restic-backup:
+          image: mazzolino/restic:{{ services.restic.version }}
+          restart: always
+          environment:
+            RUN_ON_STARTUP: "false"
+            BACKUP_CRON: "0 30 3 * * *"
+            RESTIC_REPOSITORY: "sftp:{{ services.restic.user }}@{{ services.restic.domain }}:{{ services.restic.repository }}"
+            RESTIC_PASSWORD: "{{ restic_secrets.repository_password }}"
+            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:
+            - "{{ services.restic.volume_folder }}/ssh:/run/secrets/.ssh:ro"
+            - /docker-volumes:/mnt/volumes:ro
+
+        restic-prune:
+          image: "mazzolino/restic:{{ services.restic.version }}"
+          environment:
+            RUN_ON_STARTUP: "false"
+            PRUNE_CRON: "0 0 4 * * *"
+            RESTIC_REPOSITORY: "sftp:{{ services.restic.user }}@{{ services.restic.domain }}:{{ services.restic.repository }}"
+            RESTIC_PASSWORD: "{{ restic_secrets.repository_password }}"
+            TZ: Europe/copenhagen
+          volumes:
+            - "{{ services.restic.volume_folder }}/ssh:/run/secrets/.ssh:ro"

roles/docker/tasks/services/watchtower.yml

@@ -1,12 +1,14 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  app:
+# vim: ft=yaml.ansible
+---
+- name: watchtower container
+  docker_container:
+    name: watchtower
     image: containrrr/watchtower:{{ services.watchtower.version }}
-    restart: unless-stopped
-    environment:
+    restart_policy: unless-stopped
+    networks:
+      - name: external_services
+    env:
       WATCHTOWER_POLL_INTERVAL: "60"
     volumes:
-      - "/root/.docker/config.json:/config.json:ro"
       - "/var/run/docker.sock:/var/run/docker.sock"
+      - "/root/.docker/config.json:/config.json:ro"

roles/docker/tasks/services/websites/2022.slides.data.coop.yml

@@ -0,0 +1,19 @@
+# vim: ft=yaml.ansible
+---
+- name: setup 2022.slides.data.coop website using unipi
+  docker_container:
+    name: 2022.slides.data.coop_website
+    image: docker.data.coop/unipi:{{ services.slides_2022_website.version }}
+    restart_policy: unless-stopped
+    purge_networks: yes
+    networks:
+      - name: external_services
+    env:
+      VIRTUAL_HOST: "{{ services.slides_2022_website.domain }}"
+      LETSENCRYPT_HOST: "{{ services.slides_2022_website.domain }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+    command: "--remote=https://git.data.coop/data.coop/slides.git#slides2022"
+    capabilities:
+      - NET_ADMIN
+    devices:
+      - "/dev/net/tun"

roles/docker/tasks/services/websites/cryptoaarhus.dk.yml

@@ -0,0 +1,13 @@
+# vim: ft=yaml.ansible
+---
+- 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 : "{{ services.cryptoaarhus_website.domains|join(',') }}"
+      LETSENCRYPT_HOST: "{{ services.cryptoaarhus_website.domains|join(',') }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"

roles/docker/tasks/services/websites/cryptohagen.dk.yml

@@ -0,0 +1,13 @@
+# vim: ft=yaml.ansible
+---
+- name: setup cryptohagen.dk website docker container
+  docker_container:
+    name: cryptohagen_website
+    restart_policy: unless-stopped
+    image: docker.data.coop/cryptohagen-website
+    networks:
+      - name: external_services
+    env:
+      VIRTUAL_HOST : "{{ services.cryptohagen_website.domains|join(',') }}"
+      LETSENCRYPT_HOST: "{{ services.cryptohagen_website.domains|join(',') }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"

roles/docker/tasks/services/websites/data.coop.yml

@@ -0,0 +1,23 @@
+# vim: ft=yaml.ansible
+---
+- name: Upload vhost config for root domain
+  copy:
+    src: files/configs/matrix/vhost-root
+    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ base_domain }}"
+
+- name: Upload vhost config for WWW domain
+  copy:
+    src: files/configs/vhost-www
+    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/www.{{ base_domain }}"
+
+- name: setup data.coop website docker container
+  docker_container:
+    name: data.coop_website
+    image: docker.data.coop/data-coop-website
+    restart_policy: unless-stopped
+    networks:
+      - name: external_services
+    env:
+      VIRTUAL_HOST : "{{ services.data_coop_website.domains|join(',') }}"
+      LETSENCRYPT_HOST: "{{ services.data_coop_website.domains|join(',') }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"

roles/docker/tasks/services/websites/fedi.dk.yaml

@@ -1,22 +1,19 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  web:
+# vim: ft=yaml.ansible
+---
+- name: setup fedi.dk website with unipi
+  docker_container:
+    name: fedi.dk_website
     image: docker.data.coop/unipi:{{ services.fedi_dk_website.version }}
-    restart: unless-stopped
+    restart_policy: unless-stopped
+    purge_networks: yes
     networks:
-      - external_services
-    environment:
+      - name: external_services
+    env:
       VIRTUAL_HOST: "{{ services.fedi_dk_website.domain }}"
       LETSENCRYPT_HOST: "{{ services.fedi_dk_website.domain }}"
       LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-    command: --remote=https://git.data.coop/fedi.dk/website.git#main
-    cap_add:
+    command: "--remote=https://git.data.coop/fedi.dk/website.git#main"
+    capabilities:
       - NET_ADMIN
     devices:
       - "/dev/net/tun"
-
-networks:
-  external_services:
-    external: true

roles/docker/tasks/services/websites/new.data.coop.yml

@@ -0,0 +1,13 @@
+# vim: ft=yaml.ansible
+---
+- name: setup new data.coop website using hugo
+  docker_container:
+    name: new.data.coop_website
+    image: docker.data.coop/data-coop-website:{{ services.new_data_coop_website.version }}
+    restart_policy: unless-stopped
+    networks:
+      - name: external_services
+    env:
+      VIRTUAL_HOST : "{{ services.new_data_coop_website.domain }}"
+      LETSENCRYPT_HOST: "{{ services.new_data_coop_website.domain }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"

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

@@ -0,0 +1,13 @@
+# vim: ft=yaml.ansible
+---
+- name: setup ulovliglogning.dk website docker container
+  docker_container:
+    name: ulovliglogning_website
+    restart_policy: unless-stopped
+    image: ulovliglogning/ulovliglogning.dk:latest
+    networks:
+      - name: external_services
+    env:
+      VIRTUAL_HOST: "{{ services.ulovliglogning_website.domains|join(',') }}"
+      LETSENCRYPT_HOST: "{{ services.ulovliglogning_website.domains|join(',') }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"

roles/docker/tasks/services/websites/vhs.data.coop.yaml

@@ -0,0 +1,19 @@
+# vim: ft=yaml.ansible
+---
+- name: setup vhs.data.coop website with unipi
+  docker_container:
+    name: vhs.data.coop_website
+    image: docker.data.coop/unipi:{{ services.vhs_website.version }}
+    restart_policy: unless-stopped
+    purge_networks: yes
+    networks:
+      - name: external_services
+    env:
+      VIRTUAL_HOST: "{{ services.vhs_website.domain }}"
+      LETSENCRYPT_HOST: "{{ services.vhs_website.domain }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+    command: "--remote=https://git.data.coop/vhs.data.coop/website.git#main"
+    capabilities:
+      - NET_ADMIN
+    devices:
+      - "/dev/net/tun"

roles/docker/templates/compose-files/cryptoaarhus_website.yml.j2

@@ -1,17 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  web:
-    image: docker.data.coop/cryptoaarhus-website
-    restart: unless-stopped
-    networks:
-      - external_services
-    environment:
-      VIRTUAL_HOST : "{{ services.cryptoaarhus_website.domains | join(',') }}"
-      LETSENCRYPT_HOST: "{{ services.cryptoaarhus_website.domains | join(',') }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-
-networks:
-  external_services:
-    external: true

roles/docker/templates/compose-files/cryptohagen_website.yml.j2

@@ -1,17 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  web:
-    image: docker.data.coop/cryptohagen-website
-    restart: unless-stopped
-    networks:
-      - external_services
-    environment:
-      VIRTUAL_HOST : "{{ services.cryptohagen_website.domains | join(',') }}"
-      LETSENCRYPT_HOST: "{{ services.cryptohagen_website.domains | join(',') }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-
-networks:
-  external_services:
-    external: true

roles/docker/templates/compose-files/data_coop_website.yml.j2

@@ -1,27 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  prod-web:
-    image: docker.data.coop/data-coop-website:{{ services.data_coop_website.version }}
-    restart: unless-stopped
-    networks:
-      - external_services
-    environment:
-      VIRTUAL_HOST: "{{ services.data_coop_website.domain }},{{ services.data_coop_website.www_domain }}"
-      LETSENCRYPT_HOST: "{{ services.data_coop_website.domain }},{{ services.data_coop_website.www_domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-
-  staging-web:
-    image: docker.data.coop/data-coop-website:{{ services.data_coop_website.staging_version }}
-    restart: unless-stopped
-    networks:
-      - external_services
-    environment:
-      VIRTUAL_HOST: "{{ services.data_coop_website.staging_domain }}"
-      LETSENCRYPT_HOST: "{{ services.data_coop_website.staging_domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-
-networks:
-  external_services:
-    external: true

roles/docker/templates/compose-files/diun.yml.j2

@@ -1,26 +0,0 @@
-# vim: ft=yaml.ansible
----
-version: "3.5"
-
-services:
-  diun:
-    image: "ghcr.io/crazy-max/diun:{{ services.diun.version }}"
-    command: serve
-    volumes:
-      - "./data:/data"
-      - "/var/run/docker.sock:/var/run/docker.sock"
-    environment:
-      - "TZ=Europe/Paris"
-      - "DIUN_WATCH_WORKERS=20"
-      - "DIUN_WATCH_SCHEDULE=0 */6 * * *"
-      - "DIUN_WATCH_JITTER=30s"
-      - "DIUN_PROVIDERS_DOCKER=true"
-      - "DIUN_PROVIDERS_DOCKER_WATCHBYDEFAULT=true"
-      - "DIUN_NOTIF_MATRIX_HOMESERVERURL=https://{{ services.matrix.domain }}"
-      - "DIUN_NOTIF_MATRIX_USER={{ services.diun.matrix_user }}"
-      - "DIUN_NOTIF_MATRIX_ROOMID={{ services.diun.matrix_room }}"
-      - "DIUN_NOTIF_MATRIX_PASSWORD={{ diun_secrets.matrix_password }}"
-      - "DIUN_NOTIF_MATRIX_MSGTYPE=text"
-    labels:
-      - "diun.enable=true"
-    restart: always

roles/docker/templates/compose-files/docker_registry.yml.j2

@@ -1,23 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  app:
-    image: registry:{{ services.docker_registry.version }}
-    restart: always
-    networks:
-      - external_services
-    volumes:
-      - "./registry:/var/lib/registry"
-      - "./auth:/auth"
-    environment:
-      VIRTUAL_HOST: "{{ services.docker_registry.domain }}"
-      LETSENCRYPT_HOST: "{{ services.docker_registry.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-      REGISTRY_AUTH: "htpasswd"
-      REGISTRY_AUTH_HTPASSWD_PATH: "/auth/htpasswd"
-      REGISTRY_AUTH_HTPASSWD_REALM: "data.coop docker registry"
-
-networks:
-  external_services:
-    external: true

roles/docker/templates/compose-files/drone.yml.j2

@@ -1,40 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  app:
-    image: drone/drone:{{ services.drone.version }}
-    restart: unless-stopped
-    networks:
-      - default
-      - external_services
-    volumes:
-      - ".:/data"
-      - "/var/run/docker.sock:/var/run/docker.sock"
-    environment:
-      DRONE_GITEA_SERVER: https://{{ services.forgejo.domain }}
-      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: "{{ services.drone.domain }}"
-      DRONE_SERVER_PROTO: https
-      DRONE_RPC_SECRET: "{{ drone_secrets.rpc_shared_secret }}"
-      VIRTUAL_HOST: "{{ services.drone.domain }}"
-      LETSENCRYPT_HOST: "{{ services.drone.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-
-  runner:
-    image: drone/drone-runner-docker:{{ services.drone.version }}
-    restart: unless-stopped
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock"
-    environment:
-      DRONE_RPC_HOST: "{{ services.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:
-  external_services:
-    external: true

roles/docker/templates/compose-files/element.yml.j2

@@ -1,22 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  app:
-    image: avhost/docker-matrix-element:{{ services.element.version }}
-    restart: unless-stopped
-    networks:
-      - external_services
-    expose:
-      - "8080"
-    volumes:
-      - "./data:/data"
-    environment:
-      VIRTUAL_HOST: "{{ services.element.domain }}"
-      VIRTUAL_PORT: "8080"
-      LETSENCRYPT_HOST: "{{ services.element.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-
-networks:
-  external_services:
-    external: true

roles/docker/templates/compose-files/forgejo.yml.j2

@@ -1,38 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  app:
-    image: codeberg.org/forgejo/forgejo:{{ services.forgejo.version }}
-    restart: unless-stopped
-    networks:
-      - external_services
-      - postfix
-    volumes:
-      - ".:/data"
-    ports:
-      - "22:22"
-    environment:
-      VIRTUAL_HOST: "{{ services.forgejo.domain }}"
-      VIRTUAL_PORT: "3000"
-      LETSENCRYPT_HOST: "{{ services.forgejo.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-      # Forgejo customization, see: https://docs.gitea.io/en-us/install-with-docker/#customization
-      # https://docs.gitea.io/en-us/config-cheat-sheet/#security-security
-      FORGEJO__mailer__ENABLED: true
-      FORGEJO__mailer__FROM: noreply@{{ services.forgejo.domain }}
-      FORGEJO__mailer__PROTOCOL: smtp
-      FORGEJO__mailer__SMTP_ADDR: "{{ smtp_host }}"
-      FORGEJO__mailer__SMTP_PORT: "{{ smtp_port }}"
-      FORGEJO__security__LOGIN_REMEMBER_DAYS: "60"
-      FORGEJO__security__PASSWORD_COMPLEXITY: off
-      FORGEJO__security__MIN_PASSWORD_LENGTH: "8"
-      FORGEJO__security__PASSWORD_CHECK_PWN: true
-      FORGEJO__service__ENABLE_NOTIFY_MAIL: true
-      FORGEJO__service__REGISTER_EMAIL_CONFIRM: true
-
-networks:
-  external_services:
-    external: true
-  postfix:
-    external: true

roles/docker/templates/compose-files/hedgedoc.yml.j2

@@ -1,44 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  db:
-    image: postgres:{{ services.hedgedoc.postgres_version }}
-    restart: unless-stopped
-    volumes:
-      - "./db:/var/lib/postgresql/data"
-    environment:
-      POSTGRES_USER: codimd
-      POSTGRES_PASSWORD: "{{ postgres_passwords.hedgedoc }}"
-      POSTGRES_DB: codimd
-
-  app:
-    image: quay.io/hedgedoc/hedgedoc:{{ services.hedgedoc.version }}
-    volumes:
-      - "./hedgedoc/uploads:/hedgedoc/public/uploads"
-      - "./sso.data.coop.pem:/sso.data.coop.pem"
-    restart: unless-stopped
-    networks:
-      - default
-      - external_services
-    environment:
-      CMD_DB_URL: postgres://codimd:{{ postgres_passwords.hedgedoc }}@db:5432/codimd
-      CMD_DOMAIN: "{{ services.hedgedoc.domain }}"
-      CMD_ALLOW_EMAIL_REGISTER: False
-      CMD_IMAGE_UPLOAD_TYPE: filesystem
-      CMD_EMAIL: False
-      CMD_SAML_IDPCERT: /sso.data.coop.pem
-      CMD_SAML_IDPSSOURL: https://{{ services.keycloak.domain }}/auth/realms/datacoop/protocol/saml
-      CMD_SAML_ISSUER: hedgedoc
-      CMD_SAML_IDENTIFIERFORMAT: urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
-      CMD_USECDN: false
-      CMD_PROTOCOL_USESSL: true
-      VIRTUAL_HOST: "{{ services.hedgedoc.domain }}"
-      LETSENCRYPT_HOST: "{{ services.hedgedoc.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-    depends_on:
-      - db
-
-networks:
-  external_services:
-    external: true

roles/docker/templates/compose-files/keycloak.yml.j2

@@ -1,42 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  db:
-    image: postgres:{{ services.keycloak.postgres_version }}
-    restart: unless-stopped
-    volumes:
-      - "./data:/var/lib/postgresql/data"
-    environment:
-      POSTGRES_USER: keycloak
-      POSTGRES_PASSWORD: "{{ postgres_passwords.keycloak }}"
-      POSTGRES_DB: keycloak
-
-  app:
-    image: quay.io/keycloak/keycloak:{{ services.keycloak.version }}
-    restart: unless-stopped
-    networks:
-      - default
-      - postfix
-      - external_services
-    command:
-      - "start"
-      - "--db=postgres"
-      - "--db-url=jdbc:postgresql://db:5432/keycloak"
-      - "--db-username=keycloak"
-      - "--db-password={{ postgres_passwords.keycloak }}"
-      - "--hostname={{ services.keycloak.domain }}"
-      - "--proxy=edge"
-      - "--https-port=8080"
-      - "--http-relative-path=/auth"
-    environment:
-      VIRTUAL_HOST: "{{ services.keycloak.domain }}"
-      VIRTUAL_PORT: "8080"
-      LETSENCRYPT_HOST: "{{ services.keycloak.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-
-networks:
-  postfix:
-    external: true
-  external_services:
-    external: true

roles/docker/templates/compose-files/mailu.yml.j2

@@ -1,146 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  postgres:
-    image: postgres:{{ services.mailu.postgres_version }}
-    restart: unless-stopped
-    environment:
-      POSTGRES_DB: mailu
-      POSTGRES_USER: mailu
-      POSTGRES_PASSWORD: "{{ postgres_passwords.mailu }}"
-    volumes:
-      - "./postgres:/var/lib/postgresql/data"
-    dns:
-      - "{{ services.mailu.dns }}"
-
-  redis:
-    image: redis:{{ services.mailu.redis_version }}
-    restart: unless-stopped
-    volumes:
-      - "./redis:/data"
-    depends_on:
-      - resolver
-    dns:
-      - "{{ services.mailu.dns }}"
-
-  front:
-    image: ghcr.io/mailu/nginx:{{ services.mailu.version }}
-    restart: unless-stopped
-    env_file: mailu.env
-    environment:
-      VIRTUAL_HOST: "{{ services.mailu.domain }}"
-      LETSENCRYPT_HOST: "{{ services.mailu.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-    volumes:
-      - "./certs:/certs"
-      - "./overrides/nginx:/overrides:ro"
-    expose:
-      - "80"
-    ports:
-      - "25:25"
-      - "465:465"
-      - "587:587"
-      - "110:110"
-      - "995:995"
-      - "143:143"
-      - "993:993"
-    networks:
-      - default
-      - webmail
-      - external_services
-    depends_on:
-      - resolver
-    dns:
-      - "{{ services.mailu.dns }}"
-
-  resolver:
-    image: ghcr.io/mailu/unbound:{{ services.mailu.version }}
-    restart: unless-stopped
-    env_file: mailu.env
-    networks:
-      default:
-        ipv4_address: "{{ services.mailu.dns }}"
-
-  admin:
-    image: ghcr.io/mailu/admin:{{ services.mailu.version }}
-    restart: unless-stopped
-    env_file: mailu.env
-    volumes:
-      - "./data:/data"
-      - "./dkim:/dkim"
-    networks:
-      default:
-        aliases:
-          - admin.mailu
-    depends_on:
-      - redis
-      - resolver
-    dns:
-      - "{{ services.mailu.dns }}"
-
-  imap:
-    image: ghcr.io/mailu/dovecot:{{ services.mailu.version }}
-    restart: unless-stopped
-    env_file: mailu.env
-    volumes:
-      - "./mail:/mail"
-      - "./overrides/dovecot:/overrides:ro"
-    depends_on:
-      - front
-      - resolver
-    dns:
-      - "{{ services.mailu.dns }}"
-
-  smtp:
-    image: ghcr.io/mailu/postfix:{{ services.mailu.version }}
-    restart: unless-stopped
-    env_file: mailu.env
-    volumes:
-      - "./mailqueue:/queue"
-      - "./overrides/postfix:/overrides:ro"
-    depends_on:
-      - front
-      - resolver
-    dns:
-      - "{{ services.mailu.dns }}"
-
-
-  antispam:
-    image: ghcr.io/mailu/rspamd:{{ services.mailu.version }}
-    hostname: antispam
-    restart: unless-stopped
-    env_file: mailu.env
-    volumes:
-      - "./filter:/var/lib/rspamd"
-      - "./overrides/rspamd:/overrides:ro"
-    depends_on:
-      - front
-      - redis
-      - resolver
-    dns:
-      - "{{ services.mailu.dns }}"
-
-  webmail:
-    image: ghcr.io/mailu/webmail:{{ services.mailu.version }}
-    restart: unless-stopped
-    env_file: mailu.env
-    volumes:
-      - "./webmail:/data"
-      - "./overrides/snappymail:/overrides:ro"
-    networks:
-      - webmail
-    depends_on:
-      - front
-
-networks:
-  default:
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-        - subnet: "{{ services.mailu.subnet }}"
-  webmail:
-    driver: bridge
-  external_services:
-    external: true

roles/docker/templates/compose-files/mastodon.yml.j2

@@ -1,146 +0,0 @@
-# vim: ft=yaml.docker-compose
-x-sidekiq: &sidekiq
-  image: tootsuite/mastodon:{{ services.mastodon.version }}
-  restart: always
-  env_file: mastodon.env
-  networks:
-    - default
-    - postfix
-    - external_services
-  volumes:
-    - "./mastodon_data:/mastodon/public/system"
-  healthcheck:
-    test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
-  depends_on:
-    db:
-      condition: service_healthy
-    redis:
-      condition: service_healthy
-
-version: "3.8"
-
-services:
-  db:
-    restart: always
-    image: postgres:{{ services.mastodon.postgres_version }}
-    shm_size: 256mb
-    volumes:
-      - "./postgres_data:/var/lib/postgresql/data"
-      - "./postgres_config:/config:ro"
-    command: postgres -c config_file=/config/postgresql.conf
-    environment:
-      POSTGRES_HOST_AUTH_METHOD: trust
-    healthcheck:
-      test: ['CMD', 'pg_isready', '-U', 'postgres']
-
-  redis:
-    restart: always
-    image: redis:{{ services.mastodon.redis_version }}
-    volumes:
-      - "./redis_data:/data"
-    healthcheck:
-      test: ['CMD', 'redis-cli', 'ping']
-
-  web:
-    image: tootsuite/mastodon:{{ services.mastodon.version }}
-    restart: always
-    env_file: mastodon.env
-    command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
-    networks:
-      - default
-      - external_services
-    volumes:
-      - "./mastodon_data:/mastodon/public/system"
-    environment:
-      MAX_THREADS: 10
-      WEB_CONCURRENCY: 3
-      VIRTUAL_HOST: "{{ services.mastodon.domain }}"
-      VIRTUAL_PORT: "3000"
-      VIRTUAL_PATH: /
-      LETSENCRYPT_HOST: "{{ services.mastodon.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-    healthcheck:
-      test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:3000/health || exit 1']
-    depends_on:
-      db:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-
-  streaming:
-    image: tootsuite/mastodon:{{ services.mastodon.version }}
-    restart: always
-    env_file: mastodon.env
-    command: node ./streaming
-    networks:
-      - default
-      - external_services
-    ports:
-      - "127.0.0.1:4000:4000"
-    environment:
-      DB_POOL: 15
-      VIRTUAL_HOST: "{{ services.mastodon.domain }}"
-      VIRTUAL_PORT: "4000"
-      VIRTUAL_PATH: "/api/v1/streaming"
-    healthcheck:
-      test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1']
-    depends_on:
-      db:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-
-  # sidekiq-default-push-pull: DB_POOL = 25, -c 25 for 25 connections
-  sidekiq-default-push-pull:
-    <<: *sidekiq
-    command: bundle exec sidekiq -c 25 -q default -q push -q pull
-    environment:
-      DB_POOL: 25
-
-  # sidekiq-default-pull-push: DB_POOL = 25, -c 25 for 25 connections
-  sidekiq-default-pull-push:
-    <<: *sidekiq
-    command: bundle exec sidekiq -c 25 -q default -q pull -q push
-    environment:
-      DB_POOL: 25
-
-  # sidekiq-pull-default-push: DB_POOL = 25, -c 25 for 25 connections
-  sidekiq-pull-default-push:
-    <<: *sidekiq
-    command: bundle exec sidekiq -c 25 -q pull -q default -q push
-    environment:
-      DB_POOL: 25
-
-  # sidekiq-push-default-pull: DB_POOL = 25, -c 25 for 25 connections
-  sidekiq-push-default-pull:
-    <<: *sidekiq
-    command: bundle exec sidekiq -c 25 -q push -q default -q pull
-    environment:
-      DB_POOL: 25
-
-  # sidekiq-push-scheduler: DB_POOL = 5, -c 5 for 5 connections
-  sidekiq-push-scheduler:
-    <<: *sidekiq
-    command: bundle exec sidekiq -c 5 -q push -q scheduler
-    environment:
-      DB_POOL: 5
-
-  # sidekiq-push-mailers: DB_POOL = 5, -c 5 for 5 connections
-  sidekiq-push-mailers:
-    <<: *sidekiq
-    command: bundle exec sidekiq -c 5 -q push -q mailers
-    environment:
-      DB_POOL: 5
-
-  # sidekiq-push-ingress: DB_POOL = 10, -c 10 for 10 connections
-  sidekiq-push-ingress:
-    <<: *sidekiq
-    command: bundle exec sidekiq -c 10 -q push -q ingress
-    environment:
-      DB_POOL: 10
-
-networks:
-  external_services:
-    external: true
-  postfix:
-    external: true

roles/docker/templates/compose-files/matrix.yml.j2

@@ -1,36 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  postgres:
-    image: postgres:{{ services.matrix.postgres_version }}
-    restart: unless-stopped
-    volumes:
-      - "./db:/var/lib/postgresql/data"
-    environment:
-      POSTGRES_USER: synapse
-      POSTGRES_PASSWORD: "{{ postgres_passwords.matrix }}"
-
-  synapse:
-    image: ghcr.io/element-hq/synapse:{{ services.matrix.version }}
-    restart: unless-stopped
-    networks:
-      - default
-      - external_services
-      - postfix
-    volumes:
-      - "./data:/data"
-    environment:
-      SYNAPSE_CONFIG_PATH: /data/homeserver.yaml
-      SYNAPSE_CACHE_FACTOR: "2"
-      SYNAPSE_LOG_LEVEL: INFO
-      VIRTUAL_HOST: "{{ services.matrix.domain }}"
-      VIRTUAL_PORT: "8008"
-      LETSENCRYPT_HOST: "{{ services.matrix.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-
-networks:
-  external_services:
-    external: true
-  postfix:
-    external: true

roles/docker/templates/compose-files/membersystem.yml.j2

@@ -1,46 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  app:
-    image: docker.data.coop/membersystem:{{ services.membersystem.version }}
-    restart: always
-    user: "$UID:$GID"
-    tty: true
-    networks:
-      - default
-      - external_services
-      - postfix
-    environment:
-      SECRET_KEY: "{{ membersystem_secrets.secret_key }}"
-      DATABASE_URL: postgres://postgres:{{ postgres_passwords.membersystem }}@postgres:5432/postgres
-      POSTGRES_HOST: postgres
-      POSTGRES_PORT: 5432
-      EMAIL_BACKEND: django.core.mail.backends.smtp.EmailBackend
-      EMAIL_URL: smtp://noop@{{ smtp_host }}:{{ smtp_port }}
-      VIRTUAL_HOST: "{{ services.membersystem.domain }}"
-      VIRTUAL_PORT: "8000"
-      LETSENCRYPT_HOST: "{{ services.membersystem.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-      ALLOWED_HOSTS: "{{ services.membersystem.domain }}"
-      CSRF_TRUSTED_ORIGINS: https://{{ services.membersystem.domain }}
-      DJANGO_ADMINS: "{{ services.membersystem.django_admins }}"
-      DEFAULT_FROM_EMAIL: noreply@{{ services.membersystem.domain }}
-      STRIPE_API_KEY: "{{ membersystem_secrets.stripe_api_key }}"
-      STRIPE_ENDPOINT_SECRET: "{{ membersystem_secrets.stripe_endpoint_secret }}"
-    depends_on:
-      - postgres
-
-  postgres:
-    image: postgres:{{ services.membersystem.postgres_version }}
-    restart: always
-    volumes:
-      - "./postgres/data:/var/lib/postgresql/data"
-    environment:
-      POSTGRES_PASSWORD: "{{ postgres_passwords.membersystem }}"
-
-networks:
-  external_services:
-    external: true
-  postfix:
-    external: true

roles/docker/templates/compose-files/netdata.yml.j2

@@ -1,36 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services: 
-  app:
-    image: netdata/netdata:{{ services.netdata.version }}
-    restart: unless-stopped
-    hostname: hevonen.servers.{{ base_domain }}
-    volumes: 
-      - "/proc:/host/proc:ro"
-      - "/sys:/host/sys:ro"
-      - "/etc/os-release:/host/etc/os-release:ro"
-    networks:
-      - default
-      - external_services
-    environment:
-      VIRTUAL_HOST : "{{ services.netdata.domain }}"
-      LETSENCRYPT_HOST: "{{ services.netdata.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-      PGID: "999"
-      DOCKER_HOST: "socket_proxy:2375"
-    cap_add:
-      - SYS_PTRACE
-    security_opt:
-      - apparmor:unconfined
-
-  socket-proxy:
-    image: tecnativa/docker-socket-proxy:latest
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock:ro"
-    environment:
-      CONTAINERS: 1
-
-networks:
-  external_services:
-    external: true

roles/docker/templates/compose-files/nextcloud.yml.j2

@@ -1,59 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  postgres:
-    image: postgres:{{ services.nextcloud.postgres_version }}
-    restart: unless-stopped
-    volumes:
-      - "./postgres:/var/lib/postgresql/data"
-    environment:
-      POSTGRES_DB: nextcloud
-      POSTGRES_PASSWORD: "{{ postgres_passwords.nextcloud }}"
-      POSTGRES_USER: nextcloud
-
-  redis:
-    image: redis:{{ services.nextcloud.redis_version }}
-    restart: unless-stopped
-    command: redis-server --requirepass {{ nextcloud_secrets.redis_password }}
-    tmpfs:
-      - /var/lib/redis
-
-  cron:
-    image: nextcloud:{{ services.nextcloud.version }}
-    restart: unless-stopped
-    entrypoint: /cron.sh
-    volumes:
-      - "./app:/var/www/html"
-    depends_on:
-      - postgres
-      - redis
-
-  app:
-    image: nextcloud:{{ services.nextcloud.version }}
-    restart: unless-stopped
-    networks:
-      - default
-      - postfix
-      - external_services
-    volumes:
-      - "./app:/var/www/html"
-    environment:
-      VIRTUAL_HOST: "{{ services.nextcloud.domain }}"
-      LETSENCRYPT_HOST: "{{ services.nextcloud.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-      POSTGRES_HOST: postgres
-      POSTGRES_DB: nextcloud
-      POSTGRES_USER: nextcloud
-      POSTGRES_PASSWORD: "{{ postgres_passwords.nextcloud }}"
-      REDIS_HOST: redis
-      REDIS_HOST_PASSWORD: "{{ nextcloud_secrets.redis_password }}"
-    depends_on:
-      - postgres
-      - redis
-
-networks:
-  postfix:
-    external: true
-  external_services:
-    external: true

roles/docker/templates/compose-files/nginx_proxy.yml.j2

@@ -1,38 +0,0 @@
-version: "3.8"
-
-services:
-  proxy:
-    image: nginxproxy/nginx-proxy:{{ services.nginx_proxy.version }}
-    restart: always
-    networks:
-      - external_services
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - "./conf:/etc/nginx/conf.d"
-      - "./vhost:/etc/nginx/vhost.d"
-      - "./html:/usr/share/nginx/html"
-      - "./dhparam:/etc/nginx/dhparam"
-      - "./certs:/etc/nginx/certs:ro"
-      - "/var/run/docker.sock:/tmp/docker.sock:ro"
-    labels:
-      - com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy
-
-{% if letsencrypt_enabled %}
-  acme:
-    image: nginxproxy/acme-companion:{{ services.nginx_proxy.acme_companion_version }}
-    restart: always
-    volumes:
-      - "./vhost:/etc/nginx/vhost.d"
-      - "./html:/usr/share/nginx/html"
-      - "./dhparam:/etc/nginx/dhparam:ro"
-      - "./certs:/etc/nginx/certs"
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    depends_on:
-      - proxy
-{% endif %}
-
-networks:
-  external_services:
-    external: true

roles/docker/templates/compose-files/openldap.yml.j2

@@ -1,58 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  app:
-    image: osixia/openldap:{{ services.openldap.version }}
-    restart: unless-stopped
-    tty: true
-    stdin_open: true
-    volumes:
-      - "./var/lib/ldap:/var/lib/ldap"
-      - "./etc/slapd.d:/etc/ldap/slapd.d"
-      - "./certs:/container/service/slapd/assets/certs/"
-    ports:
-      - "389:389"
-      - "636:636"
-    hostname: "{{ services.openldap.domain }}"
-    domainname: "{{ services.openldap.domain }}" # important: same as hostname
-    environment:
-      LDAP_LOG_LEVEL: "256"
-      LDAP_ORGANISATION: "{{ base_domain }}"
-      LDAP_DOMAIN: "{{ base_domain }}"
-      LDAP_BASE_DN: ""
-      LDAP_ADMIN_PASSWORD: "{{ ldap_admin_password }}"
-      LDAP_CONFIG_PASSWORD: "{{ ldap_config_password }}"
-      LDAP_READONLY_USER: false
-      LDAP_RFC2307BIS_SCHEMA: false
-      LDAP_BACKEND: mdb
-      LDAP_TLS: true
-      LDAP_TLS_CRT_FILENAME: ldap.crt
-      LDAP_TLS_KEY_FILENAME: ldap.key
-      LDAP_TLS_CA_CRT_FILENAME: ca.crt
-      LDAP_TLS_ENFORCE: false
-      LDAP_TLS_CIPHER_SUITE: SECURE256:-VERS-SSL3.0
-      LDAP_TLS_PROTOCOL_MIN: "3.1"
-      LDAP_TLS_VERIFY_CLIENT: demand
-      LDAP_REPLICATION: false
-      KEEP_EXISTING_CONFIG: false
-      LDAP_REMOVE_CONFIG_AFTER_SETUP: true
-      LDAP_SSL_HELPER_PREFIX: ldap
-
-  admin:
-    image: osixia/phpldapadmin:{{ services.openldap.phpldapadmin_version }}
-    restart: unless-stopped
-    networks:
-      - default
-      - external_services
-    environment:
-      PHPLDAPADMIN_LDAP_HOSTS: app
-      PHPLDAPADMIN_HTTPS: false
-      PHPLDAPADMIN_TRUST_PROXY_SSL: true
-      VIRTUAL_HOST: "{{ services.openldap.domain }}"
-      LETSENCRYPT_HOST: "{{ services.openldap.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-
-networks:
-  external_services:
-    external: true

roles/docker/templates/compose-files/passit.yml.j2

@@ -1,38 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  db:
-    image: postgres:{{ services.passit.postgres_version }}
-    restart: always
-    volumes:
-      - "./data:/var/lib/postgresql/data"
-    environment:
-      POSTGRES_USER: passit
-      POSTGRES_PASSWORD: "{{ postgres_passwords.passit }}"
-
-  app:
-    image: passit/passit:{{ services.passit.version }}
-    command: bin/start.sh
-    restart: always
-    networks:
-      - default
-      - postfix
-      - external_services
-    environment:
-      DATABASE_URL: postgres://passit:{{ postgres_passwords.passit }}@db:5432/passit
-      SECRET_KEY: "{{ passit_secret_key }}"
-      IS_DEBUG: "False"
-      EMAIL_URL: smtp://noop@{{ smtp_host }}:{{ smtp_port }}
-      DEFAULT_FROM_EMAIL: noreply@{{ services.passit.domain }}
-      EMAIL_CONFIRMATION_HOST: https://{{ services.passit.domain }}
-      FIDO_SERVER_ID: "{{ services.passit.domain }}"
-      VIRTUAL_HOST: "{{ services.passit.domain }}"
-      LETSENCRYPT_HOST: "{{ services.passit.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-
-networks:
-  postfix:
-    external: true
-  external_services:
-    external: true

roles/docker/templates/compose-files/portainer.yml.j2

@@ -1,21 +0,0 @@
-# vim: ft=yaml.docker-compose
-version: "3.8"
-
-services:
-  app:
-    image: portainer/portainer-ee:{{ services.portainer.version }}
-    restart: always
-    networks:
-      - external_services
-    volumes:
-      - ".:/data"
-      - "/var/run/docker.sock:/var/run/docker.sock:rw"
-    environment:
-      VIRTUAL_HOST: "{{ services.portainer.domain }}"
-      VIRTUAL_PORT: "9000"
-      LETSENCRYPT_HOST: "{{ services.portainer.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
-
-networks:
-  external_services:
-    external: true