diff --git a/group_vars/all/vault_mailman3.yml b/group_vars/all/vault_mailman3.yml index 33bb6d5b5f0356994b7e3dfa3696249ebb576b52..53d68b5db8fe9d5f785c986bf18529b59d9fc374 100644 --- a/group_vars/all/vault_mailman3.yml +++ b/group_vars/all/vault_mailman3.yml @@ -1,18 +1,23 @@ $ANSIBLE_VAULT;1.1;AES256 -66616135343163363532323330323135316136333337366262366638613865613434356137353634 -3061313561326235383732383837316536666663616661660a333033353333393564626335363731 -36306331323365333136613033316161643538383263366633646638663564643730366165623935 -3135363634613535360a643533343066343034396238373464353463636332383138363135326337 -66393836656136373266306264663239326163616330313438383137336130393337646235636331 -35626561373230306162383333393339343331646234613933363366316236353538323533633530 -30313639333961343431353662623937346534396635623137326664343832363837646132383036 -31613761356162376433656464323130623461383365663239333264666436396135386662653362 -66666438346130636433646130633938343966366536393838373762383265616265613961363231 -36393731333032326132306430633462353464656461623831306131633738373835353036623336 -64396131623238336239386665646565353832386534623635656333386465396436646235343539 -31363464306533346533653063393733373637643437336533306662396634363539643966333936 -32366436356134396237373930363534663364313966636539666131616631666237626632313063 -38663763373238633434613366333737336432323065313630356535306366616638643530626461 -30653632316539326537366438306635343061366330373430386130653363623736666138633334 -63346238626264393563613565323533343261353034313165663963316539303135343865656164 -63343563396362363132323865613131366139323963613632343563656134663162 +34386532346634376634376461353464396132666530366431613130613931366634643438633735 +3462663739613064623538306432623132373833613538330a626166323436663430633861323036 +65626161336564643539313335363962646164633161393532376263336135323631653232616235 +3066353432336636340a626631643830313261656163373137626332633036376435396433616133 +37363462653066333133386439396637396233653232653736383061663531336536633863363635 +62373338326638363132393730643231376639313863366334613931633239323362303730303737 +35303562626635336165643736633061383235636333353762373061323664383763363736353939 +62346533666635326439326365383433383433633562663964316431346366393065323635393465 +35636330303630376566336635633361356336336331383863316532316234363861613338343534 +33653264363930373030383166653966633237356461633561393635383433663236643362303062 +64356233363034623137613964343735303538353430393363373736323136653561643762666134 +36323633356437333238353064303863353262666564633531353066323762306662363130323032 +65396632373631343332313238313837373032386639343135343262376237663261626435653236 +34313030646138393838366163633234656339303162613331626265663035303439306538626533 +31303331356538373365333436306337333936376361346439336363646230303331396637666334 +30343330373730373631336630653064343439336666636535666638393765306231366530613236 +33643862303537333930653932396139623139313938336166613266386661313365336639363731 +39303533316431363539386633313937386566353431363733633833333563663636396431653634 +33643030616136303165643861363434303333366365346361663333626661363061396437393062 +63653431316262626464626665643733656335316235613661663134616161393765646639386662 +63643430376432643730613236646636613261373139323362633461343765353139366638313061 +3736616530353539366437343865613934303431633739333162 diff --git a/roles/mailman3/templates/mailman.cfg.j2 b/roles/mailman3/templates/mailman.cfg.j2 index f2b96245cd542ef0747e09546bd34ce9e77693cb..2872a1d4c35587e7e2ba590f9a7cd00b5bbd3aed 100644 --- a/roles/mailman3/templates/mailman.cfg.j2 +++ b/roles/mailman3/templates/mailman.cfg.j2 @@ -5,8 +5,9 @@ layout: fhs class: mailman.database.postgresql.PostgreSQLDatabase url: postgres://{{ vault_mailman_db_user }}:{{ vault_mailman_db_password }}@127.0.0.1/mailman - -# TODO: admin_user and admin_pass +[webservice] +admin_user: {{ vault_mailman_admin_user }} +admin_pass: {{ vault_mailman_admin_pass }} [mta] configuration: /etc/postfix.cfg diff --git a/roles/mailman3/templates/settings.py.j2 b/roles/mailman3/templates/settings.py.j2 index b47d96022f5e728a84d208abb376add77b9e1cd0..77167323d305f26499582952d7b18a5da74b2330 100644 --- a/roles/mailman3/templates/settings.py.j2 +++ b/roles/mailman3/templates/settings.py.j2 @@ -34,3 +34,6 @@ SITE_ID = 1 SECRET_KEY = '{{ vault_mailman_web_secret_key }}' + +MAILMAN_REST_API_USER = '{{ vault_mailman_admin_user }}' +MAILMAN_REST_API_PASS = '{{ vault_mailman_admin_pass }}'