Some mailman stuff.

2019-03-21 09:41:45 +01:00
10 changed files with 124 additions and 128 deletions
--- a/group_vars/all/secrets.yml
+++ b/group_vars/all/secrets.yml
@ -1,58 +1,54 @@
 $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
+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
--- 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"
--- a/playbook.yml
+++ b/playbook.yml
@ -26,7 +26,6 @@
      - ouroboros
      - mailu
      - portainer
-      - tt-rss

    smtp_host: "postfix"
    smtp_port: "587"
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@ -69,6 +69,3 @@ portainer:
  domain: "portainer.{{ base_domain }}"
  volume_folder: "{{ volume_root_folder }}/portainer"

-ttrss:
-  domain: rss.{{ base_domain }}
-  volume_folder: "{{ volume_root_folder }}/tt-rss"
--- 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: true
+enable_group_creation: false

 # If enabled, non server admins can only create groups with local parts
 # starting with this prefix
--- a/roles/docker/tasks/services/mailman.yml
+++ b/roles/docker/tasks/services/mailman.yml
@ -0,0 +1,68 @@
+---
+
+- name: run mailman server containers
+  docker_service:
+    definition:
+      version: '2'
+
+      services:
+        mailman-core:
+          image: maxking/mailman-core:0.2
+          container_name: mailman-core
+          hostname: mailman-core
+          volumes:
+            - /opt/mailman/core:/opt/mailman/
+          stop_grace_period: 30s
+          links:
+            - database:database
+          depends_on:
+            - database
+          environment:
+            - DATABASE_URL=postgres://mailman:mailmanpass@database/mailmandb
+            - DATABASE_TYPE=postgres
+            - DATABASE_CLASS=mailman.database.postgresql.PostgreSQLDatabase
+            - HYPERKITTY_API_KEY={{ hyperkitty_api_key }}
+          networks:
+            mailman:
+              ipv4_address: 172.19.199.2
+
+        mailman-web:
+          image: maxking/mailman-web:0.2
+          container_name: mailman-web
+          hostname: mailman-web
+          depends_on:
+            - database
+          links:
+            - mailman-core:mailman-core
+            - database:database
+          volumes:
+            - /opt/mailman/web:/opt/mailman-web-data
+          environment:
+            - DATABASE_TYPE=postgres
+            - DATABASE_URL=postgres://mailman:{{ postgresql}}@database/mailmandb
+            - HYPERKITTY_API_KEY={{ hyperkitty_api_key }}
+          networks:
+            mailman:
+              ipv4_address: 172.19.199.3
+
+        database:
+          environment:
+            POSTGRES_DB: mailmandb
+            POSTGRES_USER: mailman
+            POSTGRES_PASSWORD: mailmanpass
+          restart: always
+          image: postgres:9.6-alpine
+          volumes:
+            - /opt/mailman/database:/var/lib/postgresql/data
+          networks:
+            mailman:
+              ipv4_address: 172.19.199.4
+
+      networks:
+         mailman:
+           driver: bridge
+           ipam:
+             driver: default
+             config:
+             -
+      subnet: 172.19.199.0/24
--- a/roles/docker/tasks/services/mailu.yml
+++ b/roles/docker/tasks/services/mailu.yml
@ -78,7 +78,6 @@
            - "993:993"
            - "25:25"
            - "587:587"
-            - "465:465"
          networks:
            - default
            - external_services
--- 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:v0.99.2
          restart: unless-stopped
          networks:
            - matrix
@ -88,7 +88,6 @@
            - "{{ 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"
@ -97,7 +96,7 @@

        riot:
          container_name: riot_app
-          image: avhost/docker-matrix-riot:v1.5.3
+          image: avhost/docker-matrix-riot:v1.0.3
          restart: unless-stopped
          networks:
            - matrix
--- a/roles/docker/tasks/services/netdata.yml
+++ b/roles/docker/tasks/services/netdata.yml
@ -21,7 +21,5 @@
      LETSENCRYPT_HOST: "{{ netdata.domain }}"
      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
      PGID: "999"
-    labels:
-      com.ouroboros.enable: "true"


--- a/roles/docker/tasks/services/tt-rss.yml
+++ b/roles/docker/tasks/services/tt-rss.yml
@ -1,53 +0,0 @@
---
- 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"