graffen/datacoop.ansible
1
0
Fork 0
forked from data.coop/ansible
Code Issues Pull requests Releases Wiki Activity

Disable Matrix registrations and move Matrix secrets to Ansible vault.

Browse source 
Fixes #46
This commit is contained in:
Jesper Hess 2021-07-03 08:44:35 +02:00
parent 0ef4f972ed
commit b39df6003b
Signed by: graffen
GPG key ID: 351A89E40D763F0F
4 changed files with 96 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

158
group_vars/all/secrets.yml
View file

@ -1,73 +1,87 @@
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
34376131343263336262656463373830643861336631626539643663333239313831626236306530 64303966386637656661643830646664613862383261303937306662643035616533633636633465
3335623130653432636133356363656465346366303062370a346130326536366638633536613161 3630623631653063336236643438313762353365383632380a363435316136363832306531333164
62623334363537636634373231353564396362343330623562383939373538633066616565306235 36373436666631383031663231396630653836316639343435663864376339303634353438643738
3332323863353334640a396462313862366362366535383737376333383361303065383937396530 3234656530343866610a353365613237613365343338343866306537323561363530386637366161
38326331396333396263363762346331356431623532343938613834663830393337646666336435 30663665663863396334653930316630313930363335653832366264613361386130303831646463
66356439333434356165613030306138666163653934386233663362646534303737323030636234 38353233633635636638383033343665353339316464666538396562323030353636353434626430
31616132613830363136666639386462363135656432373236393034316664363637663336366435 66323066353863383261656665336264386461326564353862346237363734386630626330356336
64373238633064623735666335636231656231666434383066313336303137333663333031363638 38346234313336656430623630343965626234303964313663643533343433376636366237333764
31643733336535383338376631656439633962653262356335383638373764353530643234303935 34353730373866613265303332326132333464316639333930666661316266613032386231306665
62383930393634613530643739643335616164633038326638356135623561326165376530363461 39643533373165396363336636616561633961313666613438373431666230386634393137353637
37373032393331653261373538633065333662393366666161396638383932393331623766343035 34386330643433623161643261656231613461383264353161356561363163396530386465353365
30333335663039323931306162313538373334393335306132626336643363323839633761383063 64393732373735343931323437313066353636366565626232643438393462613834383533626237
35343632363837383132656437303138303764316439343663303964396463363638336533653930 31616462616230653239303237343538663064373938353538333266653165646536306238626434
39303236353766373131623363653835666439333164366563346164626464633633363163323864 61643131376162383636353730666362653537383866303763316531363361333539383034336166
65363961393237666433623565343832306663323862666333343665376135646132363466616364 61303663353966636664383033666165623731663466646665363161313661343737643332653739
62356331666432336661343762333961333634396466333465633164326239386266643230393566 30333661326430393234306337646163363930396263326263653333643130623138326465336164
36376461373631636630303861313538333834646461663539623738636636626537656438646431 61326133663038343566383131313661323666393335326437356537613235303432323439333362
38383436393238363038313563633634396335346138626666366437333433383039363332623639 31396535386439383961343865316665356564323166653937663732623139633163396436376164
31396165346431333838393164616339656634346561313737306562343562323030613266633263 39633564656264323833303638633033353262386565616439316461623039346165663464616664
61333263653938653034356631333664323630306461346532626533363665363133376232316132 33313931633166393330386263386166306465613136363263396336646265323932633831393032
61346431383230656134373630653264363430383561313866363235333435633966386266653964 32623565336430353861616537633632366539353432386164343532616530313862373565373663
33363534343634343232373036633330613038303437333033313061313932373739343663303931 33396234666435623938303066326265396331303361316364306334656132363061373063633633
34333833386638353436653831623835323032303134366635613735643662636336616464313330 65303539346166343161623961363262623936363265383338303463373330333634326231366631
36633335613630663233326166633565386238656236633261396235363165656333333235643137 30303565353663623833316230366231306664653061383535373739323735656337363537306261
32623461663562313533333835396233383330613661646431646365343430626662326638653330 30393964303430626231616330326161643063626566613961383236303563663035356134323438
38646232386263356566373561353130616539346630613363313163363262356264653233313862 39616662613437316234656331326562633238316265393464306135393130626632313361393463
34386331363236386534353534616531643264613764343362646366393435383332653664353363 62643562643434303437653134376132346332613934393839333561613636613238383931323961
62333935363132373434613038353632643336633136656266316466373734646234636638316265 65633362313064313061383864346362313332626137313264643433656562313663303536386132
62646261396465623561633964313065626361316630353965616233356565343834656563353830 63393533636236663262323462396537373730663432346131306536616531633135363132336637
38346361336237646331366632633130613330336637326163663463386233643734356165666431 35373734333061336532356532356436643538313764653562343635303731386632393338626439
61396263656237333138356231306437653337656133663031303031616437633564613733316264 34636434333539353166616237636233633936396661373731376263623930656534333666386563
63633930353033636235653961393330326635626666626235336334653762373262633739356263 34306465363465653738653633623030626665373239613163666563306230333438613934303164
32323532333463653937386430663437303238313130643435353739393639303033343865323736 34613665356662313965323265343364343761306237363263346339336536343937626461373132
35366139643166626364373663333266376133636433653261316566366630396666336637326664 62323766373432316331353661626132313262336635663562636538376634396264636430346465
30343039633133626435363364346666613732666335313865326234366136366130616334396338 39616431333135383538613332333836633066323462656338633330383830343033643033336534
61663461623432303930623261336464643830303631396430363637383838616432356634303332 62363132316664643432633664323633333933356131353839653530663166663265363136626532
61346536313035376139313638393737393136643366366364363862383335353533313534366534 34363530323564336262373863643361306461633665656535636362623334336161336131393730
61356136366465373530393835613834366665653334376539303462336138646438653039306261 33666230366563303334616133363536383761336637363037386530303534313332363861363138
36613736323566636634666331396463623439323063356232306631616135623231336439303739 34396638623431616264333937366633663062326262613633366361363831646535376333313631
65393837653837336235396532323465656463636238643038383363616633383866333633663831 35356136393335663230313439353233366134323465366639356434303932623633636530346334
61363634356634636265663837306232303362313564323463303363323931396438646337363161 66396138303262616336653039313135343762643538626137376130313966336265373133373837
61313033343532336563393632373830326631616462616263346363636566663966396330386464 35643937333963363335323737306363626366633064633537323362343930663932613437626434
62613039323065343838653439303333396536366537313335353834613338623961646235633764 38363836383437373735336165313536613536313261653364313463653334346534636138646230
30333032323333663530613736313765343364363433366436666134623663653336386632333437 65643635386336653134666237626637623861623264333633333063316637386335633462616536
64386639636237333138323431333234316432366236613530376234636438356531636630396431 32373933386466616634373432613132623436626637393466633865383966616639333533346337
63643833366136363962346632616161363565336163313764383030303337346565613939383563 37366565326138383632613161383162623232636138353464363638663439666231376262643431
65306137633965326534356666346238363137323233336561643333386265613863396338383134 34653934616461323434343335333138653861323136333262636535366662663865306631343131
35363135303232376364306234323435356330333061613663326563343533636165356537336536 34316537383438653732363031373337373433333261383466646431323932383466623633396661
61656131343966346365396133666662393930663237643134383963303766306534633034356335 30623832636563646634326130393135313866646265653862326564313665313934363762373430
37633732393266633965616330643061616664336430643630633033326335643438373737653164 37656236306531613261333330313931303637363861623163323238666133656565323163353563
34633737303533666335306466306330343233326531343065666138633166383664333130653864 66386562383532373637393361363730323365393736633432393336383236343864383331663063
37623730333532633936316461333066313065316664383934343731616430366135346138663531 33383732653338326233386466373136393761303861653933663932653265333862353536643538
33353134333934376663336366663036383630393031303731653332373335333131633136616537 33356331613865303362646637303465373439363435396535626262303331346238383837656261
33666266373439346633373735643339653333626237623530346436306438396332613863346264 35316462316161663165343465623064366633643139386633653166323763303632376532323735
30346431393735326566393633626535383538343866653262653330366330623930646631663961 37333435343934663332306332376434643164643937363263343866393832323438643864623036
38656138313932623131613537376139666137653063313339666333313364343738306439656264 33326362656164366136646338383830616530613565663438653461333738313361393633346432
32346533646465376135376531383132396337653966393133316436616563613135353863653064 65626638373236353337343639646437613666663537373932323534303766303532663362323863
31373466616135393036333037623164346539323463333037613030386666396363353364396439 37613335653631313830396335313538303335353861316562613733633664353263636566666438
39616536646638623739623834363662643566393430623632646434336162316362653434343337 64633734663463623935353034316130396463323662633761393530306535343635396130306637
36623334303866343533623538663531303366343136636631376334653636313264376330313836 63663766656665616330346264333130656662646133303739646632626433356633346661613862
66333131343062373138663330313633623166303337306466313362343034316364666666373965 64333934643861386539383763653663626639373734636464323832646462313235663431623631
36373933343338646333373962623034353631623535306230346663373530346438386334303536 38643462326363396561626436373963643665633162633230356261343533346335363437353738
62366666646263303764303330353835633163363666303133333730343263613039346162356532 30393331326266613139353837636364346534346636373339303638363534393461323563623938
37323133613037313430366238313261633165643563666239623730653164666264633964626461 39336563333166303736666635643062666166376132646364383161353933396665666530313433
31323536623335636333393338333166346336323132373466396432613133613933356232373532 35373534636662626236393663643861623866666535656162663538313530303165326235646432
30653564323031636231343232646165653163393663663731313033323763663965356466366562 34653061363665616232646430353438363537373236633434323134303536333464363237316238
33303830656238653164646161366265636566393436323135356630393033316337363361306363 38663537626334306135623262663165626130333936336639356335343434613134636462303534
30393766636237336466353431616130653961326431323161313234333963643032393061303265 66396139646633343238356265326361656532633966653766656636623664383136623134333266
33396664336535353164643462303636616265306338333634376664323837303238623638313266 39613433336436356338633163383235653838313837636665646466353938383534396337613332
37643861343034646532626164353238373031633861623663316638333039643036353932323962 64633733623962643832356338373266373130633361633133666566663832613830356463373630
39616136653639313232326362663834333363633562646563393561396464383765616230333230 61643933373737623566313539333462623839616438376530643961396464313138323163613865
39663939326332333362 30306436663662396434633139623066373833633938303630646435373662316461333732393238
38613930613566616561626464353135303139323864313734306232656334303836653763633665
37366464323538326261353930306232633030376233326563343930633632396330643037636433
61346365383535336232396639646135326464343035353932636465613130613464376464363037
63373739636330323161643937383163383535663335616366663338373262306534663366366336
63376565396330626666383865653365353331396163643064353161646565323566316235336363
33393739316134353965633533646233663737353936316661313932656331323331323562656166
35363834333361643361356238643535623432626237363062656562633531376265633934613437
63636464623435666533613062613030666239333562623263373031386434353039643362343562
65333139653735376130656166333935343936663666303838633137376330383061373537633536
39313161623964343731393639653365343338373862616665313732393966623436303034303163
36373439333566663835313463313033396562626364636664383936323230323939633830306239
30363533326233666531633832326561343663393436313633383365363038633134303633396463
36613230323233346264366331363330616533323366653238343064376631383039313931656233
6661306536363836616235623039353632623537316337623235

5
group_vars/all/secrets.yml.contents
View file

@ -30,3 +30,8 @@ drone_secrets:
restic_secrets: restic_secrets:
user_secret: xxx user_secret: xxx
encryption_secret: xxx encryption_secret: xxx
matrix_secrets:
registration_shared_secret: xxx
macaroon_secret_key: xxx
form_secret: xxx

8
roles/docker/files/configs/matrix/homeserver.yaml → roles/docker/files/configs/matrix/homeserver.yaml.j2
View file

@ -577,7 +577,7 @@ turn_allow_guests: True
## Registration ## ## Registration ##
# Enable registration for new users. # Enable registration for new users.
enable_registration: True enable_registration: False
# The user must provide all of the below types of 3PID when registering. # The user must provide all of the below types of 3PID when registering.
# #
@ -604,7 +604,7 @@ enable_registration: True
# If set, allows registration by anyone who also has the shared # If set, allows registration by anyone who also has the shared
# secret, even if registration is otherwise disabled. # secret, even if registration is otherwise disabled.
# #
registration_shared_secret: "jnJ5gfTj_qi#H0:vnPZx7OH*Qz.9u4cxpq.wHcHEAfuhcMgpxG" registration_shared_secret: "{{ matrix_secrets.registration_shared_secret }}"
# Set the number of bcrypt rounds used to generate password hash. # Set the number of bcrypt rounds used to generate password hash.
# Larger numbers increase the work factor needed to generate the hash. # Larger numbers increase the work factor needed to generate the hash.
@ -699,7 +699,7 @@ track_appservice_user_ips: False
# the registration_shared_secret is used, if one is given; otherwise, # the registration_shared_secret is used, if one is given; otherwise,
# a secret key is derived from the signing key. # a secret key is derived from the signing key.
# #
macaroon_secret_key: "PLawJ8o.Q_.pR3Rr.vJO3=F&eAe=b~g6hVOKbrRrSl#w5Eqr8X" macaroon_secret_key: "{{ matrix_secrets.macaroon_secret_key }}"
# Used to enable access token expiration. # Used to enable access token expiration.
# #
@ -709,7 +709,7 @@ expire_access_token: False
# falsification of values. Must be specified for the User Consent # falsification of values. Must be specified for the User Consent
# forms to work. # forms to work.
# #
form_secret: "ssHGS0,URi,oQ8~Upfi53meultXQ-Vo-r5XgKjP.u42qL;WGc-" form_secret: "{{ matrix_secrets.form_secret }}"
## Signing Keys ## ## Signing Keys ##

2
roles/docker/tasks/services/matrix_riot.yml
View file

@ -53,7 +53,7 @@
- name: upload homeserver.yaml - name: upload homeserver.yaml
template: template:
src: "files/configs/matrix/homeserver.yaml" src: "files/configs/matrix/homeserver.yaml.j2"
dest: "{{ matrix.volume_folder }}/data/homeserver.yaml" dest: "{{ matrix.volume_folder }}/data/homeserver.yaml"
- name: upload matrix logging config - name: upload matrix logging config