Setup psql backups, add grafana/promethius exporters.

Add ability to configure jitsi-prosody to load custom modules

docs/configuring-awx-system.md

@@ -31,9 +31,9 @@ Updates to this section are trailed here:
 
 ## Does I need an AWX setup to use this? How do I configure it? 
 
-Yes, you'll need to configure an AWX instance, the [Create AWX System](https://gitlab.com/GoMatrixHosting/create-awx-system) repository makes it easy to do. Just follow the steps listed in ['/docs/Installation.md' of that repository](https://gitlab.com/GoMatrixHosting/create-awx-system/-/blob/master/docs/Installation.md). 
+Yes, you'll need to configure an AWX instance, the [Create AWX System](https://gitlab.com/GoMatrixHosting/create-awx-system) repository makes it easy to do. Just follow the steps listed in ['/docs/Installation_AWX.md' of that repository](https://gitlab.com/GoMatrixHosting/create-awx-system/-/blob/master/docs/Installation_AWX.md). 
 
-For simpler installation steps you can use to get started with this system, check out our minimal installation guide at ['/doc/Installation_Minimal.md of that repository'](https://gitlab.com/GoMatrixHosting/create-awx-system/-/blob/master/docs/Installation_Minimal.md).
+For simpler installation steps you can use to get started with this system, check out our minimal installation guide at ['/doc/Installation_Minimal_AWX.md of that repository'](https://gitlab.com/GoMatrixHosting/create-awx-system/-/blob/master/docs/Installation_Minimal_AWX.md).
 
 
 ## Does I need a front-end WordPress site? And a DigitalOcean account? 

docs/configuring-playbook-bridge-heisenbridge.md

@@ -4,7 +4,7 @@
 
 The playbook can install and configure [Heisenbridge](https://github.com/hifi/heisenbridge) - the bouncer-style [IRC](https://en.wikipedia.org/wiki/Internet_Relay_Chat) bridge for you.
 
-See the project's [README](https://github.com/hifi/heisenbridge/blob/master/README.md) to learn what it does and why it might be useful to you.
+See the project's [README](https://github.com/hifi/heisenbridge/blob/master/README.md) to learn what it does and why it might be useful to you. You can also take a look at [this demonstration video](https://www.youtube.com/watch?v=nQk1Bp4tk4I).
 
 ## Configuration
 
@@ -33,4 +33,6 @@ After the bridge is successfully running just DM `@heisenbridge:your-homeserver`
 Help is available for all commands with the `-h` switch.
 If the bridge ignores you and a DM is not accepted then the owner setting may be wrong.
 
+You can also learn the basics by watching [this demonstration video](https://www.youtube.com/watch?v=nQk1Bp4tk4I).
+
 If you encounter issues or feel lost you can join the project room at [#heisenbridge:vi.fi](https://matrix.to/#/#heisenbridge:vi.fi) for help.

group_vars/all/vault.yml

@@ -1,133 +1,143 @@
 $ANSIBLE_VAULT;1.1;AES256
-36316335623431376164323463303235323966396533373330313934303066323037666431373934
-6364323533353637346262336333626638393639313034300a656135626263333732653864343765
-32626539386236373461623365376532623439643161326131306539336364383933306339633030
-3263306661313965640a643662613366383135353935636565316336343836313935393837323430
-33346434353733623433663962366138386337343437646264663762363062393166396233316131
-32376662393735653330613138663035303666333865323636316564303837316539333335303662
-66613437393233373937616632346135623437656131373431626638366564336162623139343162
-61653635326366616432303761383334613138353532643330666531313238626534343366623261
-64323630336161393861303332643833636662646561633231393332366665633363333564353833
-36346163393231396564373136653437646465623731666264363931386365356639376235346565
-34353731386437636564626131353464393335396332643438346634356236336361343235613430
-38396333373431353433383834646465393064383535343531316433306161326366653438383530
-39636235653534376435326635346632613964386466326239376435646330356534666632303132
-38316535336339316236616333373936386461633833376461326330303335633139623932323437
-30636234373562326262333964623831383163616162346163656232356431613964633831363434
-61373136616437316136633239326564333935373231383037336265383038663332353238633162
-38663137646162616339663531333737343635643865613262343361393433346265623939376365
-39393435303339303737636238356437383463663733303938623961653832656339373363663338
-39663931356561343935663131303965326564363733633639613836613864393636663136393733
-37313566613338613231626537386434656166336466666433626639613838373938363232613232
-35313137633862303231636663366534626334316539313161303865373433633235383238626632
-36386134663534363962333231363231346432346564326533363234316335356166633939356338
-61376434363836366265613337626661623230306438633362386335636566616661656332353962
-62386661333463623965663631356632366330623962386435393137636339326665643739373034
-66656563396166326233343039633730623037376263313337343361663130663064376234373533
-37613836393963306537316435323164316533376663376462396638313665333033386362643836
-64333761653732366463653136616666333235313833323137346533346362613138333932653463
-36323362306462323763303038316363663435656464666266643936376364363430616663306132
-38393539653366613637326135666466363936613932383434373736666261366564653238386464
-34653338656632363036373931383961323337626665353963396265663930636139356337323062
-65306234646462323063643032616262623931316261333932356662343264363461643737386333
-35613061303533346331313466373535303263393131383965373661363365316632653639303238
-30626564666564353131333962633464663032643637383931336635323462323937623366363833
-39396166636632396538643130326437643865323537316437303438643364336661396532343735
-64393863386361396536643164616532363364363366633633353338343330383162633334356430
-38666263636234663234623164636565393335343235356233393833333934316565653663663336
-34616239343131323862356265323965666538363133663662616336663136313931333436353238
-61616363396164613333666331613838653034656564393035303661653766643934633162373534
-32356266643133666637633366366533333632653665363961626339303537356234396437666165
-32366465663564616164373166353738366464393961376264333935306261353666666437376463
-33303333333463356636383433646362643766356466636664656234376338313530356162313633
-33373232303463653136363337336439313563633730626137663835363566356264633237326263
-33313133643436313666333064363637633831353932643865303339623865393238383464366564
-32306262653065396164613734343562643662653837386664623537393232393635393036326338
-36306565366662353737663361623839353332333531623031343531626666356162653237343036
-39646135366131613039653238616232373064613335346463613035363238393865653333336566
-32653563386465343864656335653731373430653866376563656230613264626161333639363235
-31393961383438653566336463323339313863396532376633373765623136663061363735623635
-39613765396266613537613761633262346664313230616566353333353463393261353435373932
-32343037393461363535616134383730366437313134633965663935656236373062373531643664
-32653062396664326331643530633630303661646136306366363236313632333666356332356161
-62663334323362353736623735646135633735306133383731326135363664636135333761663733
-31343339336565623562346162646363313663623139336538366161346161383334616436376564
-63366632643232303862663231366637376531363163363633333831396330643338653463613133
-36666163393265623562373063356565623862393232373434336138636134623633336434663862
-30353266386631633038663466333436643330303731326433643766636239616361336231323633
-30663361376365396331643137343538623761613336303465636336646631633331636336643932
-38303665616666376235383936656536633637386330396532626434326361323531656436333035
-65383462373539333264643233613765623639636664353831376565626630363538336239373562
-34333737623832303234656433636466373638366563636430303130316138666639623362303937
-35626565376464333537393938613333363932333134326537643866646166663066646565373563
-33343465346135333362316462353935303464393833363864353236653331646136396637366239
-34333561653739303263346566663333633930376566626263323064626366653334623532363664
-35646664323362386164343732316234643533623937613835383438383262386166616438386135
-31316535613838646234636161333734333762636135303361323561313339616664376432313336
-31313437633732346666363365633631363833656339303136633966646465666535636338363863
-62333233616538353230366361316261323832653831396439316165663465326130363236346230
-34336262653932393764653836326637653339323661363937306530616264343066373466666339
-32393661613666383739303566373036643438643038393364353161623937316463343763313539
-62646437366661633165636366623430306165376662316263336465663235633464666462333662
-35313632656364666639643361356564633432376661313337316136383930316230346665386537
-39383165346136346565623362656331306332353761393039313536363334313437333736396630
-32336134386565326339633033353630373063326534376338616434346664383662613162363835
-36316136643937393232363733353062323761313131356566373835636564666534366530623533
-63653939346461626630633139323232363239636530396436663634623263626231336331373931
-31383563633063653966393438653839313563373537353435633438303731333364336436333564
-30633261346561313565643738323863633131363737343062623066393839656433343737393062
-35663230393264653235363462633461616536653062343961373732373631663638633732653264
-33336262353930633263643934303535613230633465316635326664356466323134626363303133
-38663561376661323632383861636665306662363665383163303833316134666531616639306162
-61333635313136366636366238306530343966396431643062633937356265333731633531323431
-31643064313865333834623963353937393964396235313936663964346636306637616463373663
-37316362653635613433313739663836323562333036613237376532373234643264343036656335
-39613139623564613630626139306137303737383866646132336231613462306666323835373863
-32336366336263643935343736353664653966363235636532303532393562646264326132376637
-30666563396139383337353536373062376662396634613735663962373135356338313931636662
-36363933376633666235393763666230626635373763323233636636383465613563666262613738
-33336537636538653930373133666336616566653963306232613865666536383339383132303338
-34663735646262336466363138643966646232626164613762316336346262363066363634383938
-64643864636130666563663963313331373735316139306635633261303661326534643365613361
-36356562343865306561633861663236646631363133343734343161356430346532383461393562
-34623630376362353261333637373166316261353335373366646162366366326333373464333164
-65303561363434333038363732646264623534323766363137303737633933326337666536626436
-31663031376531366335626161666334366361396562613339396236613735363061646230623434
-36633533396639386538373861316631366565366664386437323436323061313366653862623466
-36336131303365326635363139306266613031613438643836383630353564623964353632616232
-33636666316435626362633538386162303230626131386338373234646638666639386463303135
-64326637616265353663373232633465376366386635323061656166666530396232623964636134
-63326139306234326333646662373131633534623466346166613962303362663032316539393366
-63326136313234313965366134313237303163663734646337613536326462333135393438653039
-32363866376131623531356637666639363961383139656461393332656462333933386634656133
-39323866363334613433373666353739656661343333623366336636613566396535363333666337
-61313764616437646566656530313835613739393765666634336133616539386233366266373439
-65633335663735353939663235316530376432343161373332306635316237336136373136356234
-31326162366234333237346431373139376161626262343136383462626435373036313532663934
-33653830303961383864323862613330353730323562643932626631613037353836356666386435
-39336463383864633131346166363433336632333763623761663733393961653136396661616563
-37653237333139613037663233313662323061356434613065656335666165323136373763633338
-34376332656532326365316463396562393864326563383836383364626436623239336635313736
-63656264346134373836306234326335656432303935346562643936336461353061323565393236
-64363031666262646261383765616536313335393931396439333139663165316230346435363837
-63656166323336373666326237353732663437656466633461363631376261383234626462626237
-61393236353735653063396239653039333562643962663366396634303534396336393962323765
-38613939303532636363623264343035653738616536366333396335343430336362616466653961
-64336466613334326133336433616366326366656233653832616561346435306264623435666339
-33323663383037353130363639396237616364383933363462316265643831373436363930353365
-63326239366336333733366232333163626637306265633861343165353462616233313035336435
-39663537393431306237663735633030343332343764356238636564613365353734646638326139
-64636437663464396136343531386530393732646566353331666139366464306364366666393134
-64633435653933626639303363646166646131313831323464393238303366363130373064323265
-34626631326535343237643036383334636433383365366461343633303563313364396161643331
-39376135623436383739353863383834336631623139376136383366326435376466643466363762
-35396430393132643136653863353766383265643638396262623639343337343934343462633634
-38323937313234626266333330663464653033313066356438646333373332646138313431323966
-38613931373963393332613162383937373164663932373861616361623839393365356338626363
-36316432366230396336623462656330653761633831383735626234663735386364383332366535
-63393330393039393965383831376563333938653636366664643934323961356336363431363037
-64633132366233373730383031373733636635346234386361373730323539333531316262346566
-38666637666666363038316563663465616235633631616466346162616235373636633636623361
-62306462356463376432613662663665316536653461616564666631643837646133653836633465
-39643632653235363133663466613130336566363630346139386532656564646432373331356564
-31343839656264326531
+33623139643534366434616565393762396332386136396564636536636234646463376330306166
+6663343562383835366538333562333261386631393135310a383963626336323265346530363936
+66363664643031396235373736313263303865383864663436353165353732363132393763373038
+3636616531663636390a393334376565656663363063313464346336333636386335666132613661
+36616164623464346438653431636262633337316437616538623739636637396432636538326135
+31303836346539383337336138393835316636343535386530633639626538306237393064623539
+62656538663837343932313037323836353462643438653433373132363864353864376539646566
+39663730663732306563323537323937646337396136353835343664336236666137653036353432
+32663433653638656666656536326334633235356335633233626237623134653866386637316235
+39346637383630333463333564633432373664653436383565346566386261633238613532613837
+65313565616136643835366564346234653866306363646662393338333363366331356564313634
+38396336386362316332626133383662356138633431653037376431666330323433353236363961
+34366339653566363434393738343138623239336562663832633235623830306562643338346365
+32343232346361396238333030623361633735343330383963633739633933366439303437643833
+30353936343133306262623531643763343661663437323632626461633636306365303061343564
+30613362396533356235386535656264663239396136633235356463303036303530363734303062
+65633038313033353637643739316238316630343566396464373039303331653533656466323566
+63323839343361656563353932336330313233646666333237316133363062613136626664653361
+63366662303133643235653963313935376666666333643935316262326530316632303461653163
+64613937306534303232333363343832336537316565346665666364353763616130306238313462
+31336132623561656162346162633837323132323530643233653263333730656233653564383832
+30356337653634326539633636666332363334656639623661346235323736366636623461373261
+61303235613135616361353835616462313537303261333465303234306530316266663132626631
+65616531383937393463313738373265613464613834323832346336353130656434373830323639
+38316232656238323663383935346530363432323833656634313337633163313930663330623761
+36323531303930373931396531393836353836306234623833663437336562313336656466643432
+33373464356161363136353132326362623535373436306237393235623964383161363439396361
+64663537613530653361646162626532666461663432343333613834353639653662336533336337
+39376637656630373038313865376632343033303635306563363434613365323938346361343232
+65633261396662663665363531636561366130633864666634393165616139666239366130343666
+39376136303662653762353234383861346533383166366638343530636532373235623130363262
+39353137626437336630386464613531633261323939343536646163376631623831663161626233
+33323763323834613439666266376539313134643566353266636630346264303035376661653566
+33353465306530633031653466373766303931373765663564326161663261353165646632656166
+34306564616437383335356362313238343431623065613363346130323037303865623832333336
+61636261306333346165666638316161313731343462623137376461646132333631356264336164
+35396335363936666134326131303336656261616535323966323636336430313239376331633430
+61363737386131383262643937316231356363326630376131323562643636613933313464363037
+37333138383961346537313638383533333935373766613063653338656261653661393137346336
+35336236373561636361373563373834333535323831346361396137303338653634386431373532
+32376162326338653933663633323262313330616237383835346466306232393632663563376334
+65373930383635643464636165346134343036616533396361353638313065653861326639333161
+65643465346662653734616463383939393031646134353264663862626339363835303736623061
+36636335663365393131383137663932313239326532643861636431303430376133326234333433
+34663536363934303863363432333334393433303236363730636338343931363565303737306433
+34633234656366626664376263356236626262623831613438653938336130633632333332666233
+37636431393832623165303036393631633663303965656565616238393365376631353238383963
+63633330363831306433363936393734343161343262636430306261623630366631613638616462
+62343763323437356634626633643435653138356130393430363362643131303334643138336334
+66393437306230373861336131663762363364306662343332346430623664393163313236393063
+36303233623362613765373236373038396434353135396462313734326466633830643364613331
+36393933656635343134393530616330353332626432303330633931633732373362613735396433
+38353939626332393236313739386639306437613430663536616264656532333665356636323832
+64636439306335643963643538393562623865306237316462613933373732666537336638333337
+34366462386439303331343839646264643762636238643934373362346561636130626261393832
+31663564643765323837383231666631333165326362666437396130663765326130636232396432
+31643739633062393936343761323263313338323138386230656361316163356364653263663237
+33633238636136333864303137623839303130393230653937646339613538343066386639303535
+35363664313831663536363934656530636334393030333130363930356235393862636261636139
+32623535626465376430653238333234363435313365386563313935393865383665316261653466
+32303733353662656639343964356131633361356130333031343761343463633031643731316231
+64663938333965646134393161663563656431613631643263343139336464663966316332376138
+34343534636232313265346639663663323731393235333264333966346361373361356662366664
+64363338373962646135633261353536613565383033333437663537663439633662333633363333
+65663833333530323962366563353435333439313534333239313430623136366363626461346261
+66376263646164383033616664343465643932333630306266363932616433616237646337666233
+33353939663136373631333638313263633132653161633264616533313264383536366462396433
+38623432626232326230346538613436633663623833346638393363343632386465363863366362
+62363664323966356266366239653163316661633030366632663361333164363838386135393238
+37336338376565623662316263396630303261623236636263393766636566336433383562383331
+64363034316263393532316466316339393333353161623565386361396636316334383935366366
+35303464363632356464643164353832373932393064623633633737303838386636316264613932
+39623866363264326530643964333538333730316636653531666632363737353365316530646638
+65326333373736373665323538656438613030336636353030303164623861643461303638333339
+64333862613038336634646232343464343265633833383730653537656431636161623638313430
+63323531656639383338336330353134373361616562383938363431303561656632346430633339
+30616235313733346431633164666534376637363535363737336533643830333666343732323032
+61613330336463306535643166323033653736316661666338306231633739353338323031333662
+39613132613937343633323737353465313166613061623865653734656632363961643562376137
+37666633653463653639663532336236613432666332316133646635366332666339386638316138
+39656561303431616539653934336338313565326438623231653236613635323734396266393961
+65656537346131666263313462313833633162633662316463326264633966396464666433373639
+36656262353935306663653562636461396134333866316233333166353337653164343937663466
+30646432663563373333306161666533623935373736396436346663373235366431386334616237
+36626130623136386230646238653964663335363131393661396565353238353962313766393465
+63353564643633363435326162386165373536643332373662303836366166356364666532623333
+38613635633537396330623732313761396530303765636534613365663039623466626638363036
+62326561393131316135333535393032663064663530633034393330666661636237386462316231
+39623361656461356431393834623533393164306232653766326637323239656332666664623266
+30636133356362376238663263623662393665343561636435313636636666363539623732343061
+61646632346630363230626566303963653936336666353031356631386134363265663038656534
+33356135323431626463323463366366373333666432636366316266393066393132343036613233
+65343764323038376634366362333063303730613764616332656265363239326462306363653430
+64373061383864373639353038333830303763323066373831323634316536656237633566636338
+34336561376537356266386238373138396534323939306361656130363834336334646637623665
+35353362343139643235663437656436393465383962613866623738666665366461373536356466
+35333561303432383231386432353961626631623062633230363632383634626632626536373764
+62326438396163333762326239643861653263393461613661363465326163613938653966333131
+31316638663062373736303934313633633662316230386263323536356338346638313039353564
+35656331343136383365643035663462313665643731366639353164393735313139613932616530
+39653965633565326434633231326363623336383235353964366537653433636366666436643865
+61626166633431373631373536633037333333356430316263396262396432663630663137616431
+34336532653636343433323834633262306434363833303633613364323639376232616137613366
+64656433346236313138643333653133633735626330356661336335393762396164316461313563
+30313165336661333630316164663666353932383737646366663430653430363366646536373436
+66643932333832373333393966653132646463353466643332646532623439353432636635313933
+66323863303337623263376561313664383466633464303265313533336439393263353332323063
+38666563623033363362323834323735396463353731386564373138383264306564373434366234
+61656133613864633061356330616530653964366264663831333333656638363564663232393030
+61656330333233386232636235666161343063353333303135363261663531366134643265653866
+33646437313835316466343063323737653661363464666532343731616466323663323134386436
+32376563343437623134373731666462653464616435626536333762616664356339306161306233
+63396239666665386438336262303730623663646638636234636563613233336262323661343265
+34373362373738373533363865353763383931613435616365346438626633613530366139336438
+61656234613163353837643262633334383962396465393961373463373663356366396561353934
+35366365366530356230363764623739353364313062306230653961656430613062303434376333
+65653730613438666630656138613939333231366632626466393235613864393337336335396163
+33633738313462326665393532616634616331303965303438306534316632356137323731626162
+64326233323462656631383138336139613962303666636337663362373630323835346334353665
+39393365316238616133643866326461346163386438313264346536376536313266643837633662
+37303233663135363663383530663034393735313763666637326236653165623833333738666363
+36646437663763663039313566333738323863373436323935333538373130383934656533663836
+66633566396634366332393731346434323135363433643232616264633565663833303461343337
+61316665323537666432656233663235323632336365313464333531656335393635336565386332
+36303339383865663666306131323331363833336532623032656136326336626338616637366234
+31373838616364383337636266626461376439613261666461303332613630326363326636353837
+38643962616233633035343432353838363361653335656663366363613732346133316632636632
+31623062313931313862313237666565323431346533323632653762653232323361363630333430
+61613339643536343133333364333830386362323863373830373735343331353438323936396335
+61313038383630353863376533323831646335393438346436316430303766633237353039373964
+34623266663632313134396536386661313466333965373837336531346633363536353335623266
+37343736666331346164336566613334363733376464313431613064626165323261313962353437
+36343833303637393464373030343463336562616262393961323839313939303838386664343134
+64393332336266353861336561383535613866346633643530616663646334313537313836646535
+64613532333663323866303361623164313865313831646130366338333635343963643832343463
+63303364303137326334386331363730383032303939346637373636633366363563333234303861
+33323136316439346365316237623833633930633932343761393337376463343564306563303861
+36613766346263653735323830393864366664313966306166303536313231303837383365616364
+61366433373061666234393939343064366539623863356536313631613565626138356135306238
+37373139303037316365396561366135303536393739373862616630666164373634383132626264
+30656233633361623230343032643761383963366465353835373237626162623230306562626233
+6435646233303237623436636335326430613331303032313361

inventory/host_vars/matrix.awful.club/vars.yml

@@ -90,9 +90,11 @@ matrix_mx_puppet_twitter_access_token: "{{ MATRIX_MX_PUPPET_TWITTER_ACCESS_TOKEN
 matrix_mx_puppet_twitter_access_token_secret: "{{ MATRIX_MX_PUPPET_TWITTER_ACCESS_TOKEN_SECRET }}"
 matrix_mx_puppet_twitter_environment: "{{ MATRIX_MX_PUPPET_TWITTER_ENVIRONMENT }}"
 
-# added by jlj 2/20/21 - synapse / psql updates require manual intervention
 matrix_postgres_connection_password: "{{ vault_matrix_postgres_connection_password }}"
-
+matrix_postgres_backup_enabled: true
+matrix_postgres_backup_schedule: "@weekly"
+matrix_postgres_backup_keep_weeks: "5"
+matrix_postgres_backup_path: "/matrix/postgres/backups"
 
 # added by jlj 05/28/21 -- heisenbridge testing
 matrix_heisenbridge_enabled: true
@@ -114,3 +116,19 @@ matrix_dimension_admins:
   - "@jowj:{{ matrix_domain }}"
 
 matrix_dimension_access_token: "{{ vault_matrix_dimension_access_token }}"
+
+# stats shit
+matrix_prometheus_enabled: true
+matrix_prometheus_node_exporter_enabled: true
+matrix_grafana_enabled: true
+matrix_grafana_anonymous_access: false
+
+## This has no relation to your Matrix user id. It can be any username you'd like.
+## Changing the username subsequently won't work.
+matrix_grafana_default_admin_user: "{{ vault_matrix_grafana_default_admin_user }}"
+
+## Changing the password subsequently won't work.
+matrix_grafana_default_admin_password: "{{ vault_matrix_grafana_default_admin_password }}"
+
+## explicitly enable postgres exporter to get db stats, too
+matrix_prometheus_postgres_exporter_enabled: true

roles/matrix-awx/surveys/configure_email_relay.json.j2

@@ -0,0 +1,19 @@
+{
+  "name": "Configure Email Relay",
+  "description": "Enable MailGun relay to increase verification email reliability.",
+  "spec": [
+    {
+      "question_name": "Enable Email Relay",
+      "question_description": "Enables the MailGun email relay server, enabling this will increase the reliability of your email verification.",
+      "required": false,
+      "min": null,
+      "max": null,
+      "default": "{{ matrix_mailer_relay_use | string | lower }}",
+      "choices": "true\nfalse",
+      "new_question": true,
+      "variable": "matrix_mailer_relay_use",
+      "type": "multiplechoice"
+    }
+  ]
+}
+

roles/matrix-awx/tasks/main.yml

@@ -98,6 +98,15 @@
   tags:
     - setup-client-element
 
+# Additional playbook to set the variable file during Mailer configuration
+- include_tasks: 
+    file: "set_variables_mailer.yml"
+    apply:
+      tags: setup-mailer
+  when: run_setup|bool and matrix_awx_enabled|bool
+  tags:
+    - setup-mailer
+
 # Additional playbook to set the variable file during Element configuration
 - include_tasks: 
     file: "set_variables_element_subdomain.yml"

roles/matrix-awx/tasks/set_variables_mailer.yml

@@ -0,0 +1,50 @@
+
+- name: Record Mailer variables locally on AWX
+  delegate_to: 127.0.0.1
+  lineinfile:
+    path: '{{ awx_cached_matrix_vars }}'
+    regexp: "^#? *{{ item.key | regex_escape() }}:"
+    line: "{{ item.key }}: {{ item.value }}"
+    insertafter: '# Email Settings Start'
+  with_dict:
+    'matrix_mailer_relay_use': '{{ matrix_mailer_relay_use }}'
+
+- name: Save new 'Configure Email Relay' survey.json to the AWX tower, template
+  delegate_to: 127.0.0.1
+  template:
+    src: 'roles/matrix-awx/surveys/configure_email_relay.json.j2'
+    dest: '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/configure_email_relay.json'
+
+- name: Copy new 'Configure Email Relay' survey.json to target machine
+  copy:
+    src: '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/configure_email_relay.json'
+    dest: '/matrix/awx/configure_email_relay.json'
+    mode: '0660'
+
+- name: Collect AWX admin token the hard way!
+  delegate_to: 127.0.0.1
+  shell: |
+      curl -sku {{ tower_username }}:{{ tower_password }} -H "Content-Type: application/json" -X POST -d '{"description":"Tower CLI", "application":null, "scope":"write"}' https://{{ tower_host }}/api/v2/users/1/personal_tokens/ | jq '.token' | sed -r 's/\"//g'
+  register: tower_token
+  no_log: True
+
+- name: Recreate 'Configure Email Relay' job template
+  delegate_to: 127.0.0.1
+  awx.awx.tower_job_template:
+    name: "{{ matrix_domain }} - 1 - Configure Email Relay"
+    description: "Enable MailGun relay to increase verification email reliability."
+    extra_vars: "{{ lookup('file', '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/extra_vars.json') }}"
+    job_type: run
+    job_tags: "start,setup-mailer"
+    inventory: "{{ member_id }}"
+    project: "{{ member_id }} - Matrix Docker Ansible Deploy"
+    playbook: setup.yml
+    credential: "{{ member_id }} - AWX SSH Key"
+    survey_enabled: true
+    survey_spec: "{{ lookup('file', '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/configure_email_relay.json') }}"
+    become_enabled: yes
+    state: present
+    verbosity: 1
+    tower_host: "https://{{ tower_host }}"
+    tower_oauthtoken: "{{ tower_token.stdout }}"
+    validate_certs: yes

roles/matrix-bridge-appservice-irc/defaults/main.yml

@@ -7,7 +7,7 @@ matrix_appservice_irc_container_self_build: false
 matrix_appservice_irc_docker_repo: "https://github.com/matrix-org/matrix-appservice-irc.git"
 matrix_appservice_irc_docker_src_files_path: "{{ matrix_base_data_path }}/appservice-irc/docker-src"
 
-matrix_appservice_irc_version: release-0.26.0
+matrix_appservice_irc_version: release-0.26.1
 matrix_appservice_irc_docker_image: "{{ matrix_container_global_registry_prefix }}matrixdotorg/matrix-appservice-irc:{{ matrix_appservice_irc_version }}"
 matrix_appservice_irc_docker_image_force_pull: "{{ matrix_appservice_irc_docker_image.endswith(':latest') }}"
 

roles/matrix-bridge-appservice-irc/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_appservice_irc_container_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_appservice_irc_container_self_build and matrix_appservice_irc_enabled"
 
 # If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
 # We don't want to fail in such cases.

roles/matrix-bridge-appservice-slack/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_appservice_slack_container_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_appservice_slack_container_self_build and matrix_appservice_slack_enabled"
 
 # If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
 # We don't want to fail in such cases.

roles/matrix-bridge-mautrix-facebook/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mautrix_facebook_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mautrix_facebook_container_image_self_build and matrix_mautrix_facebook_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-facebook.service'] }}"

roles/matrix-bridge-mautrix-hangouts/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mautrix_hangouts_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mautrix_hangouts_container_image_self_build and matrix_mautrix_hangouts_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-hangouts.service'] }}"

roles/matrix-bridge-mautrix-instagram/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mautrix_instagram_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mautrix_instagram_container_image_self_build and matrix_mautrix_instagram_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-instagram.service'] }}"

roles/matrix-bridge-mautrix-telegram/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mautrix_telegram_container_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mautrix_telegram_container_self_build and matrix_mautrix_telegram_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-telegram.service'] }}"

roles/matrix-bridge-mx-puppet-discord/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mx_puppet_discord_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mx_puppet_discord_container_image_self_build and matrix_mx_puppet_discord_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-discord.service'] }}"

roles/matrix-bridge-mx-puppet-groupme/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mx_puppet_groupme_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mx_puppet_groupme_container_image_self_build and matrix_mx_puppet_groupme_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-groupme.service'] }}"

roles/matrix-bridge-mx-puppet-instagram/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mx_puppet_instagram_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mx_puppet_instagram_container_image_self_build and matrix_mx_puppet_instagram_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-instagram.service'] }}"

roles/matrix-bridge-mx-puppet-skype/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mx_puppet_skype_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mx_puppet_skype_container_image_self_build and matrix_mx_puppet_skype_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-skype.service'] }}"

roles/matrix-bridge-mx-puppet-slack/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mx_puppet_slack_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mx_puppet_slack_container_image_self_build and matrix_mx_puppet_slack_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-slack.service'] }}"

roles/matrix-bridge-mx-puppet-steam/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mx_puppet_steam_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mx_puppet_steam_container_image_self_build and matrix_mx_puppet_steam_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-steam.service'] }}"

roles/matrix-bridge-mx-puppet-twitter/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mx_puppet_twitter_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mx_puppet_twitter_container_image_self_build and matrix_mx_puppet_twitter_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-twitter.service'] }}"

roles/matrix-client-element/defaults/main.yml

@@ -3,7 +3,7 @@ matrix_client_element_enabled: true
 matrix_client_element_container_image_self_build: false
 matrix_client_element_container_image_self_build_repo: "https://github.com/vector-im/riot-web.git"
 
-matrix_client_element_version: v1.7.29
+matrix_client_element_version: v1.7.30
 matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_name_prefix }}vectorim/element-web:{{ matrix_client_element_version }}"
 matrix_client_element_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_container_global_registry_prefix }}"
 matrix_client_element_docker_image_force_pull: "{{ matrix_client_element_docker_image.endswith(':latest') }}"

roles/matrix-client-element/tasks/init.yml

@@ -7,4 +7,4 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_client_element_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_client_element_container_image_self_build and matrix_client_element_enabled"

roles/matrix-client-hydrogen/defaults/main.yml

@@ -5,7 +5,7 @@ matrix_client_hydrogen_enabled: true
 matrix_client_hydrogen_container_image_self_build: true
 matrix_client_hydrogen_container_image_self_build_repo: "https://github.com/vector-im/hydrogen-web.git"
 
-matrix_client_hydrogen_version: v0.1.53
+matrix_client_hydrogen_version: v0.1.56
 matrix_client_hydrogen_docker_image: "{{ matrix_client_hydrogen_docker_image_name_prefix }}vectorim/hydrogen-web:{{ matrix_client_hydrogen_version }}"
 matrix_client_hydrogen_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_hydrogen_container_image_self_build }}"
 matrix_client_hydrogen_docker_image_force_pull: "{{ matrix_client_hydrogen_docker_image.endswith(':latest') }}"

roles/matrix-client-hydrogen/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Hydrogen image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_client_hydrogen_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_client_hydrogen_container_image_self_build and matrix_client_hydrogen_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-client-hydrogen.service'] }}"

roles/matrix-corporal/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_corporal_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_corporal_container_image_self_build and matrix_corporal_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-corporal.service'] }}"

roles/matrix-coturn/defaults/main.yml

@@ -2,7 +2,7 @@ matrix_coturn_enabled: true
 
 matrix_coturn_container_image_self_build: false
 matrix_coturn_container_image_self_build_repo: "https://github.com/coturn/coturn"
-matrix_coturn_container_image_self_build_repo_version: "docker/{{ matrix_coturn_version }}-r0"
+matrix_coturn_container_image_self_build_repo_version: "docker/{{ matrix_coturn_version }}-r1"
 matrix_coturn_container_image_self_build_repo_dockerfile_path: "docker/coturn/alpine/Dockerfile"
 
 matrix_coturn_version: 4.5.2

roles/matrix-coturn/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_coturn_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_coturn_container_image_self_build and matrix_coturn_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-coturn.service'] }}"

roles/matrix-dynamic-dns/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_dynamic_dns_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_dynamic_dns_container_image_self_build and matrix_dynamic_dns_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-dynamic-dns.service'] }}"

roles/matrix-grafana/defaults/main.yml

@@ -3,7 +3,7 @@
 
 matrix_grafana_enabled: false
 
-matrix_grafana_version: 7.5.7
+matrix_grafana_version: 8.0.0
 matrix_grafana_docker_image: "{{ matrix_container_global_registry_prefix }}grafana/grafana:{{ matrix_grafana_version }}"
 matrix_grafana_docker_image_force_pull: "{{ matrix_grafana_docker_image.endswith(':latest') }}"
 
@@ -38,11 +38,11 @@ matrix_grafana_default_admin_password: admin
 matrix_grafana_content_security_policy: true
 
 # specify content security policy template to customized template
-# added 'unsafe-inline' (ignored by browsers supporting nonces/hashes) to be backward compatible with older browsers.
 # added https: and http: url schemes (ignored by browsers supporting 'strict-dynamic') to be backward compatible with older browsers.
 # [Content Security Policy Browser Test] (https://content-security-policy.com/browser-test/)
 # [Content Security Policy Reference](https://content-security-policy.com/script-src/)
-matrix_grafana_content_security_policy_customized: true
+matrix_grafana_content_security_policy_customized: false
+matrix_grafana_content_security_policy_template: "script-src 'self' 'unsafe-eval' 'unsafe-inline' http: https: 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"
 
 # A list of extra arguments to pass to the container
 matrix_grafana_container_extra_arguments: []

roles/matrix-grafana/templates/grafana.ini.j2

@@ -13,7 +13,7 @@ content_security_policy = "{{ matrix_grafana_content_security_policy }}"
 
 # specify content security policy template to customized template
 {% if matrix_grafana_content_security_policy_customized %}
-content_security_policy_template = """script-src http: https: 'unsafe-inline' 'unsafe-eval' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data:;base-uri 'self';connect-src 'self' grafana.com;manifest-src 'self';media-src 'none';form-action 'self';"""
+content_security_policy_template = """{{ matrix_grafana_content_security_policy_template }}"""
 {% endif %}
 
 [auth.anonymous]

roles/matrix-jitsi/defaults/main.yml

@@ -39,6 +39,7 @@ matrix_jitsi_xmpp_bosh_url_base: http://{{ matrix_jitsi_xmpp_server }}:5280
 matrix_jitsi_xmpp_guest_domain: guest.meet.jitsi
 matrix_jitsi_xmpp_muc_domain: muc.meet.jitsi
 matrix_jitsi_xmpp_internal_muc_domain: internal-muc.meet.jitsi
+matrix_jitsi_xmpp_modules: ''
 
 matrix_jitsi_recorder_domain: recorder.meet.jitsi
 

roles/matrix-jitsi/templates/prosody/env.j2

@@ -25,7 +25,7 @@ XMPP_GUEST_DOMAIN={{ matrix_jitsi_xmpp_guest_domain }}
 XMPP_MUC_DOMAIN={{ matrix_jitsi_xmpp_muc_domain }}
 XMPP_INTERNAL_MUC_DOMAIN={{ matrix_jitsi_xmpp_internal_muc_domain }}
 
-XMPP_MODULES=
+XMPP_MODULES={{ matrix_jitsi_xmpp_modules }}
 XMPP_MUC_MODULES=
 XMPP_INTERNAL_MUC_MODULES=
 

roles/matrix-ma1sd/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_ma1sd_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_ma1sd_container_image_self_build and matrix_ma1sd_enabled|bool"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-ma1sd.service'] }}"

roles/matrix-mailer/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mailer_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mailer_container_image_self_build and matrix_mailer_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mailer.service'] }}"

roles/matrix-nginx-proxy/defaults/main.yml

@@ -404,7 +404,7 @@ matrix_ssl_additional_domains_to_obtain_certificates_for: []
 
 # Controls whether to obtain production or staging certificates from Let's Encrypt.
 matrix_ssl_lets_encrypt_staging: false
-matrix_ssl_lets_encrypt_certbot_docker_image: "{{ matrix_container_global_registry_prefix }}certbot/certbot:{{ matrix_ssl_architecture }}-v1.14.0"
+matrix_ssl_lets_encrypt_certbot_docker_image: "{{ matrix_container_global_registry_prefix }}certbot/certbot:{{ matrix_ssl_architecture }}-v1.16.0"
 matrix_ssl_lets_encrypt_certbot_docker_image_force_pull: "{{ matrix_ssl_lets_encrypt_certbot_docker_image.endswith(':latest') }}"
 matrix_ssl_lets_encrypt_certbot_standalone_http_port: 2402
 matrix_ssl_lets_encrypt_support_email: ~

roles/matrix-redis/defaults/main.yml

@@ -5,7 +5,7 @@ matrix_redis_connection_password: ""
 matrix_redis_base_path: "{{ matrix_base_data_path }}/redis"
 matrix_redis_data_path: "{{ matrix_redis_base_path }}/data"
 
-matrix_redis_version: 6.0.10-alpine
+matrix_redis_version: 6.2.4-alpine
 matrix_redis_docker_image_v6: "{{ matrix_container_global_registry_prefix }}redis:{{ matrix_redis_version }}"
 matrix_redis_docker_image_latest: "{{ matrix_redis_docker_image_v6 }}"
 matrix_redis_docker_image_to_use: '{{ matrix_redis_docker_image_latest }}'

roles/matrix-registration/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_registration_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_registration_container_image_self_build and matrix_registration_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-registration.service'] }}"

roles/matrix-synapse-admin/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_synapse_admin_container_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_synapse_admin_container_self_build and matrix_synapse_admin_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-synapse-admin.service'] }}"

roles/matrix-synapse/defaults/main.yml

@@ -15,8 +15,8 @@ matrix_synapse_docker_image_name_prefix: "{{ 'localhost/' if matrix_synapse_cont
 # amd64 gets released first.
 # arm32 relies on self-building, so the same version can be built immediately.
 # arm64 users need to wait for a prebuilt image to become available.
-matrix_synapse_version: v1.34.0
-matrix_synapse_version_arm64: v1.34.0
+matrix_synapse_version: v1.35.1
+matrix_synapse_version_arm64: v1.35.1
 matrix_synapse_docker_image_tag: "{{ matrix_synapse_version if matrix_architecture in ['arm32', 'amd64'] else matrix_synapse_version_arm64 }}"
 matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"
 

roles/matrix-synapse/tasks/init.yml

@@ -3,7 +3,7 @@
 - name: Fail if trying to self-build on Ansible < 2.8
   fail:
     msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_synapse_container_image_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_synapse_container_image_self_build and matrix_synapse_enabled"
 
 # Unless `matrix_synapse_workers_enabled_list` is explicitly defined,
 # we'll generate it dynamically.

roles/matrix-synapse/templates/synapse/homeserver.yaml.j2

@@ -705,33 +705,6 @@ acme:
     #
     #account_key_file: /data/acme_account.key
 
-# List of allowed TLS fingerprints for this server to publish along
-# with the signing keys for this server. Other matrix servers that
-# make HTTPS requests to this server will check that the TLS
-# certificates returned by this server match one of the fingerprints.
-#
-# Synapse automatically adds the fingerprint of its own certificate
-# to the list. So if federation traffic is handled directly by synapse
-# then no modification to the list is required.
-#
-# If synapse is run behind a load balancer that handles the TLS then it
-# will be necessary to add the fingerprints of the certificates used by
-# the loadbalancers to this list if they are different to the one
-# synapse is using.
-#
-# Homeservers are permitted to cache the list of TLS fingerprints
-# returned in the key responses up to the "valid_until_ts" returned in
-# key. It may be necessary to publish the fingerprints of a new
-# certificate and wait until the "valid_until_ts" of the previous key
-# responses have passed before deploying it.
-#
-# You can calculate a fingerprint from a given TLS listener via:
-# openssl s_client -connect $host:$port < /dev/null 2> /dev/null |
-#   openssl x509 -outform DER | openssl sha256 -binary | base64 | tr -d '='
-# or by checking matrix.org/federationtester/api/report?server_name=$host
-#
-#tls_fingerprints: [{"sha256": "<base64_encoded_sha256_fingerprint>"}]
-
 
 ## Federation ##
 
@@ -2904,7 +2877,8 @@ opentracing:
     #enabled: true
 
     # The list of homeservers we wish to send and receive span contexts and span baggage.
-    # See docs/opentracing.rst
+    # See docs/opentracing.rst.
+    #
     # This is a list of regexes which are matched against the server_name of the
     # homeserver.
     #
@@ -2913,19 +2887,26 @@ opentracing:
     #homeserver_whitelist:
     #  - ".*"
 
+    # A list of the matrix IDs of users whose requests will always be traced,
+    # even if the tracing system would otherwise drop the traces due to
+    # probabilistic sampling.
+    #
+    # By default, the list is empty.
+    #
+    #force_tracing_for_users:
+    #  - "@user1:server_name"
+    #  - "@user2:server_name"
+
     # Jaeger can be configured to sample traces at different rates.
     # All configuration options provided by Jaeger can be set here.
-    # Jaeger's configuration mostly related to trace sampling which
+    # Jaeger's configuration is mostly related to trace sampling which
     # is documented here:
-    # https://www.jaegertracing.io/docs/1.13/sampling/.
+    # https://www.jaegertracing.io/docs/latest/sampling/.
     #
     #jaeger_config:
     #  sampler:
     #    type: const
     #    param: 1
-
-    #  Logging whether spans were started and reported
-    #
     #  logging:
     #    false
 
@@ -2995,6 +2976,22 @@ redis:
   #
   password: {{ matrix_synapse_redis_password }}
 
+
+# Enable experimental features in Synapse.
+#
+# Experimental features might break or be removed without a deprecation
+# period.
+#
+experimental_features:
+  # Support for Spaces (MSC1772), it enables the following:
+  #
+  # * The Spaces Summary API (MSC2946).
+  # * Restricting room membership based on space membership (MSC3083).
+  #
+  # Uncomment to disable support for Spaces.
+  #spaces_enabled: false
+
+
 # vim:ft=yaml
 
 experimental_features: