Merge branch 'main' into watchtower

This commit is contained in:
Sam A. 2022-11-23 19:51:58 +01:00
commit 2fa5bf4982
Signed by untrusted user: samsapti
GPG key ID: CBBBE7371E81C4EA
17 changed files with 231 additions and 162 deletions

View file

@ -2,6 +2,11 @@
BASE_CMD="ansible-playbook playbook.yml --ask-vault-pass" BASE_CMD="ansible-playbook playbook.yml --ask-vault-pass"
if [ -z "$(ansible-galaxy collection list community.general 2>/dev/null)" ]; then
echo "Installing community modules"
ansible-galaxy collection install community.general
fi
if [ -z "$1" ]; then if [ -z "$1" ]; then
echo "Deploying all!" echo "Deploying all!"
$BASE_CMD $BASE_CMD

View file

@ -1,136 +1,141 @@
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
30386366303437316232616366623561376337343535383437333038666264656530626237396333 35343731613336373363633564396639393230633664336338396164303238316564326663643638
3463393737373931643262636262396637323638316162370a623232386565386333363737326239 3365306264343434623836656435653436396636353866620a646336316338373866313362363664
30643539356166306261303762663961346165663739366264303963386636616134663064333631 65363931633031613362383337643038636435303739376131643564633831316435653937353061
3062616162616565390a626666663763343435306432393965646261343837666261616531383531 6330306330383865640a643937326634393437313864326361373634373930623464613363663831
31643736363630633164303934373664393362356534393863323533373264366636636333643964 37373230366262323261316134326333663262643764623639306239623066613335616531613662
39363536636561313164353036306431353363303238666532306131623336333465376430353566 32343331313266363630343465376332303862353834653262306536623538383662366562616635
65353333393831396432666661313331643665383939376234346330653661613039653231633435 34636561663366323434356337376261373039353931636139656437346165656663653233333266
31386462333839303339313064333433383766636366336337633935353130376462386366646162 62353961626665636463396566626330383836383030363032303563633466326339626263306165
37386434316638383565663933303633646435636265663661363337336461373933643361386331 31313266636330653933363630396166333339376564333133623237373962386164616332616438
35356235633737356363636165306435313366656634663336333339663839616436393838653863 39623132663766633331306636613532333739613938333435393633386166333335393565633963
63393631633663363735343133353236623538303731643733343237356538656664336461346666 30363165643038623962353762323338306466353031383531623066363632363033383639393537
32383334373931633639613931346663663735333964623034633461373630623231383662653733 31333037626638353830653538373634666432346166373661313531656466383263323262373565
61393033613131613963323630323261653664353661613162313562663632363264656365316532 38383766343030643939633830343332666165643661363631633963393632666632643361656139
36323430346535633235313737666564646363616361346262366132646265366362363537663535 35346131363539613137396465306663363836666662303932646262383231363634373231373333
61386336326161346330643662616637303664356661356564343933326162633732346262326561 34366636346530383736393532646563643139343764333661663033316432386632393139326439
32656237653231353664363635643965623734376539356237616332393131303634316165616661 39303661333732376433663539383662363232313135663838616231343863326631353434326337
33333764646437356533336663333336623337383238306537616238376163343937646563383331 36313335393262663932666365336334396131393362636637653630653965643662626434323736
35373935396335316165623363646434306239333833666131326563633063653665666433316235 65663966306661646131643962336366643235353863646136613463323337663865323262613461
30363438386533303365363934666434656661633535313831643766363832656339393533633938 33363636386665646538333334373564396333316665343566653662666331666236303438343962
31383936616466306662373764643338393465653934333964393431376334383537636663623939 63396164316561363132306237336365313835346663616339666538643033356637633432383331
62313762373334353139633432313639383262393865333738386338373866663330616337313864 64363964356264643038396139383838616131383466666565383131663331336530663832306635
63623630646665636166656632643566626336353031306334353935646433323766326635653566 30643630623861633939646665326262393635626265323261653339646263386334353064393534
66383361643333653733663337613861323835653535353038643064373839666630393336643236 63303464623433333863386136626566336135346561343964323436643739343037383839373332
63616231323762313965326363323462353665623632366366383735656634366161316432366261 34656439333538653461663764323265303064643165663263316164396633623232626535353863
38393739663335346665383263343430306633373134633463303935313632316439386130666662 64643766623032653838306134376131623564363735386531383732346438343932353966333062
36353238333563353336653238643231663031363435323362376131393739383632306233663138 30613166623138333865343735663530346635383162616635326330636161303863626539663166
65653733386439343337336162353961393035643137653734326463333063643865666138613861 31336333643765303635643862666234643538313033663563663034343632653466626661343639
61313839343835333934306532383363623138353839633765383733623239396630646565633163 33656436393738326135363166623633366331633065373633313864353333316131346664353532
63656365643932383632346431616161633038313838303861326163326263633433393431613864 66646239373166376361326664646263616263323632636235353864656438383038663662376164
34366663626465313362323539626335383965363532636637636238396266306437353734363338 37336431306166366561623836373938366336623866653730353861333431383832313039313739
35616239373834353566303733653437623332303232633666613831323339393936386361353032 61616435666236373463616162653732373766336365313930383665363661356565613461373165
39336132326539383734663536656565313633306630363962396132633162363334623165633061 66636537333333633832366234633066366537646138346233313233376135666666336264316435
32613531633362623833343665646462623162343937653136373233313030343666386331336431 64613030323430343764336465353334633836653133343532386435636136336638313162626462
61613731316262643364356636643539666639383933363963663434653332626538333438643962 33363830396462616662313030316166646531643238363130613036666631643737306138326234
62623736336133383466326234306239346336626462643635336138363030306439623862373031 65323763636363393031616633633338653531633639356238316236303264303034623632626261
61366531316134306430396362343936393566643664373835306162656165663330616530396131 36626639633234396230356236643766306232646230623665633866643434313334303265323465
63363834363233326364393238656230373866643866636635376430316266336634343463633266 66386461323563343236633864396562306165616338306334353563656461346464353930646161
65313537353239316263663136633066666237303038646532653031346534656534656637353632 36653064613736346237363362663835656365616334363238376566316137303737316630316363
38356231343265333866313232663234366336393437636238373033393038626330613330316430 65393139313832353461313634393931633761666531316333373762373265613464303365326338
39393132633465303131303430386163333164326236376437623465376135383666646338643435 66393165366334636431353836336535636233336332336664613263613465393235363235623037
61643764636365663765633531303266303039343362363264303535663937656461383635666234 61313037633761366661303663636364346131326334393765646262393863363062333739376466
32363137653564316331653734633931303930656362306161326234363563616133663332656339 65653434336532323365376233646365323537313131306661306363313864326361646432326632
64323136356639343566353961616439383362306137366236326533386236306662613132356534 64383533313833333466313231353863656634623135386631363864363834633035636632366164
35643463366163653662366636386239366235613735666662663039623638643938306665623431 66356539353264633461396132336435353234333132376130616335613136356364643165346537
38393561303437383964393138373031633331326363623534386265363534313535353939343865 62366630363439336432353066323238363233613032343635663731613134393639656535333736
36373465343937333964303131333566323239336536393030653935326165306664376434383664 32623733333866393565366661643030376137646437616336386530363230376637316436313763
36396636333066313538383432366561393335316337343934396236313436636533386166656339 36323532643763363864336634623132343530333531363231383130333064653233363339646136
35346539623030626464323064383037393664323164363732626233643763303363363966383933 35343165623864646530633731373539356665316164653365303965663862313462313362643637
37343731336431663765633032623331313937346634306233383431633635376664393134353465 34633163363833626635613634633938656334366366316266636532613065333436663633656530
30653264343933326161326232386535663135653061333161633338626366666436666638643362 65623561326565643739303931323539643337373736646663363362646139323333346237353731
31646138386530643033656438326232656237383335363666353536653638383134303636656135 32643739626561396664646537376139326339626235336464343964613761396430343461346639
35666531383965353362336639656561613930363764626666626464643963376131316338383132 33326631373030653637393865333837386432333634653066353366613334396639626631653737
39303165383439333366383533383738333139396462613664346361653838663865646339363931 34353831386366636663323761656431663965303561636236366538393261653333396537326461
36313665323663626134363861653635336339653432346264623639663562626630663436346463 31323332613737646364616565393534306131323234633933636638333637623661343334383561
39386561333330653432653966326436653933656233656539656263336133613530666132303738 30323464373365626662323062363135333932666163323235633131303566323964343734383238
62613431306638626339316234393866636361393133323234356334653737643539326164323332 32376435363737373336363363613738366337626162333236643738373266633933363162303833
62663166353235653863353632343033386266366632316630636262326332666635653633633562 37366631343933313934313463363834643835333766663361303335313539363839663231333963
39383263613635656631616565366665636239366563656335643930303435386431306365323062 66326261323631386532346637376132646263303466383330373833633034373933616538306330
30323061333439353939653631376639383561326262313638323462613930393237333234323261 33386334306330346161633131386130636634643531633233376337343637363235356135383366
32353737663866663638393562653333303532373063616638316663643261306436363365333739 31366463323831636438646262613239663830333531386330326131643032653033336339643561
38613739303264396436623331623163623464316366663861643466623336653163313830316233 64636439323065343564306163303134623439343963383136633864623633363364646535666565
64323036306532306462396334656564353562356630643033633339366561343333613165383439 31393564316234343066303664396534386537303364343234303832346331326430386432636332
34376634653862636239613532323466343334613236396638653661653835623931623932316466 38316565346433663639646330393339303530623636386332633666656363376239383535386134
61346261366366393962306538383564353461623734643261373934336361623831653739333135 35376135306461333237383562356162326338363435643133653838343535326535326337376130
38353439633134373839393637366366323664373030643565326233323735306236313332306636 37306462633835666132653466373163613566633863343363653539343239316233616661633532
35363863353538383832666331353934326631656662643162306135343231303963643065333163 64386538363163653963363331623531313237636431343934643136656536323734636261656333
64623261383734376361353532346461306664343937663166653964346561613634353763346662 39636132613431653562393238346565323330656539666230643566633663316239353436383566
35633664633738633834313062626231346463313965316334363337363438396532333134306334 64303535353031636662643062326565313837393932346431326137316337376361363338383533
61386337396639396661643833663033383361303237356334343433343836323835336233393435 34613632323230393233666437346466626232363636636636393836333832633335393734343565
64303863356430326435306436353032386261633339343763643137636165333661303065386136 33333461343530333135663436343333623966363230666330323562363136383166666665333861
62376133613231616266643239633635366665333230343863383437646331666637343738666236 65366436643363383331353361656434336631396437616562303861666263353533313738326138
33646237313164353361373936383562386230396361363231393634313033616332623062633430 33653735333230636437643038633763343063336262386663313237653661346262653834616665
62646165643231376630636265326433303736323665666531613765643636373465643931636336 37343834323937623761386639653736313232323166373561643235336261306430393533376139
33336464373863623730396538303962303432363564373863623338306630623732373539333166 31653132613331626435623333343862393038643364616236626466333338646639663930663436
32306636623562373563373635343865613435633535613165613239636334366466656631373539 66636462646130653537343739646437363130313766636438663130616665333232396331303531
32333638353662626666623933373534383961363466383865633662643530306431653438393136 30373762343531383239653132633363386239643666316166363931326563343633653433383538
63613336316564313039363233663264353936616462376236386166333364653364643531383435 36333733626363626464636435626131653439313862666230393334353938356436376664323961
34666461613161626137656565626564636337643138333038303537633035346465663638653030 62326566646463396536633265333461306430616437646630363239653333643732366430373133
63383462346437373665393565353866343764363863653635613466356464363634333236363234 32323636636161623932376235383430366661636439643565366532376239613366303039376434
65343438393366623463623831346464646263633663643636363938393133383639636266363239 39646437363636633265313838616463383231643030643732306364333161656236303131333533
65373462386131366437336635643663316564343132623736326639633962316537343463646130 62343539613264383830306639303164643233653032616566646163656564356262323065303134
30306135373031663262313336353261643530316337613033663361643063616536393664656236 61613563646538316232353833636536633435336663326262663062663030326234316131353835
62643536366165393062386337646431653263373134623562366231383235626637303538383533 34363564306335356633343438396434363261646665653665633235303932383266393630623238
66626535353564653466616431666535323964313834373333653039316633653634396563333530 31323037336566633035366464386232616561383566343061343031623630383238643433376231
61303633323132646230623866383631333963383866643235393938333732653437346164666238 64633634616133386138326138393138353937363332646637663363363064393065336438303932
33386235653835323231613039373465396461373164623561336566666362303462393539386439 38393139306330396338646233366235316435313838633563353838303832616630633731323535
35613336316638623963393437356564313562366630336437386236643638393935646264323330 31393039306630613734343433633662343831313336616561656136323039333235383733363364
61633365373230333065653635303633313435613039353133626565386164643263393034323531 66383836363239376539316362646232356636336665316664653565653439353932663433346438
64613135626463626233343638663863363131653335613539646437636633386639636139663166 65306365623334656133636332393265643163313939363537323738646664326364343064396337
65333939353735323861373262373033363263376138656461373733636137383033326164323263 37383637383064643763363135386434316664306231376462653066653063313962316231386162
39653964313261613536363664336633623166663431643037613366643539663764666139613538 63343533386262616631333233316330666263656532306466623733343764646361666165393863
35303135646230313838306535353530663230323831393436656664373635393535393166663366 62326435346532623635343535353263626566313061643563613937346562643962386565396439
62653162333130373033363162656531333830376530663236623464373538376566663531396566 62616661626464613366656462353932323732313062363566316562396134346433376237326664
30383930316630393434666637386561346236346430623436326639376431636338326163663233 39333238346464393930653435363336333365323537356531313830626437303736333635356534
65326534306262343337383535383339633065343239613931623138323564643165343639356463 62653766323065373662366162333363343466373135623262663436626438306337333365633633
61356132323764633438363033326635353539663762613661386332326536653631323336613238 37333931623434666564366430666462343162303030643733623637656337393763393437656335
32613635663063646436376465313863636563316464623062656266613364653237353533333262 36393162363765383464316562306532336265373130623566646134666337333133363863373964
35663064336133306463303764366334646536633562333933373731326430633131393333343034 33666437323733396139653436323262383336306561643738366463646461646462333338623662
31663736613964316335323139323032313166646233383830326637366639323165353435636664 30656135343934633335376634326533313663653761656235626165313834356464636535326439
61636462386164343538323539613536623165353435386562633433663665386432323438303236 32343834316433393236353739646663393930663635646366623835633363653662626535366361
30633864306330303933653865663564326161663637396239393330356666656235383764396636 64626561613064646431306634393330333265366530353063653132353735663564326563323961
61366333316631323036666236646339623734303265336366393237363831343765613336613638 39663535346539326165313263383933653633306330303930376336316632636537363437663063
61393463623265363264333430376566393463326561366131353561303365653131373930333464 64376465663634363838623230386139636231353665616165323065633661343339373432373732
61393734646462316362396439656563343935643466373231333933393365653962633864363836 63356130653535303934396335306566646538383938636331333362353534366632663930393732
38313837643663366134333939343832393035386238633365333634643461303832636463363636 37353365343532646137343631383833616430326631323564666361323934383839303130636333
37326361333666316239623239643830636135656338646561643464376538356632353532363439 38653139303663356337376261616463303665623431613963643137356439326162386337326161
66653364386564336635376433343862313732323538333763653938333733653739376532333139 61383434383534353732343733326139313462396432366336653139363466653336626338366365
37396463663035643332633264323630613061383563323664343834383765623137393564393035 31386438333438633465666337393732343533373363646234383265323132303433316135396232
38343332623261366138613830363931326531646338653561373639333762346130313336393364 39373764333863626634343636306533393361643135323531383963366137626464353064613065
62613036313339656339646432326464363435336265396639323131666561363165663138383235 61623063303865646161363432643765323361363364383635646538636232353337636235613861
35396139623239666165353964373864393564333738623465333163356165656163363961643666 36396631383639633263303131383537326464313433663032346230386432633864613335616533
30336236386431326236343534643430333164366237343264353933373135626538363937663761 61373238363930653866643933623561613363333139373135633332643563613838346434623033
33663633343364646263623239353061653366373463666535386533376230303935663361303062 34353161396433663632656633356536323662386332626566393636323463363334613234376137
38626261636637626465643638353239343066346431653666366165343239643735323865303966 38643465656262656236666332383361616164366230323936346565303961333761613136353435
36663364643331316435613939333437633533373030363861656534313935343862613563343638 63643839636464323362396235333738626132393030393737373438393032323931643936306239
61656665633131336135613834303538333438623864333639363036363237643038333532303564 31643537353462626238306563316132663139393635356631373839653462613238323831303537
64323033386261666663376333363765313637656363666362633163366634633433393363646361 33626362636362383530386333343266383061646436353635396230396231343364323631343037
32646138363337343037326463343633366536313633323634653837343862623961666633313631 65663363656463393234313465386233663635626333346132353539366464653532333830326661
63303433343430386666633937626638653333663537386331343334303339343962333961636535 64343136323366346239373737666435366363663237663039636631656266333562376532396661
31633134646337303238633038316337383031626466333163623365333966623063613934626264 35666430626233333166356139613233306536303365313262363366316135326662636166393031
64313439623132343564663863316264363361623563333534383665323932376335376363393961 38356661396232366236303732326666353864353735336161326663623030343766633266623236
64333035663030376130656261383835333230373037626661383131376231376362303866343533 65626237636133626335656663323533386236353164303230313237643130386133613466613933
63353933616431356133663134633464613636383436633835653638663939396561613333386565 31343261356632643265623866373965326561363538326336656561373631373938343334653662
66633963396664353662363063666661653433633232646365613633313966333766343165613639 32616366373839373737393262633064666437303538386363616431386138346439353534623631
34616537653136646565383764613435633931366530326564663733633137666133343533353865 63323063346564646462313034623630396462623565646430363338393239343761396235303863
65383339366262383530643136633262343962376561326365323030346233343761313264613964 31636531323732303230626437363764306631366363643766633734353336373564393731366238
65623566336132373035313138323763323934623339323964353533343639376537353634363437 32623563633661646465396136396462663363376333613434666632383637616133626132616362
36663962366362633735316165363936623336616431326364346565366635653633663735336436 61343032643966323539353033643136616463353563666462313731386261633333623832643439
63656234323737343739643432353063313532616130343161333862346664323136346464326437 38323666666330356538313730306334336433613364313065313761636261363433356438323136
35666532626664316565643631323666353732656238626639313035613265366464646339363261 61343233643138646263626333306265366239613266646663323733636162323332643531643331
31343664363336343063306364366565656466656363343466613665353535383736303466613166 39396433636233366365336166356661623132656261656666386361326164643634366436303737
35326538396234393739303133346139313136663731326561386236653464646336306265396233 61653832373162356634313163363233323964303738366266376665346365396635343332396166
36666265646132353036346134336136313562666535313834613866326166613461663232313037 35393263373732313734353332663238326563366534623131386233633365303664616562386231
64613633333436656431383065623331613264613230656566326431343364333231366265633438 36326138356230663731306339666138343161386331313137313861633039303930623663646333
303438346539333132303436376338303064 65336461653033333332323162363539663366653762303266656366386665396463626265303264
35666437663966663130633663643861326563336466633133646562383230363332646639616436
36656137653061303262633736653433343838323666646261386266353735326564386465646334
34633339336336613531666132633832363838343333353862333136616532613462343364616539
37363437613236323235383936613763383966366265303731303034373430333936366339323437
32303537653062663233

View file

@ -22,6 +22,9 @@ docker_password: xxx
mailu_secret_key: xxx mailu_secret_key: xxx
nextcloud_secrets:
redis_password: xxx
drone_secrets: drone_secrets:
oauth_client_id: xxx oauth_client_id: xxx
oauth_client_secret: xxx oauth_client_secret: xxx

View file

@ -7,7 +7,7 @@
- name: gitea container - name: gitea container
docker_container: docker_container:
name: gitea name: gitea
image: gitea/gitea:1.16.8 image: gitea/gitea:1.17.3
restart_policy: unless-stopped restart_policy: unless-stopped
networks: networks:
- name: gitea - name: gitea

View file

@ -19,24 +19,19 @@
POSTGRES_DB: "keycloak" POSTGRES_DB: "keycloak"
app: app:
image: "quay.io/keycloak/keycloak:15.0.2" image: "quay.io/keycloak/keycloak:20.0.1"
restart: "unless-stopped" restart: "unless-stopped"
networks: networks:
- "keycloak" - "keycloak"
- "postfix" - "postfix"
- "external_services" - "external_services"
command: "start --db=postgres --db-url=jdbc:postgresql://postgres:5432/keycloak --db-username=keycloak --db-password={{ postgres_passwords.keycloak }} --hostname={{ keycloak.domain }} --proxy=edge --https-port=8080 --http-relative-path=/auth"
environment: environment:
VIRTUAL_HOST: "{{ keycloak.domain }}" VIRTUAL_HOST: "{{ keycloak.domain }}"
VIRTUAL_PORT: "8080" VIRTUAL_PORT: "8080"
LETSENCRYPT_HOST: "{{ keycloak.domain }}" LETSENCRYPT_HOST: "{{ keycloak.domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
DB_USER: "keycloak"
DB_PASSWORD: "{{ postgres_passwords.keycloak }}"
DB_ADDR: "keycloak_postgres_1"
#KEYCLOAK_USER: "{{ keycloak_secrets.admin_user }}" # Only used for the first run of the application to set up the admin user
#KEYCLOAK_PASSWORD: "{{ keycloak_secrets.admin_password }}"
PROXY_ADDRESS_FORWARDING: "true"
networks: networks:
keycloak: keycloak:
postfix: postfix:

View file

@ -52,7 +52,7 @@
- "{{ mastodon.volume_folder }}/redis_data:/data" - "{{ mastodon.volume_folder }}/redis_data:/data"
web: web:
image: tootsuite/mastodon:v3.5.3 image: "tootsuite/mastodon:{{ mastodon_version }}"
restart: always restart: always
env_file: "{{ mastodon.volume_folder }}/env_file" env_file: "{{ mastodon.volume_folder }}/env_file"
command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000" command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
@ -70,11 +70,12 @@
environment: environment:
VIRTUAL_HOST: "{{ mastodon.domain }}" VIRTUAL_HOST: "{{ mastodon.domain }}"
VIRTUAL_PORT: "3000" VIRTUAL_PORT: "3000"
VIRTUAL_PATH: "/"
LETSENCRYPT_HOST: "{{ mastodon.domain }}" LETSENCRYPT_HOST: "{{ mastodon.domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
streaming: streaming:
image: tootsuite/mastodon:v3.5.3 image: "tootsuite/mastodon:{{ mastodon_version }}"
restart: always restart: always
env_file: "{{ mastodon.volume_folder }}/env_file" env_file: "{{ mastodon.volume_folder }}/env_file"
command: node ./streaming command: node ./streaming
@ -89,12 +90,18 @@
depends_on: depends_on:
- db - db
- redis - redis
environment:
VIRTUAL_HOST: "{{ mastodon.domain }}"
VIRTUAL_PORT: "4000"
VIRTUAL_PATH: "/api/v1/streaming"
sidekiq: sidekiq:
image: tootsuite/mastodon:v3.5.3 image: "tootsuite/mastodon:{{ mastodon_version }}"
restart: always restart: always
env_file: "{{ mastodon.volume_folder }}/env_file" env_file: "{{ mastodon.volume_folder }}/env_file"
command: bundle exec sidekiq command: bundle exec sidekiq -c 32
environment:
DB_POOL: 32
depends_on: depends_on:
- db - db
- redis - redis
@ -114,3 +121,5 @@
external: true external: true
internal_network: internal_network:
internal: true internal: true
vars:
mastodon_version: "v4.0.2"

View file

@ -101,7 +101,7 @@
riot: riot:
container_name: riot_app container_name: riot_app
image: avhost/docker-matrix-riot:v1.11.0 image: avhost/docker-matrix-riot:v1.11.8
restart: unless-stopped restart: unless-stopped
networks: networks:
- matrix - matrix

View file

@ -9,7 +9,7 @@
services: services:
backend: backend:
image: docker.data.coop/member.data.coop:latest image: docker.data.coop/member.data.coop:latest
restart: unless-stopped restart: always
user: $UID:$GID user: $UID:$GID
tty: true tty: true
depends_on: depends_on:
@ -36,6 +36,7 @@
postgres: postgres:
image: postgres:13-alpine image: postgres:13-alpine
restart: always
volumes: volumes:
- "{{ volume_root_folder }}/membersystem/postgres/data:/var/lib/postgresql/data" - "{{ volume_root_folder }}/membersystem/postgres/data:/var/lib/postgresql/data"
networks: networks:

View file

@ -22,23 +22,50 @@
POSTGRES_DB: "nextcloud" POSTGRES_DB: "nextcloud"
POSTGRES_PASSWORD: "{{ postgres_passwords.nextcloud }}" POSTGRES_PASSWORD: "{{ postgres_passwords.nextcloud }}"
POSTGRES_USER: "nextcloud" POSTGRES_USER: "nextcloud"
redis:
image: "redis:7-alpine"
restart: "unless-stopped"
command: "redis-server --requirepass {{ nextcloud_secrets.redis_password }}"
tmpfs:
- /var/lib/redis
networks:
- "nextcloud"
cron:
image: "nextcloud:25-apache"
restart: "unless-stopped"
entrypoint: "/cron.sh"
networks:
- "nextcloud"
volumes:
- "{{ nextcloud.volume_folder }}/app:/var/www/html"
depends_on:
- "postgres"
- "redis"
app: app:
image: "nextcloud:22-apache" image: "nextcloud:25-apache"
restart: "unless-stopped" restart: "unless-stopped"
networks: networks:
- "nextcloud" - "nextcloud"
- "postfix"
- "external_services" - "external_services"
volumes: volumes:
- "{{ nextcloud.volume_folder }}/app:/var/www/html" - "{{ nextcloud.volume_folder }}/app:/var/www/html"
environment: environment:
VIRTUAL_HOST: "{{ nextcloud.domain }}" VIRTUAL_HOST: "{{ nextcloud.domain }}"
LETSENCRYPT_HOST: "{{ nextcloud.domain }}" LETSENCRYPT_HOST: "{{ nextcloud.domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
POSTGRES_HOST: "nextcloud_postgres_1" POSTGRES_HOST: "postgres"
POSTGRES_DB: "nextcloud" POSTGRES_DB: "nextcloud"
POSTGRES_USER: "nextcloud" POSTGRES_USER: "nextcloud"
POSTGRES_PASSWORD: "{{ postgres_passwords.nextcloud }}" POSTGRES_PASSWORD: "{{ postgres_passwords.nextcloud }}"
REDIS_HOST: "redis"
REDIS_HOST_PASSWORD: "{{ nextcloud_secrets.redis_password }}"
depends_on:
- "postgres"
- "redis"
networks: networks:
nextcloud: nextcloud:

View file

@ -16,7 +16,7 @@
- name: nginx proxy container - name: nginx proxy container
docker_container: docker_container:
name: nginx-proxy name: nginx-proxy
image: jwilder/nginx-proxy image: nginxproxy/nginx-proxy:1.0-alpine
restart_policy: always restart_policy: always
networks: networks:
- name: external_services - name: external_services
@ -34,7 +34,7 @@
- name: nginx letsencrypt container - name: nginx letsencrypt container
docker_container: docker_container:
name: nginx-proxy-le name: nginx-proxy-le
image: nginxproxy/acme-companion image: nginxproxy/acme-companion:2.2
restart_policy: always restart_policy: always
volumes: volumes:
- "{{ nginx.volume_folder }}/vhost:/etc/nginx/vhost.d" - "{{ nginx.volume_folder }}/vhost:/etc/nginx/vhost.d"

View file

@ -7,7 +7,6 @@
definition: definition:
version: "3.6" version: "3.6"
services: services:
passit_db: passit_db:
image: "postgres:10" image: "postgres:10"
restart: "always" restart: "always"

View file

@ -8,7 +8,7 @@
- name: run portainer - name: run portainer
docker_container: docker_container:
name: portainer name: portainer
image: portainer/portainer-ee:2.16.1 image: portainer/portainer-ee:2.16.2
restart_policy: always restart_policy: always
networks: networks:
- name: external_services - name: external_services

View file

@ -17,7 +17,7 @@
services: services:
rallly_db: rallly_db:
image: "postgres:14-alpine" image: "postgres:14-alpine"
restart: "unless-stopped" restart: "always"
shm_size: "256mb" shm_size: "256mb"
networks: networks:
rallly_internal: rallly_internal:
@ -33,8 +33,8 @@
retries: 5 retries: 5
rallly: rallly:
image: "lukevella/rallly:latest" image: "lukevella/rallly:a21f92bf74308d66cfcd545d49b81eba0211a222"
restart: "unless-stopped" restart: "always"
networks: networks:
rallly_internal: rallly_internal:
external_services: external_services:

View file

@ -7,7 +7,7 @@
version: '3.6' version: '3.6'
services: services:
restic-backup: restic-backup:
image: mazzolino/restic image: mazzolino/restic:1.6.0
restart: always restart: always
environment: environment:
RUN_ON_STARTUP: "true" RUN_ON_STARTUP: "true"
@ -29,7 +29,7 @@
- /docker-volumes:/mnt/volumes:ro - /docker-volumes:/mnt/volumes:ro
restic-prune: restic-prune:
image: "mazzolino/restic" image: "mazzolino/restic:1.6.0"
environment: environment:
RUN_ON_STARTUP: "true" RUN_ON_STARTUP: "true"
PRUNE_CRON: "0 0 4 * * *" PRUNE_CRON: "0 0 4 * * *"

View file

@ -9,6 +9,7 @@
- apparmor - apparmor
- haveged - haveged
- mosh - mosh
- ufw
- srvadmin-all # Dell OpenManage - srvadmin-all # Dell OpenManage
- name: Install necessary packages via pip - name: Install necessary packages via pip

View file

@ -0,0 +1,22 @@
---
- name: Setup firewall with UFW
community.general.ufw:
state: enabled
policy: deny
- name: Allow necessary ports
community.general.ufw:
rule: allow
port: "{{ item.port }}"
proto: "{{ item.proto | default('tcp') }}"
loop:
- port: 22 # Gitea SSH
- port: 80 # HTTP
- port: 443 # HTTPS
- port: 389 # OpenLDAP
- port: 636 # OpenLDAP
- port: 25 # Email
- port: 465 # Email
- port: 587 # Email
- port: 993 # Email
- port: 19022 # SSH

View file

@ -7,4 +7,6 @@
tags: [install-base-packages] tags: [install-base-packages]
- import_tasks: users.yml - import_tasks: users.yml
tags: [setup-users] tags: [setup-users]
- import_tasks: firewall.yml
tags: [setup-firewall]