From ba28b1eb0cbafe886d3bc9d229fecfda5c7baed7 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Sat, 30 Mar 2019 09:35:04 +0100 Subject: [PATCH 01/53] Add SYNAPSE_CACHE_FACTOR env var --- roles/docker/tasks/services/matrix_riot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index a170d8e..513ed10 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -88,6 +88,7 @@ - "{{ matrix.volume_folder }}/data:/data" environment: SYNAPSE_CONFIG_PATH: "/data/homeserver.yaml" + SYNAPSE_CACHE_FACTOR: "2" SYNAPSE_LOG_LEVEL: "INFO" VIRTUAL_HOST: "{{ matrix.domain }}" VIRTUAL_PORT: "8008" From e42937736e31d609a66ec3934149ea8b3af4d486 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Wed, 10 Apr 2019 17:46:39 +0200 Subject: [PATCH 02/53] Enable group/community creation for all matrix users --- roles/docker/files/configs/matrix/homeserver.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/files/configs/matrix/homeserver.yaml b/roles/docker/files/configs/matrix/homeserver.yaml index dbb8b39..b9c2abf 100644 --- a/roles/docker/files/configs/matrix/homeserver.yaml +++ b/roles/docker/files/configs/matrix/homeserver.yaml @@ -881,7 +881,7 @@ password_config: # Whether to allow non server admins to create groups on this server # -enable_group_creation: false +enable_group_creation: true # If enabled, non server admins can only create groups with local parts # starting with this prefix From 999f266af55f58de64e28c47a1ac54c9ef813e43 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Wed, 10 Apr 2019 17:53:46 +0200 Subject: [PATCH 03/53] Update synapse to v0.99.3 --- roles/docker/tasks/services/matrix_riot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index 513ed10..325735b 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -77,7 +77,7 @@ matrix_app: container_name: matrix - image: matrixdotorg/synapse:v0.99.2 + image: matrixdotorg/synapse:v0.99.3 restart: unless-stopped networks: - matrix From fb67e038a8c54643e22283a9fe9d3fee4bb8e6d1 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Wed, 10 Apr 2019 18:01:58 +0200 Subject: [PATCH 04/53] Upgrade riot to 1.0.7 --- roles/docker/tasks/services/matrix_riot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index 325735b..95efe75 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -97,7 +97,7 @@ riot: container_name: riot_app - image: avhost/docker-matrix-riot:v1.0.3 + image: avhost/docker-matrix-riot:v1.0.7 restart: unless-stopped networks: - matrix From 70632c26c2a24f6699e9c3af069eeb357ff40f7e Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Thu, 25 Apr 2019 12:05:28 +0200 Subject: [PATCH 05/53] Add tt-rss service --- group_vars/all/secrets.yml | 110 +++++++++++++------------ playbook.yml | 1 + roles/docker/defaults/main.yml | 3 + roles/docker/tasks/services/tt-rss.yml | 53 ++++++++++++ 4 files changed, 114 insertions(+), 53 deletions(-) create mode 100644 roles/docker/tasks/services/tt-rss.yml diff --git a/group_vars/all/secrets.yml b/group_vars/all/secrets.yml index 38e524d..4f3e3fa 100644 --- a/group_vars/all/secrets.yml +++ b/group_vars/all/secrets.yml @@ -1,54 +1,58 @@ $ANSIBLE_VAULT;1.1;AES256 -62313439613039363637356330653731356138373839373435306535656137646266633764393537 -3737663637343865303232643632613934313137613536640a633634356338353764366365626266 -66323064346539663435646265346665616465353363623732303563303838356364643734393231 -3161633362383363390a376530393463643838303238386139313661366335386439373734333835 -63323034303732386430313265306465636630356330303431663761363461623530643933393831 -62666438316266396432353663633331343137643265333966636436373730343938623732653030 -62383536373139366239363535353463643961313839376436663830613738303262646639396131 -66656532616231636537623162373965356537336436613130366464393461343730646664356466 -38313439373332306265643039666532363863333364666233333861363832316637383432343464 -64366536613364363265333938643438313837643936323536636335613064623639393437303466 -31333539373130376230323964636335393166306662626131636462656632623635393036663437 -37333735616665383431623266393365613433323335313161316161373637616563626637333861 -37326532303638653139383639383166323361363334306361663261366661613038633464323337 -31393538653830333865373064383837626261663163623664653938303230616334363861346132 -63353036313164313265313134633861633937323335303830336232363939613635303764313063 -33666161356366636139633138653736333662303364333838663033633163613136616639376532 -31373131326264383666326566303930636166653463313630376235663638663937663765306439 -31663039323663633735326266393263633937373339383537623835306431333636316664303864 -63653564313339376135303237626366666164623738626439613562616338663539393635396437 -30333036353035613131613034666262346233336563343531633033343163326264326563643235 -62663538623532333432656435306462663362353630346133373262633630306262626362653733 -65363031346339393632396664363362346236373035376632663466343034376566666563353231 -36623538303262323265616237326630666662646634383962656533636165326665316366643231 -39303465313135616238653664366637356361393165356430636137366236643938316430613838 -65353331636564373136393930303537386335653766363632646433353962613033656434313063 -35653365366332316434373665316230646665613166656230313832356136346439326232343166 -38323934396561386138323739396166303132396234386435633965663139643234396434333163 -66346634393330306638383430616433333361623861623864356563366162313830393334616138 -32346633396662636633373637363262656165316434333139346530303562356236306637643365 -65613361373637383936633431396636356634656333343537353762383537353035616131633732 -38303736636136393039613537613831633139363338656239613261383637653332333737323034 -61303839636330396139346436336663643531613364383134613061646136646236636364636662 -33666564623731343264306638303333326463323363306439333762306434306235643530663931 -63623932373737373539393230326538643739653734306131366365303638313263316635633439 -34343231663761393266636537353330643361306139653734383466666662623931616665663239 -65633136636333316266616433396166326333303033646162656466363931313539343035623666 -63346162386533373334633261383237376330643738663761636166653033303933613630653835 -66313439663732356539363833616338356337666335316136623231383161656362653561653565 -33616437643533386263393733636666373237663132343432636664633535653535316134313266 -66363362383662313632633535613635656364323939313466303634646237653061353766373831 -62303366366564653231613863633564303637346262336535386366663034663832663762666132 -64333630666463653266333430386135386436643939393964303230366538336562333737616639 -65646566663363313430396132653832646263393739656564653138353637373362613261366230 -62616561303735316230626134353266613938326563326232623361656364623062326365343534 -62346433373965336430326632333634306463343934393830393165393933323439393534386665 -32373235353037626638343066386563663431356465353039353338643835653166333761386433 -64333338306661346436373238646134653233666565653834303935303235653661343366653563 -63356566633730303033376230356363326561663232386161333566616334623236663562613234 -63646561623565366332313837353461313566653531356662613663323065613035323731323832 -31386166623935373139356239353037633363313531396466363735613332653430396161303366 -37376238333831306231393433313734303839376132656532616461356662383430303532373937 -39303634303762373736626439323830353665343162363531376134616466303762633535343866 -3162 +32393230646466336565653530386632356235653437356237393163313033663066393963343031 +3339346530316430666632666230316165663564313464390a666539666265326235666266306231 +38383466343364646333343132333338306434613961663765353566353166626539306335653537 +3466326433316166370a376639363235326363323234313630336330613733616362653838396464 +36623733643261633730306537613132333432333239353638636363646464633665643832646238 +34663635343437643534633232346466373336316664343335313435366636303136303239643834 +63623436323831613862343938303137643735336637306433376237643032633738376563666265 +33383032643461653763653231333132633034383431303165646439393266616634386431313565 +38656530306538343239323864303538376165313330623231646265626261303235343130653665 +62363839346630343461323136363037666135373733303864623737313634316136336537323464 +37633539396462313462386364373733313566373332343834353164393161636161356537303237 +39646561376138613433633431626530346430356264653932636163393663356565393464393161 +37313661633466636437623233623937353234313962633131383365396631643631346261386439 +65393162633965353538626133636534336635623364353963626135333637343662353765633161 +34373337653730333032396663306663653830643761633730663432366433346631363463323464 +38356163363836636562376431373933623930643236636239663065306536396236633130306165 +62343730306465333361663530363462666439343438633965393965623239623836333335366438 +65336463333539303366376635303432643538666362643335393834336231646562366234623832 +33623632653932636662653933623362356431393739646166353136346235333231643530323738 +62643135386563353933616632363664363430393035343263393736393736623831666239363866 +63333163646631396266366164633562653633333536663763643364616666323262666633663265 +65386238366131343432646164383061373635346165303064626632303234663730356130636436 +63396237313338656533393062363133643631346563303139306230333137383734333764616165 +61303632393363396565383731353066633666353835313665303532656635356465343861613132 +38613530376165376666303536303263383039613533393731396663376431616561656564316336 +39613134666531303638323230316365333432376165303361303361383339363539353938633931 +61373765366133643263373233626436333735393130373461383333613363626135666663633637 +33633061316661313930333133343262666636343835633234383264613966656438646430316636 +34333866616634306239333238356261333336343930353361656263326135656163353937316434 +63623831333939653264326638366230333636663234303762393966386539653932346436303965 +35383137323661663862313764653064353030626662353365623663653565623866626266333335 +39633538303566333061383938383739396266396533666231316534323161666331333632663963 +38383332623561383164336633316534326635323435356135383736303536643133383631393339 +36353732393263626661346563356663356436363465393639613631366332353938663535356137 +32393138323662646166386139653833313536656434363461383565636232333630653462343934 +61363535363332353131393265353031643964303766363431343332666634353166303435303165 +34356363326539383139396536643338316631333630393839623339616263666661366462313236 +34303939623335353366613865363530333338643364633862336337373737653863643239386132 +38633065623365326136656538663839313563313435653733336633613737393739623334303938 +39623161353939663935373838316137633262373435353335323537363637623834363030343839 +64666565633534326662636530383733396531613939613431646136396366323764393363343231 +38393239663762623932626537613763353065643564303766663932346666393938616562376666 +38383939643632313931343063323838613461633161643434353532623433303434396262363764 +30303361303832363765316265346534313637663462303362633039363163356535356565343964 +66653639356661373231653630646338393835656435386566623263353363376365353565333961 +62646634323730633364366137326434663661383165373066303062396432373361346436316338 +38663264663235333938363538353736636161633639383937336365323732353161643365616264 +39643234643238646332613934343666323736666261366164383034303637623133303365313062 +38353832353366383637626532386339306438333035313563333464326539363661633564316534 +62613538356366343566303339383863343265633161396162353962356366333432623438343039 +63303662643339636366623630616339363363633434383731376334323736373265326138356161 +66336636613138666465623635343163386537376263353437333765323832333539386336326564 +37356331343139653339313337383461333834353166353838643666376439376237353032363164 +66613530633538666436366563343232326334613432363162383163383031343763653864646331 +36303463316637336132353832643761386332643130353839363833346532626162643661366464 +34336438306661343961663163386361316338303930343364656561326363623630303036616264 +3232 diff --git a/playbook.yml b/playbook.yml index 49b352f..a403041 100644 --- a/playbook.yml +++ b/playbook.yml @@ -26,6 +26,7 @@ - ouroboros - mailu - portainer + - tt-rss smtp_host: "postfix" smtp_port: "587" diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 566abab..c6aa718 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -69,3 +69,6 @@ portainer: domain: "portainer.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/portainer" +ttrss: + domain: rss.{{ base_domain }} + volume_folder: "{{ volume_root_folder }}/tt-rss" diff --git a/roles/docker/tasks/services/tt-rss.yml b/roles/docker/tasks/services/tt-rss.yml new file mode 100644 index 0000000..379e368 --- /dev/null +++ b/roles/docker/tasks/services/tt-rss.yml @@ -0,0 +1,53 @@ +--- +- name: create tt-rss folders + file: + name: "{{ ttrss.volume_folder }}/{{ volume }}" + state: directory + loop: + - "config" + - "db" + loop_control: + loop_var: volume + +- name: "set up tt-rss" + docker_service: + project_name: "tt-rss" + pull: yes + definition: + version: "3.6" + services: + ttrss_db: + container_name: "ttrss_db" + image: "postgres:11" + restart: "unless-stopped" + networks: + - "ttrss" + volumes: + - "{{ ttrss.volume_folder }}/db:/var/lib/postgresql/data" + environment: + POSTGRES_USER: "ttrss" + POSTGRES_PASSWORD: "{{ postgres_passwords.ttrss }}" + + ttrss_app: + container_name: ttrss_app + image: "linuxserver/tt-rss" + restart: unless-stopped + networks: + - ttrss + - external_services + volumes: + - "{{ ttrss.volume_folder }}/config:/config" + environment: + VIRTUAL_HOST: "{{ ttrss.domain }}" + LETSENCRYPT_HOST: "{{ ttrss.domain }}" + LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" + TZ: "Europe/Copenhagen" + labels: + com.ouroboros.enable: "true" + + networks: + external_services: + external: + name: external_services + ttrss: + name: "ttrss" From 5566be7da9b706df03384c85830b330fd505f265 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Thu, 30 May 2019 18:53:26 +0200 Subject: [PATCH 06/53] Make netdata update via ouroboros --- roles/docker/tasks/services/netdata.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/docker/tasks/services/netdata.yml b/roles/docker/tasks/services/netdata.yml index adfa1ab..80068eb 100644 --- a/roles/docker/tasks/services/netdata.yml +++ b/roles/docker/tasks/services/netdata.yml @@ -21,5 +21,7 @@ LETSENCRYPT_HOST: "{{ netdata.domain }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" PGID: "999" + labels: + com.ouroboros.enable: "true" From 57cf5103c554d124da550cfd74dc4399810de5f6 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Thu, 30 May 2019 19:59:37 +0200 Subject: [PATCH 07/53] Upgrade to Matrix 0.99.5 and Riot 1.2.0 --- roles/docker/tasks/services/matrix_riot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index 95efe75..c451d2c 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -77,7 +77,7 @@ matrix_app: container_name: matrix - image: matrixdotorg/synapse:v0.99.3 + image: matrixdotorg/synapse:v0.99.5 restart: unless-stopped networks: - matrix @@ -97,7 +97,7 @@ riot: container_name: riot_app - image: avhost/docker-matrix-riot:v1.0.7 + image: avhost/docker-matrix-riot:v1.2.0 restart: unless-stopped networks: - matrix From 71664653b070978fa0865a1fbcfd9468d8273a1f Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Wed, 12 Jun 2019 14:33:35 +0200 Subject: [PATCH 08/53] Upgrade to Synapse 1.0.0 and Riot-Web 1.2.1 --- roles/docker/tasks/services/matrix_riot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index c451d2c..f32f627 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -77,7 +77,7 @@ matrix_app: container_name: matrix - image: matrixdotorg/synapse:v0.99.5 + image: matrixdotorg/synapse:v1.0.0 restart: unless-stopped networks: - matrix @@ -97,7 +97,7 @@ riot: container_name: riot_app - image: avhost/docker-matrix-riot:v1.2.0 + image: avhost/docker-matrix-riot:v1.2.1 restart: unless-stopped networks: - matrix From 3f2c7b15475d7b07f63cf397e6a3d265bdcd9086 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Mon, 11 Nov 2019 09:56:02 +0100 Subject: [PATCH 09/53] Upgrade Synapse to v1.5.1 and Riot to v1.5.3 --- roles/docker/tasks/services/matrix_riot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index f32f627..c164346 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -77,7 +77,7 @@ matrix_app: container_name: matrix - image: matrixdotorg/synapse:v1.0.0 + image: matrixdotorg/synapse:v1.5.1 restart: unless-stopped networks: - matrix @@ -97,7 +97,7 @@ riot: container_name: riot_app - image: avhost/docker-matrix-riot:v1.2.1 + image: avhost/docker-matrix-riot:v1.5.3 restart: unless-stopped networks: - matrix From 6331805793b69b2ff8729d580b2c643e5e2cd901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Tue, 19 Nov 2019 11:10:05 +0100 Subject: [PATCH 10/53] Add smtps port --- roles/docker/tasks/services/mailu.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/docker/tasks/services/mailu.yml b/roles/docker/tasks/services/mailu.yml index 0e2b4ab..a92b517 100644 --- a/roles/docker/tasks/services/mailu.yml +++ b/roles/docker/tasks/services/mailu.yml @@ -78,6 +78,7 @@ - "993:993" - "25:25" - "587:587" + - "465:465" networks: - default - external_services From 9195016a40cb444564869fbd6ee9bd223c1e5284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Smajlovi=C4=87?= Date: Sun, 24 Nov 2019 17:49:06 +0000 Subject: [PATCH 11/53] Add user deni --- group_vars/all/vars.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index 08c5346..7b584f5 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -21,4 +21,11 @@ users: groups: - sudo + deni: + comment: Denis Smajlović + key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC0pB42dtqruXr2Ha8Rdp3QoSrMOLU5cbLMfuNTNmgwPZmprhGGRTAsz8E0aG+5HCFBmW6JxiTGyHGdIZrhYWpKYshxxn4zODfitP7IzDgvg9Pz0Ugw/c5i5eKjkVfw9xLZKjO/H3Ql8R+wFMawpdw7j+Q9G+J3eIidEI6TmSvJVWijBxpLI4qrLceL084qg93XpJENYBOcvx9fYQQ+Es0jo4hmPuHWq5VIkIoIfvVvdhwjlaBsqv2je5BNx8uTMVIyV34ZHpJc95wJ6MOcqpQunW2bR4mGc9FLh67eP2ba9nDoQ0pnnlWGqAIKx5P1ELIg7RM3HhuwfRVh4DxCfjXpMz3l1gr1dA1wVD9bOtzbPWLjo7LNkRcT/loba/jpznTNIEv+kawmm/H0aTZZdlofkGHuX0iOpLV1c1tCDMH1s/MCqwosSRihrXhSOozsABvaaZpJiHcpE4DcNr+xJhe1XrHMqR30KU0r7ulIP8JdhzMNEsq3HxZQh9s8XLIUukrpcpOgJYyGuQK3kG6li5kYbmVqjLDQ1xHi/4r/4TXjJYpsFCZ71SURLzxoF1nauHpBLKcHI3MPFvqr27SQcM92fO14wKDAmAtHINwzMQjlda6B0jFNC+2xUfHrH7yIhwSktytq5qbhiFKK71DSLiMKFvOqoTVWRckO2+Zw1HZB+Q== deni@deni.dk + password: $6$ooKtdqASOxYJN2CJ$ziMrGG/qIOeyiTGjx.hPYjVBlHpzM9YY6qCJB9/L8aR33feUvXxZNBCgME93ZhbwDBjblS/tP796LsCF4i17D. + groups: + - sudo + volume_root_folder: "/docker-volumes" From edfd530afe1e7dce18097add5b361d87e77d5d9e Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Thu, 19 Dec 2019 11:18:41 +0100 Subject: [PATCH 12/53] Upgrade Synapse to v1.7.1 and Riot v1.5.6 --- roles/docker/tasks/services/matrix_riot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index c164346..65b3cec 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -77,7 +77,7 @@ matrix_app: container_name: matrix - image: matrixdotorg/synapse:v1.5.1 + image: matrixdotorg/synapse:v1.7.1 restart: unless-stopped networks: - matrix @@ -97,7 +97,7 @@ riot: container_name: riot_app - image: avhost/docker-matrix-riot:v1.5.3 + image: avhost/docker-matrix-riot:v1.5.6 restart: unless-stopped networks: - matrix From 447b82326cf2372262b2f4321078b20064f83e27 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Mon, 13 Jan 2020 17:29:09 +0100 Subject: [PATCH 13/53] Add ulovliglogning.dk website to the stack --- playbook.yml | 1 + roles/docker/defaults/main.yml | 4 ++++ roles/docker/tasks/services/ulovliglogning-dk.yml | 13 +++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 roles/docker/tasks/services/ulovliglogning-dk.yml diff --git a/playbook.yml b/playbook.yml index a403041..582056a 100644 --- a/playbook.yml +++ b/playbook.yml @@ -23,6 +23,7 @@ - docker_registry - drone - websites + - ulovliglogning-dk - ouroboros - mailu - portainer diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index c6aa718..25fb3d7 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -54,6 +54,9 @@ data_coop_website: cryptohagen_website: domain: "cryptohagen.dk" +ulovliglogning_website: + domain: "ulovliglogning.dk" + drone: domain: "drone.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/drone" @@ -72,3 +75,4 @@ portainer: ttrss: domain: rss.{{ base_domain }} volume_folder: "{{ volume_root_folder }}/tt-rss" + diff --git a/roles/docker/tasks/services/ulovliglogning-dk.yml b/roles/docker/tasks/services/ulovliglogning-dk.yml new file mode 100644 index 0000000..9a6eaff --- /dev/null +++ b/roles/docker/tasks/services/ulovliglogning-dk.yml @@ -0,0 +1,13 @@ +- 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 : "{{ ulovliglogning_website.domain }}" + LETSENCRYPT_HOST: "{{ ulovliglogning_website.domain }}" + LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" + labels: + com.ouroboros.enable: "true" \ No newline at end of file From 1adc11e9c498bbc232b8a2f82099855ae67d710b Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Mon, 13 Jan 2020 17:29:09 +0100 Subject: [PATCH 14/53] Add ulovliglogning.dk website to the stack --- playbook.yml | 1 + roles/docker/defaults/main.yml | 4 ++++ roles/docker/tasks/services/ulovliglogning-dk.yml | 13 +++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 roles/docker/tasks/services/ulovliglogning-dk.yml diff --git a/playbook.yml b/playbook.yml index a403041..582056a 100644 --- a/playbook.yml +++ b/playbook.yml @@ -23,6 +23,7 @@ - docker_registry - drone - websites + - ulovliglogning-dk - ouroboros - mailu - portainer diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index c6aa718..25fb3d7 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -54,6 +54,9 @@ data_coop_website: cryptohagen_website: domain: "cryptohagen.dk" +ulovliglogning_website: + domain: "ulovliglogning.dk" + drone: domain: "drone.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/drone" @@ -72,3 +75,4 @@ portainer: ttrss: domain: rss.{{ base_domain }} volume_folder: "{{ volume_root_folder }}/tt-rss" + diff --git a/roles/docker/tasks/services/ulovliglogning-dk.yml b/roles/docker/tasks/services/ulovliglogning-dk.yml new file mode 100644 index 0000000..19ba9db --- /dev/null +++ b/roles/docker/tasks/services/ulovliglogning-dk.yml @@ -0,0 +1,13 @@ +- 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: "{{ ulovliglogning_website.domain }}" + LETSENCRYPT_HOST: "{{ ulovliglogning_website.domain }}" + LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" + labels: + com.ouroboros.enable: "true" From ef3e0993dad8639b0edbba38df3a808c66ac66d5 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Tue, 14 Jan 2020 07:58:32 +0100 Subject: [PATCH 15/53] Add www.[domain] to hosted websites --- roles/docker/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 25fb3d7..eec0cbc 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -49,13 +49,13 @@ docker_registry: password: "{{ docker_password }}" data_coop_website: - domain: "{{ base_domain }}" + domain: "{{ base_domain }},www.{{ base_domain }}" cryptohagen_website: - domain: "cryptohagen.dk" + domain: "cryptohagen.dk,www.cryptohagen.dk" ulovliglogning_website: - domain: "ulovliglogning.dk" + domain: "ulovliglogning.dk,www.ulovliglogning.dk" drone: domain: "drone.{{ base_domain }}" From cd2424999f6c38e403e0ba0f4b580c822c19745d Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Tue, 14 Jan 2020 08:11:19 +0100 Subject: [PATCH 16/53] Add www.[domain] to hosted websites --- roles/docker/defaults/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index f289ca0..eec0cbc 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -57,9 +57,6 @@ cryptohagen_website: ulovliglogning_website: domain: "ulovliglogning.dk,www.ulovliglogning.dk" -ulovliglogning_website: - domain: "ulovliglogning.dk" - drone: domain: "drone.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/drone" From 5f1bbae3de83d005f029ad6f9163ccbfd13f4eb0 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Thu, 6 Feb 2020 21:47:43 +0100 Subject: [PATCH 17/53] Increase rate limiting for outgoing mails to support the needs of ulovliglogning --- roles/docker/templates/mailu.env.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/templates/mailu.env.j2 b/roles/docker/templates/mailu.env.j2 index 168fc93..c04392c 100644 --- a/roles/docker/templates/mailu.env.j2 +++ b/roles/docker/templates/mailu.env.j2 @@ -41,7 +41,7 @@ POSTMASTER=admin TLS_FLAVOR=mail # Authentication rate limit (per source IP address) -AUTH_RATELIMIT=10/minute;1000/hour +AUTH_RATELIMIT=120/minute;1200/hour # Opt-out of statistics, replace with "True" to opt out DISABLE_STATISTICS=False From 6e94ac766be80100d949c1bb8633bcf4b52ea8f6 Mon Sep 17 00:00:00 2001 From: Vidir Valberg Gudmundsson Date: Wed, 26 Feb 2020 20:27:05 +0100 Subject: [PATCH 18/53] Upgrade portainer. --- roles/docker/tasks/services/portainer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/tasks/services/portainer.yml b/roles/docker/tasks/services/portainer.yml index b13dcff..e22fed6 100644 --- a/roles/docker/tasks/services/portainer.yml +++ b/roles/docker/tasks/services/portainer.yml @@ -8,7 +8,7 @@ - name: run portainer docker_container: name: portainer - image: portainer/portainer + image: portainer/portainer:1.23.1 restart_policy: always networks: - name: external_services From 47d7abe631b126c9bdaec76f1fa4b307ec0a90b0 Mon Sep 17 00:00:00 2001 From: Vidir Valberg Gudmundsson Date: Wed, 26 Feb 2020 20:55:21 +0100 Subject: [PATCH 19/53] Upgrade synapse and riot. --- roles/docker/tasks/services/matrix_riot.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index 65b3cec..ade9a97 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -77,14 +77,14 @@ matrix_app: container_name: matrix - image: matrixdotorg/synapse:v1.7.1 + image: matrixdotorg/synapse:v1.11.0 restart: unless-stopped networks: - matrix - - external_services + - external_services ports: - 8008 - volumes: + volumes: - "{{ matrix.volume_folder }}/data:/data" environment: SYNAPSE_CONFIG_PATH: "/data/homeserver.yaml" @@ -97,7 +97,7 @@ riot: container_name: riot_app - image: avhost/docker-matrix-riot:v1.5.6 + image: avhost/docker-matrix-riot:v1.5.10 restart: unless-stopped networks: - matrix @@ -105,14 +105,14 @@ ports: - 8080 volumes: - - "{{ riot.volume_folder }}/data:/data" + - "{{ riot.volume_folder }}/data:/data" environment: VIRTUAL_HOST: "{{ riot.domain }}" VIRTUAL_PORT: "8080" LETSENCRYPT_HOST: "{{ riot.domain }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" - networks: + networks: external_services: external: name: external_services From d51edc2922a97e1addec3f58309993dee6e9352a Mon Sep 17 00:00:00 2001 From: Vidir Valberg Gudmundsson Date: Thu, 27 Feb 2020 09:44:33 +0100 Subject: [PATCH 20/53] Upgrade gitea. --- roles/docker/tasks/services/gitea.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/tasks/services/gitea.yml b/roles/docker/tasks/services/gitea.yml index 1e38263..90fd764 100644 --- a/roles/docker/tasks/services/gitea.yml +++ b/roles/docker/tasks/services/gitea.yml @@ -3,7 +3,7 @@ - name: gitea container docker_container: name: gitea - image: gitea/gitea:latest + image: gitea/gitea:1.11.1 restart_policy: unless-stopped networks: - name: gitea From e0f01bb78e85791498508858c50670b6110021a9 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Sun, 1 Mar 2020 08:03:05 +0100 Subject: [PATCH 21/53] Upgrade Drone initial steps --- group_vars/all/secrets.yml | 123 ++++++++++++++------------ roles/docker/tasks/services/drone.yml | 8 +- 2 files changed, 71 insertions(+), 60 deletions(-) diff --git a/group_vars/all/secrets.yml b/group_vars/all/secrets.yml index 4f3e3fa..03472e2 100644 --- a/group_vars/all/secrets.yml +++ b/group_vars/all/secrets.yml @@ -1,58 +1,67 @@ $ANSIBLE_VAULT;1.1;AES256 -32393230646466336565653530386632356235653437356237393163313033663066393963343031 -3339346530316430666632666230316165663564313464390a666539666265326235666266306231 -38383466343364646333343132333338306434613961663765353566353166626539306335653537 -3466326433316166370a376639363235326363323234313630336330613733616362653838396464 -36623733643261633730306537613132333432333239353638636363646464633665643832646238 -34663635343437643534633232346466373336316664343335313435366636303136303239643834 -63623436323831613862343938303137643735336637306433376237643032633738376563666265 -33383032643461653763653231333132633034383431303165646439393266616634386431313565 -38656530306538343239323864303538376165313330623231646265626261303235343130653665 -62363839346630343461323136363037666135373733303864623737313634316136336537323464 -37633539396462313462386364373733313566373332343834353164393161636161356537303237 -39646561376138613433633431626530346430356264653932636163393663356565393464393161 -37313661633466636437623233623937353234313962633131383365396631643631346261386439 -65393162633965353538626133636534336635623364353963626135333637343662353765633161 -34373337653730333032396663306663653830643761633730663432366433346631363463323464 -38356163363836636562376431373933623930643236636239663065306536396236633130306165 -62343730306465333361663530363462666439343438633965393965623239623836333335366438 -65336463333539303366376635303432643538666362643335393834336231646562366234623832 -33623632653932636662653933623362356431393739646166353136346235333231643530323738 -62643135386563353933616632363664363430393035343263393736393736623831666239363866 -63333163646631396266366164633562653633333536663763643364616666323262666633663265 -65386238366131343432646164383061373635346165303064626632303234663730356130636436 -63396237313338656533393062363133643631346563303139306230333137383734333764616165 -61303632393363396565383731353066633666353835313665303532656635356465343861613132 -38613530376165376666303536303263383039613533393731396663376431616561656564316336 -39613134666531303638323230316365333432376165303361303361383339363539353938633931 -61373765366133643263373233626436333735393130373461383333613363626135666663633637 -33633061316661313930333133343262666636343835633234383264613966656438646430316636 -34333866616634306239333238356261333336343930353361656263326135656163353937316434 -63623831333939653264326638366230333636663234303762393966386539653932346436303965 -35383137323661663862313764653064353030626662353365623663653565623866626266333335 -39633538303566333061383938383739396266396533666231316534323161666331333632663963 -38383332623561383164336633316534326635323435356135383736303536643133383631393339 -36353732393263626661346563356663356436363465393639613631366332353938663535356137 -32393138323662646166386139653833313536656434363461383565636232333630653462343934 -61363535363332353131393265353031643964303766363431343332666634353166303435303165 -34356363326539383139396536643338316631333630393839623339616263666661366462313236 -34303939623335353366613865363530333338643364633862336337373737653863643239386132 -38633065623365326136656538663839313563313435653733336633613737393739623334303938 -39623161353939663935373838316137633262373435353335323537363637623834363030343839 -64666565633534326662636530383733396531613939613431646136396366323764393363343231 -38393239663762623932626537613763353065643564303766663932346666393938616562376666 -38383939643632313931343063323838613461633161643434353532623433303434396262363764 -30303361303832363765316265346534313637663462303362633039363163356535356565343964 -66653639356661373231653630646338393835656435386566623263353363376365353565333961 -62646634323730633364366137326434663661383165373066303062396432373361346436316338 -38663264663235333938363538353736636161633639383937336365323732353161643365616264 -39643234643238646332613934343666323736666261366164383034303637623133303365313062 -38353832353366383637626532386339306438333035313563333464326539363661633564316534 -62613538356366343566303339383863343265633161396162353962356366333432623438343039 -63303662643339636366623630616339363363633434383731376334323736373265326138356161 -66336636613138666465623635343163386537376263353437333765323832333539386336326564 -37356331343139653339313337383461333834353166353838643666376439376237353032363164 -66613530633538666436366563343232326334613432363162383163383031343763653864646331 -36303463316637336132353832643761386332643130353839363833346532626162643661366464 -34336438306661343961663163386361316338303930343364656561326363623630303036616264 -3232 +35323262323136393639313033353339663666363339646266363230356363626534306238626534 +3830346132643438316239356533323362656466303731370a303037643038363336326231643938 +39393735313233333934373861636333653734646239333638343532316566326333353732636632 +3234313065653965360a623332386235383264376434613465333037633435373539353937396465 +66333435646531373965623030383534616466616634663736613136643332353231646564623461 +61383461333833326264643430396435343531623363356132353461663036303535643634613937 +30633838303562306635353136346337366539626330623135623661613163363031346565376534 +31643735656331626531326636393239373231333936616565383364393938346535633662666135 +33393634616434393433363836336466306262323566373866346432323333633663366132613134 +62613362313563663937633330323434306634333533333162663332363163636465663435613966 +39353062373036663036386336663933616564643736653962356465646636643237626234326364 +62323136363363643238356461396162396234616638343535333238313537316634383333323663 +38386466636636386664343930376336396437306231313065326662613834616234646636656234 +61326132326561386434636166373231323535333033366137653136613239386165366432653765 +32346563663333616166626561643833663665336235633365353732363762396236393137313831 +30383032656531653231333432363634366430616539373930663536396536366435636262313163 +34653137343061636538313032633162393964303064303236373531653438326230386631393139 +31343462666365386366653061313536656430346431656532343765663065396363663862383837 +66303036393835393539626430316266663539353361353033343838346639643731366461313261 +37313862383361613839616231633031376331386266363835363064663234373932383565643361 +64323837656131326131346334616135383364303038383237636363333532386131373161396261 +64363638616565633161396330663363356332333863663337366131303338333765393132326639 +36363964376363333737336236316263666662353866666333356630343331323530343638666638 +35376363383336643661376139663963303961626139366565393339663239313264393865343232 +31363532323130346339303561326537653866623561643433633039386564343439353035646330 +61633038336166316631366534366636353061313537356563623766323964323835396532653431 +33333235346364303165393339326464623638316330336331326261343839656265383664346662 +62376162343037306335663064356439363434326233626238366137366530386165383539366265 +35303336343862343063653362396162643930356163313736303661616430633761343366396561 +64323261356434303432633639636335626334356132376531313138333134396139336137313233 +33336431313563363931383535636637653736633139393338653561313130643735303863623836 +62336335626437356639373965653365613365623531383939303734313664376231386266633166 +38333336336162656137373062316432663366386263396635346365313161303332393662326337 +31613031353862306133306338656531653335316262373032666437643832306236386362633264 +38366532353165363430646236626434633765376634383334666465336133663137656536373136 +37336532356435636231363665373734653866326434326634666464653934633839323535383562 +35663032616332336332663039323461393336376433633330623631393436373463303138633832 +32313966623632386339396265633366346666333837663938346139616634376630386438663938 +33343736623966353737623730393066393561336532616365333231663762646364366539643836 +37353430313134343131363533616362373332653462343032663735343130653864313163343337 +39303162316661623334623337376231326530656237616664346334616130346461323766306132 +63313465626361656431623537336134303161393861633565646533663235326232656461656236 +35306138383836356538393365306230383035643938663065316233353933643736633765313766 +36636265313564396336316564343964303630336439366233613638653732326562323961393366 +30653433633033616338303661626266343062353530653765613435623061343731623032616237 +65326639383563643632653164633462626661626662353239303534643234343733343535626436 +65643561363239643665653063393961626633333634363836656531663238373335386661346263 +31393462346537316230643533653336393831666235653633353264336564653364646432373634 +37626239653038353738623765623262663137303564356132313832346636306538313237323066 +64396438386333613533303533353937323039376465383032353864653061316531373833613230 +33336664303765666132646463626164343066663165353466306436393733303232646536323938 +63656234613332393732333730653233316164366564643762653939616238633239393836663038 +38363536333138636133613638306230626662393162383465313264346238636632343134626433 +61333364643331353730343938323863656232313038333937653364643331393534376235306332 +30316131313234383561383364663139353936316666336538303636313436633934373036336466 +61333438636336396536636362386562363631663165633733343731363533636464623737366661 +30303963343138363366633337373861623931356561323336636632336138383232363663346231 +35663565656365343861303066336564316563333263663136373761653033623232326163653131 +62616135383136386334636537623832656166356236316632386530666332656136393565383634 +63373938653931343161356366313939636662393339383831333435633735323138383566656466 +35663037343366363930353661636536653766343636663766626166376539633338363162353061 +64316335363832396666626431383264626136346431613237313832343766656162333436613037 +61386562383334343264633736306637353861333761353933386138623238646265663439336434 +63663162613538346166653564396539613664353334323963363866356338383564643966613930 +32313736373663623237653766643433373132613835373033313239626563373735313535653136 +6466346461636636653961666534366234633761386530633161 diff --git a/roles/docker/tasks/services/drone.yml b/roles/docker/tasks/services/drone.yml index ad05c46..7c0fdcd 100644 --- a/roles/docker/tasks/services/drone.yml +++ b/roles/docker/tasks/services/drone.yml @@ -2,7 +2,7 @@ - name: Drone container docker_container: name: drone - image: drone/drone:latest + image: drone/drone:1.6.5 restart_policy: unless-stopped networks: - name: external_services @@ -11,10 +11,12 @@ - "/var/run/docker.sock:/var/run/docker.sock" env: DRONE_GITEA_SERVER: "https://{{ gitea.domain }}" - DRONE_GITEA_ALWAYS_AUTH: "False" - DRONE_RUNNER_CAPACITY: "2" + DRONE_GITEA_CLIENT_ID: "{{ drone_secrets.oauth_client_id }}" + DRONE_GITEA_CLIENT_SECRET: "{{ drone_secrets.oauth_client_secret }}" + DRONE_GIT_ALWAYS_AUTH: "true" DRONE_SERVER_HOST: "{{ drone.domain }}" DRONE_SERVER_PROTO: "https" + DRONE_RPC_SECRET: "{{ drone_secrets.rpc_shared_secret }}" PLUGIN_CUSTOM_DNS: "91.239.100.100" VIRTUAL_HOST: "{{ drone.domain }}" LETSENCRYPT_HOST: "{{ drone.domain }}" From f2a6aab2fe9574e3f1bec07fba88a296867ef9bb Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Sun, 1 Mar 2020 13:47:09 +0100 Subject: [PATCH 22/53] Drone is working now --- group_vars/all/secrets.yml | 132 +++++++++++++------------- roles/docker/tasks/services/drone.yml | 72 +++++++++----- 2 files changed, 116 insertions(+), 88 deletions(-) diff --git a/group_vars/all/secrets.yml b/group_vars/all/secrets.yml index 03472e2..c040982 100644 --- a/group_vars/all/secrets.yml +++ b/group_vars/all/secrets.yml @@ -1,67 +1,67 @@ $ANSIBLE_VAULT;1.1;AES256 -35323262323136393639313033353339663666363339646266363230356363626534306238626534 -3830346132643438316239356533323362656466303731370a303037643038363336326231643938 -39393735313233333934373861636333653734646239333638343532316566326333353732636632 -3234313065653965360a623332386235383264376434613465333037633435373539353937396465 -66333435646531373965623030383534616466616634663736613136643332353231646564623461 -61383461333833326264643430396435343531623363356132353461663036303535643634613937 -30633838303562306635353136346337366539626330623135623661613163363031346565376534 -31643735656331626531326636393239373231333936616565383364393938346535633662666135 -33393634616434393433363836336466306262323566373866346432323333633663366132613134 -62613362313563663937633330323434306634333533333162663332363163636465663435613966 -39353062373036663036386336663933616564643736653962356465646636643237626234326364 -62323136363363643238356461396162396234616638343535333238313537316634383333323663 -38386466636636386664343930376336396437306231313065326662613834616234646636656234 -61326132326561386434636166373231323535333033366137653136613239386165366432653765 -32346563663333616166626561643833663665336235633365353732363762396236393137313831 -30383032656531653231333432363634366430616539373930663536396536366435636262313163 -34653137343061636538313032633162393964303064303236373531653438326230386631393139 -31343462666365386366653061313536656430346431656532343765663065396363663862383837 -66303036393835393539626430316266663539353361353033343838346639643731366461313261 -37313862383361613839616231633031376331386266363835363064663234373932383565643361 -64323837656131326131346334616135383364303038383237636363333532386131373161396261 -64363638616565633161396330663363356332333863663337366131303338333765393132326639 -36363964376363333737336236316263666662353866666333356630343331323530343638666638 -35376363383336643661376139663963303961626139366565393339663239313264393865343232 -31363532323130346339303561326537653866623561643433633039386564343439353035646330 -61633038336166316631366534366636353061313537356563623766323964323835396532653431 -33333235346364303165393339326464623638316330336331326261343839656265383664346662 -62376162343037306335663064356439363434326233626238366137366530386165383539366265 -35303336343862343063653362396162643930356163313736303661616430633761343366396561 -64323261356434303432633639636335626334356132376531313138333134396139336137313233 -33336431313563363931383535636637653736633139393338653561313130643735303863623836 -62336335626437356639373965653365613365623531383939303734313664376231386266633166 -38333336336162656137373062316432663366386263396635346365313161303332393662326337 -31613031353862306133306338656531653335316262373032666437643832306236386362633264 -38366532353165363430646236626434633765376634383334666465336133663137656536373136 -37336532356435636231363665373734653866326434326634666464653934633839323535383562 -35663032616332336332663039323461393336376433633330623631393436373463303138633832 -32313966623632386339396265633366346666333837663938346139616634376630386438663938 -33343736623966353737623730393066393561336532616365333231663762646364366539643836 -37353430313134343131363533616362373332653462343032663735343130653864313163343337 -39303162316661623334623337376231326530656237616664346334616130346461323766306132 -63313465626361656431623537336134303161393861633565646533663235326232656461656236 -35306138383836356538393365306230383035643938663065316233353933643736633765313766 -36636265313564396336316564343964303630336439366233613638653732326562323961393366 -30653433633033616338303661626266343062353530653765613435623061343731623032616237 -65326639383563643632653164633462626661626662353239303534643234343733343535626436 -65643561363239643665653063393961626633333634363836656531663238373335386661346263 -31393462346537316230643533653336393831666235653633353264336564653364646432373634 -37626239653038353738623765623262663137303564356132313832346636306538313237323066 -64396438386333613533303533353937323039376465383032353864653061316531373833613230 -33336664303765666132646463626164343066663165353466306436393733303232646536323938 -63656234613332393732333730653233316164366564643762653939616238633239393836663038 -38363536333138636133613638306230626662393162383465313264346238636632343134626433 -61333364643331353730343938323863656232313038333937653364643331393534376235306332 -30316131313234383561383364663139353936316666336538303636313436633934373036336466 -61333438636336396536636362386562363631663165633733343731363533636464623737366661 -30303963343138363366633337373861623931356561323336636632336138383232363663346231 -35663565656365343861303066336564316563333263663136373761653033623232326163653131 -62616135383136386334636537623832656166356236316632386530666332656136393565383634 -63373938653931343161356366313939636662393339383831333435633735323138383566656466 -35663037343366363930353661636536653766343636663766626166376539633338363162353061 -64316335363832396666626431383264626136346431613237313832343766656162333436613037 -61386562383334343264633736306637353861333761353933386138623238646265663439336434 -63663162613538346166653564396539613664353334323963363866356338383564643966613930 -32313736373663623237653766643433373132613835373033313239626563373735313535653136 -6466346461636636653961666534366234633761386530633161 +36303830393964636165353932336334643761653732643036303563313439623836626231313739 +6239326131333263383438613161353435393036663162310a646237306461633337383838306139 +37303434653266303866643162306433636532333131366132366431303766306232653837653463 +6139336230306131660a636165373732313930396632336532366239303766393937386135306235 +62633837363138323365646235333137646363626430633339376636333838663738316535396161 +66653931666565353337623336636338383035333133643639323739393565396434373734323235 +34306132666430376537643431343362383734343861633332373838383837316266336131353231 +31356665313333343139303337633530643534376338343631396431663937616535306136343266 +36323761653933386231386339666333306331326161306536616238623836306335373930386539 +32326331366435386132393731633664333862656130636632656335353939656638613863633637 +64366662623531333933613566356632383061656165323839623732306331653133393463373465 +61363036613234353962353135366361363537313138626337376138383335633865663237303464 +37373032353066323532313364333863663739613631633230323339346634663733326430343263 +64636331616434343331333065633936313265393739353937396165363337366263393131316661 +34643263343263306235326562663065343438363338326138653066326432646531643764396161 +34343834643134363662373934346463383263636436346433303231656535626664626530326131 +39303231646537316136653932306135303931333762343434623636623436383561353131303163 +63373833656430336365316433663538643634303962623538663362383536613136366230396533 +37363963613532666434653863623030653434303463616638653135666433613030656335396238 +37356632376366383463343736303265326436383435363335333838313264333134653932616465 +31363832656563383035306537376532343934373933306232333631363132616665663433666133 +36643131386134303362373264356437333236663232373035363765303936313162353930353033 +38303864643237323437653463313238613036386461303066353465336230303632613432353661 +36313761303234303363346432666638323865663764623862623165633234363437653964343830 +62656365363538303035326239663264646163366332306332383262356130356436366661383234 +66643832656661623132303562333432656365323836363133373932333732323133383832623939 +37333632623933656336316161376565653363633330646239666266313336306563366462376531 +34623636646439366438316530386334313233613963643634366135373661373138316466313739 +64623835613166616165383463323137303431303035363733366563623934366439323666653633 +65663532343939343334616662366633353231636135346564643034666331616666316561386664 +30636535633432336438663462356232383737393031383431666664303563623932666630653233 +65323932303638653562663734386637323964333331356262346463333065633565386363393064 +37646563366437646330353765623236306561646433636534666438323036373132363036626438 +61393866626236316238326236656164643864343734353438313466633136343931376634366261 +64353631363665366237356566323532306563333937343665393166336535383636303930346362 +38333733306430636436623661653066313936626362373464396138343439376430626162316466 +66623837353763333864663562653166316665363537636537626234666230636665396438313832 +61613330396134666437306162386335613466383231633034393639366533363137613964383135 +35356136393962353262313635343031323638326163336433303066393939646536653033343530 +38303935663038303639616661346664666435393266653663373435363433386461633133343964 +65633532656566613638333266393131653863336563386262643630633164346139383436326463 +62316131363335376336366332323564383036333139386462353933316461346363626465396631 +39616164316463323162616235653365363737373736646331303436303037333536633466303533 +32663335386332663334653734303136333066636234643537393931626333303735386238373763 +33323333646531633964613633356539636538306163303938373638623230396661663538653463 +35396434303634316631376138336530393134353235383637326466306363313462323330623535 +33353335306364323335316336643233386561306134636461336537353838373830373031616636 +62333335616639353436303336653965303132316439316362303931373465376264396139346631 +61393064326433366337613266306263336163393731633165303536636132636638656339373634 +32313637666334313935613564316331396437343335313336666137366133376666306138383163 +62383131616339393534613231616134383562346163343430323261336531306332363736396663 +39643134633838393566643237656663313161326631316437663463653566343238343736656566 +35663231623533323261326162356137646436643766646439663538306661643861356565666434 +38353131363863666439316666353965663531323662376235636533363262353131323166326335 +61656432666130313762376334656434333532636165313834333634646465346234653662393735 +35643138623832646633666366616436323730383066323637316635336134356461353666636164 +30633833313863656237653762373965376638393232376532666361396363303030383138616631 +32633739626565383161343065646232636464373538626330636466316337663739376638386337 +32383763313064666464623137373036336562633734313663313463386430313838636165313962 +31383466363466396337333837626462303434353739343338313137633736313664346239666237 +62313462366136313037646264663533323738656138353235646136383334613035383236383865 +38666432313761653234636363396361643139353730323237616663323433363463373666613765 +31656430326138373434356130626465643733313065366562313566326633653832316265636538 +35396164313932356432306639653461343063643666656265333033643863303637313031653134 +39636436636333343030333762376463303538626665343434633236353236373765643231383933 +3130336364366434306366623062613130616230366633333536 diff --git a/roles/docker/tasks/services/drone.yml b/roles/docker/tasks/services/drone.yml index 7c0fdcd..62bdbaa 100644 --- a/roles/docker/tasks/services/drone.yml +++ b/roles/docker/tasks/services/drone.yml @@ -1,23 +1,51 @@ --- -- name: Drone container - docker_container: - name: drone - image: drone/drone:1.6.5 - restart_policy: unless-stopped - networks: - - name: external_services - volumes: - - "{{ drone.volume_folder }}:/data" - - "/var/run/docker.sock:/var/run/docker.sock" - env: - DRONE_GITEA_SERVER: "https://{{ 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: "{{ drone.domain }}" - DRONE_SERVER_PROTO: "https" - DRONE_RPC_SECRET: "{{ drone_secrets.rpc_shared_secret }}" - PLUGIN_CUSTOM_DNS: "91.239.100.100" - VIRTUAL_HOST: "{{ drone.domain }}" - LETSENCRYPT_HOST: "{{ drone.domain }}" - LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" +- 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:1 + restart: unless-stopped + networks: + - external_services + - drone + volumes: + - "{{ drone.volume_folder }}:/data" + - "/var/run/docker.sock:/var/run/docker.sock" + environment: + DRONE_GITEA_SERVER: "https://{{ 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: "{{ drone.domain }}" + DRONE_SERVER_PROTO: "https" + DRONE_RPC_SECRET: "{{ drone_secrets.rpc_shared_secret }}" + PLUGIN_CUSTOM_DNS: "91.239.100.100" + VIRTUAL_HOST: "{{ drone.domain }}" + LETSENCRYPT_HOST: "{{ drone.domain }}" + LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" + + drone-runner-docker: + container_name: "drone-runner-docker" + image: "drone/drone-runner-docker:1" + restart: unless-stopped + networks: + - drone + volumes: + - "/var/run/docker.sock:/var/run/docker.sock" + environment: + DRONE_RPC_HOST: "{{ drone.domain }}" + DRONE_RPC_PROTO: "https" + DRONE_RPC_SECRET: "{{ drone_secrets.rpc_shared_secret }}" + DRONE_RUNNER_CAPACITY: 2 + DRONE_RUNNER_NAME: "data.coop_drone_runner" + + networks: + drone: + external_services: + external: + name: external_services \ No newline at end of file From 98d4ab69ccd79fcc535c4b82870b7489f9a52cf9 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Wed, 4 Mar 2020 09:39:36 +0000 Subject: [PATCH 23/53] Add ulovlig-logning.dk --- roles/docker/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index eec0cbc..c7aa94c 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -55,7 +55,7 @@ cryptohagen_website: domain: "cryptohagen.dk,www.cryptohagen.dk" ulovliglogning_website: - domain: "ulovliglogning.dk,www.ulovliglogning.dk" + domain: "ulovliglogning.dk,www.ulovliglogning.dk,ulovlig-logning.dk" drone: domain: "drone.{{ base_domain }}" From 09617dd35ad053761a94a2897bc6295b3e164fc1 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Wed, 4 Mar 2020 18:05:48 +0100 Subject: [PATCH 24/53] Move postfix network config to postfix.yml file instead of base services.yml file --- roles/docker/tasks/services.yml | 8 -------- roles/docker/tasks/services/postfix.yml | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/roles/docker/tasks/services.yml b/roles/docker/tasks/services.yml index 5728069..45c9233 100644 --- a/roles/docker/tasks/services.yml +++ b/roles/docker/tasks/services.yml @@ -3,14 +3,6 @@ docker_network: name: external_services -- name: setup network for postfix - docker_network: - name: postfix - ipam_options: - subnet: '172.16.0.0/16' - gateway: 172.16.0.1 - - - name: setup services include_tasks: "services/{{ item }}.yml" with_items: "{{ services }}" diff --git a/roles/docker/tasks/services/postfix.yml b/roles/docker/tasks/services/postfix.yml index 59d5472..ee0896d 100644 --- a/roles/docker/tasks/services/postfix.yml +++ b/roles/docker/tasks/services/postfix.yml @@ -1,5 +1,12 @@ --- +- name: setup network for postfix + docker_network: + name: postfix + ipam_config: + subnet: '172.16.0.0/16' + gateway: 172.16.0.1 + - name: setup postfix docker container for outgoing mail docker_container: name: postfix From 4f07b8edb2bf8a9f5ee0e6b9c3180e4e1f70be9c Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Sat, 11 Apr 2020 16:28:38 +0200 Subject: [PATCH 25/53] Add file showing the variables contained in secrets.yml --- group_vars/all/secrets.yml.contents | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 group_vars/all/secrets.yml.contents diff --git a/group_vars/all/secrets.yml.contents b/group_vars/all/secrets.yml.contents new file mode 100644 index 0000000..b328038 --- /dev/null +++ b/group_vars/all/secrets.yml.contents @@ -0,0 +1,27 @@ +# These are the variables contained in secrets.yml + +postgres_passwords: + fider: xxx + nextcloud: xxx + passit: xxx + gitea: xxx + matrix: xxx + codimd: xxx + mailu: xxx + ttrss: xxx + +fider_jwt_secret: xxx + +ldap_admin_password: xxx +ldap_config_password: xxx + +passit_secret_key: xxx + +docker_password: xxx + +mailu_secret_key: xxx + +drone_secrets: + oauth_client_id: xxx + oauth_client_secret: xxx + rpc_shared_secret: xxx From d49b943fd22091224e9d4f1fd3b6a852fbaab7d7 Mon Sep 17 00:00:00 2001 From: Rasmus Lundsgaard Christiansen Date: Sun, 12 Apr 2020 16:34:52 +0200 Subject: [PATCH 26/53] Gitea network werent autocreated --- roles/docker/tasks/services/gitea.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/docker/tasks/services/gitea.yml b/roles/docker/tasks/services/gitea.yml index 90fd764..47c2aff 100644 --- a/roles/docker/tasks/services/gitea.yml +++ b/roles/docker/tasks/services/gitea.yml @@ -1,4 +1,8 @@ --- +- name: gitea network + docker_network: + name: gitea + # old DNS: 138.68.71.153 - name: gitea container docker_container: From 5a5bb50e09efd6e82fc932e37b60d8b0241dfa64 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Fri, 8 May 2020 15:43:58 +0200 Subject: [PATCH 27/53] Upgrade synapse and riot to latest --- roles/docker/tasks/services/matrix_riot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index ade9a97..bcfb1c9 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -77,7 +77,7 @@ matrix_app: container_name: matrix - image: matrixdotorg/synapse:v1.11.0 + image: matrixdotorg/synapse:v1.12.4 restart: unless-stopped networks: - matrix @@ -97,7 +97,7 @@ riot: container_name: riot_app - image: avhost/docker-matrix-riot:v1.5.10 + image: avhost/docker-matrix-riot:v1.6.0 restart: unless-stopped networks: - matrix From 4cf48f13c064d10b52870e56d95da90b8935b72b Mon Sep 17 00:00:00 2001 From: Vidir Valberg Gudmundsson Date: Fri, 29 May 2020 23:36:07 +0200 Subject: [PATCH 28/53] Add new data.coop website. Fix postfix container for newest ansible. Comment out tt-rss. --- playbook.yml | 2 +- roles/docker/tasks/services/postfix.yml | 4 ++-- roles/docker/tasks/services/websites.yml | 16 +++++++++++++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/playbook.yml b/playbook.yml index 582056a..f92730e 100644 --- a/playbook.yml +++ b/playbook.yml @@ -27,7 +27,7 @@ - ouroboros - mailu - portainer - - tt-rss +# - tt-rss smtp_host: "postfix" smtp_port: "587" diff --git a/roles/docker/tasks/services/postfix.yml b/roles/docker/tasks/services/postfix.yml index ee0896d..3ab9d3c 100644 --- a/roles/docker/tasks/services/postfix.yml +++ b/roles/docker/tasks/services/postfix.yml @@ -4,8 +4,8 @@ docker_network: name: postfix ipam_config: - subnet: '172.16.0.0/16' - gateway: 172.16.0.1 + - subnet: '172.16.0.0/16' + gateway: 172.16.0.1 - name: setup postfix docker container for outgoing mail docker_container: diff --git a/roles/docker/tasks/services/websites.yml b/roles/docker/tasks/services/websites.yml index 2436da2..fee9aa8 100644 --- a/roles/docker/tasks/services/websites.yml +++ b/roles/docker/tasks/services/websites.yml @@ -12,7 +12,21 @@ LETSENCRYPT_HOST: "{{ data_coop_website.domain }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" labels: - com.ouroboros.enable: "true" + com.ouroboros.enable: "true" + +- name: setup new data.coop website using hugo + docker_container: + name: data.coop_website + image: docker.data.coop/data-coop-website:hugo + restart_policy: unless-stopped + networks: + - name: external_services + env: + VIRTUAL_HOST : "new.{{ data_coop_website.domain }}" + LETSENCRYPT_HOST: "new.{{ data_coop_website.domain }}" + LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" + labels: + com.ouroboros.enable: "true" - name: setup cryptohagen.dk website docker container docker_container: From ad243a5777bf71d092c81d295320c621f8c9a205 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Wed, 10 Jun 2020 20:15:13 +0200 Subject: [PATCH 29/53] Fix problem with new.data.coop overwriting the old site --- roles/docker/tasks/services/websites.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/tasks/services/websites.yml b/roles/docker/tasks/services/websites.yml index fee9aa8..98c6701 100644 --- a/roles/docker/tasks/services/websites.yml +++ b/roles/docker/tasks/services/websites.yml @@ -16,7 +16,7 @@ - name: setup new data.coop website using hugo docker_container: - name: data.coop_website + name: new.data.coop_website image: docker.data.coop/data-coop-website:hugo restart_policy: unless-stopped networks: From 99cb94c94a448921724f0b834e381edf099291c0 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Sat, 15 Aug 2020 17:21:12 +0200 Subject: [PATCH 30/53] Update Riot and Synapse to latest --- roles/docker/tasks/services/matrix_riot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index bcfb1c9..c78e588 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -77,7 +77,7 @@ matrix_app: container_name: matrix - image: matrixdotorg/synapse:v1.12.4 + image: matrixdotorg/synapse:v1.18.0 restart: unless-stopped networks: - matrix @@ -97,7 +97,7 @@ riot: container_name: riot_app - image: avhost/docker-matrix-riot:v1.6.0 + image: avhost/docker-matrix-riot:v1.7.3 restart: unless-stopped networks: - matrix From d49a57792f1514a26264f04a8b32f6025ae4eaeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Sun, 23 Aug 2020 11:33:45 +0200 Subject: [PATCH 31/53] Add element.data.coop for riot Riot was renamed to element recently. --- roles/docker/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index c7aa94c..cc41f80 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -28,7 +28,7 @@ matrix: volume_folder: "{{ volume_root_folder }}/matrix" riot: - domain: "riot.{{ base_domain }}" + domain: "riot.{{ base_domain }},element.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/riot" privatebin: From 3e098546ef69f8609ca8d9fa1e25d389e431af87 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Mon, 31 Aug 2020 18:24:47 +0200 Subject: [PATCH 32/53] Update gitea to v 1.12.3 --- roles/docker/tasks/services/gitea.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/tasks/services/gitea.yml b/roles/docker/tasks/services/gitea.yml index 47c2aff..cd98662 100644 --- a/roles/docker/tasks/services/gitea.yml +++ b/roles/docker/tasks/services/gitea.yml @@ -7,7 +7,7 @@ - name: gitea container docker_container: name: gitea - image: gitea/gitea:1.11.1 + image: gitea/gitea:1.12.3 restart_policy: unless-stopped networks: - name: gitea From 8bec174a46761d9c87ff70bd22042f9fbb112e28 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Mon, 31 Aug 2020 18:57:49 +0200 Subject: [PATCH 33/53] Switch riot.data.coop->element.data.coop in riot's config.json --- roles/docker/files/configs/riot/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/files/configs/riot/config.json b/roles/docker/files/configs/riot/config.json index a7dbfc9..ed9f5fb 100644 --- a/roles/docker/files/configs/riot/config.json +++ b/roles/docker/files/configs/riot/config.json @@ -1,7 +1,7 @@ { "default_hs_url": "https://{{ matrix.domain }}", "default_is_url": "https://vector.im", - "brand": "riot.data.coop", + "brand": "element.data.coop", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", "integrations_widgets_urls": [ From 9a0fe697894cbf585ee2b577740966b03cf5c922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Fri, 20 Dec 2019 13:50:29 +0100 Subject: [PATCH 34/53] Add cryptoaarhus website --- roles/docker/defaults/main.yml | 3 +++ roles/docker/tasks/services/websites.yml | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index cc41f80..0d740c8 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -57,6 +57,9 @@ cryptohagen_website: ulovliglogning_website: domain: "ulovliglogning.dk,www.ulovliglogning.dk,ulovlig-logning.dk" +cryptoaarhus_website: + domain: "cryptoaarhus.data.coop" + drone: domain: "drone.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/drone" diff --git a/roles/docker/tasks/services/websites.yml b/roles/docker/tasks/services/websites.yml index 98c6701..dc7d18d 100644 --- a/roles/docker/tasks/services/websites.yml +++ b/roles/docker/tasks/services/websites.yml @@ -41,3 +41,17 @@ LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" labels: com.ouroboros.enable: "true" + +- name: setup cryptoaarhus.dk website docker container + docker_container: + name: cryptoaarhus_website + restart_policy: unless-stopped + image: docker.data.coop/cryptoaarhus-website + networks: + - name: external_services + env: + VIRTUAL_HOST : "{{ cryptoaarhus_website.domain }}" + LETSENCRYPT_HOST: "{{ cryptoaarhus_website.domain }}" + LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" + labels: + com.ouroboros.enable: "true" From 653a0603d5ba5b49fd2acae52924c60cff93a65e Mon Sep 17 00:00:00 2001 From: Carl Bordum Hansen Date: Wed, 23 Sep 2020 20:47:31 +0200 Subject: [PATCH 35/53] Allow fetching data.coop's public rooms over federation --- roles/docker/files/configs/matrix/homeserver.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/docker/files/configs/matrix/homeserver.yaml b/roles/docker/files/configs/matrix/homeserver.yaml index b9c2abf..3a4eca4 100644 --- a/roles/docker/files/configs/matrix/homeserver.yaml +++ b/roles/docker/files/configs/matrix/homeserver.yaml @@ -54,6 +54,10 @@ soft_file_limit: 0 # Set to false to disable presence tracking on this homeserver. use_presence: true +# If set to 'false', forbids any other homeserver to fetch the server's public +# rooms directory via federation. +allow_public_rooms_over_federation: true + # The GC threshold parameters to pass to `gc.set_threshold`, if defined # #gc_thresholds: [700, 10, 10] From 03cde007bc793fa9f9edf96cd018f08469f402a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Mon, 19 Oct 2020 10:01:00 +0200 Subject: [PATCH 36/53] Bump Matrix max upload size to a whopping 50 MB --- roles/docker/files/configs/matrix/homeserver.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/files/configs/matrix/homeserver.yaml b/roles/docker/files/configs/matrix/homeserver.yaml index 3a4eca4..a4dc01a 100644 --- a/roles/docker/files/configs/matrix/homeserver.yaml +++ b/roles/docker/files/configs/matrix/homeserver.yaml @@ -415,7 +415,7 @@ uploads_path: "/data/uploads" # The largest allowed upload size in bytes # -max_upload_size: "10M" +max_upload_size: "50M" # Maximum number of pixels that will be thumbnailed # From a78641674d92d7523e869ef41914f7c2a1452bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Thu, 5 Nov 2020 08:47:58 +0100 Subject: [PATCH 37/53] cryptoaarhus_website: Add cryptoaarhus.dk domain --- roles/docker/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 0d740c8..b83070a 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -58,7 +58,7 @@ ulovliglogning_website: domain: "ulovliglogning.dk,www.ulovliglogning.dk,ulovlig-logning.dk" cryptoaarhus_website: - domain: "cryptoaarhus.data.coop" + domain: "cryptoaarhus.data.coop,cryptoaarhus.dk" drone: domain: "drone.{{ base_domain }}" From 2ac2d8b8dab3fb6c7f6c264662fe5c8eccce10b3 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Mon, 23 Nov 2020 08:24:04 +0100 Subject: [PATCH 38/53] Change ouroboros interval to 10min to hopefully fly under the new docker hub rate limit. --- roles/docker/tasks/services/ouroboros.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/tasks/services/ouroboros.yml b/roles/docker/tasks/services/ouroboros.yml index c5aae9f..a85f074 100644 --- a/roles/docker/tasks/services/ouroboros.yml +++ b/roles/docker/tasks/services/ouroboros.yml @@ -14,5 +14,5 @@ LABELS_ONLY: "true" CLEANUP: "true" LATEST: "true" - CRON: "*/1 * * * *" + CRON: "*/10 * * * *" \ No newline at end of file From 8d88016efd71216d11833644d9180552447d6aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Fri, 27 Nov 2020 10:23:58 +0100 Subject: [PATCH 39/53] Matrix: up nginx client_max_body_size to 50MB Then it's consistent with max_upload_size (sort of - modulo overhead in http) --- roles/docker/files/configs/matrix/vhost-matrix | 3 ++- roles/docker/files/configs/matrix/vhost-riot | 1 + roles/docker/tasks/services/matrix_riot.yml | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 roles/docker/files/configs/matrix/vhost-riot diff --git a/roles/docker/files/configs/matrix/vhost-matrix b/roles/docker/files/configs/matrix/vhost-matrix index 36b8434..a597770 100644 --- a/roles/docker/files/configs/matrix/vhost-matrix +++ b/roles/docker/files/configs/matrix/vhost-matrix @@ -1 +1,2 @@ -listen 8008; \ No newline at end of file +listen 8008; +client_max_body_size 50M; # default is 1M diff --git a/roles/docker/files/configs/matrix/vhost-riot b/roles/docker/files/configs/matrix/vhost-riot new file mode 100644 index 0000000..66b77ed --- /dev/null +++ b/roles/docker/files/configs/matrix/vhost-riot @@ -0,0 +1 @@ +client_max_body_size 50M; # default is 1M diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index c78e588..931f747 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -46,6 +46,11 @@ src: files/configs/matrix/vhost-matrix dest: "{{ nginx.volume_folder }}/vhost/{{ matrix.domain }}" +- name: upload vhost config for riot domain + template: + src: files/configs/matrix/vhost-riot + dest: "{{ nginx.volume_folder }}/vhost/{{ domain.domain }}" + - name: upload homeserver.yaml template: src: "files/configs/matrix/homeserver.yaml" From bb5c77e6023da6a58cd637e4ab725921e0c7e091 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Fri, 27 Nov 2020 10:48:02 +0100 Subject: [PATCH 40/53] Fix typo --- roles/docker/tasks/services/matrix_riot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index 931f747..1d25d34 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -49,7 +49,7 @@ - name: upload vhost config for riot domain template: src: files/configs/matrix/vhost-riot - dest: "{{ nginx.volume_folder }}/vhost/{{ domain.domain }}" + dest: "{{ nginx.volume_folder }}/vhost/{{ riot.domain }}" - name: upload homeserver.yaml template: From fe5fa81f44f1c16e470e84d9047621eff10ace2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Thu, 10 Dec 2020 16:25:26 +0100 Subject: [PATCH 41/53] Update cryptoaarhus.dk domains --- roles/docker/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index b83070a..8b39d04 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -58,7 +58,7 @@ ulovliglogning_website: domain: "ulovliglogning.dk,www.ulovliglogning.dk,ulovlig-logning.dk" cryptoaarhus_website: - domain: "cryptoaarhus.data.coop,cryptoaarhus.dk" + domain: "cryptoaarhus.dk,www.cryptoaarhus.dk" drone: domain: "drone.{{ base_domain }}" From f5293c016dda4b8e82518a3444e80efe9b7d3cf0 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Thu, 17 Dec 2020 08:43:24 +0100 Subject: [PATCH 42/53] Change YAML to use lists instead of comma-separated strings for domains because it looks nicer --- roles/docker/defaults/main.yml | 22 ++++++++++++++----- roles/docker/tasks/services/matrix_riot.yml | 4 ++-- .../tasks/services/ulovliglogning-dk.yml | 4 ++-- roles/docker/tasks/services/websites.yml | 16 +++++++------- 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 8b39d04..7229a00 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -28,7 +28,9 @@ matrix: volume_folder: "{{ volume_root_folder }}/matrix" riot: - domain: "riot.{{ base_domain }},element.{{ base_domain }}" + domains: + - "riot.{{ base_domain }}" + - "element.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/riot" privatebin: @@ -49,16 +51,25 @@ docker_registry: password: "{{ docker_password }}" data_coop_website: - domain: "{{ base_domain }},www.{{ base_domain }}" + domains: + - "{{ base_domain }}" + - "www.{{ base_domain }}" cryptohagen_website: - domain: "cryptohagen.dk,www.cryptohagen.dk" + domains: + - "cryptohagen.dk" + - "www.cryptohagen.dk" ulovliglogning_website: - domain: "ulovliglogning.dk,www.ulovliglogning.dk,ulovlig-logning.dk" + domains: + - "ulovliglogning.dk" + - "www.ulovliglogning.dk" + - "ulovlig-logning.dk" cryptoaarhus_website: - domain: "cryptoaarhus.dk,www.cryptoaarhus.dk" + domains: + - "cryptoaarhus.dk" + - "www.cryptoaarhus.dk" drone: domain: "drone.{{ base_domain }}" @@ -78,4 +89,3 @@ portainer: ttrss: domain: rss.{{ base_domain }} volume_folder: "{{ volume_root_folder }}/tt-rss" - diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index 1d25d34..f06d91e 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -112,9 +112,9 @@ volumes: - "{{ riot.volume_folder }}/data:/data" environment: - VIRTUAL_HOST: "{{ riot.domain }}" + VIRTUAL_HOST: "{{ riot.domains|join(',') }}" VIRTUAL_PORT: "8080" - LETSENCRYPT_HOST: "{{ riot.domain }}" + LETSENCRYPT_HOST: "{{ riot.domains|join(',') }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" networks: diff --git a/roles/docker/tasks/services/ulovliglogning-dk.yml b/roles/docker/tasks/services/ulovliglogning-dk.yml index 19ba9db..7ae903f 100644 --- a/roles/docker/tasks/services/ulovliglogning-dk.yml +++ b/roles/docker/tasks/services/ulovliglogning-dk.yml @@ -6,8 +6,8 @@ networks: - name: external_services env: - VIRTUAL_HOST: "{{ ulovliglogning_website.domain }}" - LETSENCRYPT_HOST: "{{ ulovliglogning_website.domain }}" + VIRTUAL_HOST: "{{ ulovliglogning_website.domains|join(',') }}" + LETSENCRYPT_HOST: "{{ ulovliglogning_website.domains|join(',') }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" labels: com.ouroboros.enable: "true" diff --git a/roles/docker/tasks/services/websites.yml b/roles/docker/tasks/services/websites.yml index dc7d18d..0d99509 100644 --- a/roles/docker/tasks/services/websites.yml +++ b/roles/docker/tasks/services/websites.yml @@ -8,8 +8,8 @@ networks: - name: external_services env: - VIRTUAL_HOST : "{{ data_coop_website.domain }}" - LETSENCRYPT_HOST: "{{ data_coop_website.domain }}" + VIRTUAL_HOST : "{{ data_coop_website.domains|join(',') }}" + LETSENCRYPT_HOST: "{{ data_coop_website.domains|join(',') }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" labels: com.ouroboros.enable: "true" @@ -22,8 +22,8 @@ networks: - name: external_services env: - VIRTUAL_HOST : "new.{{ data_coop_website.domain }}" - LETSENCRYPT_HOST: "new.{{ data_coop_website.domain }}" + VIRTUAL_HOST : "new.{{ data_coop_website.domains|join(',') }}" + LETSENCRYPT_HOST: "new.{{ data_coop_website.domains|join(',') }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" labels: com.ouroboros.enable: "true" @@ -36,8 +36,8 @@ networks: - name: external_services env: - VIRTUAL_HOST : "{{ cryptohagen_website.domain }}" - LETSENCRYPT_HOST: "{{ cryptohagen_website.domain }}" + VIRTUAL_HOST : "{{ cryptohagen_website.domains|join(',') }}" + LETSENCRYPT_HOST: "{{ cryptohagen_website.domains|join(',') }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" labels: com.ouroboros.enable: "true" @@ -50,8 +50,8 @@ networks: - name: external_services env: - VIRTUAL_HOST : "{{ cryptoaarhus_website.domain }}" - LETSENCRYPT_HOST: "{{ cryptoaarhus_website.domain }}" + VIRTUAL_HOST : "{{ cryptoaarhus_website.domains|join(',') }}" + LETSENCRYPT_HOST: "{{ cryptoaarhus_website.domains|join(',') }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" labels: com.ouroboros.enable: "true" From a4966e74fe501554c662c2df2018397e6454700d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Tue, 19 Jan 2021 23:08:56 +0100 Subject: [PATCH 43/53] Remove deni key. --- group_vars/all/vars.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index 7b584f5..08c5346 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -21,11 +21,4 @@ users: groups: - sudo - deni: - comment: Denis Smajlović - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC0pB42dtqruXr2Ha8Rdp3QoSrMOLU5cbLMfuNTNmgwPZmprhGGRTAsz8E0aG+5HCFBmW6JxiTGyHGdIZrhYWpKYshxxn4zODfitP7IzDgvg9Pz0Ugw/c5i5eKjkVfw9xLZKjO/H3Ql8R+wFMawpdw7j+Q9G+J3eIidEI6TmSvJVWijBxpLI4qrLceL084qg93XpJENYBOcvx9fYQQ+Es0jo4hmPuHWq5VIkIoIfvVvdhwjlaBsqv2je5BNx8uTMVIyV34ZHpJc95wJ6MOcqpQunW2bR4mGc9FLh67eP2ba9nDoQ0pnnlWGqAIKx5P1ELIg7RM3HhuwfRVh4DxCfjXpMz3l1gr1dA1wVD9bOtzbPWLjo7LNkRcT/loba/jpznTNIEv+kawmm/H0aTZZdlofkGHuX0iOpLV1c1tCDMH1s/MCqwosSRihrXhSOozsABvaaZpJiHcpE4DcNr+xJhe1XrHMqR30KU0r7ulIP8JdhzMNEsq3HxZQh9s8XLIUukrpcpOgJYyGuQK3kG6li5kYbmVqjLDQ1xHi/4r/4TXjJYpsFCZ71SURLzxoF1nauHpBLKcHI3MPFvqr27SQcM92fO14wKDAmAtHINwzMQjlda6B0jFNC+2xUfHrH7yIhwSktytq5qbhiFKK71DSLiMKFvOqoTVWRckO2+Zw1HZB+Q== deni@deni.dk - password: $6$ooKtdqASOxYJN2CJ$ziMrGG/qIOeyiTGjx.hPYjVBlHpzM9YY6qCJB9/L8aR33feUvXxZNBCgME93ZhbwDBjblS/tP796LsCF4i17D. - groups: - - sudo - volume_root_folder: "/docker-volumes" From 86de1fd24e7666886117595574bb2613b78a3e6c Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Tue, 26 Jan 2021 19:57:06 +0100 Subject: [PATCH 44/53] Initial work on restic container for backup --- group_vars/all/secrets.yml | 138 +++++++++--------- roles/docker/tasks/services/restic-backup.yml | 32 ++++ 2 files changed, 104 insertions(+), 66 deletions(-) create mode 100644 roles/docker/tasks/services/restic-backup.yml diff --git a/group_vars/all/secrets.yml b/group_vars/all/secrets.yml index c040982..a9c7656 100644 --- a/group_vars/all/secrets.yml +++ b/group_vars/all/secrets.yml @@ -1,67 +1,73 @@ $ANSIBLE_VAULT;1.1;AES256 -36303830393964636165353932336334643761653732643036303563313439623836626231313739 -6239326131333263383438613161353435393036663162310a646237306461633337383838306139 -37303434653266303866643162306433636532333131366132366431303766306232653837653463 -6139336230306131660a636165373732313930396632336532366239303766393937386135306235 -62633837363138323365646235333137646363626430633339376636333838663738316535396161 -66653931666565353337623336636338383035333133643639323739393565396434373734323235 -34306132666430376537643431343362383734343861633332373838383837316266336131353231 -31356665313333343139303337633530643534376338343631396431663937616535306136343266 -36323761653933386231386339666333306331326161306536616238623836306335373930386539 -32326331366435386132393731633664333862656130636632656335353939656638613863633637 -64366662623531333933613566356632383061656165323839623732306331653133393463373465 -61363036613234353962353135366361363537313138626337376138383335633865663237303464 -37373032353066323532313364333863663739613631633230323339346634663733326430343263 -64636331616434343331333065633936313265393739353937396165363337366263393131316661 -34643263343263306235326562663065343438363338326138653066326432646531643764396161 -34343834643134363662373934346463383263636436346433303231656535626664626530326131 -39303231646537316136653932306135303931333762343434623636623436383561353131303163 -63373833656430336365316433663538643634303962623538663362383536613136366230396533 -37363963613532666434653863623030653434303463616638653135666433613030656335396238 -37356632376366383463343736303265326436383435363335333838313264333134653932616465 -31363832656563383035306537376532343934373933306232333631363132616665663433666133 -36643131386134303362373264356437333236663232373035363765303936313162353930353033 -38303864643237323437653463313238613036386461303066353465336230303632613432353661 -36313761303234303363346432666638323865663764623862623165633234363437653964343830 -62656365363538303035326239663264646163366332306332383262356130356436366661383234 -66643832656661623132303562333432656365323836363133373932333732323133383832623939 -37333632623933656336316161376565653363633330646239666266313336306563366462376531 -34623636646439366438316530386334313233613963643634366135373661373138316466313739 -64623835613166616165383463323137303431303035363733366563623934366439323666653633 -65663532343939343334616662366633353231636135346564643034666331616666316561386664 -30636535633432336438663462356232383737393031383431666664303563623932666630653233 -65323932303638653562663734386637323964333331356262346463333065633565386363393064 -37646563366437646330353765623236306561646433636534666438323036373132363036626438 -61393866626236316238326236656164643864343734353438313466633136343931376634366261 -64353631363665366237356566323532306563333937343665393166336535383636303930346362 -38333733306430636436623661653066313936626362373464396138343439376430626162316466 -66623837353763333864663562653166316665363537636537626234666230636665396438313832 -61613330396134666437306162386335613466383231633034393639366533363137613964383135 -35356136393962353262313635343031323638326163336433303066393939646536653033343530 -38303935663038303639616661346664666435393266653663373435363433386461633133343964 -65633532656566613638333266393131653863336563386262643630633164346139383436326463 -62316131363335376336366332323564383036333139386462353933316461346363626465396631 -39616164316463323162616235653365363737373736646331303436303037333536633466303533 -32663335386332663334653734303136333066636234643537393931626333303735386238373763 -33323333646531633964613633356539636538306163303938373638623230396661663538653463 -35396434303634316631376138336530393134353235383637326466306363313462323330623535 -33353335306364323335316336643233386561306134636461336537353838373830373031616636 -62333335616639353436303336653965303132316439316362303931373465376264396139346631 -61393064326433366337613266306263336163393731633165303536636132636638656339373634 -32313637666334313935613564316331396437343335313336666137366133376666306138383163 -62383131616339393534613231616134383562346163343430323261336531306332363736396663 -39643134633838393566643237656663313161326631316437663463653566343238343736656566 -35663231623533323261326162356137646436643766646439663538306661643861356565666434 -38353131363863666439316666353965663531323662376235636533363262353131323166326335 -61656432666130313762376334656434333532636165313834333634646465346234653662393735 -35643138623832646633666366616436323730383066323637316635336134356461353666636164 -30633833313863656237653762373965376638393232376532666361396363303030383138616631 -32633739626565383161343065646232636464373538626330636466316337663739376638386337 -32383763313064666464623137373036336562633734313663313463386430313838636165313962 -31383466363466396337333837626462303434353739343338313137633736313664346239666237 -62313462366136313037646264663533323738656138353235646136383334613035383236383865 -38666432313761653234636363396361643139353730323237616663323433363463373666613765 -31656430326138373434356130626465643733313065366562313566326633653832316265636538 -35396164313932356432306639653461343063643666656265333033643863303637313031653134 -39636436636333343030333762376463303538626665343434633236353236373765643231383933 -3130336364366434306366623062613130616230366633333536 +37396135363635656665356234663164386362666130323966623638393032636339303331613130 +3331646564643061643335353039653236636265393638650a323730373565393832393032623935 +63323536656534383962353366323031396666343135313939316165333039396639353630323530 +6265663366323233300a313662373861306539346164653766383565383663616661633662663339 +36386535356333623432396232386331353238643063643164366535376665623336653562653661 +64343762656534616634396465656633623839353134373131323865643036326436666330356364 +32306663613138396333353338623238333766636231636132376439373736313161336631653831 +32616634396436306633616230363330323964376463326634353536336566633332383762653638 +62346538313864663438616530313166376632393563373139373265633831333833336630313134 +66336335363536613636656438653034326433323731643438393134306334353038376365323762 +38313664366531646464313330353535323364343331646663386530336638633736383561656333 +64613836383666646235393737646535666637343663333237613736366338643935366138373036 +61613430646634323265376535323138653338643665393133656438323433353464313232643832 +64303230323132663062313966383333356163343730663231323264373861393133616138656538 +34653935303633303332386561616538306330633732353937363938663738656439626466356363 +38653835653634376363356438393834336662333661643933643231393933376266666130623930 +32363832346538383031326538363663303638356166376535663966643038366166623464313636 +34313930653332376266396530303863653364373530653963643430333330623233656238353838 +64306234313062623130346433333664616661663836326234303164333537663039376238316463 +38333064353331373665336663373661323731353263646137343061656335383839336563313038 +62653661623733383337643930313334643161343938656466353134393338313931313338663531 +63326337666465653462303564653363333839333032663336373662656562656639386634343235 +62343466376533636137373137633239383961383464306666336132656431383131643863646638 +32613838366131613938366334643234313864346462393533323264663064656436346332323231 +39353632363132353339656630333464633862313363363132613761303262333663653830613861 +39326361313031386635666463373536633662346464393661333165323966613339643535623039 +66663939616635353737366237653261316439633130383164343330643532356131666335666337 +32643136386232363333353632613065393036626431393730353036363232653533393134623039 +66303265363264313665396264306262613739653530363666373066303131383136326234363061 +35393538316365613133383838313431363339383461353934356137646335633437636134353030 +36396531643335653962363866656161626638303837336332373339663961653732646330613938 +35343439363964323465666236616131363936393261363136316565653733323438303663646634 +37396365303261346238303663656164623330663839663935396661396538313062623138636338 +35356163643534376164376133663461373234646161306264613465356663663065623962643730 +38343531343266303132653239636365626361383137333539366233336265353362643631356631 +38383835376134663162313465333031396632643064366436653462383564663661646137376631 +31306234626466353638623638363132386137326135323465366636616137666137366336373339 +39656237386632663339333735363837373535646561343839636164613164393939306238313261 +36336663386162303763373663396533633337333639313638656433393631663839623838626333 +38613363643263323739376230376536626635646231363635613437313664613137646166373961 +63323763623963386132626534383966346462653336353439353365303932363836373433633638 +64363731643639636536336462333236333833336138656362333539383533303762613437386632 +38633232326530623762396539343434363236373839363730636530636461336132323864303065 +31643830376132626566643632366666326139396561656163393636316138343139663536393539 +63336265643138336337313861643766346163373031326461313131326430626636316237316237 +66323236373461306439653333653462616364383766656162353761376135623733396263643733 +64363731353966663462323362363031373532343962356639623234376236613037303465363963 +33643830306163636533623936386564336561376639633964383361633261396138356637326434 +32363562363132363335646339313034366664353661316232353965633932336666653765336137 +36323136336238373365333333346239386339316361363435356633363135303536653265643665 +39666464386530383539353130656233323361346236373436326565346464666632616336353262 +64623165383331393430386464313164316239613863303239633466313831636235393865616466 +38376163303561343439636136356432376436613666636165306632663736633765356435363661 +64643335386562346538386338633263333634643531323630636261383132306631623333333734 +38636131343564343935333536303865343562633165356237386638333636623766323431343638 +31343463326530633464326463326161353237393533616335643663393736343133386633626539 +39373339333635666534383931623934656633396431313664356635333438373231653934613732 +62373637646163356462366664323037306637306432363064303335623930356364613266383834 +66366438373830326337323961323930656361333466313334626561623936626530366432386462 +66613639343963366163626162373737626263626464306639383263663765323439633163346139 +62633566306362323531323436666639613634383464383035643866343363663038636234316538 +37643366663262323166643439633537663631373836373634346533346130356665326461313236 +38346635663137633339356438623036656265353862623263663761656636303964363764656330 +63333731666638666164313232333162353939313138366566353334306235353963383263643239 +61626532633639616266613262373836313666373039336661396565313364326434366631393263 +36653736393436326461353461653634323130353166633630646666633466653465343831626637 +39383061623437306234633939323363623338326238633334336537656330333838393764313366 +63383463343461343332353033326563323837366430306362383266316536653137636537353831 +63343338643164616262623638343439366539636638626666636664366364636561303733626139 +30613661653834656137393265633131633737313861666662643633623738363763633830393032 +61303137393037396136303166326537376135376132663637663063633939366535393038333730 +62643134363034313932 diff --git a/roles/docker/tasks/services/restic-backup.yml b/roles/docker/tasks/services/restic-backup.yml new file mode 100644 index 0000000..0c28158 --- /dev/null +++ b/roles/docker/tasks/services/restic-backup.yml @@ -0,0 +1,32 @@ +--- + +- name: restic network + docker_network: + name: restic + +- name: restic container + docker_container: + name: restic-backup + image: mazzolino/restic + state: started + restart_policy: always + networks: + - name: restic + env: + RUN_ON_STARTUP: "true" + BACKUP_CRON: "0 30 3 * * *" + RESTIC_REPOSITORY: "rest:https://datacoop:{{ restic_secrets.user_secret }}@restic.graffen.io/datacoop-hevonen" + RESTIC_PASSWORD: "{{ restic_secrets.encryption_secret }}" + RESTIC_BACKUP_SOURCES: "/mnt/volumes" + RESTIC_BACKUP_ARGS: >- + --tag datacoop-volumes + --exclude='*.tmp' + --verbose + RESTIC_FORGET_ARGS: >- + --keep-last 10 + --keep-daily 7 + --keep-weekly 5 + --keep-monthly 12 + TZ: Europe/Copenhagen + volumes: + - /var/lib/docker/volumes:/mnt/volumes:ro From 3fe7d162aaf1b87f713d3a247340f79d5b1bc0f6 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Tue, 26 Jan 2021 20:01:05 +0100 Subject: [PATCH 45/53] Use correct volume folder --- roles/docker/tasks/services/restic-backup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/tasks/services/restic-backup.yml b/roles/docker/tasks/services/restic-backup.yml index 0c28158..a7ae711 100644 --- a/roles/docker/tasks/services/restic-backup.yml +++ b/roles/docker/tasks/services/restic-backup.yml @@ -29,4 +29,4 @@ --keep-monthly 12 TZ: Europe/Copenhagen volumes: - - /var/lib/docker/volumes:/mnt/volumes:ro + - /docker-volumes:/mnt/volumes:ro From 6d2fbdbbb6991e2ae70787c9528429e2db0fc483 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Tue, 26 Jan 2021 20:19:34 +0100 Subject: [PATCH 46/53] Fix secret for restic repo --- group_vars/all/secrets.yml | 144 ++++++++++++++++++------------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/group_vars/all/secrets.yml b/group_vars/all/secrets.yml index a9c7656..322080c 100644 --- a/group_vars/all/secrets.yml +++ b/group_vars/all/secrets.yml @@ -1,73 +1,73 @@ $ANSIBLE_VAULT;1.1;AES256 -37396135363635656665356234663164386362666130323966623638393032636339303331613130 -3331646564643061643335353039653236636265393638650a323730373565393832393032623935 -63323536656534383962353366323031396666343135313939316165333039396639353630323530 -6265663366323233300a313662373861306539346164653766383565383663616661633662663339 -36386535356333623432396232386331353238643063643164366535376665623336653562653661 -64343762656534616634396465656633623839353134373131323865643036326436666330356364 -32306663613138396333353338623238333766636231636132376439373736313161336631653831 -32616634396436306633616230363330323964376463326634353536336566633332383762653638 -62346538313864663438616530313166376632393563373139373265633831333833336630313134 -66336335363536613636656438653034326433323731643438393134306334353038376365323762 -38313664366531646464313330353535323364343331646663386530336638633736383561656333 -64613836383666646235393737646535666637343663333237613736366338643935366138373036 -61613430646634323265376535323138653338643665393133656438323433353464313232643832 -64303230323132663062313966383333356163343730663231323264373861393133616138656538 -34653935303633303332386561616538306330633732353937363938663738656439626466356363 -38653835653634376363356438393834336662333661643933643231393933376266666130623930 -32363832346538383031326538363663303638356166376535663966643038366166623464313636 -34313930653332376266396530303863653364373530653963643430333330623233656238353838 -64306234313062623130346433333664616661663836326234303164333537663039376238316463 -38333064353331373665336663373661323731353263646137343061656335383839336563313038 -62653661623733383337643930313334643161343938656466353134393338313931313338663531 -63326337666465653462303564653363333839333032663336373662656562656639386634343235 -62343466376533636137373137633239383961383464306666336132656431383131643863646638 -32613838366131613938366334643234313864346462393533323264663064656436346332323231 -39353632363132353339656630333464633862313363363132613761303262333663653830613861 -39326361313031386635666463373536633662346464393661333165323966613339643535623039 -66663939616635353737366237653261316439633130383164343330643532356131666335666337 -32643136386232363333353632613065393036626431393730353036363232653533393134623039 -66303265363264313665396264306262613739653530363666373066303131383136326234363061 -35393538316365613133383838313431363339383461353934356137646335633437636134353030 -36396531643335653962363866656161626638303837336332373339663961653732646330613938 -35343439363964323465666236616131363936393261363136316565653733323438303663646634 -37396365303261346238303663656164623330663839663935396661396538313062623138636338 -35356163643534376164376133663461373234646161306264613465356663663065623962643730 -38343531343266303132653239636365626361383137333539366233336265353362643631356631 -38383835376134663162313465333031396632643064366436653462383564663661646137376631 -31306234626466353638623638363132386137326135323465366636616137666137366336373339 -39656237386632663339333735363837373535646561343839636164613164393939306238313261 -36336663386162303763373663396533633337333639313638656433393631663839623838626333 -38613363643263323739376230376536626635646231363635613437313664613137646166373961 -63323763623963386132626534383966346462653336353439353365303932363836373433633638 -64363731643639636536336462333236333833336138656362333539383533303762613437386632 -38633232326530623762396539343434363236373839363730636530636461336132323864303065 -31643830376132626566643632366666326139396561656163393636316138343139663536393539 -63336265643138336337313861643766346163373031326461313131326430626636316237316237 -66323236373461306439653333653462616364383766656162353761376135623733396263643733 -64363731353966663462323362363031373532343962356639623234376236613037303465363963 -33643830306163636533623936386564336561376639633964383361633261396138356637326434 -32363562363132363335646339313034366664353661316232353965633932336666653765336137 -36323136336238373365333333346239386339316361363435356633363135303536653265643665 -39666464386530383539353130656233323361346236373436326565346464666632616336353262 -64623165383331393430386464313164316239613863303239633466313831636235393865616466 -38376163303561343439636136356432376436613666636165306632663736633765356435363661 -64643335386562346538386338633263333634643531323630636261383132306631623333333734 -38636131343564343935333536303865343562633165356237386638333636623766323431343638 -31343463326530633464326463326161353237393533616335643663393736343133386633626539 -39373339333635666534383931623934656633396431313664356635333438373231653934613732 -62373637646163356462366664323037306637306432363064303335623930356364613266383834 -66366438373830326337323961323930656361333466313334626561623936626530366432386462 -66613639343963366163626162373737626263626464306639383263663765323439633163346139 -62633566306362323531323436666639613634383464383035643866343363663038636234316538 -37643366663262323166643439633537663631373836373634346533346130356665326461313236 -38346635663137633339356438623036656265353862623263663761656636303964363764656330 -63333731666638666164313232333162353939313138366566353334306235353963383263643239 -61626532633639616266613262373836313666373039336661396565313364326434366631393263 -36653736393436326461353461653634323130353166633630646666633466653465343831626637 -39383061623437306234633939323363623338326238633334336537656330333838393764313366 -63383463343461343332353033326563323837366430306362383266316536653137636537353831 -63343338643164616262623638343439366539636638626666636664366364636561303733626139 -30613661653834656137393265633131633737313861666662643633623738363763633830393032 -61303137393037396136303166326537376135376132663637663063633939366535393038333730 -62643134363034313932 +34376131343263336262656463373830643861336631626539643663333239313831626236306530 +3335623130653432636133356363656465346366303062370a346130326536366638633536613161 +62623334363537636634373231353564396362343330623562383939373538633066616565306235 +3332323863353334640a396462313862366362366535383737376333383361303065383937396530 +38326331396333396263363762346331356431623532343938613834663830393337646666336435 +66356439333434356165613030306138666163653934386233663362646534303737323030636234 +31616132613830363136666639386462363135656432373236393034316664363637663336366435 +64373238633064623735666335636231656231666434383066313336303137333663333031363638 +31643733336535383338376631656439633962653262356335383638373764353530643234303935 +62383930393634613530643739643335616164633038326638356135623561326165376530363461 +37373032393331653261373538633065333662393366666161396638383932393331623766343035 +30333335663039323931306162313538373334393335306132626336643363323839633761383063 +35343632363837383132656437303138303764316439343663303964396463363638336533653930 +39303236353766373131623363653835666439333164366563346164626464633633363163323864 +65363961393237666433623565343832306663323862666333343665376135646132363466616364 +62356331666432336661343762333961333634396466333465633164326239386266643230393566 +36376461373631636630303861313538333834646461663539623738636636626537656438646431 +38383436393238363038313563633634396335346138626666366437333433383039363332623639 +31396165346431333838393164616339656634346561313737306562343562323030613266633263 +61333263653938653034356631333664323630306461346532626533363665363133376232316132 +61346431383230656134373630653264363430383561313866363235333435633966386266653964 +33363534343634343232373036633330613038303437333033313061313932373739343663303931 +34333833386638353436653831623835323032303134366635613735643662636336616464313330 +36633335613630663233326166633565386238656236633261396235363165656333333235643137 +32623461663562313533333835396233383330613661646431646365343430626662326638653330 +38646232386263356566373561353130616539346630613363313163363262356264653233313862 +34386331363236386534353534616531643264613764343362646366393435383332653664353363 +62333935363132373434613038353632643336633136656266316466373734646234636638316265 +62646261396465623561633964313065626361316630353965616233356565343834656563353830 +38346361336237646331366632633130613330336637326163663463386233643734356165666431 +61396263656237333138356231306437653337656133663031303031616437633564613733316264 +63633930353033636235653961393330326635626666626235336334653762373262633739356263 +32323532333463653937386430663437303238313130643435353739393639303033343865323736 +35366139643166626364373663333266376133636433653261316566366630396666336637326664 +30343039633133626435363364346666613732666335313865326234366136366130616334396338 +61663461623432303930623261336464643830303631396430363637383838616432356634303332 +61346536313035376139313638393737393136643366366364363862383335353533313534366534 +61356136366465373530393835613834366665653334376539303462336138646438653039306261 +36613736323566636634666331396463623439323063356232306631616135623231336439303739 +65393837653837336235396532323465656463636238643038383363616633383866333633663831 +61363634356634636265663837306232303362313564323463303363323931396438646337363161 +61313033343532336563393632373830326631616462616263346363636566663966396330386464 +62613039323065343838653439303333396536366537313335353834613338623961646235633764 +30333032323333663530613736313765343364363433366436666134623663653336386632333437 +64386639636237333138323431333234316432366236613530376234636438356531636630396431 +63643833366136363962346632616161363565336163313764383030303337346565613939383563 +65306137633965326534356666346238363137323233336561643333386265613863396338383134 +35363135303232376364306234323435356330333061613663326563343533636165356537336536 +61656131343966346365396133666662393930663237643134383963303766306534633034356335 +37633732393266633965616330643061616664336430643630633033326335643438373737653164 +34633737303533666335306466306330343233326531343065666138633166383664333130653864 +37623730333532633936316461333066313065316664383934343731616430366135346138663531 +33353134333934376663336366663036383630393031303731653332373335333131633136616537 +33666266373439346633373735643339653333626237623530346436306438396332613863346264 +30346431393735326566393633626535383538343866653262653330366330623930646631663961 +38656138313932623131613537376139666137653063313339666333313364343738306439656264 +32346533646465376135376531383132396337653966393133316436616563613135353863653064 +31373466616135393036333037623164346539323463333037613030386666396363353364396439 +39616536646638623739623834363662643566393430623632646434336162316362653434343337 +36623334303866343533623538663531303366343136636631376334653636313264376330313836 +66333131343062373138663330313633623166303337306466313362343034316364666666373965 +36373933343338646333373962623034353631623535306230346663373530346438386334303536 +62366666646263303764303330353835633163363666303133333730343263613039346162356532 +37323133613037313430366238313261633165643563666239623730653164666264633964626461 +31323536623335636333393338333166346336323132373466396432613133613933356232373532 +30653564323031636231343232646165653163393663663731313033323763663965356466366562 +33303830656238653164646161366265636566393436323135356630393033316337363361306363 +30393766636237336466353431616130653961326431323161313234333963643032393061303265 +33396664336535353164643462303636616265306338333634376664323837303238623638313266 +37643861343034646532626164353238373031633861623663316638333039643036353932323962 +39616136653639313232326362663834333363633562646563393561396464383765616230333230 +39663939326332333362 From 9ae295896f9b13ea86aca71394cd26e3cd54e864 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Tue, 26 Jan 2021 20:40:22 +0100 Subject: [PATCH 47/53] Use docker_service ansible command --- roles/docker/tasks/services/restic-backup.yml | 67 ++++++++++--------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/roles/docker/tasks/services/restic-backup.yml b/roles/docker/tasks/services/restic-backup.yml index a7ae711..b8c4c13 100644 --- a/roles/docker/tasks/services/restic-backup.yml +++ b/roles/docker/tasks/services/restic-backup.yml @@ -1,32 +1,37 @@ --- - -- name: restic network - docker_network: - name: restic - -- name: restic container - docker_container: - name: restic-backup - image: mazzolino/restic - state: started - restart_policy: always - networks: - - name: restic - env: - RUN_ON_STARTUP: "true" - BACKUP_CRON: "0 30 3 * * *" - RESTIC_REPOSITORY: "rest:https://datacoop:{{ restic_secrets.user_secret }}@restic.graffen.io/datacoop-hevonen" - RESTIC_PASSWORD: "{{ restic_secrets.encryption_secret }}" - RESTIC_BACKUP_SOURCES: "/mnt/volumes" - RESTIC_BACKUP_ARGS: >- - --tag datacoop-volumes - --exclude='*.tmp' - --verbose - RESTIC_FORGET_ARGS: >- - --keep-last 10 - --keep-daily 7 - --keep-weekly 5 - --keep-monthly 12 - TZ: Europe/Copenhagen - volumes: - - /docker-volumes:/mnt/volumes:ro +- docker_service: + project_name: restic_backup + pull: yes + definition: + version: '3.6' + services: + restic-backup: + image: mazzolino/restic + restart: always + environment: + RUN_ON_STARTUP: "true" + BACKUP_CRON: "0 30 3 * * *" + RESTIC_REPOSITORY: "rest:https://datacoop:{{ restic_secrets.user_secret }}@restic.graffen.io/datacoop-hevonen" + RESTIC_PASSWORD: "{{ restic_secrets.encryption_secret }}" + RESTIC_BACKUP_SOURCES: "/mnt/volumes" + RESTIC_BACKUP_ARGS: >- + --tag datacoop-volumes + --exclude='*.tmp' + --verbose + RESTIC_FORGET_ARGS: >- + --keep-last 10 + --keep-daily 7 + --keep-weekly 5 + --keep-monthly 12 + TZ: Europe/Copenhagen + volumes: + - /docker-volumes:/mnt/volumes:ro + + restic-prune: + image: "mazzolino/restic" + environment: + RUN_ON_STARTUP: "true" + PRUNE_CRON: "0 0 4 * * *" + RESTIC_REPOSITORY: "rest:https://datacoop:{{ restic_secrets.user_secret }}@restic.graffen.io/datacoop-hevonen" + RESTIC_PASSWORD: "{{ restic_secrets.encryption_secret }}" + TZ: Europe/copenhagen From cec959a47eb346d592bc3fb22e17ebfc4cc73239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Tue, 26 Jan 2021 21:59:26 +0100 Subject: [PATCH 48/53] Upgrade portainer to 2.0.1. --- roles/docker/tasks/services/portainer.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/docker/tasks/services/portainer.yml b/roles/docker/tasks/services/portainer.yml index e22fed6..c042bf2 100644 --- a/roles/docker/tasks/services/portainer.yml +++ b/roles/docker/tasks/services/portainer.yml @@ -8,7 +8,7 @@ - name: run portainer docker_container: name: portainer - image: portainer/portainer:1.23.1 + image: portainer/portainer-ce:2.0.1 restart_policy: always networks: - name: external_services @@ -19,5 +19,6 @@ - 9001:9000 env: VIRTUAL_HOST: "{{ portainer.domain }}" + VIRTUAL_PORT: "9000" LETSENCRYPT_HOST: "{{ portainer.domain }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" From 406e19a95cd80d4b88422d0102635199358117cd Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Wed, 27 Jan 2021 13:17:30 +0100 Subject: [PATCH 49/53] Document new secrets needed in secrets.yml --- group_vars/all/secrets.yml.contents | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/group_vars/all/secrets.yml.contents b/group_vars/all/secrets.yml.contents index b328038..b200303 100644 --- a/group_vars/all/secrets.yml.contents +++ b/group_vars/all/secrets.yml.contents @@ -1,4 +1,5 @@ # These are the variables contained in secrets.yml +# Secrets are usually 32 characters or more, matching [a-Z0-9] postgres_passwords: fider: xxx @@ -25,3 +26,7 @@ drone_secrets: oauth_client_id: xxx oauth_client_secret: xxx rpc_shared_secret: xxx + +restic_secrets: + user_secret: xxx + encryption_secret: xxx From a692e7d2cb8fc7e11ff856d9ae7c64132ed69feb Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Wed, 27 Jan 2021 13:46:06 +0100 Subject: [PATCH 50/53] Migrate Passit to docker_service & set correct volume folder path --- roles/docker/defaults/main.yml | 1 + roles/docker/tasks/services/passit.yml | 79 +++++++++++++------------- 2 files changed, 41 insertions(+), 39 deletions(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 7229a00..2e1cd68 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -19,6 +19,7 @@ gitea: passit: domain: "passit.{{ base_domain }}" + volume_folder: "{{ volume_root_folder }}/passit" fider: domain: "feedback.{{ base_domain }}" diff --git a/roles/docker/tasks/services/passit.yml b/roles/docker/tasks/services/passit.yml index fd972ef..b57f915 100644 --- a/roles/docker/tasks/services/passit.yml +++ b/roles/docker/tasks/services/passit.yml @@ -1,45 +1,46 @@ --- -- name: passit network - docker_network: - name: passit +- docker_service: + project_name: "passit" + pull: "yes" + definition: + version: "3.6" + services: -- name: passit database volume - docker_volume: - name: passit_db + passit_db: + image: "postgres:10" + restart: "always" + networks: + - "passit" + volumes: + - "{{ passit.volume_folder }}/data:/var/lib/postgresql/data" + environment: + POSTGRES_USER: "passit" + POSTGRES_PASSWORD: "{{ postgres_passwords.passit }}" -- name: passit database container - docker_container: - name: passit_db - image: postgres:10 - state: started - restart_policy: always - networks: - - name: passit - volumes: - - passit_db:/var/lib/postgresql/data - env: - POSTGRES_USER: passit - POSTGRES_PASSWORD: "{{ postgres_passwords.passit }}" + passit_app: + image: "passit/passit:stable" + 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@{{ passit.domain }}" + EMAIL_CONFIRMATION_HOST: "https://{{ passit.domain }}" -- name: passit app container - docker_container: - name: passit - image: passit/passit:stable - command: bin/start.sh - restart_policy: always - networks: - - name: passit - - name: postfix - - name: external_services - env: - DATABASE_URL: "postgres://passit:{{ postgres_passwords.passit }}@passit_db:5432/passit" - SECRET_KEY: "{{ passit_secret_key }}" - IS_DEBUG: 'False' - EMAIL_URL: smtp://noop@{{ smtp_host }}:{{ smtp_port }} - DEFAULT_FROM_EMAIL: "noreply@{{ passit.domain }}" - EMAIL_CONFIRMATION_HOST: "https://{{ passit.domain }}" + VIRTUAL_HOST: "{{ passit.domain }}" + LETSENCRYPT_HOST: "{{ passit.domain }}" + LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" - VIRTUAL_HOST: "{{ passit.domain }}" - LETSENCRYPT_HOST: "{{ passit.domain }}" - LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" + networks: + passit: + postfix: + external: true + external_services: + external: true \ No newline at end of file From 068502773e5c9a78fb274b037409af252f186d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Mon, 1 Feb 2021 20:51:28 +0100 Subject: [PATCH 51/53] Fix matrix_riot service. --- roles/docker/tasks/services/matrix_riot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index f06d91e..e20253b 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -49,7 +49,7 @@ - name: upload vhost config for riot domain template: src: files/configs/matrix/vhost-riot - dest: "{{ nginx.volume_folder }}/vhost/{{ riot.domain }}" + dest: "{{ nginx.volume_folder }}/vhost/{{ riot.domains[0] }}" - name: upload homeserver.yaml template: From 9e5c18f839e700d1e5044aa704b5bfe7e66db45f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Mon, 1 Feb 2021 21:06:23 +0100 Subject: [PATCH 52/53] Rename docker_service tasks to docker_compose. --- roles/docker/tasks/services/mailu.yml | 2 +- roles/docker/tasks/services/matrix_riot.yml | 2 +- roles/docker/tasks/services/passit.yml | 3 ++- roles/docker/tasks/services/restic-backup.yml | 3 ++- roles/docker/tasks/services/tt-rss.yml | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/roles/docker/tasks/services/mailu.yml b/roles/docker/tasks/services/mailu.yml index a92b517..e53d92c 100644 --- a/roles/docker/tasks/services/mailu.yml +++ b/roles/docker/tasks/services/mailu.yml @@ -38,7 +38,7 @@ force: yes - name: run mail server containers - docker_service: + docker_compose: project_name: mail_server pull: yes definition: diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index e20253b..016cc6e 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -62,7 +62,7 @@ dest: "{{ matrix.volume_folder }}/data/matrix.data.coop.log.config" - name: set up matrix and riot - docker_service: + docker_compose: project_name: matrix pull: yes definition: diff --git a/roles/docker/tasks/services/passit.yml b/roles/docker/tasks/services/passit.yml index b57f915..5855c90 100644 --- a/roles/docker/tasks/services/passit.yml +++ b/roles/docker/tasks/services/passit.yml @@ -1,6 +1,7 @@ --- -- docker_service: +- name: setup passit containers + docker_compose: project_name: "passit" pull: "yes" definition: diff --git a/roles/docker/tasks/services/restic-backup.yml b/roles/docker/tasks/services/restic-backup.yml index b8c4c13..379e510 100644 --- a/roles/docker/tasks/services/restic-backup.yml +++ b/roles/docker/tasks/services/restic-backup.yml @@ -1,5 +1,6 @@ --- -- docker_service: +- name: setup restic backup + docker_compose: project_name: restic_backup pull: yes definition: diff --git a/roles/docker/tasks/services/tt-rss.yml b/roles/docker/tasks/services/tt-rss.yml index 379e368..e4e7c8a 100644 --- a/roles/docker/tasks/services/tt-rss.yml +++ b/roles/docker/tasks/services/tt-rss.yml @@ -10,7 +10,7 @@ loop_var: volume - name: "set up tt-rss" - docker_service: + docker_compose: project_name: "tt-rss" pull: yes definition: From 30b9580d3cfac5c57f4d1e194d3ada6c2b3588f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Mon, 1 Feb 2021 21:06:39 +0100 Subject: [PATCH 53/53] Add required pip packages. --- roles/ubuntu_base/tasks/base.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/roles/ubuntu_base/tasks/base.yml b/roles/ubuntu_base/tasks/base.yml index d6a59c8..7ddff51 100644 --- a/roles/ubuntu_base/tasks/base.yml +++ b/roles/ubuntu_base/tasks/base.yml @@ -1,5 +1,5 @@ --- -- name: Install necessary packages +- name: Install necessary packages via apt apt: name: "{{ packages }}" vars: @@ -8,4 +8,11 @@ - python3-pip - apparmor - haveged - \ No newline at end of file + +- name: Install necessary packages via pip + pip: + name: "{{ packages }}" + vars: + packages: + - docker + - docker-compose \ No newline at end of file