Merge branch 'main' into move_stuff_around

This commit is contained in:
Sam A. 2023-09-29 23:02:07 +02:00
commit 656fb6baab
Signed by untrusted user: samsapti
GPG key ID: CBBBE7371E81C4EA
12 changed files with 241 additions and 410 deletions

View file

@ -1,165 +1,161 @@
$ANSIBLE_VAULT;1.1;AES256
37303437623836623537343137326638663435303862366236656433656631353762383831393237
6165336434633034613838386563303963386163623932300a636663666130613636323836613338
61313938373163656333656666386463643463633736666431613762663439346131613366363137
3731326163383337650a306561663939633939383437636662303138623064633264303463376536
65336135623436383633383239663433353033353361613733643933636362373033393663613132
34643034633432356330653834393039623039653538316661356230366562666561356132376332
32323130663536363431366130366437666330313833656463356661356337346162373032323833
65306531663434303163613732376233633237376364373361383164313139383131376538656231
65343336353631626235346362316662363034646538376237343534356265626336643264343966
33623962353235396435613536383639383439363131373961393131373538306433386464363839
64656536643864363866396134353937626531373161323865663562626231313865666263653133
38336432353933383238636238656364383361383535386232633433363362663539323131386338
33316361663563363238626632303666396466326331363732326135643839373636636562653537
38373266636336383261363461623035396265613764663161643766363061306264306365323061
63346631366263326266303838393963353435643162306231633835336136666439393765643263
61613063343164633031393838636233636466383036353665303063653236623334376639346264
30343530653461336134383266633862373030376339656137356434383930396463363261663763
34353531303336343435303330623433326565616639353364366363616233323532323133393462
32386566353162656265373034663161313364666238363335373937646463626332396662373563
61656237353932353262333038633164623466663930623232666365653466613439383164383439
37313565383966633464646337323266666635613831356264656362353464616135306634623930
63663331316532316464623130386138636531353536313736313561393233613936383062323863
35303633666435376530646135366364376636653335663830363964323531356666366535346465
63386262386531666136383265623666633762346137633839306233343238303638663365643461
65616335353766653239356439346563636139653061663739616238376330633865656236666265
34653763643562396266313037663837386664633065643431303261303764353234393832653033
35613138663335363734316531636535616630636535323264633134393637383030613161633966
61326333623962613566666365376266383037653330386534343765623061303139653935346135
38386461613561316132666362323664623236333835323238346135616665306435663464313533
38316162356561353431656231643134613266663536633138316561613633643032373234656435
63626132356431353732386439396535353133623233336639373330623539643130303164376433
35333833653665653030613865323332656637633439346537623733303464643264396431373966
39366534343563313834303833303730373830633639363263373966663962323761363936323131
31646465323931396133333461383337396330323664353536313230393761333039663866373337
30383539343266333763316463393036363331333866343735666633353762613337303932363938
33383463613937363039336565303035626538326161616136353439303936336137356131623666
62363261636134306266636263646566323766376565366533303533376262646239356265663561
62356437336139613136386330393738326562646237346131383562346265646238376462626165
39666437336233393839653535313666323765666161396434653063316631386337356137373131
62313238633261666637356161393638326332663565623765616565393134663836346638633763
65653430636536623137373661363230636462366166376432613662323461653930653836643432
34353062363832663135613062663265653234326433393134663464366232313766636637363661
31633638323766346462626364323638323238663537653064303833383264333463333464343436
62396366613763646138616665656334643332626265623135303662613162376130333136353539
31343864656461346161363266663562326331333762366438333862653631613365316532306661
39333134343338363230386362336637306330386437376564363563616437626135326531663234
36353938633830636535633262336662366562373961343464653461383639323764643438313663
61366461356436393735336332376236306136636664333962613632353938393461323432316138
31626638313466663663313165376362396361356536363363643366313562393362646365663439
38326134646636333562386566373038643233366232323130376333626661623235313930366334
34383139353961623831343237643263376236313533363437303638396663653963336330663462
34613130333766653532323130663337383936613864376136316535376364643964353131386463
37653436663061333837386666616565356261663539363766336531326139356561616335343537
30623435646232626639323664626337633832313262333366333066363739643836333336616565
61323666323865366439363038316136343363383230386462366137653063616632333839346231
65663137396535353063653237663261333838373864636637643238373035643563663366633661
32323439636132666630646265636336343533646131366137373036333666653137396131373132
38336139666362373633386162376562626563656632396661383866353035393863393564626631
30316431613538396632373064646261373230376336616331303865373462336366376334626630
39333239653434323466383966633031313038346163366566613561393437633563323834393233
39353130643639636535623230663031303433313234333436343163616433346339653964636631
35303032633937353539386534323763623561616135396466353532333139363062376364653063
65343065316664323363643537373065343661383038363232323736636135633238383161363266
36346463616562356265336637306236336531376439313330393865303166333366663731356430
66356335326361393034386261393438363464666363623736633364383062666666323865323531
65393036333836303434386463336636383066353964383062303930383137356336616634323438
37306234343462376431393165343437643264333764613566636364313431613030666535643761
34633135636262356638306432356238376631353663356165313861366431663063343035666332
33323366656132366565646137353038326161353564366131633664316234383433616134653033
33316439313232336533646464653537626262376433313533623530656538353636383333346266
34376534383765383836333536346235386639643665313862323233386164376166616338653561
33363033663431316431343032616563373463343437643939333763613233623838343837376366
36343566323764343961636438623766616132363261353062623461303763346662383732303135
34343137316632373561623039623139643939326334323561666462613138303433346236653263
64383137383765646364363862613433356539613133396232363736633538323939663261666338
35656365396432636533323130646530376537386532376133643662363433343337613661616139
34343137616461626564396336323832303833386632353138306131376436383862353762343061
32653237353131633962393365326235383138363235653634356661383061306162636265346561
61663231626162353030343637393165343762373738373966333430616663373064643565666261
61396563666333623363353666376637616361386564386537643165366561353134663665363930
39623239656538333539656432396532623961356537623430626637333065383362663765353433
37383139613666313363636162316365353864376464333334353236303538353932616565666430
33363561393336623833373065616433363964353735353838326562383033663661313132303963
64623230626636303037396133636632333635643938626163636639386366613163343665346566
37343432656435646138353262323031396531353364646265663433353965613639346333396637
66396230663635303230656235643464633634323363353466653836323462623437393739626164
34363863613537353531633432336230303631663032353932346462656232363634373836613562
38613238356464386666363434623335313035646562356363663737623634323464306630316431
39623031393334383262613734663535643266666366616436666230346433616162313039643930
38303563363565306139373538646666383131383161353933663561356265626434326638616465
35306664386162316535643836373461313034653566653038626331363535613166396432393831
66643833636231656365326434363233346431656435306333376566343165373537336238623632
35623237393362346237353962626337356263323530616436303835333738646234663361303234
34376633313162373530326233323134323561653264303338646536376235623534616137623035
64383130306363393363386132373335616539653264613362396437366464346234646463633362
39616430373761653265613861353165623331316364396534396434656336356535383630316133
39643863313237303839663161303031393536626131346531636463333163323932303865326662
63636137613065383865306263396439396238626464323135396362303334363363333337326362
33303565396461663661613339623164383463353663313733643936323064376636633936366337
37323761373039653737623065623663393438313066393936643430616536653432646164346430
36653664383936383265666162343834653831393337343065363832356636663361313132306561
61373263643364363736623330363636653262333733356362383264313763663662306663323438
38626135613862663937346537333338303135346438613430653031636231366234323261336264
61633532626231663266643462383236396366333938663134623061616163356534313535643734
31666563323437643538613962366230623963346630303931663133613963366565663934323138
63363666653130323139636161343836613137313535303530333832666234373530663339613630
66636439636133376262653231636162643765333133633538303532376466643736393762386532
38363633623865633838393666663762613233376536353833306435613463626332613833393435
35656530306261306235643535396230373238336663333466316566316633376264666431336662
31323535663630386362313166373965353131326461376337363965613434643638346634366331
62313031373333343536376235323437346439346433393631346631616635323836393732363231
33636133393964333662343537616264306366643561386465383436313138396562663435613131
38643665613439623536343239613262623264326235306633623165613061386239636361626539
33393763616139656239646136656232656536636562363763336266303836346635336235663536
38393531323663663865303664323831623238643661653234383262303364646438303461386438
38353861386134333763333232386538353130303139353965343361613535363762313035353939
62636539366635383763643431356530643934623331396535616461633931393931336431643865
63373032353131616131663461393939646433626636393761663637313331336466663636373863
65346631656263653266646639663633613461363464646634336361323562376133393137373032
62313465326637646533666565626532643538363332623835626334613235616562653933353335
35363138663763653961356135373561633139663031306566316438633766646665316335633730
39613064333937646533306362333539653866363139353432313535656633343066386339326664
62366431666230613165613637356631386666306461353439333237303962386231373039393634
33613633323939666434636131336461393233303034363961366630396561336635643764373532
63643630636336386265616538613536373234613466356533323461633732363936343061326665
34633732353437343133613932623864333065623836303661643039643430343131343237396239
65626562646134343365333466383265343637373363626437363130666234356437643038313265
32313031313536656130326132396636326437663434303433383934356438383334363135323361
39613536343361316330653465613030343831643164636630383564623136613766383131323531
64376135326131393663613065366666393166326532396365396463373131643431346663323663
38616233313432383633306663363839636634613137353437363736356637323630336235383064
64343632613063353961343063313261333839383064363662666339313661653864656138613062
31326566316433336238383266613066383165616230646232666165303535633830623435323036
37396434396566353632383432636266656361313837633162326137353464623831613831323264
32656438373735653635393938353730356237646539663836383762393538636235343537393263
38323139333233623064613034336233333638316533323734643465633338326166626464313361
35616634643732353832353531353861353433356231383964383230643835353132396439663734
32346561663632643732623432376233656238346236653337366531353263613463323763656161
38633961326538333263373262323562303839393663363136373335393034613362623939336165
63393434656639393662323239306432633661656161316236653861323363343461666265353065
61376661383565356635333134616132646639383230363332326234326363316139663363353336
32316466373934393864663531316265313537646239313936353062353638366465366132633339
34656332636430643033326262636331616639356237393763326264393561393735333139643035
64346461353463633833653566666164616532336234346238346433306563326132643465343939
66343836663033613135383633303438626435353232393561323334373834633363653736623834
64353064333766376432326163613762653966653434653764373436623939363232346165643637
33643561653331336261636131623265646266663833623561373066666435333263353333646138
62653962333961613664383466383031646533616363303438363566383265653762613765336130
62343838323733653263633863313330336561613162643039656236363437393536336330323434
34633134316331323265363631363137353331383937623632643436323433373032376436393363
37363234313261343434323363316234663834396435386336666336636430653864353036386536
32316262373932626635383834336566333962356539313166626637663038343931353261646563
62303864346634343230353964323838316438656233306438656466396435643435396232636437
39346536306436333232316666626333653030373662613630323765646265666466386364336438
34633764303035356163653034376537393038303863353139373963616138663431666132383961
62653066343461323466633062663763613234616263376635393834393835346165653238663537
63353034633238343464616333656139343163313734643836303936373936386662396630663863
61323030343337636636623034353635613636366238383861313838376632323438343231623631
35613466303635313866353437373062616538626532306464613831383162616464313061356161
32343131636434653635366634343335616263653331646264643336623563336633313132343163
62616561376664313739643961353232343136356364653366353233333733363535656238616630
37396135383031396130623037343038643035373633626633343532383739643462666635386539
31316134383836373063386663303139393938383234383335346665373233373033643864356665
34616262343761653564
35346661396563636532323830616336353530313861666333666533343730306431633264303634
6331383565663930343562326463313066326634306362620a613437633739383734326135666339
35393137336462366533653438323035663165643130336664323766373362363065623265363461
3230643732316231640a383432643065346137643763343065333161623034386563663838323764
62653064396265323532353432333938656233363832353736323336666136613535393066666231
38336230306239633865373634376537396133666539623630336335643535656461303530633731
38616465343138636365653766363339323134626333313538613664333930366638656265373561
39633762646631666539386130383032383034306364356662663333366638313064343334663534
66616633633030343064376165333665303365616438333566386162653463313162336433303334
36376534353039333238356464373531656636386566373166323261323033653230613664643962
66386235653564656565633361353236393433303961633931306664633761653637313739333433
34343365656535396365313032393362316537346563303230633333653233396663636535633339
37623933613863303365616261303039383665396666303238663665333964343233636330626133
38666465323163333730653439666436366236636563383936333535386662613436343838656132
32333438633735353334343730303231336136303631653635663834643364663134356539323530
63383136303263643463343839376461623633323830663238393564326133393534653264353363
39353430333262303331356334313634303062653637613737633263306466313863373830356638
30366539343330373635383234653465316637346537306236313139303164643838333333346433
38393166653537396562386630333561623537653363663864393531336339653030656664623366
61346161353264623565333733363331366530646530623461616366366234316131393032393830
36373230313163396561353634653133346331343966366161616139313238336663333963636538
65383461623234636662613534333439373838356432323331343064383730613336343935613737
32323162656466323637613731303362623266656266343163343362313032633531613162396663
63613637613035623333343864666162313165323565383163623138323663666261336265373533
35323961366565383532666130633434323735336331353636316262306664646238306338666133
31623333343765336537643663666363623139636633643130303733646262313864336434663065
62303365366161313732323732356539646231643431323265303564376362366635326539613833
35393566653162346137666462633338653637653832326661356164396364663762336464373661
65616566643435386261363461633237383739613266356665613731326263313737326632386631
66306633336631393566356235643730366436303334383132353266643739303237666331303463
62303636313362336336613139616232383530623435643036616234356365323938353965653563
35313039613262386137653236353734633939383562666136373761346335303538643961343135
34333533363734356464393138356664316237323135316131376337616333383061626533313532
65343461613464636663323038303133316637396338313132373863656430356533303530353930
35356534613465383237616632323339316239336563363731373561663939386364613030326462
61333134623534356262383961383434323861623130306630336166663332386136346663626562
38653435616263363431356261653134613331346531653163313665633538356265633335633537
61383035613262626636633866613465393463386164613761353761346637643738363733636230
61623865386630336664356534356131383966393437383539616330656633316465636263663932
38303532353962373464393434643937316432323539633961303836313763306561663963663761
62346466656531303435326235316636643231373762636339623038343466613935623366643832
38303636613230343036376534393738666163353539633032336336323732616565666531656138
38623730306232383966303866616231633032376130323436336563643138636337653738313339
61626562623432396132383265653334323337656332326137646665356632633163343537386365
66663834383363646337356237396262346135653261653833356262343932366539663764343338
30396662353961643234666139666434343363316662303335663963343963663032383532313431
37653338663230663435623331643666383639643932346139383661663166376366666236363635
61646131316636643264356164666162353936636464306330373961363139653661376630393262
65373239383463373766363865303463326362316664666566343433636239333964313766336662
61393132616562393734346162613431616632323536386363643938643431343361623261646265
36616530326464353266343964326135663534373432313962326639396161333231623631663561
65646466323335313665346430313761356333663262323434623265313530616439323336363632
36333134356161333337343365313366303362313439303033346634333735626566353061626461
30396266663261353030353939663562633361653362346235336264663633356633663865316536
33636538656562613133613032343939313735333334343662643061346137356663393732316438
34646437336434323564343764373565373564663039316435303132336635613861323430663730
37653461643063633162356130396432613837613336366566663935616264623534653161666261
66303731303465666134316138393964626137623639393935633162383262666165643831646662
61663338353762303166363932663738333361313935666338386237666636623031663632656461
30393763663565396131343065376562656335343564343966396334386261363865653963653537
37336561316261383436393036396134303231303631616239323461653538666139386265336638
39303565666466376639356465323861663164353863633930613138653435393664613837373131
39343339653731613939643937646439343238653563333665643430663534366336613666626166
31633633386166333434353165323632376662623031666164303865653937333235643733356339
33336666393736366430373262383237346161393261303461313932393938353539636435646434
65316433636661633731393837656261663031643032393734376231373933383830303161626334
64653631343864303464666238303338653238633230663836653437323936316363633031656334
62343632616338613865373736323865636632373530343562343566643465326232656566643739
33303962626235373730373637613761306133633661623039343231376534326636313335626331
65623461646339353135356562666264613364323661303165356163303265386338383066393162
66333938363234373365303839616532323864383634303230626235396362643330323965613166
36393333363035396366366530613439396534353065613763346565393736316538386463396339
33313663633538393363356537333733366661303235363863393833336333373932613838396430
33636532616363373763336436343532393235303138633536616334373931373931356339353731
36636431613262626137323639343334353434623630656163366363636566363031323561643633
39666366333263653739656230333537346533363062356532613030333637363465383364396638
31316265643530633039383536393338366361363132303536313935323937333239313833646434
32353839653834623062623032346164313063623033656164343836336136313631623436336165
38303130303738323466623561386565306231653766643363353735653032633862373939616237
30613566626533653565356232643233393461353933366632373561353139366463666462313233
61363038386665323333663237373837356563366231613562343337323533616436353365333864
36613638306133656230663634636638353361336236643131666135306330613865326163386366
37386464313631653637356434636633633035376461646164396364323663383865386565353336
31663262653332373633333630306339366436323339643962626137646362663164643632326336
37323464333861313535366630656365316330613332326262383832383633646530626237313465
38336334383163663538666232663731633530376262313864383033396330663431366436663330
30333232346335343261393266303531373366643363333464353535313336613265373366356437
35323038356338306331383466383335633630366663326463633239333763353461366131653831
63393864643662323931666362306665393764613234366361313530363233353566656334393031
64333562643937373864326262306462383066656237393732363164663038626166363234393239
35393930383134613864306365323862653464626362326136383761376165363036633365326539
38353439643537633663376462613332363165366166386266353738623434666161613735623633
61636233633263376338323134636565363865343434373864393935366563653164353531313436
32666666306666393132323263623063323464633963346532396465353033396238353936346265
65363931336366366264306231333063613537363561313735363939636330343466346134663832
37613738343262353838333032663237336536346535623630383562663230626631643063386263
32616535613261386231323131333237623438346664646238336630326561643163393530306234
61386662333938326533646230316536343162336366336133646561363936633363373335393633
31636532666537663939653165633734363361386261346133333333323535623166383233383661
64363735316563356436376430666536363939663962636433646466643464353863663034343332
34306665633932613565326566663938396364343862313131643165636434363030303434333165
36643632633135643562303535313232313534313931373665626262353065663062333237623036
65393439613136633434646130316562643433653966373965383761616530613830613639343036
37313831363235646137346230653937303138313031613532346138656631386634323933353466
31633234653830643762633463623833326139643135353732666338626561643934356439623963
66626337633965646334383636393033633530366364373930613335363737626265616639396365
30386637373863333961306365646432656230333934366163613230303333356131613632386665
63303230346635613434663734613163316637336266393338623237373063366233376463323937
39323933386332353431373739646136653332646531623165393836616539616161373130646166
66396436383536326565383133346366626532323361343430363833653539313536666530653035
39616566663466363462383762313137383034663231656366643139646332356137346461386361
64646439666336333532323031356534666332356133343737636465623463343438363762633932
39653133363163343937386437356638316462373061393634333762633363396438333935623063
39646361626164326165353136383432353730333066626365666466393333393066663138653232
32323937653961656132366230333239336465643332663135303630346231653665343633613966
33363835653065623430346539663162373233653932343865373733626431636666303335666666
38616139646337323164376337366366306335323436653335646536333866366137636532613965
36376637393333326236356233616461393363366237373363393564393636313935336439356339
36663563653265376533386334353936376438386331396130333363303861613535383235633732
63663537643861373537303461623633363535363631383337376361623066666633633035356564
38323032346136636561353635646530363364323133326365333963313166386131616130616664
39616561323433386233633264373166653162656166343366663031393732313736666433336566
63643136643635346431323036666530343965393136663634663661323563333665393435383937
62653739653764613830383333383539336436376139383036643866303361666265323461313963
64646536643738356631343631393234613764306530316537363966626536386366616138626230
30313862633966303066373435663966336338343530356565393933346262303461356334633234
66663561656261333134303939663430366365616266373463383132363331396333653330313637
37383736633861633338333165623639623736353730666535323936663166623331346639303137
39383064343235643135616136333863353230323961393631613230643830663664626133613932
62653734333066356166363234623136616638353666316632336131313830663466396562323332
36623964383136326138613439366236633165663032616562363235666636623865306663393636
37306530386238376437303437393932643265363062623733633661353230363666393537336265
65396263643837366265663765653536376663306632336139313730303731386666613539313764
61653763666331613132373561646637393566313638633034346262303566376263396239663133
62393138646334666636303636626638316536393265323531393431306236333934373834623933
34623434313061653265663335646564303932386265653365366430353530636236653237313264
64643933353737333864383165303432353264306362303162323964383238386138383962373734
38623938333163643466393134313562646236656665656639363764353766623332633931383634
33666663363535646331376461343332353166386530663065623261613035666338343637363233
63376436303662303365643466336237396635363062653531663565633137353134333834613961
66303139363135363537303330346130333663663136306464393864343736373536326466623862
30353834636366656532363132653339653465623266646638363637623136646232613361346262
37633261373061363865613236316634383730383433303534303033396662373963366535333233
66643431363636623334636164336433333366643235343639623136366261356165386634306165
32336131353762326662623735656232396561333739643338363030646237353565626534646265
34333437353265666462356566373031326438343231613332663463373731636265303737616332
64353437646131643939303432633637386466313030656631613633343330376138666165333939
61366366353266393939643764376536393234393863626237653836646264636232303033666434
61333833666430316635373565643937396235316237623336383539633365653161616431613239
36663430336665336537383839363834613736646633383133353132366537333238313337313566
61613433643261666230303032346334353064646530663533393662636135363766386334613038
36383836353339666230613161313463343862636134396431333935363437646463386333333366
37636666313739343236613462626234353764663539323262353866623862623236323462306435
61653534383737663932633236373834303937373565393966643738326430346263373134303966
38313261643932336435623964613339353939663332346238333161316464633736623032643031
34663534386330323431333733356564623634323163663733333530393833656437313339386239
65333538323336386636346637323136316263353961383263363730303263626266643065346566
30636139373932663964343138633938356366343636303563373161653962663931333631306432
32316663643361386637646436363935666436653436613462383333363662313361616431363739
39623362346439333437

View file

@ -6,7 +6,6 @@ postgres_passwords:
passit: xxx
gitea: xxx
matrix: xxx
codimd: xxx
mailu: xxx
keycloak: xxx
hedgedoc: xxx

View file

@ -13,7 +13,7 @@ services:
nginx_proxy:
file: nginx_proxy.yml
version: "1.0-alpine"
version: "1.3-alpine"
volume_folder: "{{ volume_root_folder }}/nginx"
nginx_acme_companion:
@ -37,13 +37,13 @@ services:
file: portainer.yml
domain: "portainer.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/portainer"
version: "2.16.2"
version: "2.19.0"
keycloak:
file: keycloak.yml
domain: sso.{{ base_domain }}
volume_folder: "{{ volume_root_folder }}/keycloak"
version: "20.0"
version: "22.0"
postgres_version: "10"
allowed_sender_domain: true
@ -76,10 +76,10 @@ services:
redis_version: 7-alpine
allowed_sender_domain: true
gitea:
file: gitea.yml
forgejo:
file: forgejo.yml
domain: "git.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/gitea"
volume_folder: "{{ volume_root_folder }}/forgejo"
version: "1.20"
allowed_sender_domain: true
@ -95,7 +95,7 @@ services:
file: matrix_element.yml
domain: "matrix.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/matrix"
version: v1.87.0
version: v1.90.0
postgres_version: 15-alpine
allowed_sender_domain: true
@ -104,7 +104,7 @@ services:
- "riot.{{ base_domain }}"
- "element.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/element"
version: v1.11.28
version: v1.11.43
privatebin:
file: privatebin.yml
@ -112,28 +112,20 @@ services:
volume_folder: "{{ volume_root_folder }}/privatebin"
version: "20221009"
codimd:
file: codimd.yml
domain: "oldpad.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/codimd"
hedgedoc:
file: hedgedoc.yml
domain: "pad.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/hedgedoc"
version: 1.9.7-alpine
version: 1.9.9-alpine
postgres_version: 10-alpine
data_coop_website:
file: websites/data.coop.yml
domains:
- "{{ base_domain }}"
- "www.{{ base_domain }}"
new_data_coop_website:
file: websites/new.data.coop.yml
domain: "new.{{ base_domain }}"
version: hugo
domain: "{{ base_domain }}"
www_domain: "www.{{ base_domain }}"
version: stable
staging_domain: "staging.{{ base_domain }}"
staging_version: staging
slides_2022_website:
file: websites/2022.slides.data.coop.yml
@ -188,7 +180,7 @@ services:
file: mastodon.yml
domain: "social.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/mastodon"
version: v4.1.4
version: v4.2.0
postgres_version: 14-alpine
redis_version: 6-alpine
allowed_sender_domain: true

View file

@ -1,5 +0,0 @@
#!/bin/env bash
python /byro/manage.py migrate
python /byro/manage.py compress
python /byro/manage.py collectstatic --no-input

View file

@ -1,84 +0,0 @@
# vim: ft=yaml.ansible
---
- name: Ensure byro data folder exists
file:
path: "{{ services.byro.volume_folder }}"
state: directory
- name: Create env file
template:
src: byro/env.j2
dest: "{{ services.byro.volume_folder }}/env"
- name: Deploy entrypoint file
copy:
src: byro/deploy_entrypoint.sh
dest: "{{ services.byro.volume_folder}}/data/deploy_entrypoint.sh"
mode: u=rwx,g=rx,o=rx
- name: Run byro
docker_compose:
project_name: byro_member_system
pull: yes
definition:
version: "3.8"
services:
manage:
image: ghcr.io/valberg/byro:add_missing_jquery_ui_images
entrypoint: "/var/byro/data/deploy_entrypoint.sh"
restart: "no"
volumes:
- "{{ services.byro.volume_folder }}/data:/var/byro/data"
- "{{ services.byro.volume_folder }}/static.dist:/byro/static.dist:rw"
networks:
- byro
- external_services
- postfix
env_file: "{{ services.byro.volume_folder }}/env"
gunicorn:
image: ghcr.io/byro/byro:master
restart: unless-stopped
working_dir: '/byro'
entrypoint:
- 'gunicorn'
command: >
byro.wsgi --name byro --workers 4
--max-requests 1200 --max-requests-jitter 50
--log-level=info
--bind=0.0.0.0:8345
links:
- postgres
depends_on:
postgres:
condition: service_healthy
volumes:
- "{{ services.byro.volume_folder }}/data:/var/byro/data"
- "{{ services.byro.volume_folder }}/static.dist:/byro/static.dist:rw"
networks:
- byro
- external_services
- postfix
env_file: "{{ services.byro.volume_folder }}/env"
postgres:
image: postgres:{{ services.byro.postgres_version }}
volumes:
- "{{ services.byro.volume_folder }}/postgres/:/var/lib/postgresql/data"
restart: unless-stopped
healthcheck:
test: ["CMD-SHELL", "pg_isready -U byro"]
interval: 5s
timeout: 5s
retries: 5
environment:
POSTGRES_PASSWORD: "{{ postgres_passwords.byro }}"
networks:
- byro
networks:
byro:
external_services:
external: true
postfix:
external: true

View file

@ -1,55 +0,0 @@
# vim: ft=yaml.ansible
---
- name: codimd network
docker_network:
name: codimd
- name: create codimd volume folders
file:
name: "{{ services.codimd.volume_folder }}/{{ volume }}"
state: directory
loop:
- "db"
- "codimd/uploads"
loop_control:
loop_var: volume
- name: codimd database container
docker_container:
name: codimd_db
image: postgres:10
state: started
restart_policy: unless-stopped
networks:
- name: codimd
volumes:
- "{{ services.codimd.volume_folder }}/db:/var/lib/postgresql/data"
env:
POSTGRES_USER: "codimd"
POSTGRES_PASSWORD: "{{ postgres_passwords.codimd }}"
- name: codimd app container
docker_container:
name: codimd_app
image: hackmdio/hackmd:1.3.0
restart_policy: unless-stopped
networks:
- name: codimd
- name: ldap
- name: external_services
volumes:
- "{{ services.codimd.volume_folder }}/codimd/uploads:/codimd/public/uploads"
env:
CMD_DB_URL: "postgres://codimd:{{ postgres_passwords.codimd }}@codimd_db:5432/codimd"
CMD_ALLOW_EMAIL_REGISTER: "False"
CMD_IMAGE_UPLOAD_TYPE: "filesystem"
CMD_EMAIL: "False"
CMD_LDAP_URL: "ldap://openldap"
CMD_LDAP_BINDDN: "cn=admin,dc=data,dc=coop"
CMD_LDAP_BINDCREDENTIALS: "{{ ldap_admin_password }}"
CMD_LDAP_SEARCHBASE: "dc=data,dc=coop"
CMD_LDAP_SEARCHFILTER: "(&(uid={{ '{{username}}' }})(objectClass=inetOrgPerson))"
CMD_USECDN: "false"
VIRTUAL_HOST: "{{ services.codimd.domain }}"
LETSENCRYPT_HOST: "{{ services.codimd.domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"

View file

@ -18,7 +18,7 @@
- "{{ services.drone.volume_folder }}:/data"
- "/var/run/docker.sock:/var/run/docker.sock"
environment:
DRONE_GITEA_SERVER: "https://{{ services.gitea.domain }}"
DRONE_GITEA_SERVER: "https://{{ services.forgejo.domain }}"
DRONE_GITEA_CLIENT_ID: "{{ drone_secrets.oauth_client_id }}"
DRONE_GITEA_CLIENT_SECRET: "{{ drone_secrets.oauth_client_secret }}"
DRONE_GIT_ALWAYS_AUTH: "true"

View file

@ -0,0 +1,37 @@
# vim: ft=yaml.ansible
---
- name: Create Docker network for Forgejo
docker_network:
name: forgejo
# old DNS: 138.68.71.153
- name: Set up Forgejo container
docker_container:
name: forgejo
image: codeberg.org/forgejo/forgejo:{{ services.forgejo.version }}
restart_policy: unless-stopped
networks:
- name: forgejo
- name: postfix
- name: external_services
volumes:
- "{{ services.forgejo.volume_folder }}:/data"
published_ports:
- "22:22"
env:
VIRTUAL_HOST: "{{ services.forgejo.domain }}"
VIRTUAL_PORT: "3000"
LETSENCRYPT_HOST: "{{ services.forgejo.domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
# Forgejo customization, see: https://docs.gitea.io/en-us/install-with-docker/#customization
# https://docs.gitea.io/en-us/config-cheat-sheet/#security-security
FORGEJO__mailer__ENABLED: "true"
FORGEJO__mailer__FROM: "noreply@{{ services.forgejo.domain }}"
FORGEJO__mailer__PROTOCOL: "smtp"
FORGEJO__mailer__SMTP_ADDR: "{{ smtp_host }}:{{ smtp_port }}"
FORGEJO__security__LOGIN_REMEMBER_DAYS: "60"
FORGEJO__security__PASSWORD_COMPLEXITY: "off"
FORGEJO__security__MIN_PASSWORD_LENGTH: "8"
FORGEJO__security__PASSWORD_CHECK_PWN: "true"
FORGEJO__service__ENABLE_NOTIFY_MAIL: "true"
FORGEJO__service__REGISTER_EMAIL_CONFIRM: "true"

View file

@ -1,37 +0,0 @@
# vim: ft=yaml.ansible
---
- name: gitea network
docker_network:
name: gitea
# old DNS: 138.68.71.153
- name: gitea container
docker_container:
name: gitea
image: gitea/gitea:{{ services.gitea.version }}
restart_policy: unless-stopped
networks:
- name: gitea
- name: postfix
- name: external_services
volumes:
- "{{ services.gitea.volume_folder }}:/data"
published_ports:
- "22:22"
env:
VIRTUAL_HOST: "{{ services.gitea.domain }}"
VIRTUAL_PORT: "3000"
LETSENCRYPT_HOST: "{{ services.gitea.domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
# Gitea customization, see: https://docs.gitea.io/en-us/install-with-docker/#customization
# https://docs.gitea.io/en-us/config-cheat-sheet/#security-security
GITEA__mailer__ENABLED: "true"
GITEA__mailer__FROM: "noreply@{{ services.gitea.domain }}"
GITEA__mailer__MAILER_TYPE: "smtp"
GITEA__mailer__HOST: "{{ smtp_host }}:{{ smtp_port }}"
GITEA__security__LOGIN_REMEMBER_DAYS: "60"
GITEA__security__PASSWORD_COMPLEXITY: "off"
GITEA__security__MIN_PASSWORD_LENGTH: "8"
GITEA__security__PASSWORD_CHECK_PWN: "true"
GITEA__service__ENABLE_NOTIFY_MAIL: "true"
GITEA__service__REGISTER_EMAIL_CONFIRM: "true"

View file

@ -2,6 +2,7 @@
---
- name: Upload vhost config for root domain
copy:
<<<<<<< HEAD
src: vhost/base_domain
dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ base_domain }}"
@ -9,15 +10,38 @@
copy:
src: vhost/www.base_domain
dest: "{{ services.nginx_proxy.volume_folder }}/vhost/www.{{ base_domain }}"
=======
src: files/configs/matrix/vhost-root
dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.data_coop_website.domain }}"
- name: Upload vhost config for WWW domain
copy:
src: files/configs/vhost-www
dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.data_coop_website.www_domain }}"
>>>>>>> main
- name: setup data.coop website docker container
docker_container:
name: data.coop_website
image: docker.data.coop/data-coop-website
name: "{{ services.data_coop_website.domain }}_website"
image: docker.data.coop/data-coop-website:{{ services.data_coop_website.version }}
pull: true
restart_policy: unless-stopped
networks:
- name: external_services
env:
VIRTUAL_HOST : "{{ services.data_coop_website.domains|join(',') }}"
LETSENCRYPT_HOST: "{{ services.data_coop_website.domains|join(',') }}"
VIRTUAL_HOST: "{{ services.data_coop_website.domain }},{{ services.data_coop_website.www_domain }}"
LETSENCRYPT_HOST: "{{ services.data_coop_website.domain }},{{ services.data_coop_website.www_domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
- name: setup staging data.coop website using hugo
docker_container:
name: "{{ services.data_coop_website.staging_domain }}_website"
image: docker.data.coop/data-coop-website:{{ services.data_coop_website.staging_version }}
pull: true
restart_policy: unless-stopped
networks:
- name: external_services
env:
VIRTUAL_HOST: "{{ services.data_coop_website.staging_domain }}"
LETSENCRYPT_HOST: "{{ services.data_coop_website.staging_domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"

View file

@ -1,13 +0,0 @@
# vim: ft=yaml.ansible
---
- name: setup new data.coop website using hugo
docker_container:
name: new.data.coop_website
image: docker.data.coop/data-coop-website:{{ services.new_data_coop_website.version }}
restart_policy: unless-stopped
networks:
- name: external_services
env:
VIRTUAL_HOST : "{{ services.new_data_coop_website.domain }}"
LETSENCRYPT_HOST: "{{ services.new_data_coop_website.domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"

View file

@ -1,23 +0,0 @@
PYTHONUNBUFFERED=1
DJANGO_SETTINGS_MODULE=byro.settings
BYRO_DEBUG="False"
BYRO_DATA_DIR="/var/byro/data"
BYRO_FILESYSTEM_MEDIA="/var/byro/data/media"
BYRO_FILESYSTEM_LOGS="/var/byro/data/logs"
BYRO_SITE_URL="https://{{ services.byro.domain }}"
BYRO_DB_NAME="postgres"
BYRO_DB_USER="postgres"
BYRO_DB_PASS="{{ postgres_passwords.byro }}"
BYRO_DB_HOST="postgres"
BYRO_DB_PORT="5432"
BYRO_MAIL_FROM="noreply@{{ services.byro.domain}}"
BYRO_MAIL_HOST="{{ smtp_host }}"
BYRO_MAIL_PORT="{{ smtp_port }}"
BYRO_MAIL_USER="noop"
BYRO_MAIL_TLS="True"
BYRO_MAIL_SSL="False"
BYRO_LOGGING_EMAIL="admin@data.coop"
VIRTUAL_HOST="{{ services.byro.domain }}"
VIRTUAL_PORT="8345"
LETSENCRYPT_HOST="{{ services.byro.domain }}"
LETSENCRYPT_EMAIL="{{ letsencrypt_email }}"