From fd796ce99cff850f68e61fbd9450113c4783df1f Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Tue, 19 Jul 2022 11:44:55 +0200 Subject: [PATCH 01/19] started big cleanup --- README.md | 5 + ansible.cfg | 9 +- books/base.yml | 8 +- books/users.yml | 7 - group_vars/all/ansible.yml | 1 + group_vars/all/user_vault | 324 +++++----- group_vars/all/users.yml | 135 ++++ group_vars/all/vault | 608 +++++++++--------- group_vars/all/vpn_vault | 72 +-- host_vars/barium/ansible.yml | 2 + host_vars/barium/users.yml | 3 + host_vars/bismuth/ansible.yml | 2 + host_vars/bismuth/users.yml | 4 + host_vars/hindley/users.yml | 6 + host_vars/krypton/ansible.yml | 2 + host_vars/krypton/users.yml | 3 + host_vars/matrix_server/ansible.yml | 4 - host_vars/sulfur/ansible.yml | 2 + .../{matrix_server => sulfur}/networking.yml | 0 host_vars/sulfur/users.yml | 7 + host_vars/{matrix_server => sulfur}/vpn.yml | 0 host_vars/technetium/ansible.yml | 2 + host_vars/technetium/users.yml | 4 + host_vars/vanadium/ansible.yml | 2 + host_vars/vanadium/users.yml | 3 + hosts | 87 ++- roles/create_users/tasks/main.yml | 17 - roles/users/tasks/main.yml | 19 + vault-client.sh | 6 + 29 files changed, 775 insertions(+), 569 deletions(-) delete mode 100755 books/users.yml create mode 100644 group_vars/all/ansible.yml create mode 100644 group_vars/all/users.yml create mode 100644 host_vars/barium/ansible.yml create mode 100644 host_vars/barium/users.yml create mode 100644 host_vars/bismuth/ansible.yml create mode 100644 host_vars/bismuth/users.yml create mode 100644 host_vars/hindley/users.yml create mode 100644 host_vars/krypton/ansible.yml create mode 100644 host_vars/krypton/users.yml delete mode 100644 host_vars/matrix_server/ansible.yml create mode 100644 host_vars/sulfur/ansible.yml rename host_vars/{matrix_server => sulfur}/networking.yml (100%) create mode 100644 host_vars/sulfur/users.yml rename host_vars/{matrix_server => sulfur}/vpn.yml (100%) create mode 100644 host_vars/technetium/ansible.yml create mode 100644 host_vars/technetium/users.yml create mode 100644 host_vars/vanadium/ansible.yml create mode 100644 host_vars/vanadium/users.yml delete mode 100644 roles/create_users/tasks/main.yml create mode 100644 roles/users/tasks/main.yml create mode 100755 vault-client.sh diff --git a/README.md b/README.md index fa1483e..8210134 100644 --- a/README.md +++ b/README.md @@ -43,3 +43,8 @@ The user managment role allows to manage user. Especially, it generate the described users on each hosts. The password are stored in the variables in there hash form. The script `hash_passwd.py` can give you the hash of a password. + +## Passwords + +`keyring set ansible-painsperdus vault-default the_vault_password` +`keyring set ansible-painsperdus become your_password` diff --git a/ansible.cfg b/ansible.cfg index 8c16ad8..960b7ef 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,7 +1,6 @@ # Ansible configuration [defaults] - # Do not create .retry files retry_files_enabled = False @@ -23,18 +22,14 @@ forks = 15 # Some SSH connection will take time timeout = 60 -vault_identity_list = main_vault@.main_vault_password , user_vault@.user_vault_password, vpn_vault@.vpn_vault_password +vault_password_file: vault-client.sh +vault_identity = default [privilege_escalation] - # Use sudo to get priviledge access become = True -# Ask for password -become_ask_pass = True - [diff] - # TO know what changed always = yes diff --git a/books/base.yml b/books/base.yml index 23c0daf..2d93f20 100755 --- a/books/base.yml +++ b/books/base.yml @@ -1,18 +1,18 @@ #!/usr/bin/env ansible-playbook --- -- hosts: vpn, !tests, +- hosts: vpn roles: - vpn - client_apt_proxy -- hosts: all, !tests, +- hosts: server roles: - networking - base_config - prometheus-node-exporter -- hosts: all, !tests, !no_user, +- hosts: server roles: - - create_users + - users - ssh_totp diff --git a/books/users.yml b/books/users.yml deleted file mode 100755 index 03736fd..0000000 --- a/books/users.yml +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env ansible-playbook ---- - -- hosts: all, !tests, !no_user - roles: - - create_users - - base_totp diff --git a/group_vars/all/ansible.yml b/group_vars/all/ansible.yml new file mode 100644 index 0000000..2925bad --- /dev/null +++ b/group_vars/all/ansible.yml @@ -0,0 +1 @@ +ansible_become_password: "{{lookup('community.general.keyring','ansible-painsperdus become')}}" diff --git a/group_vars/all/user_vault b/group_vars/all/user_vault index c23d962..5cf060c 100644 --- a/group_vars/all/user_vault +++ b/group_vars/all/user_vault @@ -1,162 +1,162 @@ -$ANSIBLE_VAULT;1.2;AES256;user_vault -66646139353961656263643538333430306336343661306434346136646234336534393663333732 -6265656462333262363466366232313434643739616235660a323232393330383037636664303162 -66343861653038663534313139653266376563613030633934323335383431623538643135643637 -6634656439313233390a316435623232376135323666656332323038646565353733393039373533 -64663035613930303631313536636130333363633362383934623863333631633538393231633531 -30646430346634346433323339343461323430643938613634613164393461613863356633346638 -33396463303162333338623731646431663839623034613664616166383237323435623631393737 -32316336393330633330616530306538353136623737346530343838313634386535376633393134 -36306438393531613464326561356633373139663863666564323433353161656266616638626436 -66316363663631646562333566356638343830626437643666306335393364353165313939323363 -39323362333364323531353330343164643938346636333865626630363431663130373161353263 -34366131333362396634326336396635343961393239333665626632343533363263653535306438 -66343430343734653261386230653738373436313432393839313765333062363165373762303536 -34303939663837333531626437653263383662326238306162356361333362353863313466343031 -65646537323762373234633134323737333137316161343539663065386538653762616236396133 -33313637316331326432363132643462666438663037613537363263306564316530396433383662 -34356464353562336331623934316138376662396466626430383162656430653935626537303138 -61663033353961303061646364363865653135346362373433666531363432366566396638376139 -32656265636163326632356133653639623633663934353636396365356662666563623735353830 -33386166326564656135386161653032646635663832383662323162343039323665326165613263 -38613732373962363264373237643239383961383639393832616631613535316332306330353637 -39613638656434393039613362383738383039343030393761666534393633666630656632613739 -65376461323363643462613064336566353463363031303436616335633632623838306565313464 -61323431363635356431333336323434353334666539323233666132333931633636633632626461 -39366335613739393634636637663535643663353035663731613939323864613965663632616136 -61613133316636336336623563373564333533343062333262336539363962623739373233633462 -66643664616438383030303764313038613133353535636130643531623564373639396563333934 -32353663343533616262323165373564303239356635633136306133326666313037363062633132 -62363364623465353435386461623062373836353531616361346533626266623961393166323639 -35613261666533363436386438656232653732396631626638356532306163656661633738326361 -38353961323135383439326331663139613730303362326233363436353532373865656633633462 -32326339323865666531393565333633386234663463663133386463323730323230646533393535 -35356336326235333536663165393938353730653862356161356137666532653231396265663336 -63633330336264383765356661303431353239346433326138383565396663643638666330633161 -65323338646436323237613235343936636333653332666435373461346632643462383961356233 -62373066616239303437383637323838613666353465383035303230386565366138663933653838 -33626665663562353137316561303863333862376537303831316665653164656336323461666436 -33323165393762616664356561633138383836316433623635383664353564353664383566313561 -38623631356432316431343934306334633532383034383432323562313033356238323736316239 -31653261333035663631666362366231303237656630656435373636383164306266646164363265 -30653064306132393330376561616431343765656637356336306565306135336664373837353566 -65323636646235386661616132316461376531653738343632393638663938626564333235643238 -61653164616331653933336138393763613837353030653239626532633562396530373736316462 -63643930313264393363613564316637306562643336373536353036306233343266653066343832 -35306231383866613439636333623039376465386463653266663365646332336335326564323939 -65386630336131343964653037646365616631663466323036623661363836363135363636623361 -65613831653164393732623031613234323437383136636466353362313966656661623861373532 -64653063373933373730386363353939373062386637303936646566646137353238633765326132 -62393239386264346133623039616630636139646261366132623765613439303836336266323930 -64623861386131613239323261306636373065343233353566353565643532643031346332336331 -35663564353433383966633961383061613739373039643265653661666139363735313131363637 -62383539643433633164313563366161393133333433656131656331383861393566366631656136 -32653131363836366330313239383635336662633838363734366234343533353035356334303662 -66613833653930653836663137333064656564376464633435636431326336316339336533613866 -31373962333134653863316339623838333439386433663937306539343635363134633062306237 -64663834613937663733666662343933633839343532376662366561326535316530363466663432 -33626332303032386232363165653439666233616362306665656133656561306564363561633138 -34393237316239643462613931633530643062373130386162333537663136666131623263363534 -34333164376238353534623038333532343266636535366532633837633161393363393734613765 -37333438613332653466653231303361623439376465343231383135316230323337616330613262 -31613235356137313233616637333733633437376262383862323566343865313138633538333136 -35356261336263323330653664306635656332646365646630373437386536363538376636323533 -63383531336261626463613265386337346639616130613333363061643065313766326262313635 -30396438653535653739316264346531646438323862346438633339613563383930306230663932 -39653564336531376234373364306462396433633738313565363335303435353736616264313131 -38363738303431653963363765666238613435386261613037353465303337613933353430353131 -38653366643866303863616366383339653631666466646332323463616663376139636632393434 -35376537646236623339346366613066383061353535303036383732616337643331616263373131 -32633336303963653562386664313532373666346132663334313065336564346362373433326532 -65396532356238326237353034333264393233343138363739383830653230643665646362663630 -39333537353832616331363534326164323133373761306630623130383465663636636464313539 -61646363626434393530333465316333623139626433326337383766343730323963353731333930 -35646535376531656262326536306536633137636138663732366330656565633565313533306465 -34383464326330353133303731303534663834393837323965393363303635343236313666656264 -33633735653135643062313664663432363231653230636339386438386339623363323336393566 -62353037346564633535376638363037363861366263323766333961303534393539356530633562 -61616664633236613865626663636632323066643534393630393033626635663336366632393134 -32326565303031333566346461633136326566306461323436393539353533313033333061383032 -34326337616338626630316661663237333831616363346130653663663861353562366164643730 -34656638303531353861386437646662346132346662336164616232623839303934383166623532 -63343538656130306636313337646238663663636432376237353738303864303835646433353137 -61653931383837353934663536663266636636373936376230353836636134653531353031363938 -65333361303361363334393733666466643063653266363262306233633834353331666565353266 -38666431643139316139623263663864386534376566393437373965346530343433366535323732 -65626336396362393331623564656436383135636539333934633233666330643465633531316166 -62306637323739346639306630623132346665373630343566656437303630626664333465383766 -62303365653332653162336230336634333232663732653237386533646531643839643465366637 -65303964626463363130383164633938636538316461366335356664613138336463653539393465 -35353637616462613833636137333139356538386162616538613562333337383233313038313035 -31303065663630353865303338643533393839373665373231383666646634353035316261613662 -34663661323235383331643634636534363238353934303837666531376630643830323863343932 -32333934376332646537373064346666343535303038383234356165303635633732373939656438 -30326463396631376538346366373135373164666631323036623066613664376334353331386463 -32346132643361646136376362356266316231336162333834646232353935656363373766323338 -63616337343631383963343165303938333665333731373163383264656537356130343536626661 -63663236643539313436636531623232643163643036363438616230306264373166336630363833 -39396530643765336436386639323533643638336566636135613438643936623531613436653733 -62326536663538376266393233373135333231613161613335323562613734653639633137383364 -39313263303036396635663431356363663964393231333663396433653263333337653763613738 -66653636653436326636353361623637346562303465303034356561663964666139623630366261 -34656338363863393861323735613739366339363063633762363235626264666561373334376135 -33396663306131313530663763393137313264383335373830333939636238393163303065323731 -33636630363033646530383438343465623462346666333131626434616138363435623732663030 -65616632393866633466363837383238386264363536633439366661313265316333666435333536 -33376661663733343136353061623065393061306435396338623961623466376532613163353739 -64343033626666646130663861383236613961663335623134313063376436383666636338633332 -65643365656161373631633232353930343533653134346566643066376265626661366234303439 -33386539386536663932636238626234646266643432626162633534376161633262366631356662 -63643066383631326632643732616432343733306134616432636561393333326431626230643935 -32663232373331643335356562336563653837656164653531323561623432303334333330656263 -35303237663131616133643235646634373931313831313965346661356334396266356437613362 -63393136353762636666343538663134336138353661663161663936366531316662373666363035 -65363333393464303933646230396230363238313264373665623465393434346638663837366364 -65633536633464306138663033323132653436663461646432636161353038663836393735316663 -32316130383234633664663163663965313436656461353835633439303239663038646464653662 -63636261653263373337356433353935323563616438363964653036633139393836366537343562 -35323935396461303136623961633730623361663631393036633635663564306139353139646230 -32333731643838613465343064633638663738333666653637393331373033383834346134396261 -62393564633630353065646563336439623735636461313231343864326132323935633235643637 -33353935383665613162663364356232356661393565386231396534633865303938663239353137 -36323364346438386231643664306637333039353330616232356536323361356332643564323065 -64373137316131643631333331353062643930323265663935656532613430333537663038666337 -30656636666233386564663362386366353634613261393261303738643762656266653463633534 -35643537376639633563363266663534633662363432373032613738613130313065643134613635 -33336236346231346534363064356461653330383763626133386663616661306330393438333139 -63326264623864623463333937303338383061393835386132383336666234396437313165373634 -37346363616237666337613335313432386563323434333031626261373031343662376430336638 -30316466633362623663353037353863633037383631653233616334383562333236386633326464 -37336134663563656233623639643665343633323965613136613536633161353835363636663863 -34376234633364323534616465633762643033396433326436316435663533653639303536303931 -33643261623935363032346233393462653136346461383334336462613735633836663732323735 -61353538623534313564643037333162396562373836383763373861343361373164646564343537 -34326230393730333766356663343831616663666564613237636661353237313162623237313565 -38343239336561343435326535363363313739353165663835363865333164623332346234346430 -36336333626434343964383635363864386535343230313036663331666538363433363639346634 -65356534343432643064356332343337633034323735623531303638366461383137383038663833 -35373262356462666136313564643932663534396366386161326662316166626336353334313333 -64326238383962386534396466636235616464633166636134313162646663356438393331633066 -37333532373137646139653535623938386364613331346437626537646637366565653038633563 -63643431653538396363333566343339326632626566383035356631323931643135303830316162 -35336563396534633136343166623638643661623662366466613432616332313133663366323735 -63663533383735623262643963353530643330353130356131623733373937623662336536613565 -62306535353738613139326337326130333234373036646663633932366532336463616162343936 -33373764336530383439333133646339646330376265396639393063623761386464303532376338 -30306630626262333839613533663766613730653764373939306437613032323536623531353363 -32316464636231386634356534616162373064653066326637636533393230643263633635303263 -31663939393236306362616534646136643038666436306137313139366162303163333366323231 -33313763623839306162373134623361626263363365633834636331313030313635353932313165 -61666364646435643233303862613238373333303130333465643561656634663531303231323936 -37626565366334386536343637366162666464613639356139353761656563313532343764653064 -31396139373337353363643436666634623037613136333637313931323539383833316338623164 -63633562313536396462613437373031396137396532616466343034333839316461663632366365 -39396663366536373833363533353039623833613436393065366163383566303537316334343064 -31356334343034356431303533633236646334376136666665326365373239376233636436666337 -35333731366133616365303365396338653031343432373966356633313136303063653033643462 -36653566363630646564303531336330343566383861313431633933386265343661393965653439 -65636262393335373038643432633236646134356135323835616336323737373738353636323036 -35396363613565633431333434376530666662316434313938653338316163303033623931373932 -38363538303561646161636662633136313536633634366133316166366631663732633162663130 -33313038383230313464656131623039396230613661626534303563353033623365663765363936 -38396234356563373465366134646165633464323166333832393465393433363361 +$ANSIBLE_VAULT;1.1;AES256 +35633963343765633636396266393332366432646631306564643361343531383734646235663931 +6139666164356533326430636133363961316239386163640a346635393435333437623034343638 +34656166323733656539326133663661616437653065623061396434313663626265326466363464 +3666383465663962330a613766393463303136316563396134663462626661366363303666656462 +39643161323235303462326437393233636538336331333031363933666466306633303639643163 +62396439663465323037373161393638643566383834663666656333653830333530653430383465 +62323536666531383136666537326666323235363062396566616565316232393733613338653864 +33633665363431616338363264366531313064306138656537616438656632386332386435363037 +31663934366331396239366137353161316565323036623231393839613265366537646234663339 +31353139616639393039653338383261356636653164636631363363633866393761643336323563 +35323063323031333862383765613238363863326231346537633066323235383531633934306565 +38333765613965633163383235333834663164353034656362323332303431633062386466636266 +37386163303331303935373565646232366233326436633664613464376262343433646331353732 +31316163343064336539623637323135623266656566353934623431353062653236323063306237 +62353132666536313862363064396261346430656637613561373935383364363836643066313166 +35626465396238626332386132346334366635616662353339636636663931333663376266306465 +66383330303939366161383961326635663830623464643436653638343162346331313133373661 +39656331623135623461333262353965303832626335613363333634363237346232633336306430 +30613639653961373730653035643534643236333033386636366462316532383966656635623130 +38323163666166346262656361306362326463356661303237613362346436326263333735313663 +66613932396337616231393566613338633337653036373938323864626133626237333235666537 +39646365316335343538336634386464326435323336373136653766616461663761633764633637 +38663063613831636136343864333663303861383264323836633239323638613064303933656334 +64636339323066336561333739616362613238373432356639386135663862363162316366393137 +34656431663833613532613966373137326631633437383537326566376166386665346261383933 +30323134333936393237666363313466653630633734303437313237326135353631363462353731 +37656565313537306663663365346665326136626663343162633661376565653830383632366263 +34323337616565313265343031386339633661653164616136313261616339336433313466643065 +64303531343838393862303230363339353332376163313066353935656531343463646435333164 +62316238303866326330623232316539653535343966326532653539653864326636626434656634 +61313164626366386234343435366162643933323434323031373365383766383962616434303732 +38626562343863313862643134303430613833653466396331323361393163343865653661666230 +63323434613139393637613262303135623961626531623934613933643836663633326638646432 +31393161386262363830386464613461623836373933343566383139653532326634313166653732 +37363433333534633336333730313861623737376233663866666331333937313462336430616439 +66383632626663363930386165386562623166313064366263343739623030666233616664633163 +39663739646166646537663865303635623636303466353932373531336339396239306631656132 +39636663353036613432653833363732313263386562636666613430303463383139636335336164 +62656166383863326365383934373863653061366135343934313163303764363434373134633934 +32363535303034666630643935373538376339643364383765343738616333356431366534313636 +30356539323035633834323966313039333233613861373561613564636435313430313064386234 +31646363646332376664663562363436363565356362323638626330633935393531353831386136 +62396530613337333563383064333037303064393130383062303739383465646132393263633233 +30643863623939663063366534643362316163373934656633656438656634373266313561646435 +61303164306465336230346535653935663030336466623565373565653537626162313562343834 +37623464376562316663616337633838633332373165366639343962396239666564613631383237 +62353536613635356531356265313166306339356634343361313063613836313432373231663961 +33333732643262663131373662626663336433343131333163666333616265663662316339336234 +61643830656566373533373132643663336333333436663735333337633532313365306338646132 +38396664306133336533626366303764656235313233613965363738616433653434646633363064 +38616234396634643666613133653066363661613939316633316137336162356434303233353161 +62643430656237336133316666663664336637323638396634623765326637306234313732376436 +32326430336434646366336562646361363935343535376564333637343930626139343630323538 +38656564373764363037653132393263386339383331316162366266303532306462643534663166 +66353566376435306263353431343662623365323033393535363762353630633133316562303733 +39323735663663326331333530393863653564623330373437323762396565626439396438323965 +33356536656634396337353239343962393335636661313334353065313839356632666266383564 +36366435356362326163626339323130346139326363383062613138383062333530633430376565 +30383361306337343661643763336361383335633463333838643762393564393962646630613230 +32363735386336666435356335666336633834333966633238373033326539666333343034393239 +39376433633139646331376139663238363734346235366230383836323264356133653634313035 +62383165313936363366663037353163643662376164306530613930623239313631616663393635 +63623935656237653838633235653565326235643635663766326531396637613732626338393965 +33333135323439386561393461663237333431623065376361373134383534633264373939343262 +37313663656661646137646132656434333333383664613261326133666430636632306134323136 +65386137613932656461373430373866643831623132323165353735373035356536353661373164 +66313632663533333038643265353534393133303234643534363762663436393766393961633764 +37623561363063646165343431353366613335336130383264333734343039393434396436663239 +64346261666134613432646231623235306463306133656434343261363331636461663538396264 +36363264376339393331633162376638316566363534393164636539646537353135633131363864 +35336232343231363662623764396439306331373730396462616434633931343161303731366561 +31666433353737303035613061393462633462623830356439623664646265323336623536656236 +31386434653533636235623236623239633761626531376261626430636137363662373864643533 +63306438376264383064636665663631616635643565616230313836613964333364366361363336 +66326562393261663537386366613130323065663465616134633666386435626333663962383036 +36353231333639653737303963366231643338316537386133643264656535666631306637353734 +65613239666135303931336338393639636634323361303037383161326664346535623261376635 +66376163393237623266323731333231373037383934623962653231613265663834663766613731 +64643165666462303038323364383063323135393864626433323733333431343931393634363463 +35346636663434646662353935323062653337316631396261386238346535356530373231343732 +37383261663630663435333463616163663364653964306666363462343236373135303237393039 +34646331366237336366643235386233366363643065313639303463366535316464653266643231 +39336164323035303963323038666437396336313438373334326163356135663432366432356662 +39353530303136623633363764303737313530653461623531326332336166663362393230623963 +38313661393262313531306364643864333037386132306263393965646630343132323236383734 +62363239363734303561306166613436653361646630383065353335323861663533613433643366 +35376334396539353265373531353134386638343730383461656537653538623338353264653236 +63363231396630313365303165323034336564633032316636323137313238336231636536306237 +62343431363036323965326639346533343339313962666234356466376638333866623430333939 +32343335613436383864643330363165653634346637393430623462303163643164656535393065 +62316231666666356336366265333636386265613462313932353437613262323337656334613932 +30373738303035366263306239393339373761633630663366303838393261323235363037623763 +31383461396663363137353163363430313135346239363664653662633166636537343861363130 +62653735626566323832313362623163663632356338643834396233613463386330623036306138 +66633366303964646564663962343937363331616235323239376638323730643666333935336639 +36383462633731346539373666623937666533613534616663663939613938343365383564643464 +33616266653165626564663732343232666237336134303566663932346138306265303231616632 +37383938663366613363656335356663323737366432613431366139646662343230643066663233 +32663236386665326562386130623039303531383835343865623761646166313039333438303537 +63366361363637633934333138653934633438623738386337613639343534313237346261376466 +38396639623732626163343139633438666232316332323662633332336135666234643362356238 +37333136313061366432353237633234316236616132666632333235623737303166393463663336 +65333736313931313565393863376461356463306532636164306136336561643563356335643065 +36663061626664653166623637663865373136666461306363643337663965666535303765396234 +33383935363335306461313138343163653536623633366462653730326135323033313663636439 +30636464376632343536316664356330346232636337343766653236666536323137343537346564 +66393864316136383730656263386637323166613966333738303537613761383236303330633064 +63336238653431666633393937666161663037616462343365343665383736326439376638356638 +37663332306235653164626432393738393637373538336332653361653130393361636638646162 +31393666653963666234376663313534346434343261336431323137666563303461616135373135 +38376236336162633630336433653834343864366236343338363632373038643163663665633537 +64363162313861313239333733323836353930316139663239333933383030646434333661333938 +36626566373161316638326632656365353966626662663138366264313765393264303936623161 +63313765323065626635633134313765613366386262646631356563663132313665326632346535 +38636235633861386535313937363663363165363530396166636362343962313735663731316362 +31653862376264616535336363333965656531336565623237316232636664666635366137313866 +34393438363534386632323364363536393264643962363235353264373662393362633362613835 +31376139353562626563653966346237613539326234663434626333643132303832363161326362 +35306132386134616336663037626566616132616264666465313765376234306266616262326538 +65363661306233323833343737313135366664643439666631313565373436663435333462376132 +66633265616638646136626133393937626531333136663566343336306134306137633835376162 +66613836383965633864643735393432316663633635343732313338633239636237656563613565 +30623730333662353639353363653936396563303334313938346438633938346464333963323261 +62666232663730653864623566313138633837316265363463666438326634313738303362396330 +62643639663930373939656566646663363432376636623264336530353635383033313965393661 +62633534376335363537356131636530636365373764653065363362356362326566643664666439 +66303338373061373366623632396162633034323632353933356663396136323834663862313365 +32616263613637353436643032363134396332333730336633333164653737376238656434343864 +63363937316430323965393839336362303065373738343537353238643638336236393637666434 +34363638366536303762656164303037613162636462623336633166353435363264646436623233 +37376335616462306439396239363630633730313265656631623162363039373564653337326537 +63376236623062663730373633343863313530353731636430613863343862376135613332306430 +32623063306534373864313535623166303462336136356237653538643964643262623930393035 +39643639383833343930313163663733616334666132323432326466613137653735376163373238 +35623139303364336337373331666535303563643831643732383363336235373134366564623030 +37663738373839643636633937613632323264373435656465316364633665326165343964646137 +39343062333863633634636334613036613939346334363936353464636433353162316662663864 +63306361373864653464306438646665393131333131643637386436306264303237336136306138 +65613163333661353839666231313366343335386131306431643336343830386336346663363464 +61353731626463633937613935303036616365363630366631386363613565306562366339636463 +65323563313265656466303531396338343636303131396463663535346362333866353266356333 +30313066313136626363386662653037323962373434626461666563663737646463366265333339 +37623232356638333135303831626139336362303363333831353361653866643833313039363731 +38336535653536333266626235346132366232623331623962303730663839666430393365333361 +61373966326537613765343666663533623566643466353438666163623161366136643138613035 +31336339346166376666316666383533376235333066333138353833643762313161353435363435 +63303733616437326361316436663666363362336636653931343238636637396330343339376638 +36626464616139666435343161333562623063336264383632646361396338366465353739343961 +63303463366530303831336535313230363932313462633732663337363835336331386537323363 +35353866656233336338613965616530363233643134343334373335346139396130353631653462 +39346663633739663162336462373263353662353638356265323363303039306238376666643931 +62383234343936323133646464656435313137643135303232316235356233656264316232336635 +34663930613263613261623831393431656231393365366661356338323932373365306265313062 +61333031646336636566323834616139306166333637613235326661343332633763323032386534 +65613663396261646631643363313365616333393339376136306536643864396531386332616532 +62636135643865613130396230363866313662346338323934663662343835616635343266616339 +38663466333561393038356261376237373337353435363464616538626263366631323439643138 +65363562353063613064633666363763356666313933386262333963386363656465666462303037 +34313964663738653038376438313339386439643736366634646638623338333965333831326631 +66616132336235366563633064323538363964663563333330323339333166316435376466613761 +38636462666663343737633633626530656230336234323763613735336232383066 diff --git a/group_vars/all/users.yml b/group_vars/all/users.yml new file mode 100644 index 0000000..febd6e4 --- /dev/null +++ b/group_vars/all/users.yml @@ -0,0 +1,135 @@ +$ANSIBLE_VAULT;1.1;AES256 +32663331653233353731353139666138323138373161633338653030366131353635333031343366 +6262363661383266393163333436643265336430633665330a646636616530626237306236393063 +34383165613330663935623565326430626561303961366464663739393465633735303634653865 +3731393330383366620a316139346166616335343564353431613938363266343962663831613034 +30626561316663336239613230386663316266393638643761336432383566623066343838323133 +31613765623162636462303638363930636433303331666434303764386337663162643537663361 +39373337376635306132386538323939646239633461633733666132343430643235313633386464 +39346238333836353238396466336330343862393733306333363265366363303136343932623736 +36666337363165343239636262336363613236396162303061343331313839353731616162666561 +61333235306237613161653632616332383332376365373733326335333739316563316439633361 +65393366346134366137663263616165613063333166636532393734393963613033313363353163 +32333832353931613738353530396637613534393839336338336231356632616239303662623339 +61373836383538346565363963623662616530316634346564643730383032656130626636333135 +36383631663766616131373537376435326461316536373337646136623664373365643732383630 +63313563666466316535663531613265313933343664303439653336323935373832326632333961 +38363366396136636231383136323934396532313233353538313831616231383637633665623261 +39336162636561363438323636616363373939306332376433303934396531666534333431313965 +63376665323537613263353531646135633861663364336564363131383633623065383938363665 +38353338323732306463333138623966666563323263363534363664666532323038393463636635 +33323434363733393739363562626237393031336461313338643562383334656230346132666532 +66326362613263303262343837623835323161373163643438313937316530633230646132626264 +38643536353764313661383430383962326131346338643632633161663262333232623662316365 +30316236346338303331313266386266663239303963363761393766386430383338343163616137 +36616536336165653936333463343737323961356135626563383161373431613362633564653863 +36393963663766383533376335373165343465316261356536336333643665393065333433386261 +62613534353934633830623762376436633661383666316635386436616533633561353032303261 +66376536353333623832303365386265336264366439386261333064643062303035613936306261 +37313932336331326265666163356333373163363161336665386338643864656232643332373363 +34366337323232346361623839623631393730363961353530396162343666313233313132636630 +31323231316463306663623039623165653465313232363532316564326639653161323264623837 +66373165656535353933656365626462373566336663363335653232393233613132316236373233 +65653135623235616430316330386666333031646565646461386335343164336334393237656262 +63636232613237363061393633663762376166393364663731376261323434383862303935363565 +37643136613339313366356165623631376131356232646438373135343539313463383362636633 +34386261333866646562643335343636663563346263383462353235623738383065353137373266 +34366664366434346563383933656333343266613434613035396465316630326261313737623464 +65316631363361626564393763323063326537636333303566316236353763393838356237376135 +65646433303139393263383136346361383136356331633832643233333262333033316535393433 +34373233343235323061393538346135306133366335303764336262613133376637633436376637 +36396366616231336161396232316535323963353131366138636264303737363137353538653136 +38323030626139363638646165623438626338306435356361353731643337366161386561613464 +37626132613238626237666337616336653639356331363166613431363636626365623664353736 +38323836373563386137643362386465343064363030633963623864616335636630353936366662 +31353263326533313562306530376232303933396239303739326238343736333732356666633034 +39643038656137356161373031626131346435396262356238643937653164356566633434623362 +62336431366266623164616462366137343564636431383930346530663039356563343163393365 +63633335303036356130623062616433643138626466383761333731306239353565636336626166 +65333431656634666163376661343538303563646438666333396636303331356434356132636235 +30353938663634383537376232653261363932613135663734306536663733613862356639613466 +34326630326362373830383263306132313763616265646235353562373430376630666432353136 +36633034653761373636626139353837643130326162316564626165383232663830633662373562 +30633565393235373261663962396535666430343133626261323063353137386431353330316134 +33336637363862646366633362653066373234656131626132643661333532633535363332363966 +30633761306539346432656131376463633631323630663762613832613332653762353865306137 +31663465633462636663333735666137326166656135653036633830663463623466336134303032 +64663036646238326237353336633365643238653938363039376337616139306132663939353036 +64663166343939333361626136313434633639376566663865613339663331386530356663303038 +33343235383434346532343762353661336136383034653030656631333332313639336239323838 +65376231666338333331663432326539663334663136313162306666663564353738303639646335 +38333431323839333135643966383861383065333930666433653663636134636236666430363063 +65373639343432333762666138376461323562316261663961356530613733376463386538663830 +37333762613866363939646662626239353765306266616236643037373865316461326437303039 +37653431323864303431316337363739656235386534383533386635343930646130383839333139 +39666165333363653939646236653135653163643364666135323439346266353738653065323063 +30656265333136353436643062623738306531376435626463356337313764366665373939343033 +65396635323638316662333537613865336532613932636262643634643232316438356135626432 +30636138383366373338313166366161626563633736343663343132653035646131393530653233 +64303762363865616536306365333832303563656664653164346462666262646365643435646639 +31383230373135366236373634396531393638373830653565376535656364626361383834616465 +34666536303230303638356530346635326239326237373730343138333137623162343566633466 +31363166643566623866383637633864326662613131326339323236633662396665613864323434 +62303866323537663264663732303562306562316632346361373433376364623566356232613435 +64316261646432663039393062613166323264333433323633353532306332343662616166366533 +30613737303331356462646337653236643935353638363837313661343233613839373264346530 +37326536633561646436643832303861313366303562393230653733353862333734336561323266 +61303230613066643636313230303232343436323135363765633232643863326235653766623365 +31353132663030346361626632336539666263336661376433663039633134623065373635363561 +37613138316336613738633639386635396462393336336534616533303165623837393639636364 +34326163333461346566356361623632373361613163663065643065366236623664633430366430 +38376539653235666535383434316466333165313339343063356362363038656137346231366330 +39623230643831393334393338656664343765623034346465666633653731623762383634656666 +37396632343532396139386565303865393034333266363230396433383466346661623639376166 +66636536656539316239323461663061316166303335633961343836633262353833313736666637 +31386634373934326532376631336430316663613062336332643562323565363936633530663231 +31643630616338663431633038373035393636643464623333663831353962383439666633386564 +33353231363630353833373964663433623165613662343032616564396233346632356166316466 +30666631373235396336363934386438323166626332313030643230373362633238333361323732 +64626464303561666230313365366636346366376435333833633764376562343839646539353261 +32646630326530396438353435306336303963666333626339396133303666383730376362643735 +35346161333062326535336232386134613434356234663665383964373935373137336639646130 +35383564313133393931376164316632356635323463393762353038373234393539363565303862 +36313731316537363932663337336138633230643965353335356233326434626665333061353233 +61383861326639363531383033623935363537396332393361633837626638303963336633323430 +33653834633866353431396438346231656333643136633861333834336639613137326564356262 +65376238373631626339366661343563663233336231303965633336393539393162663230626634 +32346433373934383264356661383032393138343436343039343566643164393933643239363834 +30343739326463363633306461363062313532393261323134646536303336643563353063313538 +38383466653161396466643336663732343932383839623135366532363566353138633161333463 +39303461396235366365656166326632636235306131356538386263313262626463613735346338 +63303535653964356632386135333033306561383962633538363462353061343962373438316265 +39386263636133666636393064343831636236646162306636633836363737323930336435396138 +33366535613931626230633136613864383336356661633565333362363436343838376330366333 +30363332373831393364333237626134366533333533363130643662316366343238633464666436 +62346534616330623333626138616330323631633763656330353738616263626233386337323963 +32303565313465303464343366376334353533396264663561346438626266376463306635333831 +66613861653965653434376633363034336462316635386332653063356637343531316439653030 +32313734303762613563393762653661303735653364326131656236613230656635636630376537 +30613730363761383438383262626432396631393832346262333266346537336436653862366663 +38656138336236333939623333326234656166326163643165646631313230633263613732363533 +36643665386366363637376138343339646435373062313563316433306232363266386236663931 +62623433646239636263643039646462633936653331303032326335336231323561326534643932 +62333865646565326338386339336264613036313631633431343561303936623733363163386630 +33353738316438376539643234303433313137303063326264313135626231363731666535313363 +34353231363864313365653162303631613362623562336663356664636437653137383635333263 +65373331653065303932306133306636623265373939346431363633633538626666306431386463 +38663137386166633166343930663663663165316261656631613734643838663237333034306461 +37383838336338633965626231393839626664656536323938616164656666346665333432616437 +32336333343266653561396232393639336365616237626465343333326332653732363733353031 +33633965333639393531383231373334393332373038393666626231613862666162346431626132 +35336233313266613933383266323765303538396535343461393832646238343335323433663734 +30376136376537333535643132633866643232363133653934363733323035366665663338633464 +62303234323238613531323237366636656336343165646436646366323235393537663539623765 +62346264613236636463313565366562393238313537313962666466393939363863393633323532 +64643935366630346135646232663161323033376138633633316265353138303834313034616233 +34366336643832383139313865626237353461336637346135613334326638653361326163646536 +34316362616230376462636134366663616437316333323064326461363338373565396231306362 +32623261333764336264653762393730323465653563613534343431363965386663396162663364 +35646164323236653934633039373236363565653030396265663439326637653734643963393830 +62346137653137663265353531333161616238303839643638643531646332343365373639396232 +31323030323833653164636461323733616466636662366663323138346232643837386331643636 +39663432613064343732393732643138663263613662373139396130616534653466376631373165 +32623838653365303331386633633962613536623334393536616465323734336266613936663435 +64626438396365396536616665313131646131326435356463356431616339343939653561346261 +6366396261353230613565393938323965613832313865623132 diff --git a/group_vars/all/vault b/group_vars/all/vault index 90b8fb6..7f416f7 100644 --- a/group_vars/all/vault +++ b/group_vars/all/vault @@ -1,305 +1,305 @@ $ANSIBLE_VAULT;1.1;AES256 -66396364626137653230336236313132366334386632383339303335333062323833373534643931 -3035323936343830646136386237623565303262616366320a303665383565613936323763383538 -32373832626130636665313664356636623339353266656433366563366439363764386136616537 -6230376436363463620a663761633130383262353661313461343839656361356238376433396639 -36643034376539383136633937613031343862653739396536346130303164346465356530323564 -38396130343031343862383237383566333661623466353538343462343565373765316132666430 -32393635623834343566303932343734653566326231303531346662303436653437663034333865 -65666230623861393161353339336663616131393830333136373366626233363966613064656630 -65663362636566323263353838393932343036613337383533393838636338393738303835666538 -34373266393237326465613064656231616562626531353937653565346634646162653038356566 -37643364336562643439616464636536353335666162623831313035663039386637323639623035 -66653538646665306130393934333732346366366439396637313932366463343935303264613033 -64633162373062373534643938646633306332303064356662366163366366326561656266636234 -36613630346162353061313532386330653939373663616534653263306339633139653935663565 -31316237373766653865326632306232346234613237643038613334353737323930636365303562 -63333261646638633031313032386239383938386439376333613762346237313463643663336133 -36353833333661323632633461333064313263323937613263356264366539313036366637646138 -63373761626566613732623365643065626234643032323263623965316464343734386532333165 -37626561616334396561333930326461393863346139663738393536626135386463366366396336 -36306538373331616562373263653636643938643031386435633234666561353164386463323339 -63353761653538663264333762613731336333656139313434613563343061386462643535346533 -65366263383735306336386430636338396561346236333837336465323866333933333337626235 -39653030326430663332636263333938326536356366643734346362643430336366623164633330 -65383838383830306133626461643632656637336264666638383636376565666231373331393834 -38663939633137363236303632616638646238313431653262346437313237356263616530656339 -34336634386133383434623739326234313339333265636364373963343334363836313934653565 -64336132376336323063663765643365336366303732666137376631323231343631656439383666 -36383535316232636434653238313738653166633836303461376232333933316332326462656432 -39313166396234613162623361343037383131663465383438356438663130306138356266656561 -37306232653730653962656336373634643937333633623361343132393964623739623161373233 -35373461303833343666623261616534323435663634363639316466613761616533646531616635 -37663038396537343361393635343264613635666564343065313930376365393361363934643234 -34663830386664613062626465633666616430646566633435303837623536646466616337376162 -39376431643738336163653333333638663564356237393630636537306564333531336330333039 -61386261316335323866353637626536363939346564373333633561323361396264373034353063 -33613835393064393363326263623964353131326566353938623431396566663961633863313465 -37373264343331333839356538346436336561656435643434353532626539333538343261616336 -66623432653930633334363266316339373830643631316432303633633337666537373039323037 -62316333356438346364663734613863316334636365316565336561626563373266386636366164 -62346536313965643661356433383538646532633234313137353035633732356366643934663661 -63373735323138356565613131373938613338653061383734643633636363353438373533313765 -65393665616139343137643565626437373033363737633061386362376332353739313861623339 -66333538666563636264303239353535306166656530346363396338373963653536333066383035 -39633938353932303164306236626564306235326237646238393461306464386536616463376132 -38666237376533353965656131373639353533333532396430616165383037303266653033633432 -36666535616633333736653033386263616434343361383066663163363936386435626130303836 -66623833323735643435653261323437386338663137653633663261336434636234623232356664 -39376338303433303534636632376136656366633165616638623934666362666638653730343564 -38303566653464383231633464306139306635386136336634643732623237643961643636333761 -66326136633434346262343364633732303831323337663566613833646537346237643761616236 -36373966356330333233336330663063663966633337373835656334326330326630353261666437 -65316362643165353166656330313839623562633562373161356561663163636437633133323131 -30373462336532353063663164303837653332383565663436383436396265373966653036316661 -62663534383061656363643439633032383735376237653832616563383865613733356633323633 -65326631353265383433346130636364656533333736653834333661623733333966666638326437 -37353833663432613133336566663337313833323334393065303633396464613333393663643732 -39666235353664323036306531306462653161613937313633623333306663333834303763623362 -34613362396331383636626237376433303966626463633364353265356637653533623538653630 -35393766306639633431373530363633306635663666373137653932663963363939616134643366 -37363436336535663861336463653639653536303634363661666335666633306530633934363466 -31386437363765633938633966343535386335323735623739656131623232393238316161353634 -38633338643937623663346561383239313933613330626166636334333838333531666233356233 -65343439373233353463663462333036376362643066613762303963383065633337326139353638 -39373461386664313935393463313231353833663133663930323435353332373562396638343138 -33636465626238663534313765363333326561386164346139396432336431376234383238333530 -66356535353966633132626161343661643465633730633164666465366332623061386261383164 -39313433663237633166343033353063613733383130636237393063623962613938373164653630 -66343031613439316434666364366662373838626164653637636232643737376637633863616330 -30326233323137323865643262363837353162363634333336353465373264336337383066323939 -35336462336462613634363831343266336364646334386239373832653863323832303766643435 -34356339653964373532326138303132616530663362303664633861373931373061393566313765 -66343937343532386162346431623166366262623163306633393933663266616135663961643436 -37653663303337623662393761336632356534663430316264343437653763656635323437646637 -38393661306362313064613434396331613366373037613464356565373461393663636138633532 -64343561346463316532366361646438323731383963646337623165383663666266316139656166 -37336463633834636435343761613837666635653166326163346539626139613562396439306130 -33363230626633346138303538373439626161623163626135643665613932666535343532303036 -35373431343635393665616366643332643035623133613666396234353338623636663762636336 -35346431303536613962323861336539396333346234393763396438383539383036333636353637 -39646333383633326238393164333835393237623734383537376230353264346237353866333264 -38643231343536356339373531633165393334353365336261656665336230373266633938343134 -37646266383438633835323233306363643765653833666363376338356265663831636431646637 -39633532353130396635383965643531363564373766323064616165376134613834303666306231 -38643366333166633238626335313463623935373233353236393663353561383763636131383862 -34623536343664623962326237326532643830636533636361666432333261363530373464356233 -64373865653035613363373832653163326165363061623531373337663765653937303036656663 -66636463346139663962393431633162303664313031306331323865313739323661303538336238 -65313639663663393962396333666438633432323533613064313765353362326532613834373136 -65326265646136613030353862326233646331396238343634323534626136376136356561316635 -66333662666437613339396563323531396261366138323938303834393865633439313965613463 -38343961646664626663346464393061396234356237663339323462623864663864383939353862 -34313266373138346235626236303433613062306332343638663538356431663930303863306461 -63386262333663393262623364343864376437616237313537343839656632363436613933376438 -65346137313732316639353937336162313661386536383339633938613763336532353634373935 -64393635366435666639346537386661383362623565623365636136316363336337663738356463 -32333466363366336337653739313166396435323434376662356165643662353332306431383839 -61613331313164336537313037393166356537656530616336663138316532323164346266353831 -65666238306135346235376237376561333063373163633433386461383834633762646431396462 -65313637623266646332336332363139376265363037383533613763373734313664343835396335 -35323230326463356333653833326561306236336238373539653938653933636239626661376436 -35303639643832343364393439386631616632313830363461326665303162383839653762366630 -34656330393539636564346461316638396230323566376431636236306632616331323132623962 -35666466326136633166323466666361326137306335353565326232373363323965373261636235 -32363935323865303630383836303964326138393632333234643261386361393961336161636664 -36393163343634633033396561313535663534623936323564373430396238356635356231386365 -64313331633231336361613333313532626439393562356430386238396430393861396136633339 -34303962343336356331663530613031636361333836646132316131343839623235356561633266 -31343733353631653266353631376161613632373063323765663932646633653964366563363531 -31313363393136643036366531333138353135666235303335393531353833313231386364393934 -63653566616235303835393136646562626562353830653663386564366633343061613034383634 -33363238303661313034636562356235393861356563333039313136396232343964613437356232 -36346239303732333462613838653232326234353737633236396165616433656531393332663433 -62366161373231646235656562323765653662343161383031613461643138303462386236666339 -33623037366431353462346534636565393234626434613134343135343466623662386537386535 -62306533386532353962626532613839346236303963646265333235336363653037373961663236 -34366162353466373265643765356236313732353830303934376538343833343065363562356362 -61623364386366396366353037393434626530326231623165376337306261373164343030383533 -39353633656332363130326361636233363739333662663362366534396331353330343633313130 -61326266343235396461353637333630333133326339303431376234356433623631316132633632 -34653365623632613630306134643666373961623137393135393163383666326232633933393630 -34666430316266326638613537373337386138383261643564313564666663666664363363323463 -38366633346563343964653561316533323965366662663965623661613735366333313133663730 -63626432306132356138623762366432613064326138646238643766313737653531653530663337 -62393136356331636131303163313236386436663261613935353532666534386265313964656235 -62633135643630313032666134393638663136373162646365343163353432333232613733346539 -36666664613461343831373733393231303962356461383632303539633862633630636331613236 -65376464363235326338366262323535646636316438356161316333663134613865326465626639 -34633834376130663235316563333936633036623031326232636436363563633432323930383636 -36383538333162623836306339613236623632353063366332636366376231353132663163623737 -66373563663166666235313364383761383730346233363466623133386530313265383962333130 -61313064316264613466626131616162376563346363323639303630343361613230333434613836 -39303065626232393663626562376239356531613931323530323666353734396132613461643133 -66356564626666303836326262666466623431373933303435616461653837383765393363623635 -63386335313835366139633761613539366539356536663763396530356230353138633833316337 -62343434323330393439656236626336323439333063376131643964376631376564306339323066 -39666433663438306266393430303538316435336238383934323439323261373936326666623539 -39633035313633313563663366666231383865333032333162386365633163366635393766366162 -35663334303061303862346337376435616337663130633864383439653764366262323539666433 -61306432626635323730373964353338323030656437656364663035336531353537653839623133 -66363934333866356635383930383036326638326534333164383034613730383861303439383632 -30343434623834366162366564356131356139363432353864646535623537656137383166303262 -33313433303561333932333832383465366633336262386163363137353731393135636632323931 -37373233663336333332326238323338373639346333663366383966653337623132653537356632 -66366462336133613735666631366661643432333037383536303736333432663338623165653834 -36383930303664313432363433333130396236343332303561373261353561303331356333393330 -38613037383038376335313836363337313633346539626532383132323766613838303237333766 -62623235343232663566616233653764323132613634316263373330356635396232656264346333 -31333339336630373934353130353464373962656264613938366132646665646531646633646536 -37373639393030303161373032373638656566316666393239326338353164626434393235366264 -63343864646336376538323235313333363531303563316634373338393137656663323132333533 -35343062373534376531383531313835303738376439636630336161303539346363633064383435 -38656434666239396539353338396662343035626333633862323739366136393063646431363531 -33643566343736616665666361633961336163306632383632616264636165366165396132303237 -32643436613034623062616463623038313061356364303235656439323430366430623339386339 -66383130323530333963666431306130633565353833336464626331313030616239336138343035 -31343833613631666461313631336565376264333336353561386233626234623730323561373134 -61616236333962386231343532323464646235633530333062343663373830656130636665623865 -36643633323539376165616238646139336365316532643565656266353539366433366330323330 -62663735396233386463653437616639313331623736613562343236613564306139336233656263 -65646534643762336435323232373062306434393463623662323963333232373631373530353237 -35373131356538646462303961663862656533643162383436303361306639643134383436343739 -66393238663837353164333662653933353530376433633930663336373634383036393637663934 -39336337313264366135386464363061356664303638333866303562316664336636333566623366 -32306639303963336233386365373562366466303930303931643266373235343366336163303930 -30386337393966633135326164646532376637636265663762326562336565383935613062323462 -62353536663936633837316363653366356231323664363439393866393133336261346134333863 -64643832306236666636333939326531346163346335356636643566333362643533333034643739 -36373736353464653531316262636231343963376633653239633037336133373130643762626461 -35346637653434656339323861316233303863393263373638353664326430303731643439613430 -65313161336137656536346435356132343835326636616164366266373561323864386366366432 -66613039663836626161643336316432343436333130383935306638393564303838373938313930 -37393633343562646461653339626135303262626434343132303462353662323066633639346433 -64336239663733613234333738633730306337313936343865323030626566323066306266336334 -33393332373163353130623132633264656137386163373662613965343162646433653263393566 -39356464393962636233306462323730333837656363643164376438363565303138666564656633 -33343933313138386539303837306365373639373464306537663439376637303134626262656264 -64336663663238376231323030306438616434626466616566303135363333366564346636323562 -32343765353931663261633338356161383734303764356465616136643862393266343031353534 -37393030656663613764323831353839616466633664623530663962666466383562663464353334 -37376435363230366362633939613764383863653438303933633962653937643332633063353937 -36613434306634623362643233313164333832663639653066313137336565333138363864306363 -31643366393733316236353263316537396336656139643435373365313965383235376166353862 -62363438613163626564383966343331316338343835656236303565303631313733353265396537 -38316463633931633431653837633134383563366133373362326664323731326363326137326232 -30373536386435353236313330373537303239313538303361396330663837383166393536383966 -34313466623333623466326365643664383737363363623731316565353366373864636135656333 -64633132613138313564336337383338656639666330313939376234343839386438636433373832 -37653366633238663266383565346564396135356163326566313665343339346333323765336631 -35643762313662636662376331336139373866373437623631363636326135346536363765613936 -32306166306135313638643633353131643939366465346233636639663961303563643162366133 -32316634383963653038613037366266346634323361313337666262343432386239326337326334 -65653461626264353564323161656631373865666433353139363639393338376661353064353966 -33663064613665326564333737303733633433333735303461613933353435303461333033623433 -62356236323735653338333861656435616661386339303439653531643065643030393536663963 -64613730343036353636616462633365326661333038383264616336633839346466393665393465 -30316465323466633234376466383538613539313239353937353531316462636463316238356634 -38346439363033336363396165376162633536363361386564633362623864316339623233313235 -36646161323832346332386261623837663135646237343864333564653533623835333834343333 -33333739633130386131316537386636363234333466623730303061336136633330646361366632 -37386336623862373561386663353063616635326131663535313337623232376164316631346436 -65656536313761653739623130313766366662613630396337373034323562343633333234373031 -63383861656461336333303436353739646461623333616236333962356564623566363031353334 -38636165646632346633353766393230343736313966333564313730353262636135633164393334 -32373063393964656365333164623165326532643633313563643337653062363566393636653934 -63383533326337393762343462313732323561316532303137336133616634373339633864306334 -64333032356531313763313838353730633939393536383165376130663163643339393439616163 -35363162313063663765616332613834306134393731633662306130656464336132303130303165 -32303261333162303438366436653963326162626334613030653038343834336232333733643461 -62326632373832623863333536613339373539396533393639326463633837306439383439643437 -61326261373064313733636566316631343132656663376234323339383464363537643266383238 -63353366383664653837326637376537616266346161653038306331353938373230386131333032 -36653461633134373034656534623262383335626539623939313936396136376565643332353230 -62643633323835376563653337306631376664336464646234666336626532356562613864626464 -64323135373835613239613830616134303561363630623435346562633466323462643839303536 -62303634386563313565663837393761666532303834623063343431343364363338663838313961 -39643431366661333465313066643939356336643264613133653738666438653630353239386465 -32363739663566616431623665363763613531346134343933333963623033313762346438343937 -31306262353364353434663231656538376262393235346432383936663065316165376364326134 -61396563636462396438623262343537636131636339636566393138666565356438333562613461 -64313139326365393439366138623366646435333132326638656438396161386139393036656439 -32646535663564663462343862366666386633623730336333346335666436623866613564636665 -64316230343332306266303831373139353934353633323032646135376632303631616533663534 -31656539353538653539306331373233333337653864323433393038636232373439326462336337 -65356565633835333939373736383134373963396132306638323664363639663262393232383335 -30386231353535643139363536653065326663353665353932376533363634373164333061326634 -33343330626136363465313132363563326666323335383239376133633161623033386231616332 -66636566353337356433333266336565646133346637386366353239623937626431633039663734 -31656466383362666333393165306561323164313164363030393639363435656262643461613033 -30303466623230643330313164663535663836363536353238663136373133356663323062336438 -33393935353161633536356134363064646235323339663730383464636134636433353062353537 -30613135626264366566623339613037383636353334363530653732626165323738643461613337 -35383138323336616563333965643630353836383032363034623963373733626232353365643536 -32303761613033353563333531396630646261343966393662336661313336626662306538636633 -30346430653736346636646264633936353562313537323863363462316561333865353563363630 -37326336363234313933363333396336626436343936623535316665366437656637386539303862 -34336330316430626563623331656464313663633432396263346564376532306364353566363664 -61653131643837633639356533376163643465326166636436646165336635323838386265316264 -38393433346262626365303261303533653931366531303565623165376661323834333535376364 -30633034346635663262653835326131396165306632663161366138376631366364356162626338 -65666465336365313535376637313365653632346432393937326334633861313562323564663638 -36623462653539356339623666643234363361656639313133313635306362373738636264646531 -32313063393731373666373266326661623562633935656233383339383161316564393130643932 -39336163306462336638646138626236396237363939323461633330633762616561343432613937 -66636663623063333333376666646334306662303561656231333365626164366336653237396236 -63323531333139646336393033633731653437313230376465616663623734623339623238313863 -35366639613930303166393739393163313635663063326432323434333363613930653937653136 -65663766616465383736333164346533643236326561323335653331623931326130616236306462 -63336434326464613335356333666237303261326432396361376534326566346435376461613933 -39313537323939373264333064356166386339356131396466376437323638313366336336653766 -63613365303032373939326463383463303136396239333236303437326331636637356133353135 -63666430386631626139626664376264333833386437316563383830666135663431383162383366 -33343463633462333263613965383034666336396564376635313666343434346366376434313830 -38613638656439343465363261653737333362316433353964653530366562613137303231633464 -33656364363032396566353830656634613434636561633063643261396334613935343133653830 -37386634653166636561646163623964313465616163343661646464313036356435636338313237 -39323266623861366562323238316666613237353236363235333436303333653561316635373233 -61323233346330643431333866623861656632376164616533653765393866623432363130653331 -36323937393138616162326438323463363438633437303665313630643432353633316337613537 -33623130303738623763383936653333386631333135616637393731346665626634633238326537 -36336539306166333062313465653630393134363936616237643866313264306531363163616136 -30616166643439643034616562646464316662666539653439626461636537333639383636643630 -38353266303831396630653261643536376633633430616365303866366132343062306539346530 -65353836313464333833623364326661356164313963383462623138306534613934373366646535 -38646630363564343865613035383130666663373333643530643237323030643432633139646239 -61623136663139343866636663313731633530363033666536666137303861643339306331313233 -30633665306333653734383731396663396433353862326162643463326365363565303634396661 -36663832626636333936336131383236323538306131613237393835663235313636373330633164 -32383331636561386164373964373664643436663830623361393965656265646137666263666632 -33653736363232373838653235343665663465333562653861646436633061393430333133613735 -33343238373633383966366365383333373263343139646533356439333763663462343263383631 -35663666656562383230333065376439643132313734316166313430386661313234396164356338 -39653265306637376239343537626237323332313234373862393862653265386266323161316135 -64353139613530323264326639333464333366323437633932363334633635343436353462343130 -32623337663533666334323965656435636561333865303461326163653061316137306339626136 -64363166623962346366353732633865373037636563373338333061303263636363393632633337 -61633833646466626663613063663131323139663263356663356538623536313230623361363332 -35343630353637376636663762323564323033393834336261333838326332333966383266333363 -66626436323566623866333462333832323536363465373265333830353265306263343731343662 -37663036356330353537333434313165313662303038326335653761343432383639663365613334 -63376239373638343432616665336437373266376463623330393238396138393734633934626661 -34333164643330313531346636636432656230633264396130636338613564306337353337653030 -39623466373732336435343738383539663833356233666165616638356436373231656661613138 -31353062393463383035323962633330393733346237666366363939333437396163353433336638 -65393433613337373935353338613630666539303231633139376235376162373932646338333436 -65663363613831363538336233616666393836316237653432343137376262636632646234363230 -39373133333931393963363339376166623563633733363137363361653463333066666465613432 -39316662613734636462393936613338346361323438396634313234393335323462666632653938 -65626464393733666431366161653238373266646266376463633366336332303133633738343165 -32616239653230646565316463373139373933323365366430663463653631343837376232613666 -63336134316536353962396430326166306339656137333765306233336234393233646136633833 -31623861303530313739666636373138353339393434396335646535613932343666643261383639 -39386135356463663335616466633137623035376639623635613765303732326232303937366262 -34326464336666613566333562316164333339303636613265323538373263363866333932656532 -33306163343437343861363861666533393462373561303562386135306133363664313638336163 -61666239636535326634393437656536333034313139383961353062326138373463323361613533 -61376264616361393262306237336363386237383665383839373637346535663639323065636135 -33363436383031373232323936653163383535633436623936653766666231343838656533643532 -64623961613837363362393563353438656631666336653861666233636437363632376365363630 -66636536343365653761353235353435383132366464306432323434386135356631653538306134 -65616630323833373732323535633932633563386233353062333739393562353338663663343734 -62616333366630303833313131313633346539316163633665633438323237396533636232396661 -63333432636166646433366138356263343535613334623538396335303739356135313566353265 -34313936393436356334396139643863383561616130376466643533336363323163386437636138 -34663961313534646439 +66303764326165643463653831376330356231346236656530623263386537656233636563333766 +6638303139333533373538383765663266363365346439370a353235393063323931326336383262 +31306664656366623564306630343731346430303731383331363562333262383861373939383837 +3038653736613933340a303339613433386166393665346163313136666632396364376561643930 +39633030316537663262356165643336306330316662393364636136356533633738636661346432 +39386132613633666339623239383031653930623761373838346531353635663539323562653433 +39613332346234346136666362386532346631383439383065666566633234663139353537326239 +63616135373937303161343864663638316461653435636462323739366333663737323162363131 +64623862396235306230353730623832626236393634313430313763663038633634303630613333 +62623636383966363532636538353537313039353465633964323434363339333134373234633964 +63643733326439326635663964646638633932366564666231333563303939326232643464306230 +35373565316566393833346162343339346464306236646530343764613566313031343331636162 +36363234666161306362356166383930323338383266316430356238373864626161393837313765 +33313363623264643936306664363566666531636236656433373934303362316239663963373764 +63396361323030613666353862383437353466646163396435336365656136366566326565303638 +33336264306235366631653362383338343334346234653839336564633765316639343631643335 +39356562623239366136666564366632663333333165303330323964666364333632313465643563 +33663932346466376438346562386330333662323438393134656130643839333666356265646533 +39656236393237623636663531346565306566363437366661306333353738633630653865306265 +31393038656630336531623166613833333131623139656661353963343634346633626230373234 +65393539303638613633326561343461363363363938613831363437613762313563333234383162 +63323164633639306331303331663032343866613834393662393036373364646539306133613339 +38323932313937376237313564363435613062323037353835666261373334323864343563643031 +34323432373861636266353530313561643465633030653236643338613663346337653731353839 +39326536633736343764656437623031306632616336393965306233616166383739613830373238 +61323130646564313131643462363062373933343933346131313538646431656134613139386164 +63653434336130326664323266373031356233323632363966323233333538626433386334646661 +33326139643334373434323033336333313830326366636433643465323965643339613331386138 +64633033383433366333356435613035393938303239373065343565633765356233613566636163 +63386538653266653664326562633364326266336466303763393231313133353031373037336366 +37393666666136323962643866643337393365313236396566373962653866333238306661626535 +33303165626535326532653731333963613063333336656136353937643135386336323739616162 +30633861383938306439656434383337613763303365616334333738643836356164323664396133 +34303034653563663839313866313139363138363361306339653533343938656532393062366366 +34363238613864303533343936383034383463343634316537646633306137666463323863346636 +65306465313966643734353137666363306430366439323435643631386435623936626431303034 +34323738363437393134646439386461333235376231636139643464646662356337356264613235 +61656631396230636365366334323065376563353139663732343732626435356134616635366466 +30646261393330343735323939653939636363303439643064663932633835656334373663316438 +64663065316635326339643864386333326637303064613263656231636432333235666530613332 +65663863313332356264326462343064326637363831623464653435393939366535376663643764 +37626639323931643863633337303035643666623065333961653439623238613038613563623361 +66653961316136663034653935333538326437653030666539633438663436303638643334303866 +65623432616561353139396164313466386462393231363135653439623265353339336335343264 +31643734336639323964326238303963313130306535653636666633626539363862316638323635 +65363866326233613362353237323839376132643232393463316334343365376437623666663735 +62383634323434616465633238633033343030333538386533663064363166616136306633666639 +64646139323637636362326437613338626335663065613439613838633730383732306536373034 +37393863303638616332646237323733313161343464353461373763356430306161346535666436 +30623538633862616638313739393738636364386137646165373665633435343937383936653435 +37643232623335636531363337316165626130303630623466333364633435636261316466343161 +64373932323130373137303064336135633539373033663933313530353634313930366432393535 +39313337626138376537373034633734343064353939663233306536653664663763376664396639 +61663164353132303137343439356431313237376266393762306633656263343434653132663863 +65363530323934623766326239393930316435303530363664626638356631386337653432613064 +34383935353861393732656566376662373961336565613131326435313866376530313462383763 +65356565383330316232393236363561306539353462666232313635383836633430393766363864 +35656361333839313532353338623037663837393865643638303230393461393466386362396131 +33653263333635646563613330343265626664616635333137333535363766323864343935386262 +39383530323931393938396233633033623833646263626236636636353839303535643236303938 +62396637396434383831353063333563353437613230323364353065386637653762663837636438 +38323262313962373833313536633761346163396531646538643761373834323337623431376639 +37383461323534653535323130343866653635346332666662323336383661386531666463326332 +33356464653163306332316339363034356332663338373431313836386166376166336335393763 +62343063303562356338393437313631613063353830623736653937303130303336613331313664 +66653763646130666331326136663237303061666539643532373564626265396434363936656436 +30346263306636316364653933633232353664316532396261633766633132323365643961343832 +62663162366430623861656434646536313564373832383337376135333064666538333130646130 +39313138373030336633386664313666376461316664656137303833323734393763336663313466 +32653935633462323861353337313864356166383831313730303333343461316633626362373639 +35653061383336373538636436666633393331623134373737386265376231316336376137663437 +39383263373038626566373962303765653261633363383961643237626430373838336137386534 +65316564343831396162643861373634323864353965323430323865653266626334363863363462 +61336439333663663763646637363038326463653563646635333834333533356539353035366332 +61616233623139646238623232313931623963303463633339363831323831303062393464666339 +39386135323637346635313734323733353239626261613263373664306163326138653363643436 +34313739336430613665366436633564366338636635323032626566666533386264353061623561 +30313930393665623233653666313836313839393035396330633334633935313434613663633730 +63316634376562383965323237616630303064306137623635313939383063623362396133383564 +32393361346631303562643162383438643762363364393866613364376331373833643232366632 +63666462313935653138333561646135336435396439336662383832306564393534663133616137 +32656239303335626364373134306661646339333635356435653537313662616433633633643336 +65663661353366343334353137623435333835353930346236343262633230353131303931316363 +33366564323764613361663064333437363865353161643661353031303032393438356631353930 +66613733366333643863653765356630323863636434313735336362643462333666396136363333 +32333562393233393564663931663761623030333132383036376562643166373033653562383330 +33313163303433313736396631373233386432633162613630633161303639306436343464666133 +36396439373863383435613834333334616265323962343833616633366234373335353239303434 +30353435333532393964353432616139643337356634386633323861393832333466616133616361 +63326337353730326165383665613231663132303431323536333539343536643237616532353336 +66323430373161666164656334383063633530633638366237303139633764643766616632356132 +33373136623163666634363137613039306631336530343663363833633366376634316131313564 +62383032363565643964613330316434346364323939323266623135623930343164393333303331 +61333533353035376536666166626230343163663461336231323332326163313661386338336139 +65386662623638386666386233666635383165323031663637396466313034653666656332396238 +65663733393630353966353139613136323937613266626632333964353536356364623133623064 +62393266636635373433383666633739383361323436396138666435613433366563336565376164 +37633135336432316435393462396336313165616565326461376265663338623737386131363461 +62353566356261303536626363353638356662613930393864653765346333373934386164353535 +62653037333930656532343533366333376638393339353462363166666263343135396435353339 +38363434366563393564313135353364343966313161396563333534346133643666303432343833 +31303464343033313235393062363066336335336261376564393034356536336464316234323862 +37623034353738626166356365623533636635326139373664316237323165326431333762313966 +36613864353630666630376361363062626335353936363161636634313662333133636630386462 +37666566303030316536663237363631353036616164663132613764373431626638656533643235 +30373566323137343765303763366630333063363965613766353164383631303538663866303065 +37626361323434303630376538663737376166656138633065653131303862656462353066363665 +33633062336463306564336262303834363064653362623436646635316133363832363735326136 +66396534366539326261626161396536626437363231666334643230623438386465313938306537 +61333665306364376235376433646532663437373364353865346633656138356564623365366465 +35613266643963323336663166323134616636353030363036303361306436313961353238636134 +35343965326336313838346466396437336130323230366332643933323736303330333763643536 +38373331306266333333643738613730373965616561393662636265313863376561376437376365 +66306665376665373363633265623263343761616434646637336436643634636431306262313764 +65666635306133343731633130363362613062626434393837336439626462393663393032386265 +36373662646635616632643235346638656230613838303939386335346634623034663064303739 +34326162326532663139633437656234666533303539396666616465653038323336666338663936 +63623738383632356633326531303762303765336436666434353439666336373833396239646434 +66363961323037373864353863386139373265653730626163343431633738343065363637373662 +37333330323163323964353332343465386562633163323537336333343630333164373930353263 +61353432353262393031303633353533353031323761613638626666623362363064363334373637 +65306332663334616661663631393736326263383534623661306162633264386138373332623261 +36333131366235313137326662353264626337333263303964376138333861636365643035393334 +30633138336236666430373839633765383965623462313261303932633463643132323833363439 +64666338373463393139383065353636656162333334386136396133393861306161323037653232 +62366362663037363462333064346233323166653236643631336263383263326139363330336436 +30303764323063376566666565396365626133343431346637366165616264313732616137373364 +62313838663332646564386661623662316231303233633334653039646538396636623365333932 +37626665343835623830316463306663323766616631353362656436666461363038633033343530 +63346161636364366632343162376331656433643662613436663637386337313665633665303336 +34303939613135383333383063363862616239356565663361383465353162666461373665376536 +63656432383437323737346232373365396231653532393565313638393537303038623361366164 +30663363313732333938326435363335323762383064653332393364626232396531373638356331 +65646333356230353062343839363937356638356637356330656138316432313039616338616639 +31313632316462313062303161303262343833613464303931636266383733643561353531393832 +64363035376139313034636234643831613133623638303935383430306339633464353938313332 +66313062653630313063616434363230366536333739643735623637383934373333643761393963 +35386536363839313633356564333832656434363731636633353334333639613833363662636134 +34343231333834303461303266336362623939383731653338323732623532356562616637643038 +33313938653032636431313137343133306131643961326365376666326562343636313230343564 +64643736373966633838343635316231353236646539663039343536333061343937623766313862 +63646236333437303339396164396664383737643130653438613837396632613133303332353138 +30613566643765613839366565393432333166643362313233323733646631303633346335613262 +33343938613462663463653032373033303837653032393531353162366437333366306139326266 +62643166336432346539316430303236386233343230383930643433373538333463636363386437 +33656237656133323566306465653062356132613633366336333838643662303563356437316137 +38373739643762613436376132313866373864393136623863353038636539626163393237303733 +35346530366337643033383131643936663931623162346362373936316464363834616532303362 +30383735333236633134633534343336313866663162323436326366633434653435613738646235 +38313164616666613539303035396533363833363931643936343433306464333663623666616466 +33396331333830323137336233373139663665306635303933353831643938383837336637376664 +63376335333763313362343864343536646234633134383561373038366138343563363164363833 +32353061353261653062306333346531623330383438363030666333366238636630663936316438 +66646132633265633965393363333766343364653031633235656165363732373238373263333639 +63356366343364393566313831623037373232386637633664333735666463306232353061666264 +64323062303536303838626637343363393362306561336465656365613331666130303732646139 +36316638326339653130316631363636633030656362613139653262336262623263353763343730 +35663931343236363233393235353262316463663562306530366262366137326236373564346261 +64316639303430343862353865393433633930656634656465373365396464613331613038306232 +66346138346533363332353564326163343261326436366164313537373632626635653032313566 +39343535613661333363633461343031346636636661643861663235303264353931666133383937 +61353865316631376534616265663531323933336430356463393531666637333666663831626430 +39666332643331363035363436653031303761396131626364386565336466633439333935333331 +64393734316666393266333338663634393930383931323836306539396332636664363036656233 +65353266373838326333336635306232376562353237303532353661373465396162646133323765 +37636337396138666331636633343064356534343462643465333639383637303266626263663334 +31653465343763613530636237633863366438313331333838313436633934643434323037343936 +30633162623436666435613436356236653565636232666637656638646636626361323930623738 +38356138353762363664643531636363343338383934363633666464383639353161653137316338 +37353431383464323936376565666637633334663039613662613363636230313562303364373564 +65643937323765303032656163313534326538636533633864646231623265303233346530613532 +61306331663062393633613439343538363034633964313039636630396639343636356363306135 +36303665643965373336326462663430396434303264306466323462666262303666613637653836 +36306333316338306362316332613862656264333039653138373231353834383761353261373866 +32643564323735363665613134333764396431326238343664656136303139343532353534656334 +34393535653337656632653165393432323535343737353264646534333334613865623263623363 +36303665323531343966316464653861623733303165306162386566303265363835636362653432 +39663334366337366330393338303330336461326661373238376265653635643735623935373133 +66666432313030346432386364373334646563623936336332336537383134646663633033313365 +39383138346434356432373537656632343463363566636566663239323234633335343631663066 +62646662643163376561323463323062306231666531626463343930646266313136393066306231 +32653236323131346330613361623165356639386264613130386334613531366233376237396635 +36333333363938626136663831636637343336376339323164376139636433656165306131666232 +66636465336632343465303635633564343535643566386563656164306464306538326562636430 +65646530326432346561623432356566396136393638353131333965313264653564316635633736 +36323566663931373031623935363831383061396433653462613864326666646562396664623734 +65643638613235653037306531316461323039633030303062396539643661333766386231313333 +36386666343939646331666331396165663866343937393732346234363036323939373638633862 +65363335626237613962313931363466306564323839353662306331323630396531643232376362 +35666561383831396130623932636332633063333866303538343162363134313637373538383035 +65663736626366323464343064643333306364323462376130343030616437356332613164613136 +61666630306232373732323161356339336638313464306230353034363634643662653631666361 +62396232383530646239306238303234653030306434373738373734323932646365623762353833 +62343131346462356632616166653662323066383338623835353764623530306466333236383333 +35393831363563636632353937366134383130663464393134313261656536663331613435333362 +37393438313666633366373963323638316263396466613131333665323035653736643763383231 +37633434326566313765313934363737316134643538393331646461346261363164306664613431 +35316635323630633132316233313264616462353031663431373963343562623134313639303630 +64633335323633653665396238656236643838386163376335636539363065663032373931346233 +66643639633339643235303866636439643832626337623035373663353737636637376564396639 +30316534313065333963663863636333383133316264333639366234336163616333366534353032 +62323366636166353432646237353834656464323561356366333832316632303764353266363866 +38623438333932363531626435623563303736646162306566646634333664326235333132356439 +66633962323862636439303831343534303631633062623664616135333262363431373835373330 +64336137363132393632656332363835633563366463303838383734326563323765316564386437 +66303732626630643763323338386562643861323230376130313834623130633065396439643532 +66636232653266336164656132346136376337383835353339633666383633396165376461356361 +62643731353966666138346434353466646631343832303165623835323139306637333462626134 +33363632353034366638643333633661366231663962383663633633633331393633333265623430 +38316666313632633730636466613131656362636161656664386433666565663332643362313332 +36633265666336646139383565323334663937353536633663653666646330353162323734313162 +66353533663534653265623261653931346363373839383266323164616639366462303039303862 +32316136666264343766323662366264663631356233623065653162356134303161653562646366 +33656262333263613738303234656130323866366435616266663236306134633765343937333033 +61613634636430636466353163376339303237623564343236313465333237636336313237613435 +63656133383663626631336632336130326531356565333333653662383838306133373833663562 +31343238396236666537386135336236666466303465396439613463383535343839306135333332 +33663962653265313263306437336537653236386535643631353166666233323463313233303036 +36643966356432323531616163633931656332373530363434613166386665303965333966396464 +39316163616161323564646562303236373735613630383632636234623734656366346339653632 +32363637313736386435333064643762623536303338636666306330343533383666653337373238 +34613337613561633033333536653832613231656235326166323037303963656332323361653566 +38353861376230633139313138346533656531636263343938366638383565323333306666356330 +32316138616630306534376562383938393232316461343134336264616432333039653530346334 +31333964343934616437386330336363653361373935353739323638393962323364633737396162 +32396662343435306365306531393036373162323834623564316331333831656363666333333836 +35633132623936333666313665383833616362386633376138343863616538396632633565653335 +63386231366236626132373063393233313437656132306134343233663834363837623733343463 +31363263656137396536646335636363646239633935613539363434373439376161643730353338 +33656530396437633862616665316264303733383166363831613939633530613932623965326237 +30396632306364323135646364336436363061623930313036653330323130393732306136303263 +39666366313364373739633864333737623465356161633539363833333236343532656266313132 +63313166386437653164626562633532636237363736616432613463366337636133386434343433 +65663937633134326336373065653966616636396561383635313536616639383831313337393035 +39636465343965663038643834343162316463616466373661613735653337343433333965366566 +32303964353539356136313037623632646330303766343235663735663038326130656361616636 +65306661646633346431356235333637613965393164383636623464643736333930363334303531 +33356231656230663163326239333764623664643938333566636365373065363865653238373465 +65313130326539303133356431666436336264646634373637396134396236613632366137656565 +61333535343336656363366263303164646231613362643835333465336430316436623038663138 +30623337363963613661623737386439613539613333356565313030323830323761366238356665 +33373562356262646231623336316562626164346266303163386265626530393430386538343761 +61386437306161376533373933653532313466323764643764363661306465313331353365323064 +34326132623835356434643461626632363139633434666232646435376535313135636133356335 +63336437333333353438363439373532396564353939343266353162626661356266643239373933 +63303739646335656435366433666265363136333836343935366363303935313731643930396636 +34653737333764626431623733323037363264633365333364313464303630343438643830663766 +36653765613133613530626461663235383834663261386630663961363432373563366535616661 +32316466396264656536333237303130326438333835303262393264353265366261633766323434 +63323536666566356462313661373562653234303432646536336437353538383537616431363365 +38666663356633656136373866643136643334646364656239666666346465326365366131616464 +35393431343038313035393761616465363130303365333939623937313135613131323133306138 +33623037633030633266306637383733343932323865633066653036613162323264343334613430 +34353537663532383565366632646438313735373037303435316366376564306439366163643632 +61313934613363326634316362366335316338616366343834633635363832653137323739633933 +63616234636237623430376130663630356230623736316438373638623335656166343162633734 +61303932363561313462323637636237393030393531373462623665633036383136306434396234 +38623235656339393633373138323663653837663339656466616530393061343261386163643533 +61633066313864333936633034373339653164656265306139363666626666626537663930343663 +66393635316163333436333964626262396564353630356135376330633634313038643232366337 +63373039306666373462376532616366616233373532656130336433386165623762326463613261 +37383738303038663335373265623936316232633639333833303939643265636231323964396462 +32383464623531396536343936353066306363653130386532313539353536383261383937353633 +38656234636439376331646664663665346566326636396530333734376434346462333838613730 +62653237303234663933643134333938623838303435626266316366663037616565393962393836 +66633637366339306530316461323761613238666330396231346332656465363761383439313462 +37376265633136313933393834313930656265383437386130643230333337303335616432653365 +33393936363562393238666266636566366461363337643435396564653338366431656430626135 +38323830633835626635616230373165343530363662663037303738663833353862396361326265 +39346163386335396138313463636464663266363830363433346362356335653033373237663738 +61623164316130633030663137633239346132376565663037653363613839626366656634323234 +32356238613633336635303633613331343236653139323862623739376565353962376132383435 +39613766376236333165346336616236343131623463373665653363626334373064626365363436 +62373431363664623436376632313466336633313962323763313266393234316430353365363233 +61363466343732646333333462373834656432363164333839333765363432303030326336623665 +34643964343534316238393762666239633665353564323435616234333535613439333934353963 +36613339366335366236633339396630376363323033636536663339326561323264323435353961 +37636534393835366263353633396639336364313030323937663665363932656535326135353437 +32303538666334383536376464386435396566646564646631383736376332343134313439366133 +66613065363034653065376432623536383665386539396364306564353336326333623030613165 +30353262363031633461656232346235373832333864323865356338303333333938646464663631 +39303762613261323731663265623334356466633231633935313038323939336565613265336363 +63333839613033323735613637656239333630653236663963653864633164623961626139313833 +31353336386234313165376532633334336434306635383164633137326537613362386332366662 +61616635663230613962303231626134653936616463386162353536666231623564383366326333 +37616533663533663336303430366437336633376162343435363263393732383362363263633361 +38666335396365643362323162396136656633376138356664386362376366653439633436313861 +31613034343761323438373663313032356363306163366664643336626261666566303264636430 +32616138653465393833616236383535346433656337333665613939353062323239626462376561 +30386235343864643736303539386331303664396135633838653961303461393432643131383961 +30316439633539343164633835383937316163653662613034653632633263393039663863326266 +30396262623237636439663432363961303961363534613533303863363838313166613462366630 +32343033636639663635626336333663643738346636613937373566353462326564396539323939 +62343732623936366464633831633362646431636631373463303262313136376566663137633631 +66326165373665396138653232623835316230316130656161383031373765653630613135623361 +32353235383332326131613431663563663961653138363038323135613965653439383536326261 +38343639336639346561663266343531353563663530636164383965393033383339333036643832 +38663864336132613836326565326137633966306564393239326166353765346438643066306233 +65343839366339613532313564626532666534636332363363636364366633393131623561323661 +34356434393162626561333138613365636339663938653433366531343865633132373939356335 +62336263626638326530626634393232376563336237623237323965633665386637316562396238 +33366337656131633062346531313865653331623565623135363965643633323334353463363462 +62643033653934373461343163636561633862636461363266383438333962316539346434333161 +30383639353461666630 diff --git a/group_vars/all/vpn_vault b/group_vars/all/vpn_vault index dfb1517..f81f8e5 100644 --- a/group_vars/all/vpn_vault +++ b/group_vars/all/vpn_vault @@ -1,36 +1,36 @@ -$ANSIBLE_VAULT;1.2;AES256;vpn_vault -63336164323763623961373136616238363832356135343764343966356631333766396265653566 -6139626665393664343961363966363339346636376431340a343730653565383265616365386366 -32333533666333373663373037653731666361343737356261636532303562663063343633346537 -3337643137653839320a346236613362393636363935373162643237343831333535393461633963 -37343039383931613031663733666538383735383064356532373232633661386237366433396236 -63666134376463313637643061623934653666353364353235323431633930373663636137313462 -30666263386237303563393936373566386563386631656162303634306466656663666330313937 -32313431343536666437626130646231333237343734303538363639383933633661323565353661 -32343065383433623730346664643361306539623937656331333764346336396231656465373561 -33343034303263303833373936383936366131663962613961666161303134316134316635626639 -36666334393961306662626162393433643961646339323934653335613933383131633635623763 -34656538336434303339613032623432613239303239373937643361306535383137643239646134 -33336461613034303362353837313362643934666239363036333432373631336162646330333532 -36303332306333623765653838373361353435646366323462383237343134643736376230353434 -35333738313030636339363538656130643163353238666638383830316665646438366164636138 -30643031336164323862633135313630666561656335626464336162386564306261396532396238 -36666139386236663736613936633964363166343765626366323566613733353233313862646165 -33373264633763386166373739313136343362383864343866323231373536633130633032616334 -30383930333130646636666134363661316236323937373861343333333833616633346161323965 -31343966396635626465613630333732353335373264646464373764363433393439656635636430 -31303930333731656339633032366166386265653632633638323932626161623966613761636236 -61303134663931636139336436313637333739626336643838663861626539323336393239643131 -37383665326332393663323166643338353135363831306561623639643663326364343639316665 -38343337323633353066653666366238633932393836396338336261663331656565653532613438 -36323462326431333235376566343134663734373534663834316133333236636166386439633766 -31323931363066343334363764356630383764346332353162316461333762613366663130393831 -36633430383131326335333130303832666430366134393462616163326239383538616531373166 -37383130616339343832313335636364623434636434393430383566376433363565626336303064 -63376234613835666338373662373735386561643431633037336231643033393563316363613131 -61656232363035333635636464656465613763613032376666623238613362343032613465313331 -62353035313862323631653766393463383565336535616630383839376135393037363038343639 -39646531666130626638666535623533373766386531343236313962636539373233363462363032 -61373938373139376236633062353063643037333062363464383638333635643331616465643533 -34646238663731616635313131313438376536633862346165666631326632623534306666396264 -636139633664356536626239303631643864 +$ANSIBLE_VAULT;1.1;AES256 +33326464643530643862323238303631356639303466646138663239643165633333316539383033 +3735666534333264303135656539666266343237366232360a363765343864326139343237323634 +33366361656236336463666563376666346666353563373236653964633632383733303030383632 +3339366333363063660a643036336663396631346335343838306237663034383436383631626161 +36383562333664626366613331623765343631323833303935633737366333366461313136643862 +64363362663933313234323435393031353137393035666565373030623936316564316565663938 +30343537366138303737633233663433643335353335653963653066363632643339376566363730 +61383833373634336237373733633961373633386434663333333935653831393631336165393265 +66373561363635663062316435303663306436343133303630373363363363386338643666326338 +37313530346434376539663063656236643339313939623737623937333037366535303963363638 +39613534383265353235313662393533616138616439333835663662623435303538633763356437 +35643736643134643133346132616234326664353831613237636561616663656133633935333661 +32363436306535616366393865643534636133366565393136313134303333363733333265656431 +34353166393737343565396566343239303030343335663639653934363632643862353962303730 +62353661316364646232313964343033393364613737353335393466316466316466363334326532 +32306263326134373337646137326262626632333937373039373030313063326161656436633737 +62663761346436383330383731626135616439383136626661323830633964346130643634326461 +34633562323538653736333435346665623565643639636565353166353336363737333064343337 +66626639386663383162643362396634623237346361623033336637366339353134356537333462 +37313233643531666332316666386434376235643764356237653935353335323965366237303965 +64616532656461363666373235353539363338623031626233386435393334653163636337366130 +37343834343433353632393963663330623736643833356466363663653332626530623962343266 +36376366666164666433653462653635303233626330653734313538646330316339383339643362 +65623564616638393638663031663233356430343139653261386262356433336637613737306233 +65316630613137633632393033396366633134653864663036646436653161343965373461643366 +63663635623563373164633266373931303338373938633265636536613164636339383936383935 +38303636323836626538663165383533353838373233303237333763616430656537656632373366 +35616361303061646235306562633761373034346661626330626237613337333833643363653031 +37653964643133303666363666343839613663643634663537326538303035646564626433643565 +36343763613237313333393763376133316439636239626533386131396530366162313566303832 +39646237346463636239613062313566623636653830353130383866383632616365386139663531 +37656634373135373530393733386539646532633635646232323439373433366537313937636439 +31313836636133663033626239346230303361666136626637646261373838333638613061383065 +63333639326261663631363734376236316534376231353336656230613534313930366330626630 +666466326463316330373334353563373262 diff --git a/host_vars/barium/ansible.yml b/host_vars/barium/ansible.yml new file mode 100644 index 0000000..e49c9c0 --- /dev/null +++ b/host_vars/barium/ansible.yml @@ -0,0 +1,2 @@ +--- +ansible_host: "barium.lan" diff --git a/host_vars/barium/users.yml b/host_vars/barium/users.yml new file mode 100644 index 0000000..e5c5450 --- /dev/null +++ b/host_vars/barium/users.yml @@ -0,0 +1,3 @@ +--- +users: + - g33kex: sudo diff --git a/host_vars/bismuth/ansible.yml b/host_vars/bismuth/ansible.yml new file mode 100644 index 0000000..ce56910 --- /dev/null +++ b/host_vars/bismuth/ansible.yml @@ -0,0 +1,2 @@ +--- +ansible_host: "bismuth.lan" diff --git a/host_vars/bismuth/users.yml b/host_vars/bismuth/users.yml new file mode 100644 index 0000000..c5f2a60 --- /dev/null +++ b/host_vars/bismuth/users.yml @@ -0,0 +1,4 @@ +--- +users: + - g33kex: sudo + - antoine: sudo diff --git a/host_vars/hindley/users.yml b/host_vars/hindley/users.yml new file mode 100644 index 0000000..89d2310 --- /dev/null +++ b/host_vars/hindley/users.yml @@ -0,0 +1,6 @@ +--- +users: + - histausse: sudo + - g33kex: sudo + - thomyrock: sudo + - dorian: sudo diff --git a/host_vars/krypton/ansible.yml b/host_vars/krypton/ansible.yml new file mode 100644 index 0000000..f2b6a0a --- /dev/null +++ b/host_vars/krypton/ansible.yml @@ -0,0 +1,2 @@ +--- +ansible_host: "krypton.lan" diff --git a/host_vars/krypton/users.yml b/host_vars/krypton/users.yml new file mode 100644 index 0000000..e5c5450 --- /dev/null +++ b/host_vars/krypton/users.yml @@ -0,0 +1,3 @@ +--- +users: + - g33kex: sudo diff --git a/host_vars/matrix_server/ansible.yml b/host_vars/matrix_server/ansible.yml deleted file mode 100644 index b60da3e..0000000 --- a/host_vars/matrix_server/ansible.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -#ansible_host: "172.20.1.5" -ansible_host: "nyx.ovh" -ansible_port: "4502" diff --git a/host_vars/sulfur/ansible.yml b/host_vars/sulfur/ansible.yml new file mode 100644 index 0000000..4d19f67 --- /dev/null +++ b/host_vars/sulfur/ansible.yml @@ -0,0 +1,2 @@ +--- +ansible_host: sulfur.lan diff --git a/host_vars/matrix_server/networking.yml b/host_vars/sulfur/networking.yml similarity index 100% rename from host_vars/matrix_server/networking.yml rename to host_vars/sulfur/networking.yml diff --git a/host_vars/sulfur/users.yml b/host_vars/sulfur/users.yml new file mode 100644 index 0000000..067ee68 --- /dev/null +++ b/host_vars/sulfur/users.yml @@ -0,0 +1,7 @@ +--- +users: + - g33kex: sudo + - histausse: sudo + - dorian: sudo + - thomyrock: sudo + diff --git a/host_vars/matrix_server/vpn.yml b/host_vars/sulfur/vpn.yml similarity index 100% rename from host_vars/matrix_server/vpn.yml rename to host_vars/sulfur/vpn.yml diff --git a/host_vars/technetium/ansible.yml b/host_vars/technetium/ansible.yml new file mode 100644 index 0000000..2415950 --- /dev/null +++ b/host_vars/technetium/ansible.yml @@ -0,0 +1,2 @@ +--- +ansible_host: "technetium.lan" diff --git a/host_vars/technetium/users.yml b/host_vars/technetium/users.yml new file mode 100644 index 0000000..7812302 --- /dev/null +++ b/host_vars/technetium/users.yml @@ -0,0 +1,4 @@ +--- +users: + histausse: sudo, video + g33kex: sudo, video diff --git a/host_vars/vanadium/ansible.yml b/host_vars/vanadium/ansible.yml new file mode 100644 index 0000000..221d731 --- /dev/null +++ b/host_vars/vanadium/ansible.yml @@ -0,0 +1,2 @@ +--- +ansible_host: "vanadium.lan" diff --git a/host_vars/vanadium/users.yml b/host_vars/vanadium/users.yml new file mode 100644 index 0000000..e5c5450 --- /dev/null +++ b/host_vars/vanadium/users.yml @@ -0,0 +1,3 @@ +--- +users: + - g33kex: sudo diff --git a/hosts b/hosts index b44fe00..224681d 100644 --- a/hosts +++ b/hosts @@ -1,28 +1,59 @@ -# Servers and VMs inventory -all: - children: - ubuntu: - hosts: - hindley: - debian_bullseye: - hosts: - matrix_server: - proxy: - hosts: - hindley: - vpn: - hosts: - hindley: - matrix_server: - apt_proxies: - hosts: - hindley: - prometheus_servers: - hosts: - hindley: - matrix: - hosts: - matrix_server: - no_user: - hosts: - matrix_server: +# Inventory +# Meta group containing everything except test servers +[server:children] +vm +container +physical + +[vm] +bismuth # BigBlueButton +sulfur # Synapse +technetium # Test + +[container] +krypton # Cybersecurity + +[physical] +hindley # Various +vanadium # Proxmox +barium # Backup + +# Distrubutions/info TODO: remove this and utilize facts instead to autodetect +[ubuntu] +hindley + +[debian_bullseye] +sulfur + +[cloudinit] +bismuth +technetium + +# Groups +[proxy] +hindley + +[vpn] +hindley +sulfur + +[apt_proxies] +hindley + +[prometheus_servers] +hindley + +[matrix] +sulfur + +[proxmox] +vanadium + +[backup] +barium + +[no_user] +sulfur + +[tests] +technetium diff --git a/roles/create_users/tasks/main.yml b/roles/create_users/tasks/main.yml deleted file mode 100644 index 76937e0..0000000 --- a/roles/create_users/tasks/main.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- - -- name: Generate user - user: - name: "{{ item.name }}" - groups: "{{ item.groups }}" - shell: "{{ item.shell }}" - password: "{{ item.password_hash }}" - loop: "{{ uservault_users }}" - no_log: true - -- name: Add ssh key - authorized_key: - key: "{{ item.ssh_key }}" - user: "{{ item.name }}" - loop: "{{ uservault_users }}" - no_log: true diff --git a/roles/users/tasks/main.yml b/roles/users/tasks/main.yml new file mode 100644 index 0000000..4453b11 --- /dev/null +++ b/roles/users/tasks/main.yml @@ -0,0 +1,19 @@ +--- + +- name: Create users + user: + name: "{{ item.key }}" + groups: "{{ item.value | default('') }}" + shell: "{{ user_dict[item.key].shell | default('/bin/bash') }}" + password: "{{ user_dict[item.key].password_hash }}" + update_password: always + state: present + loop: "{{ users | dict2items }}" + +- name: Add SSH key to users + authorized_key: + key: "{{ user_dict[item.key].ssh_keys | join('\n') }}" + user: "{{ item.key }}" + exclusive: no + state: present + loop: "{{ users | dict2items }}" diff --git a/vault-client.sh b/vault-client.sh new file mode 100755 index 0000000..c3e047e --- /dev/null +++ b/vault-client.sh @@ -0,0 +1,6 @@ +#!/bin/bash +if [ $# -ne 2 ] || [ $1 != "--vault-id" ]; then + >&2 echo "Usage: vault-client.sh --vault-id [vault-id]" + exit 1 +fi +keyring get ansible-painsperdus vault-$2 -- 2.38.5 From d331e4d0e98b5871af6193183669045f877b2fbe Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Tue, 19 Jul 2022 12:36:30 +0200 Subject: [PATCH 02/19] improved users group with ACL --- group_vars/all/user_vault.example | 10 ---------- roles/base_totp/tasks/main.yml | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 group_vars/all/user_vault.example diff --git a/group_vars/all/user_vault.example b/group_vars/all/user_vault.example deleted file mode 100644 index 9fa62c5..0000000 --- a/group_vars/all/user_vault.example +++ /dev/null @@ -1,10 +0,0 @@ ---- -uservault_users: - - { - name: lorem, - groups: sudo, - shell: "/bin/bash", - password_hash: "$6$lvbzekjvbzejbvzvzvbzvbzhvbzbv....aezrfv/", # the string betwenn the first and second `:` in /etc/shadow - ssh_key: "ssh-rsa azrekgnbmoienbzrinoien...aoeuzn user@host", - totp: "daeae8ce486f6636d68c37c21ce002" # the hex value - } diff --git a/roles/base_totp/tasks/main.yml b/roles/base_totp/tasks/main.yml index de187a4..f3596ce 100644 --- a/roles/base_totp/tasks/main.yml +++ b/roles/base_totp/tasks/main.yml @@ -13,10 +13,10 @@ lineinfile: path: /etc/users.oath regexp: "{{ item.name }}" - line: "HOTP/T{{ totp_periode }}/{{ totp_digits }} {{ item.name }} - {{item.totp}}" + line: "HOTP/T{{ totp_periode }}/{{ totp_digits }} {{ users.key }} - {{ users_dict[users.key].totp }}" create: true group: root owner: root mode: '600' - loop: "{{ uservault_users }}" + loop: "{{ users | dict2items }}" no_log: true -- 2.38.5 From 6a4870a9cc03b3f2b5fae21925d34cc62500d278 Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Thu, 21 Jul 2022 15:19:24 +0200 Subject: [PATCH 03/19] remade base playbook and roles --- books/apt_proxy.yml | 8 +- books/base.yml | 22 +- books/monitoring.yml | 4 +- books/vpn.yml | 3 +- group_vars/all/networking.yml | 5 + group_vars/all/users.example | 9 + group_vars/all/users.yml | 263 +++++++++--------- host_vars/sulfur/ansible.yml | 2 - host_vars/sulfur/main.yml | 38 +++ host_vars/sulfur/networking.yml | 13 - host_vars/sulfur/secrets.yml | 9 + host_vars/sulfur/users.yml | 7 - host_vars/sulfur/vpn.yml | 13 - host_vars/technetium/ansible.yml | 2 - host_vars/technetium/main.yml | 36 +++ host_vars/technetium/secrets.yml | 8 + host_vars/technetium/users.yml | 4 - hosts | 10 +- .../files/update-motd.d/01-logo | 0 roles/{base_config => base}/tasks/main.yml | 3 - roles/base_totp/tasks/main.yml | 22 -- roles/cloudinit/tasks/main.yml | 14 + roles/networking/tasks/main.yml | 24 +- roles/{ssh_totp => ssh}/handlers/main.yml | 3 +- roles/ssh/tasks/main.yml | 8 + roles/ssh/templates/sshd_config.j2 | 13 + roles/ssh_totp/meta/main.yml | 2 - roles/ssh_totp/tasks/main.yml | 25 -- roles/users/tasks/main.yml | 1 + roles/vpn/handlers/main.yml | 2 +- roles/vpn/tasks/main.yml | 20 +- 31 files changed, 304 insertions(+), 289 deletions(-) create mode 100644 group_vars/all/users.example delete mode 100644 host_vars/sulfur/ansible.yml create mode 100644 host_vars/sulfur/main.yml delete mode 100644 host_vars/sulfur/networking.yml create mode 100644 host_vars/sulfur/secrets.yml delete mode 100644 host_vars/sulfur/users.yml delete mode 100644 host_vars/sulfur/vpn.yml delete mode 100644 host_vars/technetium/ansible.yml create mode 100644 host_vars/technetium/main.yml create mode 100644 host_vars/technetium/secrets.yml delete mode 100644 host_vars/technetium/users.yml rename roles/{base_config => base}/files/update-motd.d/01-logo (100%) rename roles/{base_config => base}/tasks/main.yml (88%) delete mode 100644 roles/base_totp/tasks/main.yml create mode 100644 roles/cloudinit/tasks/main.yml rename roles/{ssh_totp => ssh}/handlers/main.yml (65%) create mode 100644 roles/ssh/tasks/main.yml create mode 100644 roles/ssh/templates/sshd_config.j2 delete mode 100644 roles/ssh_totp/meta/main.yml delete mode 100644 roles/ssh_totp/tasks/main.yml diff --git a/books/apt_proxy.yml b/books/apt_proxy.yml index fb59756..2e63611 100755 --- a/books/apt_proxy.yml +++ b/books/apt_proxy.yml @@ -1,5 +1,11 @@ #!/usr/bin/env ansible-playbook --- -- hosts: apt_proxies +- hosts: apt_proxy roles: - apt_cacher_ng + +- import_playbook: vpn.yml + +- hosts: vpn + roles: + - client_apt_proxy diff --git a/books/base.yml b/books/base.yml index 2d93f20..d801889 100755 --- a/books/base.yml +++ b/books/base.yml @@ -1,18 +1,18 @@ #!/usr/bin/env ansible-playbook --- -- hosts: vpn - roles: - - vpn - - client_apt_proxy - - hosts: server roles: - networking - - base_config - - prometheus-node-exporter - -- hosts: server - roles: + - base - users - - ssh_totp + - ssh + tasks: + - name: Check if host is using cloud init + stat: + path: /etc/cloud + register: cloudinit_folder + - include_role: + name: cloudinit + when: cloudinit_folder.stat.exists + diff --git a/books/monitoring.yml b/books/monitoring.yml index 1265a5b..31f80a2 100755 --- a/books/monitoring.yml +++ b/books/monitoring.yml @@ -1,12 +1,12 @@ #!/usr/bin/env ansible-playbook --- -- hosts: prometheus_servers +- hosts: prometheus roles: - prometheus - prometheus-alert-manager - grafana - prometheus-blackbox-exporter -- hosts: all, !tests, +- hosts: server roles: - prometheus-node-exporter diff --git a/books/vpn.yml b/books/vpn.yml index 841482d..77ab98b 100755 --- a/books/vpn.yml +++ b/books/vpn.yml @@ -1,6 +1,5 @@ #!/usr/bin/env ansible-playbook --- -- hosts: vpn, !tests +- hosts: vpn roles: - vpn - - networking diff --git a/group_vars/all/networking.yml b/group_vars/all/networking.yml index 9587af1..a9abcd1 100644 --- a/group_vars/all/networking.yml +++ b/group_vars/all/networking.yml @@ -28,6 +28,11 @@ intranet: ipv4: 172.20.1.5 netmaskv4: 32 comment: Matrix server + technetium: + domaine: technetium + ipv4: 172.20.1.99 + netmaskv4: 32 + comment: Test VM guest_hellman: domaine: hllm ipv4: 172.20.198.0 diff --git a/group_vars/all/users.example b/group_vars/all/users.example new file mode 100644 index 0000000..1d91425 --- /dev/null +++ b/group_vars/all/users.example @@ -0,0 +1,9 @@ +--- +user_dict: + lorem: + shell: "/bin/bash", + password_hash: "$6$lvbzekjvbzejbvzvzvbzvbzhvbzbv....aezrfv/", # the string betwenn the first and second `:` in /etc/shadow + ssh_keys: + - "ssh-rsa azrekgnbmoienbzrinoien...aoeuzn lorem@host1", + - "ssh-ed25519 azrekgnbmoienbzrinoien...aoeuzn lorem@host2", + totp: "daeae8ce486f6636d68c37c21ce002" # the hex value diff --git a/group_vars/all/users.yml b/group_vars/all/users.yml index febd6e4..8354410 100644 --- a/group_vars/all/users.yml +++ b/group_vars/all/users.yml @@ -1,135 +1,130 @@ $ANSIBLE_VAULT;1.1;AES256 -32663331653233353731353139666138323138373161633338653030366131353635333031343366 -6262363661383266393163333436643265336430633665330a646636616530626237306236393063 -34383165613330663935623565326430626561303961366464663739393465633735303634653865 -3731393330383366620a316139346166616335343564353431613938363266343962663831613034 -30626561316663336239613230386663316266393638643761336432383566623066343838323133 -31613765623162636462303638363930636433303331666434303764386337663162643537663361 -39373337376635306132386538323939646239633461633733666132343430643235313633386464 -39346238333836353238396466336330343862393733306333363265366363303136343932623736 -36666337363165343239636262336363613236396162303061343331313839353731616162666561 -61333235306237613161653632616332383332376365373733326335333739316563316439633361 -65393366346134366137663263616165613063333166636532393734393963613033313363353163 -32333832353931613738353530396637613534393839336338336231356632616239303662623339 -61373836383538346565363963623662616530316634346564643730383032656130626636333135 -36383631663766616131373537376435326461316536373337646136623664373365643732383630 -63313563666466316535663531613265313933343664303439653336323935373832326632333961 -38363366396136636231383136323934396532313233353538313831616231383637633665623261 -39336162636561363438323636616363373939306332376433303934396531666534333431313965 -63376665323537613263353531646135633861663364336564363131383633623065383938363665 -38353338323732306463333138623966666563323263363534363664666532323038393463636635 -33323434363733393739363562626237393031336461313338643562383334656230346132666532 -66326362613263303262343837623835323161373163643438313937316530633230646132626264 -38643536353764313661383430383962326131346338643632633161663262333232623662316365 -30316236346338303331313266386266663239303963363761393766386430383338343163616137 -36616536336165653936333463343737323961356135626563383161373431613362633564653863 -36393963663766383533376335373165343465316261356536336333643665393065333433386261 -62613534353934633830623762376436633661383666316635386436616533633561353032303261 -66376536353333623832303365386265336264366439386261333064643062303035613936306261 -37313932336331326265666163356333373163363161336665386338643864656232643332373363 -34366337323232346361623839623631393730363961353530396162343666313233313132636630 -31323231316463306663623039623165653465313232363532316564326639653161323264623837 -66373165656535353933656365626462373566336663363335653232393233613132316236373233 -65653135623235616430316330386666333031646565646461386335343164336334393237656262 -63636232613237363061393633663762376166393364663731376261323434383862303935363565 -37643136613339313366356165623631376131356232646438373135343539313463383362636633 -34386261333866646562643335343636663563346263383462353235623738383065353137373266 -34366664366434346563383933656333343266613434613035396465316630326261313737623464 -65316631363361626564393763323063326537636333303566316236353763393838356237376135 -65646433303139393263383136346361383136356331633832643233333262333033316535393433 -34373233343235323061393538346135306133366335303764336262613133376637633436376637 -36396366616231336161396232316535323963353131366138636264303737363137353538653136 -38323030626139363638646165623438626338306435356361353731643337366161386561613464 -37626132613238626237666337616336653639356331363166613431363636626365623664353736 -38323836373563386137643362386465343064363030633963623864616335636630353936366662 -31353263326533313562306530376232303933396239303739326238343736333732356666633034 -39643038656137356161373031626131346435396262356238643937653164356566633434623362 -62336431366266623164616462366137343564636431383930346530663039356563343163393365 -63633335303036356130623062616433643138626466383761333731306239353565636336626166 -65333431656634666163376661343538303563646438666333396636303331356434356132636235 -30353938663634383537376232653261363932613135663734306536663733613862356639613466 -34326630326362373830383263306132313763616265646235353562373430376630666432353136 -36633034653761373636626139353837643130326162316564626165383232663830633662373562 -30633565393235373261663962396535666430343133626261323063353137386431353330316134 -33336637363862646366633362653066373234656131626132643661333532633535363332363966 -30633761306539346432656131376463633631323630663762613832613332653762353865306137 -31663465633462636663333735666137326166656135653036633830663463623466336134303032 -64663036646238326237353336633365643238653938363039376337616139306132663939353036 -64663166343939333361626136313434633639376566663865613339663331386530356663303038 -33343235383434346532343762353661336136383034653030656631333332313639336239323838 -65376231666338333331663432326539663334663136313162306666663564353738303639646335 -38333431323839333135643966383861383065333930666433653663636134636236666430363063 -65373639343432333762666138376461323562316261663961356530613733376463386538663830 -37333762613866363939646662626239353765306266616236643037373865316461326437303039 -37653431323864303431316337363739656235386534383533386635343930646130383839333139 -39666165333363653939646236653135653163643364666135323439346266353738653065323063 -30656265333136353436643062623738306531376435626463356337313764366665373939343033 -65396635323638316662333537613865336532613932636262643634643232316438356135626432 -30636138383366373338313166366161626563633736343663343132653035646131393530653233 -64303762363865616536306365333832303563656664653164346462666262646365643435646639 -31383230373135366236373634396531393638373830653565376535656364626361383834616465 -34666536303230303638356530346635326239326237373730343138333137623162343566633466 -31363166643566623866383637633864326662613131326339323236633662396665613864323434 -62303866323537663264663732303562306562316632346361373433376364623566356232613435 -64316261646432663039393062613166323264333433323633353532306332343662616166366533 -30613737303331356462646337653236643935353638363837313661343233613839373264346530 -37326536633561646436643832303861313366303562393230653733353862333734336561323266 -61303230613066643636313230303232343436323135363765633232643863326235653766623365 -31353132663030346361626632336539666263336661376433663039633134623065373635363561 -37613138316336613738633639386635396462393336336534616533303165623837393639636364 -34326163333461346566356361623632373361613163663065643065366236623664633430366430 -38376539653235666535383434316466333165313339343063356362363038656137346231366330 -39623230643831393334393338656664343765623034346465666633653731623762383634656666 -37396632343532396139386565303865393034333266363230396433383466346661623639376166 -66636536656539316239323461663061316166303335633961343836633262353833313736666637 -31386634373934326532376631336430316663613062336332643562323565363936633530663231 -31643630616338663431633038373035393636643464623333663831353962383439666633386564 -33353231363630353833373964663433623165613662343032616564396233346632356166316466 -30666631373235396336363934386438323166626332313030643230373362633238333361323732 -64626464303561666230313365366636346366376435333833633764376562343839646539353261 -32646630326530396438353435306336303963666333626339396133303666383730376362643735 -35346161333062326535336232386134613434356234663665383964373935373137336639646130 -35383564313133393931376164316632356635323463393762353038373234393539363565303862 -36313731316537363932663337336138633230643965353335356233326434626665333061353233 -61383861326639363531383033623935363537396332393361633837626638303963336633323430 -33653834633866353431396438346231656333643136633861333834336639613137326564356262 -65376238373631626339366661343563663233336231303965633336393539393162663230626634 -32346433373934383264356661383032393138343436343039343566643164393933643239363834 -30343739326463363633306461363062313532393261323134646536303336643563353063313538 -38383466653161396466643336663732343932383839623135366532363566353138633161333463 -39303461396235366365656166326632636235306131356538386263313262626463613735346338 -63303535653964356632386135333033306561383962633538363462353061343962373438316265 -39386263636133666636393064343831636236646162306636633836363737323930336435396138 -33366535613931626230633136613864383336356661633565333362363436343838376330366333 -30363332373831393364333237626134366533333533363130643662316366343238633464666436 -62346534616330623333626138616330323631633763656330353738616263626233386337323963 -32303565313465303464343366376334353533396264663561346438626266376463306635333831 -66613861653965653434376633363034336462316635386332653063356637343531316439653030 -32313734303762613563393762653661303735653364326131656236613230656635636630376537 -30613730363761383438383262626432396631393832346262333266346537336436653862366663 -38656138336236333939623333326234656166326163643165646631313230633263613732363533 -36643665386366363637376138343339646435373062313563316433306232363266386236663931 -62623433646239636263643039646462633936653331303032326335336231323561326534643932 -62333865646565326338386339336264613036313631633431343561303936623733363163386630 -33353738316438376539643234303433313137303063326264313135626231363731666535313363 -34353231363864313365653162303631613362623562336663356664636437653137383635333263 -65373331653065303932306133306636623265373939346431363633633538626666306431386463 -38663137386166633166343930663663663165316261656631613734643838663237333034306461 -37383838336338633965626231393839626664656536323938616164656666346665333432616437 -32336333343266653561396232393639336365616237626465343333326332653732363733353031 -33633965333639393531383231373334393332373038393666626231613862666162346431626132 -35336233313266613933383266323765303538396535343461393832646238343335323433663734 -30376136376537333535643132633866643232363133653934363733323035366665663338633464 -62303234323238613531323237366636656336343165646436646366323235393537663539623765 -62346264613236636463313565366562393238313537313962666466393939363863393633323532 -64643935366630346135646232663161323033376138633633316265353138303834313034616233 -34366336643832383139313865626237353461336637346135613334326638653361326163646536 -34316362616230376462636134366663616437316333323064326461363338373565396231306362 -32623261333764336264653762393730323465653563613534343431363965386663396162663364 -35646164323236653934633039373236363565653030396265663439326637653734643963393830 -62346137653137663265353531333161616238303839643638643531646332343365373639396232 -31323030323833653164636461323733616466636662366663323138346232643837386331643636 -39663432613064343732393732643138663263613662373139396130616534653466376631373165 -32623838653365303331386633633962613536623334393536616465323734336266613936663435 -64626438396365396536616665313131646131326435356463356431616339343939653561346261 -6366396261353230613565393938323965613832313865623132 +33616537616365396333336638636535353264303632353932306133323533356566666238323764 +3662623730313661316266313535393332616534336565320a323864623561306530613934313961 +36336665636437336135323163643430386261633062626434376636666561656632393537306561 +6363333965656334350a323935656335343863353838633666383331626237323135303264336630 +30326563626661636437616533663966373434303930356464373835613162313635613038333437 +32353333343664663665313865303163616264373432336633376138643432373931306532383232 +34363764383738386336336631313262626661663463666330633361346436396564303436396139 +62613731616339386239383762356438646333613538363130353065383437376633363238306531 +37633161326139386533386334633731383039663661633631373961656438653930643038303039 +32373861313662393963623963616163323534386339383734303364663036333565353663616138 +37396332616464313966353835623839633264326231663030363039643465393630613466363562 +33653761373734343336643035616233386464336266633438316138303939636663376532633062 +64303839613062343765663162353938333764386233346463653961373562663631623732313065 +61666562616237386631356165393439323533336363373636373166343562373932353935383963 +31663630636238613335616335346430313862616462333134336537383037663237623539346462 +36663932623437333138613663636132316533383939623530386630353230666435343332316561 +34323732653565333565623930383265303934313562353835303064623166656637383035616635 +34343633666432663562363564303636303036643961666236366565373966663162333735636337 +61323337636136626261323065353432643939353735643136653236376235356366333466316531 +37393238393262633433616434326535306237666232666664386361303735373861643539663539 +38346637653332623033393663366331336238666337643762666530663761303966383364343031 +66316639353666323334396334333831366436383466633033363839363632623033363865376530 +36373933333265613462353532373032666561613332333539363864376132336266626638653766 +37393562356362353339366234613035393934663661393964346339633137636232623363633131 +39323034663834636332383330636466316630303136363330363162383132633365636433383131 +65313533643264613735336333393463303533366139343364313065336436336630336439383733 +63666663653635373461336438353161326666613632613733383530626430376631333563636164 +36333762346439393665626333393066646237316466643563373838656235323132326534623335 +33303161633638386334363465663164626165383763306436636362346135613238313262343636 +65623461313863666462333235636436366237643561323661323332306130363036613861376561 +32356236306161343831613966396236313638313938653831353863316465346635346161616131 +31323335636532353234396665643033366334376131343962316136373737626136373561373065 +30633930346465363832633335613761353039386666633561396637306265383734396630656166 +63613931653235613537333431373666303339333666366236626235393737653132633833353637 +35623566356635623331376631393233346663666466616366386464323462313130666264326565 +36633664306236666432623430643935363735303936646165306534383764336133336333366531 +62333965383336383365613766356264343431626535613037386266373536363763666462386437 +66653962313830316166653032336162636166313532323139306562316238656461643733636133 +34666561396261313733323961313563643362336635343937303663646436323064313239643533 +64643161386532366331623835623838633739613337376362333936613063623034326336623662 +31316438643834353061613765383336643062386464336336396330373564613436323166623836 +62353663343533653362396637386538306333326365336336316130353863356264626536303734 +65316166656637643266636664633838636636346133356264343036383839666632626662353366 +62646133356633353538376664353364616237653739346365663632613230346235656431376638 +38383835373833376536356537393032346132396661326330393532663630393832616362666466 +38353366316631366335366139313935666366383534383731636464303434373831313833323139 +66633764383338636134303830343731666465396665346430643061383031393034313564653261 +35393762656266613463643766656134323465373464313034353363363138636433653361346263 +66363762393362306632346338316662396331306661663037663939353363383434393937643962 +65353030363036363532366538316531316266313137363439386439353361646564653035626533 +62346433653439646236333031343239323935353930623238306131633039383233623637666566 +32376639383437643434653432636663643635386637303864656635303734306363666661643965 +63363234363332386633363264333639343866303935303332643465653039343635343961653533 +32363030353731663334376638333832346464663365343939303434326239306632326638373439 +63396539393933323463626130653630376330356561373336313764373731356462343766323762 +65653134363637383535326232333337636438366231653961346166333637376131643662626266 +63356639313263646136616462366234386465333335313266333763333766313866393439393031 +35306564376432393436656663646265633861396536366236353663643864386134666438646537 +31663635366231373139323338643036313631613635313237633030386231613931623036343661 +30363834646265343363333333333230383265366561363765326337306666373333313563393962 +37366637303631376338636265336566386438323061303034666638643335356138336365666463 +32323136363834336437643263376262313730326264613438623230343830636439396137346633 +30663563653035346461616632656161303534613137386532653339333963396133353739386332 +61323234376564333032363739313934356165353261313538636130373735306563656134626539 +39353932656463326534323731643865663732383938353865663232393365356364626534306164 +30316663343234323832353465333631633965373932393462316664356365313139323439373364 +65623466653061376166313066363763386536363134666633613533393166663563393364343631 +38643739353438356433626236356135623364616261663563393439656233356264613037316331 +39616534633266336139633736643333623666636666643839323833643133623861373232323939 +64656436353561626461366461663366306663616362333161663032333738623834616363386266 +34346164393039363230643532623637653963376262326135623338373430383731313133346333 +35303739353465383766663061306439383861376430623563396465353230653937336262313834 +63383435623062663235623966306630343832646361373630313732613934653064346531393037 +32346364383463363739633566616237333066623862356238383261373361316164303332343461 +33376638396130363032633734353538343261393335343232353765666535303432633563373438 +64396665363162626633393366623239373231663131353038383637353435333764613565633466 +61636530356163303737653131633130643231346465613966643131616339336531376336643337 +63393762353938323232373636346232343761373830363639613763633835343766356434623435 +31626337386466623537376633326438353235396262636432393733623430353237396336303965 +39323333663862363033393732643139383036613939656134306665333039633864653034343635 +66393962353638303964666564393732396434306638366531316366333933323565333164626164 +62646561346661333338663136643732333432666366633839303939386264646330663764356661 +30343236333837363736366263396334333437363962653761313039646663316338663030386339 +34343963616366316432313264653636353366623364653761356566363964396262366464396165 +66393035653937656334653737326463373039373562386139323937303633626630376337636437 +64643539623239323730386336306238663931393061636434343766313935636465623766613266 +63306461653430346135633461633130666232373565336136306561353165333237316263306431 +32343439666462346565393138653663393634303164656636616131303466363732353932336436 +61343732386533643231383861623066383066383031363731306661393830646564366338333365 +61396537313163323166373736623339616162623937396565363633623361613863643336613134 +39373734623030663632386633656438326366346333643434303439313532636132313161393037 +65373764376538363365323432643230376366663733316235613534393432613038343763666230 +32356630343835313532356434663436613431666562306138623830373938653061353630313532 +39356661353966626231636631336362373531353238623737323935623738653333376139613434 +64353035666332343361666563636535623934303535633636333666396165396637663866613534 +34623966303639646339333565363364353937653830393663383162313562623431336434393364 +65633030623939393264613736336265366564383138326538646635323764306165333165363962 +33383433663638323562366162396534333961353635323033633666386363646135386138613438 +31353463366539653530643464396666333735376465386331396336356635383064633132383763 +39366233623337643764343439653632326564343635323064326366396362336566393863363765 +31313165353565366663383466386330396166363065396661326137653737643462656363306131 +33343939393534656238376531303039616265323465353334643531663263366332623934633763 +63353638323538653163373263383539613733623661366233393265646131386232333766613362 +33636138636434383539616238613866383338333534393263656439396263366365303032633035 +62623635636137316536333630373865643036353664616438663535663765313339323461653435 +61303461663562616632373061613031333332356330303035636231303864306464306138656538 +63633566636636633738646266343733616639303138363336326565663232383230376533613964 +38303230636333356236386538326631333561316332396366313337303839396337396639636432 +64626661383037356537323866613039633637376331386438663236383937616631343731643733 +31616132383437623663623230383661373034393735323937363332336331366364336335376636 +31393866383332363762626136613663626630656534373764363733623763336132336135366533 +63636133656133346661393764343564653035363834613730626139313736346161633330656134 +64373031616664366566396637363465333636366237363130663334643131373262383162653334 +62663162613634666535346630343134666131376362636262633862373833356263656535386431 +37316461373731656236613463646639383966336336346637613562653538396161393662363636 +31626332376238323061646530653838616433333934616639316430393065373165393766646132 +39613462363331356239616365393132373866396330656430376633356131316138333230633536 +37333761653763333139303566633966616337356637623330396334333931303232346239303164 +66323865643131383830623232313766373834393733653162623761643431316239663037336336 +36353365346466363166666366326635366632323836393265353530336132326239343138313662 +39393064363034646562643163313735363833623733303666643434326436623465636664646339 +62343932316631623862336437386139386165623635653164363662633239616633383363623462 +33663565356134383135376263653437393530346634663163383364636664393431306337646338 +34383735623839396162373737343163363266343866626330373236666665396432303531366230 +39336337363239646165666639383965396662666533386637633533643835363338343065346631 +33343933643664353937393366383465366563363531386134313338393938666430353938303339 +36363535363938373732646233663837363232663938333265343031313735363332653237333235 +39663534373564653230353632396464623434623931353663343063316230616330323039356135 +31343033653439366232376464613834363036636161366662363939333466383235 diff --git a/host_vars/sulfur/ansible.yml b/host_vars/sulfur/ansible.yml deleted file mode 100644 index 4d19f67..0000000 --- a/host_vars/sulfur/ansible.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -ansible_host: sulfur.lan diff --git a/host_vars/sulfur/main.yml b/host_vars/sulfur/main.yml new file mode 100644 index 0000000..48d122d --- /dev/null +++ b/host_vars/sulfur/main.yml @@ -0,0 +1,38 @@ +--- +ansible_host: sulfur.lan + +## Users +users: + g33kex: sudo + histausse: sudo + dorian: sudo + thomyrock: sudo + +## Networking +interfaces: + ens18: + type: dhcp + wg0: + ipv4: "{{ intranet.subnets.physical.subnets.matrix.ipv4 }}" + netmaskv4: "{{ intranet.netmaskv4 }}" + type: wireguard + +ipv4_forwarding: false +ipv6_forwarding: false + +lan_address: "{{ intranet.subnets.physical.subnets.matrix.ipv4 }}" + +## VPN +vpn_interfaces: + wg0: + ip: "{{ interfaces.wg0.ipv4 }}" + private_key: "{{ vpn_key }}" + public_key: "oQH8CBofxNSOGevaz1HZlz3ZW+H3ndb/TmqM0pCiRR8=" + keepalive: true + peers: + - endpoint: "{{ hostvars['hindley'].interfaces.enp2s0.ipv4 }}" + public_key: "{{ hostvars['hindley'].vpn_interfaces.wg0.public_key }}" + allowed_ips: + - "{{ hostvars['hindley'].vpn_interfaces.wg0.ip }}/{{ interfaces.wg0.netmaskv4 }}" + comment: "hindley" + diff --git a/host_vars/sulfur/networking.yml b/host_vars/sulfur/networking.yml deleted file mode 100644 index de2694d..0000000 --- a/host_vars/sulfur/networking.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -interfaces: - ens18: - type: dhcp - wg0: - ipv4: "{{ intranet.subnets.physical.subnets.matrix.ipv4 }}" - netmaskv4: "{{ intranet.netmaskv4 }}" - type: wireguard - -ipv4_forwarding: false -ipv6_forwarding: false - -lan_address: "{{ intranet.subnets.physical.subnets.matrix.ipv4 }}" diff --git a/host_vars/sulfur/secrets.yml b/host_vars/sulfur/secrets.yml new file mode 100644 index 0000000..aec2996 --- /dev/null +++ b/host_vars/sulfur/secrets.yml @@ -0,0 +1,9 @@ +$ANSIBLE_VAULT;1.1;AES256 +65636333393239393537363163356565376535366136633266643165393662306533613137396262 +3263333334636263383162623533333637303466383139660a356161616138353764326166383566 +39383038613361616663646166626335396537343466336133356135633130643532373165633233 +3437613237656666630a346263643330343336633431313264373365633439623235396236353133 +63623733363935663035393666343739643461393263393966356336346563306434623833303139 +63653036343662333062393936316138613236326332363336326561316131356239646266643936 +30366265636138366239626633363562613330623432626266386135313537643030366534613237 +65633430346337643331 diff --git a/host_vars/sulfur/users.yml b/host_vars/sulfur/users.yml deleted file mode 100644 index 067ee68..0000000 --- a/host_vars/sulfur/users.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -users: - - g33kex: sudo - - histausse: sudo - - dorian: sudo - - thomyrock: sudo - diff --git a/host_vars/sulfur/vpn.yml b/host_vars/sulfur/vpn.yml deleted file mode 100644 index beae875..0000000 --- a/host_vars/sulfur/vpn.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -vpn_interfaces: - wg0: - ip: "{{ interfaces.wg0.ipv4 }}" - private_key: "{{ vpn_vault_matrix_key }}" - public_key: "oQH8CBofxNSOGevaz1HZlz3ZW+H3ndb/TmqM0pCiRR8=" - keepalive: true - peers: - - endpoint: "{{ hostvars['hindley'].interfaces.enp2s0.ipv4 }}" - public_key: "{{ hostvars['hindley'].vpn_interfaces.wg0.public_key }}" - allowed_ips: - - "{{ hostvars['hindley'].vpn_interfaces.wg0.ip }}/{{ interfaces.wg0.netmaskv4 }}" - comment: "hindley" diff --git a/host_vars/technetium/ansible.yml b/host_vars/technetium/ansible.yml deleted file mode 100644 index 2415950..0000000 --- a/host_vars/technetium/ansible.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -ansible_host: "technetium.lan" diff --git a/host_vars/technetium/main.yml b/host_vars/technetium/main.yml new file mode 100644 index 0000000..d368653 --- /dev/null +++ b/host_vars/technetium/main.yml @@ -0,0 +1,36 @@ +--- +ansible_host: technetium.lan + +## Users +users: + g33kex: sudo, video + histausse: sudo, video + +## Networking +interfaces: + eth0: + type: dhcp + wg0: + ipv4: "{{ intranet.subnets.physical.subnets.technetium.ipv4 }}" + netmaskv4: "{{ intranet.netmaskv4 }}" + type: wireguard + +ipv4_forwarding: false +ipv6_forwarding: false + +lan_address: "{{ intranet.subnets.physical.subnets.technetium.ipv4 }}" + +## VPN +vpn_interfaces: + wg0: + ip: "{{ interfaces.wg0.ipv4 }}" + private_key: "{{ vpn_key }}" + public_key: "sBk95X1alesUr7EhbJ04SfQ3HXHhnE4mm9PGYNa1xmc=" + keepalive: true + peers: + - endpoint: "{{ hostvars['hindley'].interfaces.enp2s0.ipv4 }}" + public_key: "{{ hostvars['hindley'].vpn_interfaces.wg0.public_key }}" + allowed_ips: + - "{{ hostvars['hindley'].vpn_interfaces.wg0.ip }}/{{ interfaces.wg0.netmaskv4 }}" + comment: "hindley" + diff --git a/host_vars/technetium/secrets.yml b/host_vars/technetium/secrets.yml new file mode 100644 index 0000000..bbe3d86 --- /dev/null +++ b/host_vars/technetium/secrets.yml @@ -0,0 +1,8 @@ +$ANSIBLE_VAULT;1.1;AES256 +66656663643539653865323364386464393932303834303832313463636662643161396533656534 +3330346432353736323266653063303538306232356133650a373134623933666137636538343832 +65323430353263623234616336396530613038333530333433383966653739336439643431363065 +6363313939623162340a626635633335333631306332386535393861653462383765376464613230 +63313033613462393331313431616138306430316634373334656537323431336633663833636132 +33323365316533373462323361383561623535326336643232633631316438316362653166616462 +333165626564653538333033393233303435 diff --git a/host_vars/technetium/users.yml b/host_vars/technetium/users.yml deleted file mode 100644 index 7812302..0000000 --- a/host_vars/technetium/users.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -users: - histausse: sudo, video - g33kex: sudo, video diff --git a/hosts b/hosts index 224681d..bc7c3af 100644 --- a/hosts +++ b/hosts @@ -36,11 +36,12 @@ hindley [vpn] hindley sulfur +technetium -[apt_proxies] +[apt_proxy] hindley -[prometheus_servers] +[prometheus] hindley [matrix] @@ -52,8 +53,3 @@ vanadium [backup] barium -[no_user] -sulfur - -[tests] -technetium diff --git a/roles/base_config/files/update-motd.d/01-logo b/roles/base/files/update-motd.d/01-logo similarity index 100% rename from roles/base_config/files/update-motd.d/01-logo rename to roles/base/files/update-motd.d/01-logo diff --git a/roles/base_config/tasks/main.yml b/roles/base/tasks/main.yml similarity index 88% rename from roles/base_config/tasks/main.yml rename to roles/base/tasks/main.yml index 6338f03..5f9acb5 100644 --- a/roles/base_config/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -19,9 +19,6 @@ - acl state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Customize motd copy: diff --git a/roles/base_totp/tasks/main.yml b/roles/base_totp/tasks/main.yml deleted file mode 100644 index f3596ce..0000000 --- a/roles/base_totp/tasks/main.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- name: Install the PAM lib - apt: - name: - - libpam-oath - state: latest - update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - -- name: Add the totp secret for users - lineinfile: - path: /etc/users.oath - regexp: "{{ item.name }}" - line: "HOTP/T{{ totp_periode }}/{{ totp_digits }} {{ users.key }} - {{ users_dict[users.key].totp }}" - create: true - group: root - owner: root - mode: '600' - loop: "{{ users | dict2items }}" - no_log: true diff --git a/roles/cloudinit/tasks/main.yml b/roles/cloudinit/tasks/main.yml new file mode 100644 index 0000000..d59b580 --- /dev/null +++ b/roles/cloudinit/tasks/main.yml @@ -0,0 +1,14 @@ +--- +- name: Remove cloudinit sudoers file + file: + path: "/etc/sudoers.d/90-cloud-init-users" + state: absent +- name: Disable cloudinit + file: + path: "/etc/cloud/cloud-init.disabled" + owner: root + group: root + mode: "0644" + state: touch + modification_time: preserve + access_time: preserve diff --git a/roles/networking/tasks/main.yml b/roles/networking/tasks/main.yml index 7ee6fd9..2b40de1 100644 --- a/roles/networking/tasks/main.yml +++ b/roles/networking/tasks/main.yml @@ -6,9 +6,6 @@ - ifupdown2 state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded when: ansible_facts["lsb"]["id"] == "Debian" - name: Install bridge-utils @@ -17,40 +14,23 @@ - bridge-utils state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded when: (ansible_facts["lsb"]["id"] == "Debian") and (lookup('dict', interfaces, wantlist=True) | selectattr('value.bridge', 'defined') | selectattr('value.bridge') | list) - name: Enable ipv4 forwarding ansible.posix.sysctl: name: net.ipv4.ip_forward - value: '1' + value: "'{{ ipv4_forwarding | int }}'" sysctl_set: true when: ipv4_forwarding - name: Enable ipv6 forwarding ansible.posix.sysctl: name: net.ipv6.conf.all.forwarding - value: '1' + value: "'{{ ipv6_forwarding | int }}'" sysctl_set: true when: ipv6_forwarding -- name: Disable ipv4 forwarding - ansible.posix.sysctl: - name: net.ipv4.ip_forward - value: '0' - sysctl_set: true - when: not ipv4_forwarding - -- name: Disable ipv6 forwarding - ansible.posix.sysctl: - name: net.ipv6.conf.all.forwarding - value: '0' - sysctl_set: true - when: not ipv6_forwarding - - name: Create interface config files ansible.builtin.template: src: "debian_interfaces.j2" diff --git a/roles/ssh_totp/handlers/main.yml b/roles/ssh/handlers/main.yml similarity index 65% rename from roles/ssh_totp/handlers/main.yml rename to roles/ssh/handlers/main.yml index 8500e47..a4838a3 100644 --- a/roles/ssh_totp/handlers/main.yml +++ b/roles/ssh/handlers/main.yml @@ -1,5 +1,4 @@ ---- -- name: Reload sshd +- name: reload_sshd systemd: name: sshd state: reloaded diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml new file mode 100644 index 0000000..03c881d --- /dev/null +++ b/roles/ssh/tasks/main.yml @@ -0,0 +1,8 @@ +- name: sshd_config + ansible.builtin.template: + src: sshd_config.j2 + dest: /etc/ssh/sshd_config + owner: root + group: root + mode: 0644 + notify: reload_sshd diff --git a/roles/ssh/templates/sshd_config.j2 b/roles/ssh/templates/sshd_config.j2 new file mode 100644 index 0000000..6ea7af0 --- /dev/null +++ b/roles/ssh/templates/sshd_config.j2 @@ -0,0 +1,13 @@ +{{ ansible_managed | comment }} +{% if ansible_os_family == "Ubuntu" %} +Include /etc/ssh/sshd_config.d/*.conf + +{% endif %} +AuthorizedKeysFile /etc/ssh/authorized_keys/%u +PermitRootLogin no +PasswordAuthentication no +ChallengeResponseAuthentication no +UsePAM yes +AcceptEnv LANG LC_* +Subsystem sftp /usr/lib/openssh/sftp-server +PrintMotd yes diff --git a/roles/ssh_totp/meta/main.yml b/roles/ssh_totp/meta/main.yml deleted file mode 100644 index 608d56d..0000000 --- a/roles/ssh_totp/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - role: base_totp diff --git a/roles/ssh_totp/tasks/main.yml b/roles/ssh_totp/tasks/main.yml deleted file mode 100644 index f313398..0000000 --- a/roles/ssh_totp/tasks/main.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- name: Eddit pam config for ssh - lineinfile: - path: /etc/pam.d/sshd - regexp: 'pam_oath.so' - line: "auth required pam_oath.so usersfile=/etc/users.oath window={{totp_periode}} digits={{totp_digits}}" - insertafter: "^# PAM configuration for the Secure Shell service" - -- name: Set ChallengeResponseAuthentication in sshd conf - lineinfile: - path: /etc/ssh/sshd_config - regexp: '^#?ChallengeResponseAuthentication' - line: 'ChallengeResponseAuthentication yes' - notify: Reload sshd - -- name: Set UsePAM in sshd conf - lineinfile: - path: /etc/ssh/sshd_config - regexp: '^#?UsePAM' - line: 'UsePAM yes' - notify: Reload sshd - - - - diff --git a/roles/users/tasks/main.yml b/roles/users/tasks/main.yml index 4453b11..0867a44 100644 --- a/roles/users/tasks/main.yml +++ b/roles/users/tasks/main.yml @@ -15,5 +15,6 @@ key: "{{ user_dict[item.key].ssh_keys | join('\n') }}" user: "{{ item.key }}" exclusive: no + path: "/etc/ssh/authorized_keys/{{ item.key }}" state: present loop: "{{ users | dict2items }}" diff --git a/roles/vpn/handlers/main.yml b/roles/vpn/handlers/main.yml index dc9f10c..4cfc2f1 100644 --- a/roles/vpn/handlers/main.yml +++ b/roles/vpn/handlers/main.yml @@ -4,5 +4,5 @@ name: "wg-quick@{{ item.key }}" state: restarted loop: - - "{{ lookup('dict', vpn_interfaces) }}" + - "{{ vpn_interfaces | dict2items }}" no_log: true diff --git a/roles/vpn/tasks/main.yml b/roles/vpn/tasks/main.yml index 30c947b..a7fb461 100644 --- a/roles/vpn/tasks/main.yml +++ b/roles/vpn/tasks/main.yml @@ -3,7 +3,7 @@ apt_repository: repo: deb http://deb.debian.org/debian buster-backports main state: present - when: ('debian_buster' in group_names) or ('proxmox_buster' in group_names) + when: ansible_facts["lsb"]["codename"] == "buster" - name: Install wireguard dependencies for proxmox apt: @@ -12,10 +12,7 @@ - wireguard-dkms # May need a `dkms autoinstall` and reboot ? state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - when: ('proxmox_buster' in group_names) + when: ('proxmox' in group_names) - name: Install wireguard apt: @@ -23,9 +20,6 @@ - wireguard state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Create wireguard config files ansible.builtin.template: @@ -35,15 +29,13 @@ group: root mode: '600' notify: Restart wireguard for interface - loop: - - "{{ lookup('dict', vpn_interfaces) }}" - no_log: true + loop: "{{ vpn_interfaces | dict2items }}" + no_log: "{{ enable_no_log | default('true') }}" - name: Enable interface systemd: name: "wg-quick@{{ item.key }}" state: started enabled: yes - loop: - - "{{ lookup('dict', vpn_interfaces) }}" - no_log: true + loop: "{{ vpn_interfaces | dict2items }}" + no_log: "{{ disable_no_log | not | default('true') }}" -- 2.38.5 From 4597a9c65fe9a098ccac50f822d746d48b7d6b6a Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Thu, 21 Jul 2022 15:20:07 +0200 Subject: [PATCH 04/19] first set new network config before installing ifupodown2 --- roles/networking/tasks/main.yml | 58 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/roles/networking/tasks/main.yml b/roles/networking/tasks/main.yml index 2b40de1..f296f13 100644 --- a/roles/networking/tasks/main.yml +++ b/roles/networking/tasks/main.yml @@ -1,4 +1,33 @@ --- +- name: Create interface config files + ansible.builtin.template: + src: "debian_interfaces.j2" + dest: "/etc/network/interfaces" + owner: root + group: root + mode: '644' + notify: Reload network interfaces debian + when: ansible_facts["lsb"]["id"] == "Debian" + +- name: Create dhcpcd config files + ansible.builtin.template: + src: "raspbian_dhcpcd.conf.j2" + dest: "/etc/dhcpcd.conf" + owner: root + group: netdev + mode: '664' + notify: Restart dhcpcd raspbian + when: ansible_facts["lsb"]["id"] == "Raspbian" + +- name: Create netplan config files + ansible.builtin.template: + src: "ubuntu_00-installer-config.yaml.j2" + dest: "/etc/netplan/00-installer-config.yaml" + owner: root + group: root + mode: '644' + notify: Apply netplan ubuntu + when: ansible_facts["lsb"]["id"] == "Ubuntu" - name: Install ifupdown2 apt: @@ -31,32 +60,3 @@ sysctl_set: true when: ipv6_forwarding -- name: Create interface config files - ansible.builtin.template: - src: "debian_interfaces.j2" - dest: "/etc/network/interfaces" - owner: root - group: root - mode: '644' - notify: Reload network interfaces debian - when: ansible_facts["lsb"]["id"] == "Debian" - -- name: Create dhcpcd config files - ansible.builtin.template: - src: "raspbian_dhcpcd.conf.j2" - dest: "/etc/dhcpcd.conf" - owner: root - group: netdev - mode: '664' - notify: Restart dhcpcd raspbian - when: ansible_facts["lsb"]["id"] == "Raspbian" - -- name: Create netplan config files - ansible.builtin.template: - src: "ubuntu_00-installer-config.yaml.j2" - dest: "/etc/netplan/00-installer-config.yaml" - owner: root - group: root - mode: '644' - notify: Apply netplan ubuntu - when: ansible_facts["lsb"]["id"] == "Ubuntu" -- 2.38.5 From 7ac125c5760556de45d721c1a54cdcbd46a73abc Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Thu, 21 Jul 2022 16:26:21 +0200 Subject: [PATCH 05/19] fixed bug with authorized keys directory permissions --- group_vars/all/users.yml | 271 ++++++++++++++++++---------------- host_vars/technetium/main.yml | 1 + roles/users/tasks/main.yml | 9 ++ 3 files changed, 152 insertions(+), 129 deletions(-) diff --git a/group_vars/all/users.yml b/group_vars/all/users.yml index 8354410..48dd4a9 100644 --- a/group_vars/all/users.yml +++ b/group_vars/all/users.yml @@ -1,130 +1,143 @@ $ANSIBLE_VAULT;1.1;AES256 -33616537616365396333336638636535353264303632353932306133323533356566666238323764 -3662623730313661316266313535393332616534336565320a323864623561306530613934313961 -36336665636437336135323163643430386261633062626434376636666561656632393537306561 -6363333965656334350a323935656335343863353838633666383331626237323135303264336630 -30326563626661636437616533663966373434303930356464373835613162313635613038333437 -32353333343664663665313865303163616264373432336633376138643432373931306532383232 -34363764383738386336336631313262626661663463666330633361346436396564303436396139 -62613731616339386239383762356438646333613538363130353065383437376633363238306531 -37633161326139386533386334633731383039663661633631373961656438653930643038303039 -32373861313662393963623963616163323534386339383734303364663036333565353663616138 -37396332616464313966353835623839633264326231663030363039643465393630613466363562 -33653761373734343336643035616233386464336266633438316138303939636663376532633062 -64303839613062343765663162353938333764386233346463653961373562663631623732313065 -61666562616237386631356165393439323533336363373636373166343562373932353935383963 -31663630636238613335616335346430313862616462333134336537383037663237623539346462 -36663932623437333138613663636132316533383939623530386630353230666435343332316561 -34323732653565333565623930383265303934313562353835303064623166656637383035616635 -34343633666432663562363564303636303036643961666236366565373966663162333735636337 -61323337636136626261323065353432643939353735643136653236376235356366333466316531 -37393238393262633433616434326535306237666232666664386361303735373861643539663539 -38346637653332623033393663366331336238666337643762666530663761303966383364343031 -66316639353666323334396334333831366436383466633033363839363632623033363865376530 -36373933333265613462353532373032666561613332333539363864376132336266626638653766 -37393562356362353339366234613035393934663661393964346339633137636232623363633131 -39323034663834636332383330636466316630303136363330363162383132633365636433383131 -65313533643264613735336333393463303533366139343364313065336436336630336439383733 -63666663653635373461336438353161326666613632613733383530626430376631333563636164 -36333762346439393665626333393066646237316466643563373838656235323132326534623335 -33303161633638386334363465663164626165383763306436636362346135613238313262343636 -65623461313863666462333235636436366237643561323661323332306130363036613861376561 -32356236306161343831613966396236313638313938653831353863316465346635346161616131 -31323335636532353234396665643033366334376131343962316136373737626136373561373065 -30633930346465363832633335613761353039386666633561396637306265383734396630656166 -63613931653235613537333431373666303339333666366236626235393737653132633833353637 -35623566356635623331376631393233346663666466616366386464323462313130666264326565 -36633664306236666432623430643935363735303936646165306534383764336133336333366531 -62333965383336383365613766356264343431626535613037386266373536363763666462386437 -66653962313830316166653032336162636166313532323139306562316238656461643733636133 -34666561396261313733323961313563643362336635343937303663646436323064313239643533 -64643161386532366331623835623838633739613337376362333936613063623034326336623662 -31316438643834353061613765383336643062386464336336396330373564613436323166623836 -62353663343533653362396637386538306333326365336336316130353863356264626536303734 -65316166656637643266636664633838636636346133356264343036383839666632626662353366 -62646133356633353538376664353364616237653739346365663632613230346235656431376638 -38383835373833376536356537393032346132396661326330393532663630393832616362666466 -38353366316631366335366139313935666366383534383731636464303434373831313833323139 -66633764383338636134303830343731666465396665346430643061383031393034313564653261 -35393762656266613463643766656134323465373464313034353363363138636433653361346263 -66363762393362306632346338316662396331306661663037663939353363383434393937643962 -65353030363036363532366538316531316266313137363439386439353361646564653035626533 -62346433653439646236333031343239323935353930623238306131633039383233623637666566 -32376639383437643434653432636663643635386637303864656635303734306363666661643965 -63363234363332386633363264333639343866303935303332643465653039343635343961653533 -32363030353731663334376638333832346464663365343939303434326239306632326638373439 -63396539393933323463626130653630376330356561373336313764373731356462343766323762 -65653134363637383535326232333337636438366231653961346166333637376131643662626266 -63356639313263646136616462366234386465333335313266333763333766313866393439393031 -35306564376432393436656663646265633861396536366236353663643864386134666438646537 -31663635366231373139323338643036313631613635313237633030386231613931623036343661 -30363834646265343363333333333230383265366561363765326337306666373333313563393962 -37366637303631376338636265336566386438323061303034666638643335356138336365666463 -32323136363834336437643263376262313730326264613438623230343830636439396137346633 -30663563653035346461616632656161303534613137386532653339333963396133353739386332 -61323234376564333032363739313934356165353261313538636130373735306563656134626539 -39353932656463326534323731643865663732383938353865663232393365356364626534306164 -30316663343234323832353465333631633965373932393462316664356365313139323439373364 -65623466653061376166313066363763386536363134666633613533393166663563393364343631 -38643739353438356433626236356135623364616261663563393439656233356264613037316331 -39616534633266336139633736643333623666636666643839323833643133623861373232323939 -64656436353561626461366461663366306663616362333161663032333738623834616363386266 -34346164393039363230643532623637653963376262326135623338373430383731313133346333 -35303739353465383766663061306439383861376430623563396465353230653937336262313834 -63383435623062663235623966306630343832646361373630313732613934653064346531393037 -32346364383463363739633566616237333066623862356238383261373361316164303332343461 -33376638396130363032633734353538343261393335343232353765666535303432633563373438 -64396665363162626633393366623239373231663131353038383637353435333764613565633466 -61636530356163303737653131633130643231346465613966643131616339336531376336643337 -63393762353938323232373636346232343761373830363639613763633835343766356434623435 -31626337386466623537376633326438353235396262636432393733623430353237396336303965 -39323333663862363033393732643139383036613939656134306665333039633864653034343635 -66393962353638303964666564393732396434306638366531316366333933323565333164626164 -62646561346661333338663136643732333432666366633839303939386264646330663764356661 -30343236333837363736366263396334333437363962653761313039646663316338663030386339 -34343963616366316432313264653636353366623364653761356566363964396262366464396165 -66393035653937656334653737326463373039373562386139323937303633626630376337636437 -64643539623239323730386336306238663931393061636434343766313935636465623766613266 -63306461653430346135633461633130666232373565336136306561353165333237316263306431 -32343439666462346565393138653663393634303164656636616131303466363732353932336436 -61343732386533643231383861623066383066383031363731306661393830646564366338333365 -61396537313163323166373736623339616162623937396565363633623361613863643336613134 -39373734623030663632386633656438326366346333643434303439313532636132313161393037 -65373764376538363365323432643230376366663733316235613534393432613038343763666230 -32356630343835313532356434663436613431666562306138623830373938653061353630313532 -39356661353966626231636631336362373531353238623737323935623738653333376139613434 -64353035666332343361666563636535623934303535633636333666396165396637663866613534 -34623966303639646339333565363364353937653830393663383162313562623431336434393364 -65633030623939393264613736336265366564383138326538646635323764306165333165363962 -33383433663638323562366162396534333961353635323033633666386363646135386138613438 -31353463366539653530643464396666333735376465386331396336356635383064633132383763 -39366233623337643764343439653632326564343635323064326366396362336566393863363765 -31313165353565366663383466386330396166363065396661326137653737643462656363306131 -33343939393534656238376531303039616265323465353334643531663263366332623934633763 -63353638323538653163373263383539613733623661366233393265646131386232333766613362 -33636138636434383539616238613866383338333534393263656439396263366365303032633035 -62623635636137316536333630373865643036353664616438663535663765313339323461653435 -61303461663562616632373061613031333332356330303035636231303864306464306138656538 -63633566636636633738646266343733616639303138363336326565663232383230376533613964 -38303230636333356236386538326631333561316332396366313337303839396337396639636432 -64626661383037356537323866613039633637376331386438663236383937616631343731643733 -31616132383437623663623230383661373034393735323937363332336331366364336335376636 -31393866383332363762626136613663626630656534373764363733623763336132336135366533 -63636133656133346661393764343564653035363834613730626139313736346161633330656134 -64373031616664366566396637363465333636366237363130663334643131373262383162653334 -62663162613634666535346630343134666131376362636262633862373833356263656535386431 -37316461373731656236613463646639383966336336346637613562653538396161393662363636 -31626332376238323061646530653838616433333934616639316430393065373165393766646132 -39613462363331356239616365393132373866396330656430376633356131316138333230633536 -37333761653763333139303566633966616337356637623330396334333931303232346239303164 -66323865643131383830623232313766373834393733653162623761643431316239663037336336 -36353365346466363166666366326635366632323836393265353530336132326239343138313662 -39393064363034646562643163313735363833623733303666643434326436623465636664646339 -62343932316631623862336437386139386165623635653164363662633239616633383363623462 -33663565356134383135376263653437393530346634663163383364636664393431306337646338 -34383735623839396162373737343163363266343866626330373236666665396432303531366230 -39336337363239646165666639383965396662666533386637633533643835363338343065346631 -33343933643664353937393366383465366563363531386134313338393938666430353938303339 -36363535363938373732646233663837363232663938333265343031313735363332653237333235 -39663534373564653230353632396464623434623931353663343063316230616330323039356135 -31343033653439366232376464613834363036636161366662363939333466383235 +65616337396337633230376666363537306262393836613830646137333730636665663764313433 +3162643532613662633031323662303634623063323737390a353235333463613430636235373162 +65366334313663386132656166356264383037396564343736613863633934373430656634373530 +3830316461666133630a376235363839313238363837313966323037353534306561383861613135 +63346132316434313430316237316131663464383231666337333838323064366563323436666139 +39376436313266386632383433613633613835636464323930376637623865393035656363373132 +34366130643138336138393832663866353034646461343261343962646231643463386238316263 +61643064326666343035346639373633356137393831656239303665616235633532333631366634 +35656664613339613762303137323132386562313661386265646634346364633434323763313737 +30356265663563373061333634366263626166343265383933306634663566363637343938343463 +65613964383638633930396637343361333361343263613634323063666633656662636265323534 +63313339346162626530393466383763666632303330353166613936666635353834303761363837 +33346331636538396537663435636233623761396264396361303030306432653737636635633832 +34383265613563316235653736326464303539616234373836633136346132393432623739643963 +64633563303162656239633130643033636436386630366231633061393866363461636138643034 +33343436646437626363376533373938336234363865376138616231323164346364393732343435 +33656337353665613637346334306539376139383266356364346635333636613631346430636637 +36653937353561386234623031623432386135336632666539316666306633336364616262313664 +66663935633037326438643435386262323761626635336336633436396266646264623630383864 +33343264313666303063353265343362366535353862353339353165306466366561306138323366 +39336233626436616465333963613861383032393634373265323934356363633064633361626566 +31646636316562616630373462343038386532393735623065646561396532343361363862383635 +33666337396135343230616165366636646634313735356536303530373735616331386564386163 +35306434376664623535623662633463396632623333616434363537633432373735383831316638 +62353834613836393062386239666538613234393736663163626539663931636264386430666562 +38663935343035666665336438663337646264373564653366383434313630373936653863373164 +61643765663038386461383763376466316638636136636431663463336636346366353136326539 +31333137373132643464313536383761373034303966353333386238363839613132323466363463 +32613562633033373537633239363235396439613334346338373637333939373565353839383537 +61386633336236363966303266353930313239316232663333323363626138363132386262623064 +33316130643364393966333835636561623465306230356130666439383262613866313630333439 +35376330363062353135366132323162663837633331613465333761623734313363663035326530 +38376236343132373963343866366434366133373839663763636662653532353761643639326636 +31363131663232663734616463386538343061393763373335323730323062653230363530643765 +38353061323036663166323862326337313631653937306631656439363839363362396362356336 +62373231663862643539646136653865643535616134303534353731373539636262366365393533 +61303739666336326139373331343061653838616261613066356131306631356339636236383035 +64396334653333653430313436636431613231643963353561333935623835306134386232316165 +33366437646262613435336162303238316361313337363338633538323763316632646231633137 +39363861333437306663333237303461306465363531613034346463343065663861663532386464 +36313636653138613833616363643837666139356566353930366634376639313861623239333966 +65306162343261346334653962663565363137643535663639653063323362656262306363323166 +66623738623739343239306437323234396135613732343632306266636230393464373831323862 +64396136393362633333633731646138333831373038316334616432366364303261316338313939 +39396130623363613138663235323961303935326263393936353431363931373537383437333362 +32343865306461633139343633323236333766643138363537326635393038376662303534346663 +66393530663765343165383563343636663535373935623936316433353333623632313165636564 +39666337313738383233623238306466336233393636316636646463346437636135646332666234 +35343234363737383436326532393365396465636636333364663338653263663336663064346364 +39663964343762353363636433613463336362393039656336653335333033303138333634356161 +34656266393636333337363763386532616330343630376133393461353162333830303733313231 +65623336386239366538383430383961313431613537656338343961313231383835393062663361 +36306435653836626432666465653764383263353637623034303138623631633965616230313630 +65323731383335393833326233336235346638303630383862326639633065363930363537643464 +64366136643134316331353931336339353739333933353634633134666539333665626365323661 +30633564306232643664346138343038333133323539333438613131643034303663313364336230 +38303862303165323765383937623530353136373463323665323530633266656139663131666461 +32316366353738346531353231393738303435313665366132343735343166356434346265393365 +31326166353265346135303863626534663030386665633732306266613862666530343131653935 +32616130353763353334633765393237636531363534346237393364373766616631343939366334 +38366637363465373733333563653935376533323066636336666633653736633962383934633331 +32393335306465313538636633303164386435303436623239363866616364323466366661646162 +61343666323236393461383933623631353639383133613435663961616437393135656266373834 +62303035383063643937666163633436323332643465346635383963393739333635623936663866 +30383530326164363233326336626665373534326334316339393866353438356330383964323733 +33316433626234393230336466343034373632636663633764373137353862336164303738303135 +38623932336666623930623939353831303836343064306232663763666231393138363533373532 +63666632353862646161303935643833303563656435653934653561663266323032643430396636 +34636531616137303665633431343264636539616239383665656436373136623265643539656435 +32656530656662373230626566363262393339303261346135353661393562313330376361663465 +36333962626238636366336165613137613933313566653533333062353666613636643461323463 +38303662643862336338616163653063306534643662613134373937336637653532356437636335 +33656536383037356437633266643133636463306533613831623465396533646665666134363333 +33313039366461623338653938306539653238646662616139313938646464656135353063336231 +36653439636232326262373134326438333365653334653534353634623533336466343836373832 +33306364316562633338373963383166656631356536613935393733343465333562346163393564 +39333430393537313664343538346436333062316533373766633637333231383436363137643465 +39613465636531623238303631386665663163326266383562653239303233306139613064303533 +30356131323662613366313133633765316238386364616264653163653837316165653561616566 +36333265376637326639613836323333626432343536653936666266663030663931303833626161 +32633039623736363934316661313862626631623639613637393036303536386335636233336633 +35633063653965656330623736636333643132636130333937316339373238656638623531326330 +38663264373135313833353235663134336537303665393936376666643138306266316465386266 +36613266323364336163353664323662373535656430346534616263363264653139663730353236 +38336363626230626366613436366262666365383765343930623562366266353039636363356163 +36663561363364656438636634663136643863333165373634616234336439356239323965653237 +37323131363963633137356538613938653165343235306237356163663365356533313835336134 +66336264366230613832383465323162633632386537346436653064636533356235383831393464 +35653034336336643234616639343730646636643635353137633839663437643462353136366438 +31366564313937356536613937353163303465613236323565346361373065643561323161626332 +61346630643761313139366137623835643039303863396134393364323535616165313931323630 +61336436333965323736323034306464616566656638373438613832356666323838616464396337 +30366264346238366463343438616561326336396135353232366631333865393263383062636236 +35303865613935336233333862373162356631333962613366393138633930306161646134613132 +38383261626466386666396564623536333262393238363733363163616661646337623334633261 +31313436333738386364323930633666633964366637396130323337393439643237636562663266 +36343565613264656261653836356230346666353438636632333838393937666665653863336466 +63626639353738613233346565333531346130373166386166343739333836333730666434313938 +65333736623531633062303862363033336263346433393161353866666237656530316461363534 +37613831333234643562623565376137383863306332346336663862663838666664323831663430 +66346132356134353263303665643835616162663636386233653762333634343364633261323364 +30663938646331363432323838636230303138366566306435373863316462323830313734373138 +37623063653037636164656535353631663339393534346465623634326237656333386433656164 +61333661336237346530363861366333666364633332343633663830616433306630343538643434 +31333065626130333137326566633338383366633666363566316365343035353631666165646266 +35336565613230303834306231363262643763616330643638646565306564666265623234633632 +30386265336262386437663335383265346634643966326661333365346264376631353261353535 +62376638373131363336633838636236303830316463663265323332306366363466393765363637 +37393732636363303233636236333836666565646537386136653966363335633831343361643236 +64616633343261343064383364323231333264656330396536626566663661313632643833646333 +39306533616235323337376162623531393537666665363939353833613266383332613363653434 +35656633613239373332343364656163386565393530643637653633643632313332396636623931 +31613636376638323330633030313365356566323864303638353036383430376266376163396566 +33633164363262346663373837316332333936393061306534663531643337616231646238396263 +31333334396231613539303763333061343237656337313035666564663564363138346130326332 +36626139616662633234633031363066616436653033393837663365623135396466333564363037 +31656362373665633837636630376336346439323131653931313139636330373133663132383733 +63653962346366393738373262313862343730396430396566313866643366303433303539646132 +37623231623230663461653637656538646438366134626434646538346638376532636330313230 +31316235306263353637663036356438396563653562343037343738666663643139323065336565 +31323362333636356239333130333965386239393834313562653764616661306336353336663539 +64393561363835623230393132633134626561663532303030306630653164363261393265653435 +33643766356137623433653135633261623834363833386332366133353537623730343835623931 +65656332653262316337356232623162343566353134373262353266643038373038323430326632 +31656136353734316639383265356435316334323565626533356265623362343434343430373933 +37633233336433393637393737326430326631616130343163386263363837356466343236656435 +62333631376361326531333165323666663163356665323461396562643030643737623636333838 +61663938353664636163393933346333623966363361393231363230343061386661633265646262 +65613663643931373061633062316566383962306336623738313261623732393738383538393234 +64663863666464306164316538383861613434343337343665353337313337313261336165373437 +65353733623838386230386435653531383739613733303631363535306161396662666232303732 +65336366353237366662616561646133323964663364663761643830323137343462633061633533 +65306634383534353266313533616232636131623465653161333863313233323631363934613938 +31333432303531396266316333393338373761306631313066333037323761613066373965396562 +35623963656439313461346430633238646166623832656639373937383034363833613231393033 +66653230623239346534333633386335633736383631613333396162663637306537646630336234 +64373139303663343235353635343633616136366262383737666633326566613963306530386666 +30373935653038643432636438373239653164333562316261626361633834623761313235326137 +31333462353830663266356330393763306339313065633133323637616432643462363634383636 +63643535666562366138303530666463353135393761316235356132653763356465646163363136 +35623738333634666661663265613335346461656363306465316163383537646133643435313236 +3065336138613331393133656362643133363366666438343635 diff --git a/host_vars/technetium/main.yml b/host_vars/technetium/main.yml index d368653..f63122d 100644 --- a/host_vars/technetium/main.yml +++ b/host_vars/technetium/main.yml @@ -5,6 +5,7 @@ ansible_host: technetium.lan users: g33kex: sudo, video histausse: sudo, video + antoine: ## Networking interfaces: diff --git a/roles/users/tasks/main.yml b/roles/users/tasks/main.yml index 0867a44..68777d7 100644 --- a/roles/users/tasks/main.yml +++ b/roles/users/tasks/main.yml @@ -10,11 +10,20 @@ state: present loop: "{{ users | dict2items }}" +- name: Create authorized_keys directory + file: + path: /etc/ssh/authorized_keys + state: directory + owner: root + group: root + mode: 0710 + - name: Add SSH key to users authorized_key: key: "{{ user_dict[item.key].ssh_keys | join('\n') }}" user: "{{ item.key }}" exclusive: no path: "/etc/ssh/authorized_keys/{{ item.key }}" + manage_dir: no state: present loop: "{{ users | dict2items }}" -- 2.38.5 From 0b4f9607c3dc97455df0074b7c68d04e3611ee3f Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Thu, 21 Jul 2022 17:43:24 +0200 Subject: [PATCH 06/19] added guest agent setup for vm --- books/base.yml | 15 +- group_vars/all/users.yml | 284 +++++++++++++++---------------- roles/base/tasks/main.yml | 8 + roles/guest_agent/tasks/main.yml | 5 + roles/users/tasks/main.yml | 19 ++- 5 files changed, 170 insertions(+), 161 deletions(-) create mode 100644 roles/guest_agent/tasks/main.yml diff --git a/books/base.yml b/books/base.yml index d801889..b150a48 100755 --- a/books/base.yml +++ b/books/base.yml @@ -3,16 +3,9 @@ - hosts: server roles: - networking - - base - users - ssh - tasks: - - name: Check if host is using cloud init - stat: - path: /etc/cloud - register: cloudinit_folder - - include_role: - name: cloudinit - when: cloudinit_folder.stat.exists - - + - base +- hosts: vm + roles: + - guest_agent diff --git a/group_vars/all/users.yml b/group_vars/all/users.yml index 48dd4a9..e225549 100644 --- a/group_vars/all/users.yml +++ b/group_vars/all/users.yml @@ -1,143 +1,143 @@ $ANSIBLE_VAULT;1.1;AES256 -65616337396337633230376666363537306262393836613830646137333730636665663764313433 -3162643532613662633031323662303634623063323737390a353235333463613430636235373162 -65366334313663386132656166356264383037396564343736613863633934373430656634373530 -3830316461666133630a376235363839313238363837313966323037353534306561383861613135 -63346132316434313430316237316131663464383231666337333838323064366563323436666139 -39376436313266386632383433613633613835636464323930376637623865393035656363373132 -34366130643138336138393832663866353034646461343261343962646231643463386238316263 -61643064326666343035346639373633356137393831656239303665616235633532333631366634 -35656664613339613762303137323132386562313661386265646634346364633434323763313737 -30356265663563373061333634366263626166343265383933306634663566363637343938343463 -65613964383638633930396637343361333361343263613634323063666633656662636265323534 -63313339346162626530393466383763666632303330353166613936666635353834303761363837 -33346331636538396537663435636233623761396264396361303030306432653737636635633832 -34383265613563316235653736326464303539616234373836633136346132393432623739643963 -64633563303162656239633130643033636436386630366231633061393866363461636138643034 -33343436646437626363376533373938336234363865376138616231323164346364393732343435 -33656337353665613637346334306539376139383266356364346635333636613631346430636637 -36653937353561386234623031623432386135336632666539316666306633336364616262313664 -66663935633037326438643435386262323761626635336336633436396266646264623630383864 -33343264313666303063353265343362366535353862353339353165306466366561306138323366 -39336233626436616465333963613861383032393634373265323934356363633064633361626566 -31646636316562616630373462343038386532393735623065646561396532343361363862383635 -33666337396135343230616165366636646634313735356536303530373735616331386564386163 -35306434376664623535623662633463396632623333616434363537633432373735383831316638 -62353834613836393062386239666538613234393736663163626539663931636264386430666562 -38663935343035666665336438663337646264373564653366383434313630373936653863373164 -61643765663038386461383763376466316638636136636431663463336636346366353136326539 -31333137373132643464313536383761373034303966353333386238363839613132323466363463 -32613562633033373537633239363235396439613334346338373637333939373565353839383537 -61386633336236363966303266353930313239316232663333323363626138363132386262623064 -33316130643364393966333835636561623465306230356130666439383262613866313630333439 -35376330363062353135366132323162663837633331613465333761623734313363663035326530 -38376236343132373963343866366434366133373839663763636662653532353761643639326636 -31363131663232663734616463386538343061393763373335323730323062653230363530643765 -38353061323036663166323862326337313631653937306631656439363839363362396362356336 -62373231663862643539646136653865643535616134303534353731373539636262366365393533 -61303739666336326139373331343061653838616261613066356131306631356339636236383035 -64396334653333653430313436636431613231643963353561333935623835306134386232316165 -33366437646262613435336162303238316361313337363338633538323763316632646231633137 -39363861333437306663333237303461306465363531613034346463343065663861663532386464 -36313636653138613833616363643837666139356566353930366634376639313861623239333966 -65306162343261346334653962663565363137643535663639653063323362656262306363323166 -66623738623739343239306437323234396135613732343632306266636230393464373831323862 -64396136393362633333633731646138333831373038316334616432366364303261316338313939 -39396130623363613138663235323961303935326263393936353431363931373537383437333362 -32343865306461633139343633323236333766643138363537326635393038376662303534346663 -66393530663765343165383563343636663535373935623936316433353333623632313165636564 -39666337313738383233623238306466336233393636316636646463346437636135646332666234 -35343234363737383436326532393365396465636636333364663338653263663336663064346364 -39663964343762353363636433613463336362393039656336653335333033303138333634356161 -34656266393636333337363763386532616330343630376133393461353162333830303733313231 -65623336386239366538383430383961313431613537656338343961313231383835393062663361 -36306435653836626432666465653764383263353637623034303138623631633965616230313630 -65323731383335393833326233336235346638303630383862326639633065363930363537643464 -64366136643134316331353931336339353739333933353634633134666539333665626365323661 -30633564306232643664346138343038333133323539333438613131643034303663313364336230 -38303862303165323765383937623530353136373463323665323530633266656139663131666461 -32316366353738346531353231393738303435313665366132343735343166356434346265393365 -31326166353265346135303863626534663030386665633732306266613862666530343131653935 -32616130353763353334633765393237636531363534346237393364373766616631343939366334 -38366637363465373733333563653935376533323066636336666633653736633962383934633331 -32393335306465313538636633303164386435303436623239363866616364323466366661646162 -61343666323236393461383933623631353639383133613435663961616437393135656266373834 -62303035383063643937666163633436323332643465346635383963393739333635623936663866 -30383530326164363233326336626665373534326334316339393866353438356330383964323733 -33316433626234393230336466343034373632636663633764373137353862336164303738303135 -38623932336666623930623939353831303836343064306232663763666231393138363533373532 -63666632353862646161303935643833303563656435653934653561663266323032643430396636 -34636531616137303665633431343264636539616239383665656436373136623265643539656435 -32656530656662373230626566363262393339303261346135353661393562313330376361663465 -36333962626238636366336165613137613933313566653533333062353666613636643461323463 -38303662643862336338616163653063306534643662613134373937336637653532356437636335 -33656536383037356437633266643133636463306533613831623465396533646665666134363333 -33313039366461623338653938306539653238646662616139313938646464656135353063336231 -36653439636232326262373134326438333365653334653534353634623533336466343836373832 -33306364316562633338373963383166656631356536613935393733343465333562346163393564 -39333430393537313664343538346436333062316533373766633637333231383436363137643465 -39613465636531623238303631386665663163326266383562653239303233306139613064303533 -30356131323662613366313133633765316238386364616264653163653837316165653561616566 -36333265376637326639613836323333626432343536653936666266663030663931303833626161 -32633039623736363934316661313862626631623639613637393036303536386335636233336633 -35633063653965656330623736636333643132636130333937316339373238656638623531326330 -38663264373135313833353235663134336537303665393936376666643138306266316465386266 -36613266323364336163353664323662373535656430346534616263363264653139663730353236 -38336363626230626366613436366262666365383765343930623562366266353039636363356163 -36663561363364656438636634663136643863333165373634616234336439356239323965653237 -37323131363963633137356538613938653165343235306237356163663365356533313835336134 -66336264366230613832383465323162633632386537346436653064636533356235383831393464 -35653034336336643234616639343730646636643635353137633839663437643462353136366438 -31366564313937356536613937353163303465613236323565346361373065643561323161626332 -61346630643761313139366137623835643039303863396134393364323535616165313931323630 -61336436333965323736323034306464616566656638373438613832356666323838616464396337 -30366264346238366463343438616561326336396135353232366631333865393263383062636236 -35303865613935336233333862373162356631333962613366393138633930306161646134613132 -38383261626466386666396564623536333262393238363733363163616661646337623334633261 -31313436333738386364323930633666633964366637396130323337393439643237636562663266 -36343565613264656261653836356230346666353438636632333838393937666665653863336466 -63626639353738613233346565333531346130373166386166343739333836333730666434313938 -65333736623531633062303862363033336263346433393161353866666237656530316461363534 -37613831333234643562623565376137383863306332346336663862663838666664323831663430 -66346132356134353263303665643835616162663636386233653762333634343364633261323364 -30663938646331363432323838636230303138366566306435373863316462323830313734373138 -37623063653037636164656535353631663339393534346465623634326237656333386433656164 -61333661336237346530363861366333666364633332343633663830616433306630343538643434 -31333065626130333137326566633338383366633666363566316365343035353631666165646266 -35336565613230303834306231363262643763616330643638646565306564666265623234633632 -30386265336262386437663335383265346634643966326661333365346264376631353261353535 -62376638373131363336633838636236303830316463663265323332306366363466393765363637 -37393732636363303233636236333836666565646537386136653966363335633831343361643236 -64616633343261343064383364323231333264656330396536626566663661313632643833646333 -39306533616235323337376162623531393537666665363939353833613266383332613363653434 -35656633613239373332343364656163386565393530643637653633643632313332396636623931 -31613636376638323330633030313365356566323864303638353036383430376266376163396566 -33633164363262346663373837316332333936393061306534663531643337616231646238396263 -31333334396231613539303763333061343237656337313035666564663564363138346130326332 -36626139616662633234633031363066616436653033393837663365623135396466333564363037 -31656362373665633837636630376336346439323131653931313139636330373133663132383733 -63653962346366393738373262313862343730396430396566313866643366303433303539646132 -37623231623230663461653637656538646438366134626434646538346638376532636330313230 -31316235306263353637663036356438396563653562343037343738666663643139323065336565 -31323362333636356239333130333965386239393834313562653764616661306336353336663539 -64393561363835623230393132633134626561663532303030306630653164363261393265653435 -33643766356137623433653135633261623834363833386332366133353537623730343835623931 -65656332653262316337356232623162343566353134373262353266643038373038323430326632 -31656136353734316639383265356435316334323565626533356265623362343434343430373933 -37633233336433393637393737326430326631616130343163386263363837356466343236656435 -62333631376361326531333165323666663163356665323461396562643030643737623636333838 -61663938353664636163393933346333623966363361393231363230343061386661633265646262 -65613663643931373061633062316566383962306336623738313261623732393738383538393234 -64663863666464306164316538383861613434343337343665353337313337313261336165373437 -65353733623838386230386435653531383739613733303631363535306161396662666232303732 -65336366353237366662616561646133323964663364663761643830323137343462633061633533 -65306634383534353266313533616232636131623465653161333863313233323631363934613938 -31333432303531396266316333393338373761306631313066333037323761613066373965396562 -35623963656439313461346430633238646166623832656639373937383034363833613231393033 -66653230623239346534333633386335633736383631613333396162663637306537646630336234 -64373139303663343235353635343633616136366262383737666633326566613963306530386666 -30373935653038643432636438373239653164333562316261626361633834623761313235326137 -31333462353830663266356330393763306339313065633133323637616432643462363634383636 -63643535666562366138303530666463353135393761316235356132653763356465646163363136 -35623738333634666661663265613335346461656363306465316163383537646133643435313236 -3065336138613331393133656362643133363366666438343635 +34643163313033623533646261613134326363633963393462616363646533653464376238396333 +6234316430616461643164353666333163363463656537610a383539353261626465326363656332 +61386236373134306632326166323532393734383336633361353638306661656232643863323537 +3733396133303831660a323330643232613838646532643934373531313736366535363935636432 +33613535386139636432643561333630656233643431383530343766633434643134616536653263 +33343134373235666430306634303964666234616338396533306539383235373365653038626432 +62663632313838636638333839653833393530336233353530616633303835653333386432386264 +31333538666363333036353566353032346161376161616563623064363538343630303164363365 +37386263626231316335323133393265656430336639373765353237303632333364353761323665 +37313138386533383537656539666338623563336361663263316639363464363836666630633562 +38363239373937363637336437656364633731373164326161343539336330623231346230383038 +62646336336661613461643762353335303633396664666633643631616235623833626166663833 +63366637323635323663373831653631653265303837306636316266393337643031646638376362 +37626538663866616437343065323130343735646365373539363264663662353065363766646239 +38333132323630386237303536306164363137356433343964356235646166666334346439633434 +64623664333032323933396666376333366234303565663133373133366361383662383932363439 +37336535643735393564633564636362376130663734373762386238303431396631383239623730 +35396132633166303530353239383230653361313063353637626637666335633662633935616434 +37303538633937656566356636633665353962626536323064303465636137336163323261346632 +61393039326339363762323266353137343434313264666263386364643437313135323435626633 +38636139393139306238623339663634386566393565626561323830643739643234316532313831 +63393939383838616332623235316531653532323134346536356636363966356439386235623630 +62363963376432626332643361383737306563346361333134303332666662396163303031626534 +62313431376430663863356330323666343835376534636333313862333138303361353964383763 +65633438346234393735386531373637383630616631653536623562313937653062646238343732 +38613661646537303761366334393637303563666539366266313536326137356162303366363561 +31653864363830303730316436633964666462393466363433313834653335316530373538336432 +32326238643765353065303938376566626561393534353630323130653533333439313631323432 +63656131653336373230633336633763343462386330623463373033643037653066373966386363 +62353366663163643161393938643939643235613431323766643634333130346333633366356534 +30303661316333623564633736663162323132326538643330373238396434623231333563376361 +31356562303064316361343163613531316161376462616331376362663064303733346230613663 +66336262306233306435653731613134383964656664643466316562323231656138363738346137 +31373462333636373366333237383631313636346166643938333061356332623461393134303232 +39636564356139646232666337393864636663313065656431393532376537323761383664643635 +30383433323361363937303762333430303030623634666532623431396437356538346565626562 +39363633306662383632373038363661323335623164313165306335353439663639663035393463 +66386537313331363462363164363236356132626339663165386236656131343430353534613636 +66643761343565343837613337636433363736633337333865663230613861336465636239656439 +39306230663535366431336636326131616663613463306562363236353961353664626664313037 +38316264346635613061303436646539383932633636316130656634623034386161663864316533 +33316137323937303636613539633763346161393763326632373838373738316431376538666534 +61383761643834633664633737656230666331303463376337633964623536306463376266343661 +66356530626136646564616161333931313063363937303934626430386266363235343263333434 +33386530613236313764633035346332623034643235393666653431396436373264393135336236 +38346661666333333263633836323132313961303635313761343835346432623330383136323561 +61666331393939653435306236653538663136663330613935323465316538356233333764343233 +36653762346130323430626263373531613961333236663832323731653834346562333366323331 +64316539353065663236636337393133653039633536303461353136353062656262336334373931 +65653131376665613762383636643035396637656330333461393638356631323233643530633165 +39373731363034396535356330353339373433393738643166343237353665646161613064336335 +33323636633130366635633534616165366462623164353137656566363239636137363430323934 +33326434353532393564633265333232613038313737326330633338666634363464346536383865 +66613466613031336462373433316463383438663331313838613365643934333737613562313265 +62643135313832656464666130346565316230376239356438333932393338643765636466373663 +36373338353038313461353336643761313563356164366664623466326564653461393938626139 +34623963653035316664623363633731386636636230303964393537656333313632376238353735 +32333034663237643032623737613766633131643366376130623431316364653732363162333532 +30373564616262623135313331393331336635366235353761383263666339343739366363326463 +37386637613665393837323338646661623238396531663065616334363933663066356564303061 +36663639373734326231323661643666656161643134323638643966336565356366323136333261 +61663032313239663863643762393936636335386464646233303530396434333661336234663231 +35363335303730663732356133633732326633623366623861343532373861613261316339653133 +66653663306536633061613366636237626636653430616266666231613463663462353233336630 +65626631646635623838643139366333656662643239396539616436353361346331616430363932 +36366336376135353065383164633435323965316137323463626438663036336133373938636165 +64326166633732353632343534333338323431613535366633646238396133303363383062323534 +61663936626635323264376363383830366631323862383365626637623663383838366563656539 +31643336393537666263366263323162303064303439336662346133306534343738383265626433 +64623866633162663465383033336266373566633366363264613734623730376538386165663465 +34306135616665313136383663393961626466373365346566336363313939356330393064323839 +34393932336239303937613263396539383130353239393962633335366665313264646635613766 +62343963306566303465366234346463633438346430373230386262636464383331346363623965 +66303034356232386263313562353631633565383661363431353461616562613337303539353866 +37613166663662343537626138666230363632373562333362613662626439346233616537313139 +37346164323437616135383932306131326332363139393562626438383232373537386437383935 +36646263333737353534666137386330353961306361353663386638343830653462663331663765 +63643765613330383836323638666237366536346464663566336430626566303662636434313638 +31323537656332646530373836353363353535383438343233353530343563656634346664303266 +38333464366130663230613939663231653534643734666463643338646666623563313264393832 +64643939633762396231633664613530373435613139393033666164363534633437373433623166 +38356330663962346539633931303834633861333737326363383261336531363436613166303961 +35353336376634663031363031336231313062316264393936333265366138616331643265373832 +65343238666563356133383561623662393835613432636234343130626235396334303532353039 +64336430666138353638383932326339356633333763303964343933313736626335653036623637 +63363738373264343638326430626261363363663938386234633033623365643434313734353738 +34383234663231313462323935646265343937373334363834663536653665303766393032626432 +39303936646361663036326131333131323665343165663035323634333562363732313934386235 +62613666363966316630613036393861363162383437326538313432343364343330626234393234 +34643238313566333138636261646437363930316336366561343131656638623766633439393432 +36353332326665353465623135323538306230336361343863366132396539636266373938323964 +31633232613537633836396466616230613966646538616139323030323263326235346536636161 +65626235323731353863643861386463623837373462643536633663343965393933613736353761 +64346664623062373430396539313965323632363532646434656333333435633736396465333966 +30386365366632396434613365303962326130623665383364633566613238346665626339316364 +37653736353462376337353435333863343630353966656464363435663963666666666239643764 +33623763346462316437636462643433616166613436363661623538313339663234346664623765 +64326437306231313232313438326435643535636338623137353036646333303466316337333966 +65666462323831366364343430616663313034366133613165366135396263376565303136313634 +30633065323861306465376531633964393635323430306431326363336465653836613436643734 +63663064646564326265353364343632393537316636396530643531646333343563356561623566 +34353238343734353733383065356638323662646366663133626134353366336164373235353963 +33613636316564653231663432306531376539386463663631613232343834326135663437616439 +63363661343835393538393638613663653336396135356661396433386437636261333465613632 +36663737613737393864633266336132656563663166353633636637396231336435663662393339 +34383839373164303936383931396436323362653662663138376364376330653363393766623664 +65373434363062636465623632613636343030663730336364613234336165636665316536343463 +64363062656430316466313461643866633162626535303464646338633530343263383965303264 +39636665353265376332613064393534303565623330363062303763643465356266333735316536 +31343539653561333030373130393033326137366531373066393432343537633666653865643935 +66303436613662613338333966363464356332373434616562643063306330626338666163393133 +38653031393533616536646363643936396564386137663237616334303636366132363338333063 +66313237376362613530316330386561343165396533646233376466333336383337396464363038 +62616263363034343261343163363437383733636562346661353332633963303633663261626463 +64653331613836333062646462646130363862663535326634303035376532316365623639333231 +64303663346634373237633438333637343464366437343263396665313661326436303061353765 +65613733626364643964343637373531643337316364623963366466643364376631323732323563 +36613239643039656536376333333663323563616166313261336435333637393064356334373566 +30326462376464333536326632386164653362383962383938613438633136323032336238636335 +34636130353139326632626464636262643334653461636363346432636232613337303666373339 +66373637363265633732313832626232656466363062353532396536386538333233643261373939 +35313737643332303861633135376439613562353964383565346338613031343837326230663065 +37333432616661376634353965373665393965653231613863373831346162326339333331303561 +39663633393562326462623336613239333365633430656463663837323939346530373035626230 +32613964316438396262633961653531346639396130396261363661363139326536613366346333 +31363463666363343766636433633734613238323461323166326266636564613664616163373736 +64313237656433313965323834393361376166356165343965396336386261313765303166363165 +37636530303131313437343430646336336663356166656465653030663038333430323139316636 +37613766333936366535313739663966626364366639663638313866643563646336326535386235 +30613337636537373162306462633235656637376139336466666534613631313761323330633232 +38393563643239656435663432303465376530626233306531373962336232646331623838336262 +38353664346133303964646661656465363939626465393066333434373337356338363930666436 +61646234633135656137653564343963343232616339353335643334303939363833333431353864 +32326334636338346235663662616230663536323233396639616230393133323863373631323331 +36393436636232336333356136373333346162386136313831633438313337616261336539323734 +33663334313730303832363263363539346130623865333239633039636637666631326265653033 +37383430636634636133666137376638613932323538303033303134306139306366616565303438 +64323838303431316664343134613335643439343761363731306336363464366661316536303239 +39666339373163623339656266326265303934663263333236653065383637626464653236653665 +38653862303536336462666132366231616436313938326339363534303566653332323933373430 +37383264633763386136366165333131383830303138383733643038313935336634393665613536 +6337313238373563336135376230626566633332373630326333 diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 5f9acb5..4e4679e 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -28,3 +28,11 @@ loop: - 01-logo +- name: Check for cloud init + stat: + path: /etc/cloud + register: cloudinit_folder +- include_role: + name: cloudinit + when: cloudinit_folder.stat.exists + diff --git a/roles/guest_agent/tasks/main.yml b/roles/guest_agent/tasks/main.yml new file mode 100644 index 0000000..4dbb7b8 --- /dev/null +++ b/roles/guest_agent/tasks/main.yml @@ -0,0 +1,5 @@ +# Setup QEMU Guest Agent +- name: Install QEMU Guest Agent + package: + name: qemu-guest-agent + state: present diff --git a/roles/users/tasks/main.yml b/roles/users/tasks/main.yml index 68777d7..ea64192 100644 --- a/roles/users/tasks/main.yml +++ b/roles/users/tasks/main.yml @@ -7,6 +7,10 @@ shell: "{{ user_dict[item.key].shell | default('/bin/bash') }}" password: "{{ user_dict[item.key].password_hash }}" update_password: always + # Prevent the user from changing their password + password_expire_max: -1 + password_expire_min: 1 + state: present loop: "{{ users | dict2items }}" @@ -16,14 +20,13 @@ state: directory owner: root group: root - mode: 0710 + mode: 0711 - name: Add SSH key to users - authorized_key: - key: "{{ user_dict[item.key].ssh_keys | join('\n') }}" - user: "{{ item.key }}" - exclusive: no - path: "/etc/ssh/authorized_keys/{{ item.key }}" - manage_dir: no - state: present + ansible.builtin.copy: + dest: "/etc/ssh/authorized_keys/{{ item.key }}" + content: "{{ user_dict[item.key].ssh_keys | join('\n') }}\n" + owner: root + group: "{{ item.key }}" + mode: 0640 loop: "{{ users | dict2items }}" -- 2.38.5 From 4491dabb5c470e88584496f67f59b323739f2260 Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Thu, 21 Jul 2022 17:44:09 +0200 Subject: [PATCH 07/19] commented ifupdown2 because it causes problem with network setup at boot on Debian --- roles/networking/tasks/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/networking/tasks/main.yml b/roles/networking/tasks/main.yml index f296f13..1d2d3c1 100644 --- a/roles/networking/tasks/main.yml +++ b/roles/networking/tasks/main.yml @@ -29,13 +29,13 @@ notify: Apply netplan ubuntu when: ansible_facts["lsb"]["id"] == "Ubuntu" -- name: Install ifupdown2 - apt: - name: - - ifupdown2 - state: latest - update_cache: true - when: ansible_facts["lsb"]["id"] == "Debian" +#- name: Install ifupdown2 +# apt: +# name: +# - ifupdown2 +# state: latest +# update_cache: true +# when: ansible_facts["lsb"]["id"] == "Debian" - name: Install bridge-utils apt: -- 2.38.5 From bab2e6d93480410a5296fd06fcf200d7631948d8 Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Thu, 21 Jul 2022 18:27:55 +0200 Subject: [PATCH 08/19] migrate vpn role variables --- group_vars/all/ansible.yml | 4 + group_vars/all/totp.yml | 4 - group_vars/all/user_vault | 162 ------------------ group_vars/all/users.example | 1 - group_vars/all/vars.yml | 2 - group_vars/all/vpn_vault | 36 ---- group_vars/all/vpn_vault.example | 4 - group_vars/{all/vpn.yml => vpn/main.yml} | 0 host_vars/barium/ansible.yml | 2 - host_vars/barium/main.yml | 6 + host_vars/barium/users.yml | 3 - host_vars/bismuth/ansible.yml | 2 - host_vars/bismuth/{users.yml => main.yml} | 3 + host_vars/hindley/ansible.yml | 2 - host_vars/hindley/apt_proxy.yml | 3 - host_vars/hindley/{vpn.yml => main.yml} | 32 +++- host_vars/hindley/networking.yml | 14 -- host_vars/hindley/secrets.yml | 9 + host_vars/hindley/users.yml | 6 - host_vars/krypton/ansible.yml | 2 - host_vars/krypton/main.yml | 6 + host_vars/krypton/users.yml | 3 - host_vars/technetium/secrets.yml | 15 +- host_vars/vanadium/ansible.yml | 2 - host_vars/vanadium/main.yml | 6 + host_vars/vanadium/users.yml | 3 - roles/apt_cacher_ng/tasks/main.yml | 2 +- roles/generate-cert/tasks/main.yml | 4 +- roles/grafana/tasks/main.yml | 2 +- .../tasks/kassandra.yml | 2 +- .../tasks/main.yml | 2 +- roles/prometheus/tasks/main.yml | 2 +- roles/synapse/tasks/main.yml | 4 +- roles/vpn/handlers/main.yml | 5 +- roles/vpn/tasks/main.yml | 2 +- 35 files changed, 83 insertions(+), 274 deletions(-) delete mode 100644 group_vars/all/totp.yml delete mode 100644 group_vars/all/user_vault delete mode 100644 group_vars/all/vpn_vault delete mode 100644 group_vars/all/vpn_vault.example rename group_vars/{all/vpn.yml => vpn/main.yml} (100%) delete mode 100644 host_vars/barium/ansible.yml create mode 100644 host_vars/barium/main.yml delete mode 100644 host_vars/barium/users.yml delete mode 100644 host_vars/bismuth/ansible.yml rename host_vars/bismuth/{users.yml => main.yml} (54%) delete mode 100644 host_vars/hindley/ansible.yml delete mode 100644 host_vars/hindley/apt_proxy.yml rename host_vars/hindley/{vpn.yml => main.yml} (64%) delete mode 100644 host_vars/hindley/networking.yml create mode 100644 host_vars/hindley/secrets.yml delete mode 100644 host_vars/hindley/users.yml delete mode 100644 host_vars/krypton/ansible.yml create mode 100644 host_vars/krypton/main.yml delete mode 100644 host_vars/krypton/users.yml delete mode 100644 host_vars/vanadium/ansible.yml create mode 100644 host_vars/vanadium/main.yml delete mode 100644 host_vars/vanadium/users.yml diff --git a/group_vars/all/ansible.yml b/group_vars/all/ansible.yml index 2925bad..075ca96 100644 --- a/group_vars/all/ansible.yml +++ b/group_vars/all/ansible.yml @@ -1 +1,5 @@ +# Use python 3 +ansible_python_interpreter: /usr/bin/python3 + +# Set your become password with `keyring set ansible-painsperdus become` ansible_become_password: "{{lookup('community.general.keyring','ansible-painsperdus become')}}" diff --git a/group_vars/all/totp.yml b/group_vars/all/totp.yml deleted file mode 100644 index b171f71..0000000 --- a/group_vars/all/totp.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -totp_periode: 60 -totp_digits: 6 -totp_machine: "pains-perdus" diff --git a/group_vars/all/user_vault b/group_vars/all/user_vault deleted file mode 100644 index 5cf060c..0000000 --- a/group_vars/all/user_vault +++ /dev/null @@ -1,162 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -35633963343765633636396266393332366432646631306564643361343531383734646235663931 -6139666164356533326430636133363961316239386163640a346635393435333437623034343638 -34656166323733656539326133663661616437653065623061396434313663626265326466363464 -3666383465663962330a613766393463303136316563396134663462626661366363303666656462 -39643161323235303462326437393233636538336331333031363933666466306633303639643163 -62396439663465323037373161393638643566383834663666656333653830333530653430383465 -62323536666531383136666537326666323235363062396566616565316232393733613338653864 -33633665363431616338363264366531313064306138656537616438656632386332386435363037 -31663934366331396239366137353161316565323036623231393839613265366537646234663339 -31353139616639393039653338383261356636653164636631363363633866393761643336323563 -35323063323031333862383765613238363863326231346537633066323235383531633934306565 -38333765613965633163383235333834663164353034656362323332303431633062386466636266 -37386163303331303935373565646232366233326436633664613464376262343433646331353732 -31316163343064336539623637323135623266656566353934623431353062653236323063306237 -62353132666536313862363064396261346430656637613561373935383364363836643066313166 -35626465396238626332386132346334366635616662353339636636663931333663376266306465 -66383330303939366161383961326635663830623464643436653638343162346331313133373661 -39656331623135623461333262353965303832626335613363333634363237346232633336306430 -30613639653961373730653035643534643236333033386636366462316532383966656635623130 -38323163666166346262656361306362326463356661303237613362346436326263333735313663 -66613932396337616231393566613338633337653036373938323864626133626237333235666537 -39646365316335343538336634386464326435323336373136653766616461663761633764633637 -38663063613831636136343864333663303861383264323836633239323638613064303933656334 -64636339323066336561333739616362613238373432356639386135663862363162316366393137 -34656431663833613532613966373137326631633437383537326566376166386665346261383933 -30323134333936393237666363313466653630633734303437313237326135353631363462353731 -37656565313537306663663365346665326136626663343162633661376565653830383632366263 -34323337616565313265343031386339633661653164616136313261616339336433313466643065 -64303531343838393862303230363339353332376163313066353935656531343463646435333164 -62316238303866326330623232316539653535343966326532653539653864326636626434656634 -61313164626366386234343435366162643933323434323031373365383766383962616434303732 -38626562343863313862643134303430613833653466396331323361393163343865653661666230 -63323434613139393637613262303135623961626531623934613933643836663633326638646432 -31393161386262363830386464613461623836373933343566383139653532326634313166653732 -37363433333534633336333730313861623737376233663866666331333937313462336430616439 -66383632626663363930386165386562623166313064366263343739623030666233616664633163 -39663739646166646537663865303635623636303466353932373531336339396239306631656132 -39636663353036613432653833363732313263386562636666613430303463383139636335336164 -62656166383863326365383934373863653061366135343934313163303764363434373134633934 -32363535303034666630643935373538376339643364383765343738616333356431366534313636 -30356539323035633834323966313039333233613861373561613564636435313430313064386234 -31646363646332376664663562363436363565356362323638626330633935393531353831386136 -62396530613337333563383064333037303064393130383062303739383465646132393263633233 -30643863623939663063366534643362316163373934656633656438656634373266313561646435 -61303164306465336230346535653935663030336466623565373565653537626162313562343834 -37623464376562316663616337633838633332373165366639343962396239666564613631383237 -62353536613635356531356265313166306339356634343361313063613836313432373231663961 -33333732643262663131373662626663336433343131333163666333616265663662316339336234 -61643830656566373533373132643663336333333436663735333337633532313365306338646132 -38396664306133336533626366303764656235313233613965363738616433653434646633363064 -38616234396634643666613133653066363661613939316633316137336162356434303233353161 -62643430656237336133316666663664336637323638396634623765326637306234313732376436 -32326430336434646366336562646361363935343535376564333637343930626139343630323538 -38656564373764363037653132393263386339383331316162366266303532306462643534663166 -66353566376435306263353431343662623365323033393535363762353630633133316562303733 -39323735663663326331333530393863653564623330373437323762396565626439396438323965 -33356536656634396337353239343962393335636661313334353065313839356632666266383564 -36366435356362326163626339323130346139326363383062613138383062333530633430376565 -30383361306337343661643763336361383335633463333838643762393564393962646630613230 -32363735386336666435356335666336633834333966633238373033326539666333343034393239 -39376433633139646331376139663238363734346235366230383836323264356133653634313035 -62383165313936363366663037353163643662376164306530613930623239313631616663393635 -63623935656237653838633235653565326235643635663766326531396637613732626338393965 -33333135323439386561393461663237333431623065376361373134383534633264373939343262 -37313663656661646137646132656434333333383664613261326133666430636632306134323136 -65386137613932656461373430373866643831623132323165353735373035356536353661373164 -66313632663533333038643265353534393133303234643534363762663436393766393961633764 -37623561363063646165343431353366613335336130383264333734343039393434396436663239 -64346261666134613432646231623235306463306133656434343261363331636461663538396264 -36363264376339393331633162376638316566363534393164636539646537353135633131363864 -35336232343231363662623764396439306331373730396462616434633931343161303731366561 -31666433353737303035613061393462633462623830356439623664646265323336623536656236 -31386434653533636235623236623239633761626531376261626430636137363662373864643533 -63306438376264383064636665663631616635643565616230313836613964333364366361363336 -66326562393261663537386366613130323065663465616134633666386435626333663962383036 -36353231333639653737303963366231643338316537386133643264656535666631306637353734 -65613239666135303931336338393639636634323361303037383161326664346535623261376635 -66376163393237623266323731333231373037383934623962653231613265663834663766613731 -64643165666462303038323364383063323135393864626433323733333431343931393634363463 -35346636663434646662353935323062653337316631396261386238346535356530373231343732 -37383261663630663435333463616163663364653964306666363462343236373135303237393039 -34646331366237336366643235386233366363643065313639303463366535316464653266643231 -39336164323035303963323038666437396336313438373334326163356135663432366432356662 -39353530303136623633363764303737313530653461623531326332336166663362393230623963 -38313661393262313531306364643864333037386132306263393965646630343132323236383734 -62363239363734303561306166613436653361646630383065353335323861663533613433643366 -35376334396539353265373531353134386638343730383461656537653538623338353264653236 -63363231396630313365303165323034336564633032316636323137313238336231636536306237 -62343431363036323965326639346533343339313962666234356466376638333866623430333939 -32343335613436383864643330363165653634346637393430623462303163643164656535393065 -62316231666666356336366265333636386265613462313932353437613262323337656334613932 -30373738303035366263306239393339373761633630663366303838393261323235363037623763 -31383461396663363137353163363430313135346239363664653662633166636537343861363130 -62653735626566323832313362623163663632356338643834396233613463386330623036306138 -66633366303964646564663962343937363331616235323239376638323730643666333935336639 -36383462633731346539373666623937666533613534616663663939613938343365383564643464 -33616266653165626564663732343232666237336134303566663932346138306265303231616632 -37383938663366613363656335356663323737366432613431366139646662343230643066663233 -32663236386665326562386130623039303531383835343865623761646166313039333438303537 -63366361363637633934333138653934633438623738386337613639343534313237346261376466 -38396639623732626163343139633438666232316332323662633332336135666234643362356238 -37333136313061366432353237633234316236616132666632333235623737303166393463663336 -65333736313931313565393863376461356463306532636164306136336561643563356335643065 -36663061626664653166623637663865373136666461306363643337663965666535303765396234 -33383935363335306461313138343163653536623633366462653730326135323033313663636439 -30636464376632343536316664356330346232636337343766653236666536323137343537346564 -66393864316136383730656263386637323166613966333738303537613761383236303330633064 -63336238653431666633393937666161663037616462343365343665383736326439376638356638 -37663332306235653164626432393738393637373538336332653361653130393361636638646162 -31393666653963666234376663313534346434343261336431323137666563303461616135373135 -38376236336162633630336433653834343864366236343338363632373038643163663665633537 -64363162313861313239333733323836353930316139663239333933383030646434333661333938 -36626566373161316638326632656365353966626662663138366264313765393264303936623161 -63313765323065626635633134313765613366386262646631356563663132313665326632346535 -38636235633861386535313937363663363165363530396166636362343962313735663731316362 -31653862376264616535336363333965656531336565623237316232636664666635366137313866 -34393438363534386632323364363536393264643962363235353264373662393362633362613835 -31376139353562626563653966346237613539326234663434626333643132303832363161326362 -35306132386134616336663037626566616132616264666465313765376234306266616262326538 -65363661306233323833343737313135366664643439666631313565373436663435333462376132 -66633265616638646136626133393937626531333136663566343336306134306137633835376162 -66613836383965633864643735393432316663633635343732313338633239636237656563613565 -30623730333662353639353363653936396563303334313938346438633938346464333963323261 -62666232663730653864623566313138633837316265363463666438326634313738303362396330 -62643639663930373939656566646663363432376636623264336530353635383033313965393661 -62633534376335363537356131636530636365373764653065363362356362326566643664666439 -66303338373061373366623632396162633034323632353933356663396136323834663862313365 -32616263613637353436643032363134396332333730336633333164653737376238656434343864 -63363937316430323965393839336362303065373738343537353238643638336236393637666434 -34363638366536303762656164303037613162636462623336633166353435363264646436623233 -37376335616462306439396239363630633730313265656631623162363039373564653337326537 -63376236623062663730373633343863313530353731636430613863343862376135613332306430 -32623063306534373864313535623166303462336136356237653538643964643262623930393035 -39643639383833343930313163663733616334666132323432326466613137653735376163373238 -35623139303364336337373331666535303563643831643732383363336235373134366564623030 -37663738373839643636633937613632323264373435656465316364633665326165343964646137 -39343062333863633634636334613036613939346334363936353464636433353162316662663864 -63306361373864653464306438646665393131333131643637386436306264303237336136306138 -65613163333661353839666231313366343335386131306431643336343830386336346663363464 -61353731626463633937613935303036616365363630366631386363613565306562366339636463 -65323563313265656466303531396338343636303131396463663535346362333866353266356333 -30313066313136626363386662653037323962373434626461666563663737646463366265333339 -37623232356638333135303831626139336362303363333831353361653866643833313039363731 -38336535653536333266626235346132366232623331623962303730663839666430393365333361 -61373966326537613765343666663533623566643466353438666163623161366136643138613035 -31336339346166376666316666383533376235333066333138353833643762313161353435363435 -63303733616437326361316436663666363362336636653931343238636637396330343339376638 -36626464616139666435343161333562623063336264383632646361396338366465353739343961 -63303463366530303831336535313230363932313462633732663337363835336331386537323363 -35353866656233336338613965616530363233643134343334373335346139396130353631653462 -39346663633739663162336462373263353662353638356265323363303039306238376666643931 -62383234343936323133646464656435313137643135303232316235356233656264316232336635 -34663930613263613261623831393431656231393365366661356338323932373365306265313062 -61333031646336636566323834616139306166333637613235326661343332633763323032386534 -65613663396261646631643363313365616333393339376136306536643864396531386332616532 -62636135643865613130396230363866313662346338323934663662343835616635343266616339 -38663466333561393038356261376237373337353435363464616538626263366631323439643138 -65363562353063613064633666363763356666313933386262333963386363656465666462303037 -34313964663738653038376438313339386439643736366634646638623338333965333831326631 -66616132336235366563633064323538363964663563333330323339333166316435376466613761 -38636462666663343737633633626530656230336234323763613735336232383066 diff --git a/group_vars/all/users.example b/group_vars/all/users.example index 1d91425..e12f5ca 100644 --- a/group_vars/all/users.example +++ b/group_vars/all/users.example @@ -6,4 +6,3 @@ user_dict: ssh_keys: - "ssh-rsa azrekgnbmoienbzrinoien...aoeuzn lorem@host1", - "ssh-ed25519 azrekgnbmoienbzrinoien...aoeuzn lorem@host2", - totp: "daeae8ce486f6636d68c37c21ce002" # the hex value diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index 90d7b95..cfe8aed 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -1,6 +1,4 @@ --- -# Use python 3 -ansible_python_interpreter: /usr/bin/python3 dns_resolve_server: 1.1.1.1 # Default prometheus serveur, to overide in host_vars or something diff --git a/group_vars/all/vpn_vault b/group_vars/all/vpn_vault deleted file mode 100644 index f81f8e5..0000000 --- a/group_vars/all/vpn_vault +++ /dev/null @@ -1,36 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -33326464643530643862323238303631356639303466646138663239643165633333316539383033 -3735666534333264303135656539666266343237366232360a363765343864326139343237323634 -33366361656236336463666563376666346666353563373236653964633632383733303030383632 -3339366333363063660a643036336663396631346335343838306237663034383436383631626161 -36383562333664626366613331623765343631323833303935633737366333366461313136643862 -64363362663933313234323435393031353137393035666565373030623936316564316565663938 -30343537366138303737633233663433643335353335653963653066363632643339376566363730 -61383833373634336237373733633961373633386434663333333935653831393631336165393265 -66373561363635663062316435303663306436343133303630373363363363386338643666326338 -37313530346434376539663063656236643339313939623737623937333037366535303963363638 -39613534383265353235313662393533616138616439333835663662623435303538633763356437 -35643736643134643133346132616234326664353831613237636561616663656133633935333661 -32363436306535616366393865643534636133366565393136313134303333363733333265656431 -34353166393737343565396566343239303030343335663639653934363632643862353962303730 -62353661316364646232313964343033393364613737353335393466316466316466363334326532 -32306263326134373337646137326262626632333937373039373030313063326161656436633737 -62663761346436383330383731626135616439383136626661323830633964346130643634326461 -34633562323538653736333435346665623565643639636565353166353336363737333064343337 -66626639386663383162643362396634623237346361623033336637366339353134356537333462 -37313233643531666332316666386434376235643764356237653935353335323965366237303965 -64616532656461363666373235353539363338623031626233386435393334653163636337366130 -37343834343433353632393963663330623736643833356466363663653332626530623962343266 -36376366666164666433653462653635303233626330653734313538646330316339383339643362 -65623564616638393638663031663233356430343139653261386262356433336637613737306233 -65316630613137633632393033396366633134653864663036646436653161343965373461643366 -63663635623563373164633266373931303338373938633265636536613164636339383936383935 -38303636323836626538663165383533353838373233303237333763616430656537656632373366 -35616361303061646235306562633761373034346661626330626237613337333833643363653031 -37653964643133303666363666343839613663643634663537326538303035646564626433643565 -36343763613237313333393763376133316439636239626533386131396530366162313566303832 -39646237346463636239613062313566623636653830353130383866383632616365386139663531 -37656634373135373530393733386539646532633635646232323439373433366537313937636439 -31313836636133663033626239346230303361666136626637646261373838333638613061383065 -63333639326261663631363734376236316534376231353336656230613534313930366330626630 -666466326463316330373334353563373262 diff --git a/group_vars/all/vpn_vault.example b/group_vars/all/vpn_vault.example deleted file mode 100644 index 303cf10..0000000 --- a/group_vars/all/vpn_vault.example +++ /dev/null @@ -1,4 +0,0 @@ ---- -vpn_vault_hindley_key: "AAAAAcxofuT6w7K0ev6L9zxHk/nLvnGgXVgYzXRJNXw=" -vpn_vault_azerty_key: "BBBBBcxofuT6w7K0ev6L9zxHk/nLvnGgXVgYzXRJNXw=" -vpn_vault_hellman_key: "CCCCCcxofuT6w7K0ev6L9zxHk/nLvnGgXVgYzXRJNXw=" diff --git a/group_vars/all/vpn.yml b/group_vars/vpn/main.yml similarity index 100% rename from group_vars/all/vpn.yml rename to group_vars/vpn/main.yml diff --git a/host_vars/barium/ansible.yml b/host_vars/barium/ansible.yml deleted file mode 100644 index e49c9c0..0000000 --- a/host_vars/barium/ansible.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -ansible_host: "barium.lan" diff --git a/host_vars/barium/main.yml b/host_vars/barium/main.yml new file mode 100644 index 0000000..bf7c4d2 --- /dev/null +++ b/host_vars/barium/main.yml @@ -0,0 +1,6 @@ +--- +ansible_host: "barium.lan" + +## Users +users: + - g33kex: sudo diff --git a/host_vars/barium/users.yml b/host_vars/barium/users.yml deleted file mode 100644 index e5c5450..0000000 --- a/host_vars/barium/users.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -users: - - g33kex: sudo diff --git a/host_vars/bismuth/ansible.yml b/host_vars/bismuth/ansible.yml deleted file mode 100644 index ce56910..0000000 --- a/host_vars/bismuth/ansible.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -ansible_host: "bismuth.lan" diff --git a/host_vars/bismuth/users.yml b/host_vars/bismuth/main.yml similarity index 54% rename from host_vars/bismuth/users.yml rename to host_vars/bismuth/main.yml index c5f2a60..bdabb89 100644 --- a/host_vars/bismuth/users.yml +++ b/host_vars/bismuth/main.yml @@ -1,4 +1,7 @@ --- +ansible_host: "bismuth.lan" + +## Users users: - g33kex: sudo - antoine: sudo diff --git a/host_vars/hindley/ansible.yml b/host_vars/hindley/ansible.yml deleted file mode 100644 index 287daec..0000000 --- a/host_vars/hindley/ansible.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -ansible_host: "hindley.adh.auro.re" diff --git a/host_vars/hindley/apt_proxy.yml b/host_vars/hindley/apt_proxy.yml deleted file mode 100644 index 583f7f8..0000000 --- a/host_vars/hindley/apt_proxy.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -proxy_apt_interfaces: - - "{{ interfaces['wg0'].ipv4 }}" diff --git a/host_vars/hindley/vpn.yml b/host_vars/hindley/main.yml similarity index 64% rename from host_vars/hindley/vpn.yml rename to host_vars/hindley/main.yml index ead66d1..841ce7e 100644 --- a/host_vars/hindley/vpn.yml +++ b/host_vars/hindley/main.yml @@ -1,8 +1,33 @@ --- +ansible_host: "hindley.adh.auro.re" + +## Users +users: + - histausse: sudo + - g33kex: sudo + - thomyrock: sudo + - dorian: sudo + +## Networking +interfaces: + enp2s0: + ipv4: 45.66.110.3 + type: dhcp + wg0: + ipv4: "{{ intranet.subnets.physical.subnets.hindley.ipv4 }}" + netmaskv4: "{{ intranet.netmaskv4 }}" + type: wireguard + +ipv4_forwarding: true +ipv6_forwarding: false + +lan_address: "{{ intranet.subnets.physical.subnets.hindley.ipv4 }}" + +## VPN vpn_interfaces: wg0: ip: "{{ interfaces.wg0.ipv4 }}" - private_key: "{{ vpn_vault_hindley_key }}" + private_key: "{{ vpn_key }}" public_key: "Ce48/ZdvpI2S82bIivhiWHQsyidzTAtxCnEYojY3xEA=" keepalive: false peers: @@ -23,5 +48,6 @@ vpn_interfaces: - "{{ hostvars['matrix_server'].vpn_interfaces.wg0.ip }}/32" comment: "matrix VM, hosted on g33kex's server" - - +# apt proxy +proxy_apt_interfaces: + - "{{ interfaces['wg0'].ipv4 }}" diff --git a/host_vars/hindley/networking.yml b/host_vars/hindley/networking.yml deleted file mode 100644 index efdd3e5..0000000 --- a/host_vars/hindley/networking.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -interfaces: - enp2s0: - ipv4: 45.66.110.3 - type: dhcp - wg0: - ipv4: "{{ intranet.subnets.physical.subnets.hindley.ipv4 }}" - netmaskv4: "{{ intranet.netmaskv4 }}" - type: wireguard - -ipv4_forwarding: true -ipv6_forwarding: false - -lan_address: "{{ intranet.subnets.physical.subnets.hindley.ipv4 }}" diff --git a/host_vars/hindley/secrets.yml b/host_vars/hindley/secrets.yml new file mode 100644 index 0000000..caedca2 --- /dev/null +++ b/host_vars/hindley/secrets.yml @@ -0,0 +1,9 @@ +$ANSIBLE_VAULT;1.1;AES256 +33616139646133343635303262363364376264323635656530643766393139666165316561656666 +3963643939633835396136343761363839376562326162610a343365303635373761616137663231 +31326666303231366433343266616264313535333965666266396639633465626336653363343066 +6239353034383537630a313136323163313436646434646638316535313364653936373662326263 +32353363366632636537613134646639653833326462346137613661653832663035336234613638 +37373734663564346135643930613064666639333532306633363532306662633063386538343438 +33623439383037633235623762373437613665333537363664333235653466643536353030336337 +62306233636461326463 diff --git a/host_vars/hindley/users.yml b/host_vars/hindley/users.yml deleted file mode 100644 index 89d2310..0000000 --- a/host_vars/hindley/users.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -users: - - histausse: sudo - - g33kex: sudo - - thomyrock: sudo - - dorian: sudo diff --git a/host_vars/krypton/ansible.yml b/host_vars/krypton/ansible.yml deleted file mode 100644 index f2b6a0a..0000000 --- a/host_vars/krypton/ansible.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -ansible_host: "krypton.lan" diff --git a/host_vars/krypton/main.yml b/host_vars/krypton/main.yml new file mode 100644 index 0000000..5c05669 --- /dev/null +++ b/host_vars/krypton/main.yml @@ -0,0 +1,6 @@ +--- +ansible_host: "krypton.lan" + +## Users +users: + - g33kex: sudo diff --git a/host_vars/krypton/users.yml b/host_vars/krypton/users.yml deleted file mode 100644 index e5c5450..0000000 --- a/host_vars/krypton/users.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -users: - - g33kex: sudo diff --git a/host_vars/technetium/secrets.yml b/host_vars/technetium/secrets.yml index bbe3d86..ab94825 100644 --- a/host_vars/technetium/secrets.yml +++ b/host_vars/technetium/secrets.yml @@ -1,8 +1,9 @@ $ANSIBLE_VAULT;1.1;AES256 -66656663643539653865323364386464393932303834303832313463636662643161396533656534 -3330346432353736323266653063303538306232356133650a373134623933666137636538343832 -65323430353263623234616336396530613038333530333433383966653739336439643431363065 -6363313939623162340a626635633335333631306332386535393861653462383765376464613230 -63313033613462393331313431616138306430316634373334656537323431336633663833636132 -33323365316533373462323361383561623535326336643232633631316438316362653166616462 -333165626564653538333033393233303435 +62353537323135663839356464396361646432303638653765616663363432613266383739343835 +6435313938393332396537613031316333643835666164650a396464396632353031303662386332 +65643437616137383837623566316438376334363634653061383334356530366261343865323631 +3466653030623239390a363765386362323563333861353964343161613732626565633666343430 +61353266623033643030346238303562313864653161623436666463363761336532346137656138 +38316439663361363930656162633232396237343165396463626633633837346335643038653131 +36323039663333346131303735316539333335383565623061646634613861303630356563633238 +63393034323136663861 diff --git a/host_vars/vanadium/ansible.yml b/host_vars/vanadium/ansible.yml deleted file mode 100644 index 221d731..0000000 --- a/host_vars/vanadium/ansible.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -ansible_host: "vanadium.lan" diff --git a/host_vars/vanadium/main.yml b/host_vars/vanadium/main.yml new file mode 100644 index 0000000..9937ea3 --- /dev/null +++ b/host_vars/vanadium/main.yml @@ -0,0 +1,6 @@ +--- +ansible_host: "vanadium.lan" + +## Users +users: + - g33kex: sudo diff --git a/host_vars/vanadium/users.yml b/host_vars/vanadium/users.yml deleted file mode 100644 index e5c5450..0000000 --- a/host_vars/vanadium/users.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -users: - - g33kex: sudo diff --git a/roles/apt_cacher_ng/tasks/main.yml b/roles/apt_cacher_ng/tasks/main.yml index 3b99764..0424cdf 100644 --- a/roles/apt_cacher_ng/tasks/main.yml +++ b/roles/apt_cacher_ng/tasks/main.yml @@ -50,7 +50,7 @@ group: apt-cacher-ng mode: '640' notify: Restart apt-cacher-ng - no_log: true + no_log: {{ enable_no_log | default('true') }} # This is uggly, and overkill - name: Set cron job to clear the cache diff --git a/roles/generate-cert/tasks/main.yml b/roles/generate-cert/tasks/main.yml index afd91c7..ba8695e 100644 --- a/roles/generate-cert/tasks/main.yml +++ b/roles/generate-cert/tasks/main.yml @@ -79,7 +79,7 @@ dest: "/tmp/ansible_hacky_pki_ca.key" mode: u=rw,g=,o= delegate_to: localhost - no_log: yes + no_log: {{ enable_no_log | default('true') }} - name: Sign the certificate become: false @@ -100,7 +100,7 @@ owner: "{{ owner | default('root') }}" group: "{{ group | default('root') }}" mode: "{{ key_mode | default('u=rw,g=,o=') }}" - no_log: yes + no_log: {{ enable_no_log | default('true') }} - name: Send certificate to the server copy: diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml index 98c4d41..5f4be5b 100644 --- a/roles/grafana/tasks/main.yml +++ b/roles/grafana/tasks/main.yml @@ -36,7 +36,7 @@ owner: grafana group: grafana mode: u=rw,g=r,o= - no_log: true + no_log: "{{ enable_no_log | default('true') }}" notify: Restart Grafana - name: Copy the CA cert diff --git a/roles/prometheus-alert-manager/tasks/kassandra.yml b/roles/prometheus-alert-manager/tasks/kassandra.yml index 6136298..09c1611 100644 --- a/roles/prometheus-alert-manager/tasks/kassandra.yml +++ b/roles/prometheus-alert-manager/tasks/kassandra.yml @@ -35,7 +35,7 @@ group: nogroup mode: '0600' notify: Restart kassandra - no_log: true + no_log: {{ enable_no_log | default('true') }} - name: Copy the CA cert copy: diff --git a/roles/prometheus-blackbox-exporter/tasks/main.yml b/roles/prometheus-blackbox-exporter/tasks/main.yml index caf3464..a0d6caa 100644 --- a/roles/prometheus-blackbox-exporter/tasks/main.yml +++ b/roles/prometheus-blackbox-exporter/tasks/main.yml @@ -42,7 +42,7 @@ group: prometheus mode: '0640' notify: Restart blackbox-exporter - no_log: true + no_log: {{ enable_no_log | default('true') }} #- name: Copy the web-config folder # template: diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml index 2acae58..aafcd41 100644 --- a/roles/prometheus/tasks/main.yml +++ b/roles/prometheus/tasks/main.yml @@ -59,7 +59,7 @@ group: prometheus mode: '0640' notify: Restart prometheus - no_log: true + no_log: {{ enable_no_log | default('true') }} - name: Add node targets file template: diff --git a/roles/synapse/tasks/main.yml b/roles/synapse/tasks/main.yml index c58dd32..f8eb41d 100644 --- a/roles/synapse/tasks/main.yml +++ b/roles/synapse/tasks/main.yml @@ -12,7 +12,7 @@ owner: synapse_user local: C template: template0 - no_log: true + no_log: {{ enable_no_log | default('true') }} - name: Install apt utils apt: @@ -60,7 +60,7 @@ src: homeserver.yaml dest: /etc/matrix-synapse/homeserver.yaml notify: Restart synapse - no_log: true + no_log: {{ enable_no_log | default('true') }} # --- DRAFT --- - name: Install nginx diff --git a/roles/vpn/handlers/main.yml b/roles/vpn/handlers/main.yml index 4cfc2f1..96ee8e4 100644 --- a/roles/vpn/handlers/main.yml +++ b/roles/vpn/handlers/main.yml @@ -3,6 +3,5 @@ systemd: name: "wg-quick@{{ item.key }}" state: restarted - loop: - - "{{ vpn_interfaces | dict2items }}" - no_log: true + loop: "{{ vpn_interfaces | dict2items }}" + no_log: "{{ enable_no_log | default('true') }}" diff --git a/roles/vpn/tasks/main.yml b/roles/vpn/tasks/main.yml index a7fb461..48ed553 100644 --- a/roles/vpn/tasks/main.yml +++ b/roles/vpn/tasks/main.yml @@ -38,4 +38,4 @@ state: started enabled: yes loop: "{{ vpn_interfaces | dict2items }}" - no_log: "{{ disable_no_log | not | default('true') }}" + no_log: "{{ enable_no_log | default('true') }}" -- 2.38.5 From 8eedcebe0feb7e90933235e85132045c387e522d Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Thu, 21 Jul 2022 18:51:45 +0200 Subject: [PATCH 09/19] added toggle to no_log --- host_vars/hindley/main.yml | 15 ++++++++------- roles/vpn/templates/wiregard.conf.j2 | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/host_vars/hindley/main.yml b/host_vars/hindley/main.yml index 841ce7e..71da82a 100644 --- a/host_vars/hindley/main.yml +++ b/host_vars/hindley/main.yml @@ -31,22 +31,23 @@ vpn_interfaces: public_key: "Ce48/ZdvpI2S82bIivhiWHQsyidzTAtxCnEYojY3xEA=" keepalive: false peers: - - endpoint: "" - public_key: "jvjOCj5xVTLwyQ8o7QsYvF2ep1HbD/GKnmjpqJuztB8=" + - public_key: "jvjOCj5xVTLwyQ8o7QsYvF2ep1HbD/GKnmjpqJuztB8=" allowed_ips: - "{{ intranet.subnets.physical.subnets.router_hellman.ipv4 }}/{{ intranet.subnets.physical.subnets.router_hellman.netmaskv4 }}" - "{{ intranet.subnets.guest_hellman.ipv4 }}/{{ intranet.subnets.guest_hellman.netmaskv4 }}" comment: "Router hosted on Hellman" - - endpoint: "" - public_key: "{{ vpn_guest_keys.knuth }}" + - public_key: "{{ vpn_guest_keys.knuth }}" allowed_ips: - "{{ intranet.subnets.guest.subnets.knuth.ipv4 }}/{{ intranet.subnets.guest.subnets.knuth.netmaskv4 }}" comment: "Client laptop: knuth" - - endpoint: "" - public_key: "{{ hostvars['matrix_server'].vpn_interfaces.wg0.public_key }}" + - public_key: "{{ hostvars['sulfur'].vpn_interfaces.wg0.public_key }}" allowed_ips: - - "{{ hostvars['matrix_server'].vpn_interfaces.wg0.ip }}/32" + - "{{ hostvars['sulfur'].vpn_interfaces.wg0.ip }}/32" comment: "matrix VM, hosted on g33kex's server" + - public_key: "{{ hostvars['technetium'].vpn_interfaces.wg0.ip }}/32" + allowed_ips: + - "{{ hostvars['technetium'].vpn_interfaces.wg0.ip }}/32" + comment: "test VM" # apt proxy proxy_apt_interfaces: diff --git a/roles/vpn/templates/wiregard.conf.j2 b/roles/vpn/templates/wiregard.conf.j2 index 7f6af40..3b43127 100644 --- a/roles/vpn/templates/wiregard.conf.j2 +++ b/roles/vpn/templates/wiregard.conf.j2 @@ -9,7 +9,7 @@ ListenPort = {{ vpn_port }} [Peer] {{ peer.comment | comment }} Publickey = {{ peer.public_key }} -{% if peer.endpoint %} +{% if peer.endpoint is defined %} Endpoint = {{ peer.endpoint }}:{{ vpn_port }} {% endif %} AllowedIPs = {{ peer.allowed_ips | join(", ") }} -- 2.38.5 From e88b2cf8d78a05a3b5c56e872f044d5fa662eea0 Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Thu, 21 Jul 2022 19:05:12 +0200 Subject: [PATCH 10/19] fixed vpn config --- host_vars/hindley/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host_vars/hindley/main.yml b/host_vars/hindley/main.yml index 71da82a..783c65f 100644 --- a/host_vars/hindley/main.yml +++ b/host_vars/hindley/main.yml @@ -44,7 +44,7 @@ vpn_interfaces: allowed_ips: - "{{ hostvars['sulfur'].vpn_interfaces.wg0.ip }}/32" comment: "matrix VM, hosted on g33kex's server" - - public_key: "{{ hostvars['technetium'].vpn_interfaces.wg0.ip }}/32" + - public_key: "{{ hostvars['technetium'].vpn_interfaces.wg0.public_key }}" allowed_ips: - "{{ hostvars['technetium'].vpn_interfaces.wg0.ip }}/32" comment: "test VM" -- 2.38.5 From 81c0523da4863de88ebd917f8d4c1cda5c322ef8 Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Thu, 21 Jul 2022 19:10:02 +0200 Subject: [PATCH 11/19] bumped submodule versions --- roles/matrix-bridge-discord | 2 +- roles/matrix-bridge-facebook | 2 +- roles/matrix-bridge-instagram | 2 +- roles/matrix-bridge-signal | 2 +- roles/matrix-bridge-telegram | 2 +- roles/postgre | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/matrix-bridge-discord b/roles/matrix-bridge-discord index 2358c02..355f127 160000 --- a/roles/matrix-bridge-discord +++ b/roles/matrix-bridge-discord @@ -1 +1 @@ -Subproject commit 2358c022895b3ce2f2a08dea41580e4cf84d218f +Subproject commit 355f127465676f299648b7f26808190730c1737c diff --git a/roles/matrix-bridge-facebook b/roles/matrix-bridge-facebook index 89fb99e..950bada 160000 --- a/roles/matrix-bridge-facebook +++ b/roles/matrix-bridge-facebook @@ -1 +1 @@ -Subproject commit 89fb99ebb7c35ec3c11ecd5e4fbb194817f9cae6 +Subproject commit 950badac374e89e038e4076703b07068b2ba3e35 diff --git a/roles/matrix-bridge-instagram b/roles/matrix-bridge-instagram index 70675be..4166832 160000 --- a/roles/matrix-bridge-instagram +++ b/roles/matrix-bridge-instagram @@ -1 +1 @@ -Subproject commit 70675bec04af6bf456857c30687c5e57fa5e812a +Subproject commit 4166832cb237d08a6e697669be4df51f83d1e9e9 diff --git a/roles/matrix-bridge-signal b/roles/matrix-bridge-signal index b273607..0b8467d 160000 --- a/roles/matrix-bridge-signal +++ b/roles/matrix-bridge-signal @@ -1 +1 @@ -Subproject commit b27360700e82dd14fc42de6bdffc3d80bf3fa975 +Subproject commit 0b8467d8903cd738b29ea3fec42b55c0f2bbc648 diff --git a/roles/matrix-bridge-telegram b/roles/matrix-bridge-telegram index c8e442e..aee4055 160000 --- a/roles/matrix-bridge-telegram +++ b/roles/matrix-bridge-telegram @@ -1 +1 @@ -Subproject commit c8e442e4a931acc2220e4406282925c2d4a48954 +Subproject commit aee4055a3fad824405ca1938b46792619bedeaba diff --git a/roles/postgre b/roles/postgre index e5ce162..32b3a71 160000 --- a/roles/postgre +++ b/roles/postgre @@ -1 +1 @@ -Subproject commit e5ce16268f165be36d4f2f893caf47f9bdb6f332 +Subproject commit 32b3a71f1e1d93f3cb681acb9143414b3230289f -- 2.38.5 From aeb0c272c7c0326a6f75f47d703b9e7ec11b618f Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Thu, 21 Jul 2022 21:02:19 +0200 Subject: [PATCH 12/19] migrated apt proxy variables --- group_vars/all/vault | 601 +++++++++--------- .../{all/apt_proxy.yml => apt_proxy/main.yml} | 2 +- group_vars/apt_proxy/secrets.yml | 12 + host_vars/bismuth/main.yml | 12 +- host_vars/hindley/main.yml | 8 +- host_vars/hindley/secrets.yml | 16 +- host_vars/sulfur/main.yml | 2 - host_vars/vanadium/main.yml | 22 +- hosts | 2 +- roles/apt_cacher_ng/tasks/main.yml | 3 - roles/cloudinit/tasks/main.yml | 7 + roles/networking/tasks/main.yml | 10 +- roles/ssh/templates/sshd_config.j2 | 2 +- 13 files changed, 366 insertions(+), 333 deletions(-) rename group_vars/{all/apt_proxy.yml => apt_proxy/main.yml} (80%) create mode 100644 group_vars/apt_proxy/secrets.yml diff --git a/group_vars/all/vault b/group_vars/all/vault index 7f416f7..dfe2425 100644 --- a/group_vars/all/vault +++ b/group_vars/all/vault @@ -1,305 +1,298 @@ $ANSIBLE_VAULT;1.1;AES256 -66303764326165643463653831376330356231346236656530623263386537656233636563333766 -6638303139333533373538383765663266363365346439370a353235393063323931326336383262 -31306664656366623564306630343731346430303731383331363562333262383861373939383837 -3038653736613933340a303339613433386166393665346163313136666632396364376561643930 -39633030316537663262356165643336306330316662393364636136356533633738636661346432 -39386132613633666339623239383031653930623761373838346531353635663539323562653433 -39613332346234346136666362386532346631383439383065666566633234663139353537326239 -63616135373937303161343864663638316461653435636462323739366333663737323162363131 -64623862396235306230353730623832626236393634313430313763663038633634303630613333 -62623636383966363532636538353537313039353465633964323434363339333134373234633964 -63643733326439326635663964646638633932366564666231333563303939326232643464306230 -35373565316566393833346162343339346464306236646530343764613566313031343331636162 -36363234666161306362356166383930323338383266316430356238373864626161393837313765 -33313363623264643936306664363566666531636236656433373934303362316239663963373764 -63396361323030613666353862383437353466646163396435336365656136366566326565303638 -33336264306235366631653362383338343334346234653839336564633765316639343631643335 -39356562623239366136666564366632663333333165303330323964666364333632313465643563 -33663932346466376438346562386330333662323438393134656130643839333666356265646533 -39656236393237623636663531346565306566363437366661306333353738633630653865306265 -31393038656630336531623166613833333131623139656661353963343634346633626230373234 -65393539303638613633326561343461363363363938613831363437613762313563333234383162 -63323164633639306331303331663032343866613834393662393036373364646539306133613339 -38323932313937376237313564363435613062323037353835666261373334323864343563643031 -34323432373861636266353530313561643465633030653236643338613663346337653731353839 -39326536633736343764656437623031306632616336393965306233616166383739613830373238 -61323130646564313131643462363062373933343933346131313538646431656134613139386164 -63653434336130326664323266373031356233323632363966323233333538626433386334646661 -33326139643334373434323033336333313830326366636433643465323965643339613331386138 -64633033383433366333356435613035393938303239373065343565633765356233613566636163 -63386538653266653664326562633364326266336466303763393231313133353031373037336366 -37393666666136323962643866643337393365313236396566373962653866333238306661626535 -33303165626535326532653731333963613063333336656136353937643135386336323739616162 -30633861383938306439656434383337613763303365616334333738643836356164323664396133 -34303034653563663839313866313139363138363361306339653533343938656532393062366366 -34363238613864303533343936383034383463343634316537646633306137666463323863346636 -65306465313966643734353137666363306430366439323435643631386435623936626431303034 -34323738363437393134646439386461333235376231636139643464646662356337356264613235 -61656631396230636365366334323065376563353139663732343732626435356134616635366466 -30646261393330343735323939653939636363303439643064663932633835656334373663316438 -64663065316635326339643864386333326637303064613263656231636432333235666530613332 -65663863313332356264326462343064326637363831623464653435393939366535376663643764 -37626639323931643863633337303035643666623065333961653439623238613038613563623361 -66653961316136663034653935333538326437653030666539633438663436303638643334303866 -65623432616561353139396164313466386462393231363135653439623265353339336335343264 -31643734336639323964326238303963313130306535653636666633626539363862316638323635 -65363866326233613362353237323839376132643232393463316334343365376437623666663735 -62383634323434616465633238633033343030333538386533663064363166616136306633666639 -64646139323637636362326437613338626335663065613439613838633730383732306536373034 -37393863303638616332646237323733313161343464353461373763356430306161346535666436 -30623538633862616638313739393738636364386137646165373665633435343937383936653435 -37643232623335636531363337316165626130303630623466333364633435636261316466343161 -64373932323130373137303064336135633539373033663933313530353634313930366432393535 -39313337626138376537373034633734343064353939663233306536653664663763376664396639 -61663164353132303137343439356431313237376266393762306633656263343434653132663863 -65363530323934623766326239393930316435303530363664626638356631386337653432613064 -34383935353861393732656566376662373961336565613131326435313866376530313462383763 -65356565383330316232393236363561306539353462666232313635383836633430393766363864 -35656361333839313532353338623037663837393865643638303230393461393466386362396131 -33653263333635646563613330343265626664616635333137333535363766323864343935386262 -39383530323931393938396233633033623833646263626236636636353839303535643236303938 -62396637396434383831353063333563353437613230323364353065386637653762663837636438 -38323262313962373833313536633761346163396531646538643761373834323337623431376639 -37383461323534653535323130343866653635346332666662323336383661386531666463326332 -33356464653163306332316339363034356332663338373431313836386166376166336335393763 -62343063303562356338393437313631613063353830623736653937303130303336613331313664 -66653763646130666331326136663237303061666539643532373564626265396434363936656436 -30346263306636316364653933633232353664316532396261633766633132323365643961343832 -62663162366430623861656434646536313564373832383337376135333064666538333130646130 -39313138373030336633386664313666376461316664656137303833323734393763336663313466 -32653935633462323861353337313864356166383831313730303333343461316633626362373639 -35653061383336373538636436666633393331623134373737386265376231316336376137663437 -39383263373038626566373962303765653261633363383961643237626430373838336137386534 -65316564343831396162643861373634323864353965323430323865653266626334363863363462 -61336439333663663763646637363038326463653563646635333834333533356539353035366332 -61616233623139646238623232313931623963303463633339363831323831303062393464666339 -39386135323637346635313734323733353239626261613263373664306163326138653363643436 -34313739336430613665366436633564366338636635323032626566666533386264353061623561 -30313930393665623233653666313836313839393035396330633334633935313434613663633730 -63316634376562383965323237616630303064306137623635313939383063623362396133383564 -32393361346631303562643162383438643762363364393866613364376331373833643232366632 -63666462313935653138333561646135336435396439336662383832306564393534663133616137 -32656239303335626364373134306661646339333635356435653537313662616433633633643336 -65663661353366343334353137623435333835353930346236343262633230353131303931316363 -33366564323764613361663064333437363865353161643661353031303032393438356631353930 -66613733366333643863653765356630323863636434313735336362643462333666396136363333 -32333562393233393564663931663761623030333132383036376562643166373033653562383330 -33313163303433313736396631373233386432633162613630633161303639306436343464666133 -36396439373863383435613834333334616265323962343833616633366234373335353239303434 -30353435333532393964353432616139643337356634386633323861393832333466616133616361 -63326337353730326165383665613231663132303431323536333539343536643237616532353336 -66323430373161666164656334383063633530633638366237303139633764643766616632356132 -33373136623163666634363137613039306631336530343663363833633366376634316131313564 -62383032363565643964613330316434346364323939323266623135623930343164393333303331 -61333533353035376536666166626230343163663461336231323332326163313661386338336139 -65386662623638386666386233666635383165323031663637396466313034653666656332396238 -65663733393630353966353139613136323937613266626632333964353536356364623133623064 -62393266636635373433383666633739383361323436396138666435613433366563336565376164 -37633135336432316435393462396336313165616565326461376265663338623737386131363461 -62353566356261303536626363353638356662613930393864653765346333373934386164353535 -62653037333930656532343533366333376638393339353462363166666263343135396435353339 -38363434366563393564313135353364343966313161396563333534346133643666303432343833 -31303464343033313235393062363066336335336261376564393034356536336464316234323862 -37623034353738626166356365623533636635326139373664316237323165326431333762313966 -36613864353630666630376361363062626335353936363161636634313662333133636630386462 -37666566303030316536663237363631353036616164663132613764373431626638656533643235 -30373566323137343765303763366630333063363965613766353164383631303538663866303065 -37626361323434303630376538663737376166656138633065653131303862656462353066363665 -33633062336463306564336262303834363064653362623436646635316133363832363735326136 -66396534366539326261626161396536626437363231666334643230623438386465313938306537 -61333665306364376235376433646532663437373364353865346633656138356564623365366465 -35613266643963323336663166323134616636353030363036303361306436313961353238636134 -35343965326336313838346466396437336130323230366332643933323736303330333763643536 -38373331306266333333643738613730373965616561393662636265313863376561376437376365 -66306665376665373363633265623263343761616434646637336436643634636431306262313764 -65666635306133343731633130363362613062626434393837336439626462393663393032386265 -36373662646635616632643235346638656230613838303939386335346634623034663064303739 -34326162326532663139633437656234666533303539396666616465653038323336666338663936 -63623738383632356633326531303762303765336436666434353439666336373833396239646434 -66363961323037373864353863386139373265653730626163343431633738343065363637373662 -37333330323163323964353332343465386562633163323537336333343630333164373930353263 -61353432353262393031303633353533353031323761613638626666623362363064363334373637 -65306332663334616661663631393736326263383534623661306162633264386138373332623261 -36333131366235313137326662353264626337333263303964376138333861636365643035393334 -30633138336236666430373839633765383965623462313261303932633463643132323833363439 -64666338373463393139383065353636656162333334386136396133393861306161323037653232 -62366362663037363462333064346233323166653236643631336263383263326139363330336436 -30303764323063376566666565396365626133343431346637366165616264313732616137373364 -62313838663332646564386661623662316231303233633334653039646538396636623365333932 -37626665343835623830316463306663323766616631353362656436666461363038633033343530 -63346161636364366632343162376331656433643662613436663637386337313665633665303336 -34303939613135383333383063363862616239356565663361383465353162666461373665376536 -63656432383437323737346232373365396231653532393565313638393537303038623361366164 -30663363313732333938326435363335323762383064653332393364626232396531373638356331 -65646333356230353062343839363937356638356637356330656138316432313039616338616639 -31313632316462313062303161303262343833613464303931636266383733643561353531393832 -64363035376139313034636234643831613133623638303935383430306339633464353938313332 -66313062653630313063616434363230366536333739643735623637383934373333643761393963 -35386536363839313633356564333832656434363731636633353334333639613833363662636134 -34343231333834303461303266336362623939383731653338323732623532356562616637643038 -33313938653032636431313137343133306131643961326365376666326562343636313230343564 -64643736373966633838343635316231353236646539663039343536333061343937623766313862 -63646236333437303339396164396664383737643130653438613837396632613133303332353138 -30613566643765613839366565393432333166643362313233323733646631303633346335613262 -33343938613462663463653032373033303837653032393531353162366437333366306139326266 -62643166336432346539316430303236386233343230383930643433373538333463636363386437 -33656237656133323566306465653062356132613633366336333838643662303563356437316137 -38373739643762613436376132313866373864393136623863353038636539626163393237303733 -35346530366337643033383131643936663931623162346362373936316464363834616532303362 -30383735333236633134633534343336313866663162323436326366633434653435613738646235 -38313164616666613539303035396533363833363931643936343433306464333663623666616466 -33396331333830323137336233373139663665306635303933353831643938383837336637376664 -63376335333763313362343864343536646234633134383561373038366138343563363164363833 -32353061353261653062306333346531623330383438363030666333366238636630663936316438 -66646132633265633965393363333766343364653031633235656165363732373238373263333639 -63356366343364393566313831623037373232386637633664333735666463306232353061666264 -64323062303536303838626637343363393362306561336465656365613331666130303732646139 -36316638326339653130316631363636633030656362613139653262336262623263353763343730 -35663931343236363233393235353262316463663562306530366262366137326236373564346261 -64316639303430343862353865393433633930656634656465373365396464613331613038306232 -66346138346533363332353564326163343261326436366164313537373632626635653032313566 -39343535613661333363633461343031346636636661643861663235303264353931666133383937 -61353865316631376534616265663531323933336430356463393531666637333666663831626430 -39666332643331363035363436653031303761396131626364386565336466633439333935333331 -64393734316666393266333338663634393930383931323836306539396332636664363036656233 -65353266373838326333336635306232376562353237303532353661373465396162646133323765 -37636337396138666331636633343064356534343462643465333639383637303266626263663334 -31653465343763613530636237633863366438313331333838313436633934643434323037343936 -30633162623436666435613436356236653565636232666637656638646636626361323930623738 -38356138353762363664643531636363343338383934363633666464383639353161653137316338 -37353431383464323936376565666637633334663039613662613363636230313562303364373564 -65643937323765303032656163313534326538636533633864646231623265303233346530613532 -61306331663062393633613439343538363034633964313039636630396639343636356363306135 -36303665643965373336326462663430396434303264306466323462666262303666613637653836 -36306333316338306362316332613862656264333039653138373231353834383761353261373866 -32643564323735363665613134333764396431326238343664656136303139343532353534656334 -34393535653337656632653165393432323535343737353264646534333334613865623263623363 -36303665323531343966316464653861623733303165306162386566303265363835636362653432 -39663334366337366330393338303330336461326661373238376265653635643735623935373133 -66666432313030346432386364373334646563623936336332336537383134646663633033313365 -39383138346434356432373537656632343463363566636566663239323234633335343631663066 -62646662643163376561323463323062306231666531626463343930646266313136393066306231 -32653236323131346330613361623165356639386264613130386334613531366233376237396635 -36333333363938626136663831636637343336376339323164376139636433656165306131666232 -66636465336632343465303635633564343535643566386563656164306464306538326562636430 -65646530326432346561623432356566396136393638353131333965313264653564316635633736 -36323566663931373031623935363831383061396433653462613864326666646562396664623734 -65643638613235653037306531316461323039633030303062396539643661333766386231313333 -36386666343939646331666331396165663866343937393732346234363036323939373638633862 -65363335626237613962313931363466306564323839353662306331323630396531643232376362 -35666561383831396130623932636332633063333866303538343162363134313637373538383035 -65663736626366323464343064643333306364323462376130343030616437356332613164613136 -61666630306232373732323161356339336638313464306230353034363634643662653631666361 -62396232383530646239306238303234653030306434373738373734323932646365623762353833 -62343131346462356632616166653662323066383338623835353764623530306466333236383333 -35393831363563636632353937366134383130663464393134313261656536663331613435333362 -37393438313666633366373963323638316263396466613131333665323035653736643763383231 -37633434326566313765313934363737316134643538393331646461346261363164306664613431 -35316635323630633132316233313264616462353031663431373963343562623134313639303630 -64633335323633653665396238656236643838386163376335636539363065663032373931346233 -66643639633339643235303866636439643832626337623035373663353737636637376564396639 -30316534313065333963663863636333383133316264333639366234336163616333366534353032 -62323366636166353432646237353834656464323561356366333832316632303764353266363866 -38623438333932363531626435623563303736646162306566646634333664326235333132356439 -66633962323862636439303831343534303631633062623664616135333262363431373835373330 -64336137363132393632656332363835633563366463303838383734326563323765316564386437 -66303732626630643763323338386562643861323230376130313834623130633065396439643532 -66636232653266336164656132346136376337383835353339633666383633396165376461356361 -62643731353966666138346434353466646631343832303165623835323139306637333462626134 -33363632353034366638643333633661366231663962383663633633633331393633333265623430 -38316666313632633730636466613131656362636161656664386433666565663332643362313332 -36633265666336646139383565323334663937353536633663653666646330353162323734313162 -66353533663534653265623261653931346363373839383266323164616639366462303039303862 -32316136666264343766323662366264663631356233623065653162356134303161653562646366 -33656262333263613738303234656130323866366435616266663236306134633765343937333033 -61613634636430636466353163376339303237623564343236313465333237636336313237613435 -63656133383663626631336632336130326531356565333333653662383838306133373833663562 -31343238396236666537386135336236666466303465396439613463383535343839306135333332 -33663962653265313263306437336537653236386535643631353166666233323463313233303036 -36643966356432323531616163633931656332373530363434613166386665303965333966396464 -39316163616161323564646562303236373735613630383632636234623734656366346339653632 -32363637313736386435333064643762623536303338636666306330343533383666653337373238 -34613337613561633033333536653832613231656235326166323037303963656332323361653566 -38353861376230633139313138346533656531636263343938366638383565323333306666356330 -32316138616630306534376562383938393232316461343134336264616432333039653530346334 -31333964343934616437386330336363653361373935353739323638393962323364633737396162 -32396662343435306365306531393036373162323834623564316331333831656363666333333836 -35633132623936333666313665383833616362386633376138343863616538396632633565653335 -63386231366236626132373063393233313437656132306134343233663834363837623733343463 -31363263656137396536646335636363646239633935613539363434373439376161643730353338 -33656530396437633862616665316264303733383166363831613939633530613932623965326237 -30396632306364323135646364336436363061623930313036653330323130393732306136303263 -39666366313364373739633864333737623465356161633539363833333236343532656266313132 -63313166386437653164626562633532636237363736616432613463366337636133386434343433 -65663937633134326336373065653966616636396561383635313536616639383831313337393035 -39636465343965663038643834343162316463616466373661613735653337343433333965366566 -32303964353539356136313037623632646330303766343235663735663038326130656361616636 -65306661646633346431356235333637613965393164383636623464643736333930363334303531 -33356231656230663163326239333764623664643938333566636365373065363865653238373465 -65313130326539303133356431666436336264646634373637396134396236613632366137656565 -61333535343336656363366263303164646231613362643835333465336430316436623038663138 -30623337363963613661623737386439613539613333356565313030323830323761366238356665 -33373562356262646231623336316562626164346266303163386265626530393430386538343761 -61386437306161376533373933653532313466323764643764363661306465313331353365323064 -34326132623835356434643461626632363139633434666232646435376535313135636133356335 -63336437333333353438363439373532396564353939343266353162626661356266643239373933 -63303739646335656435366433666265363136333836343935366363303935313731643930396636 -34653737333764626431623733323037363264633365333364313464303630343438643830663766 -36653765613133613530626461663235383834663261386630663961363432373563366535616661 -32316466396264656536333237303130326438333835303262393264353265366261633766323434 -63323536666566356462313661373562653234303432646536336437353538383537616431363365 -38666663356633656136373866643136643334646364656239666666346465326365366131616464 -35393431343038313035393761616465363130303365333939623937313135613131323133306138 -33623037633030633266306637383733343932323865633066653036613162323264343334613430 -34353537663532383565366632646438313735373037303435316366376564306439366163643632 -61313934613363326634316362366335316338616366343834633635363832653137323739633933 -63616234636237623430376130663630356230623736316438373638623335656166343162633734 -61303932363561313462323637636237393030393531373462623665633036383136306434396234 -38623235656339393633373138323663653837663339656466616530393061343261386163643533 -61633066313864333936633034373339653164656265306139363666626666626537663930343663 -66393635316163333436333964626262396564353630356135376330633634313038643232366337 -63373039306666373462376532616366616233373532656130336433386165623762326463613261 -37383738303038663335373265623936316232633639333833303939643265636231323964396462 -32383464623531396536343936353066306363653130386532313539353536383261383937353633 -38656234636439376331646664663665346566326636396530333734376434346462333838613730 -62653237303234663933643134333938623838303435626266316366663037616565393962393836 -66633637366339306530316461323761613238666330396231346332656465363761383439313462 -37376265633136313933393834313930656265383437386130643230333337303335616432653365 -33393936363562393238666266636566366461363337643435396564653338366431656430626135 -38323830633835626635616230373165343530363662663037303738663833353862396361326265 -39346163386335396138313463636464663266363830363433346362356335653033373237663738 -61623164316130633030663137633239346132376565663037653363613839626366656634323234 -32356238613633336635303633613331343236653139323862623739376565353962376132383435 -39613766376236333165346336616236343131623463373665653363626334373064626365363436 -62373431363664623436376632313466336633313962323763313266393234316430353365363233 -61363466343732646333333462373834656432363164333839333765363432303030326336623665 -34643964343534316238393762666239633665353564323435616234333535613439333934353963 -36613339366335366236633339396630376363323033636536663339326561323264323435353961 -37636534393835366263353633396639336364313030323937663665363932656535326135353437 -32303538666334383536376464386435396566646564646631383736376332343134313439366133 -66613065363034653065376432623536383665386539396364306564353336326333623030613165 -30353262363031633461656232346235373832333864323865356338303333333938646464663631 -39303762613261323731663265623334356466633231633935313038323939336565613265336363 -63333839613033323735613637656239333630653236663963653864633164623961626139313833 -31353336386234313165376532633334336434306635383164633137326537613362386332366662 -61616635663230613962303231626134653936616463386162353536666231623564383366326333 -37616533663533663336303430366437336633376162343435363263393732383362363263633361 -38666335396365643362323162396136656633376138356664386362376366653439633436313861 -31613034343761323438373663313032356363306163366664643336626261666566303264636430 -32616138653465393833616236383535346433656337333665613939353062323239626462376561 -30386235343864643736303539386331303664396135633838653961303461393432643131383961 -30316439633539343164633835383937316163653662613034653632633263393039663863326266 -30396262623237636439663432363961303961363534613533303863363838313166613462366630 -32343033636639663635626336333663643738346636613937373566353462326564396539323939 -62343732623936366464633831633362646431636631373463303262313136376566663137633631 -66326165373665396138653232623835316230316130656161383031373765653630613135623361 -32353235383332326131613431663563663961653138363038323135613965653439383536326261 -38343639336639346561663266343531353563663530636164383965393033383339333036643832 -38663864336132613836326565326137633966306564393239326166353765346438643066306233 -65343839366339613532313564626532666534636332363363636364366633393131623561323661 -34356434393162626561333138613365636339663938653433366531343865633132373939356335 -62336263626638326530626634393232376563336237623237323965633665386637316562396238 -33366337656131633062346531313865653331623565623135363965643633323334353463363462 -62643033653934373461343163636561633862636461363266383438333962316539346434333161 -30383639353461666630 +34386463633536616463363239343662653835336363636534393539363036636266363430653338 +3038303961656137316232323138313831346562653436630a383935336134393730353636616561 +35316461623438643438633566373439373030623664313735306233356161333462633266323131 +3063633139366539320a303138373264333762303235633566643236313530663838316335366633 +66393266356239623239336436666138633339346630383466373531356338653764633266333865 +33646363656564313737613833656139666537376464656233383965306463653465653731303237 +31653530363265313535636538346434646335663932323163303261316632366136646263316538 +36613438333135623661316130376131653733316633636566323530303031313235353536343561 +31643964393965333437633339366339303035323933346362376665626331616533343561613061 +35356164336139316266336636373363373662653237316636343964333133656438366539333637 +64646634306632383631346665336535316532643836663464636530313534663265343932346232 +33343465336663613434366135623131306136623361396331643062626563343437353839383230 +66643737316232383338623630343765633761343665306266666366343436376162366430613334 +65313664623634663635643162313063623239633332303138303964303030613439333264313539 +62346261643962386634356663613362646563323761643833393464656166363530373865376238 +37636166653464623164336165656530303532333738356664343664656637626239626363313265 +32643261626339663736303639316231623137326437653762343964633038663037326530343238 +33366631393664666236626664373736346666393462353165386538313462636330643166643335 +38306136353161393837643961386361666334656362643339383839303266616235383564373165 +63316564663037633234373835393138646161633632626563616330393934313531326438303133 +61663665386266363739623062643739313631356231633537666531333561633631633166353239 +63323131376231343236336463633839303463386138336436363634346539326435303466316337 +66636136663063666137653638353161646238613562366433373562323265643464316536623034 +33653138396438363863666538393837353035613561333532356239643231386133636130613832 +31396132643830323138616339383437623766653166386538383834646135313335396332323466 +38383434613134663435376238356239623433653632383137653565633032393735373465633130 +63393333646532396262313736343765666439656162666535656639613065343139336637323965 +61353866663961666335636262306561663864373637333365343035363138616635323366376363 +64636237346465373564333061366630393838326331343963346434643663643637653434373766 +61336161303332653836333332383063373330333939623132333332343862393661333962386431 +33376264613533616561313632626664616461303762613463616139366138353965633261653336 +63343462613233353231343136613937643937353866383637663739626433386334373531346535 +37393662343437373331313731613132633161323932323433373737303839373362343034663937 +64313830613436333364626136613033363632306466373465646366386663646437313232326635 +34393065616563663539623733353237323763343063326361363038616163336561653830313461 +37376366613162356133663762613763323863643737663163303364663066396263386632386664 +34353035663038646264353734613430363034643933316530376462623839323739653537343737 +65656130616563653137396635383162663537373463373037306662323362353336343139373639 +30386364323866336435666631653037633761623238663533626462393465633739393732396261 +63333135323562393632623966366534663564623464646432613134316161323338336330376435 +63653332643335396365356530666439343934616263333536353032383136343462626233383131 +36616162323739383063666462313666316630326238383037383463343566643764613934353833 +63653261373865356530343634323264323430323738623030663664323537383232623963333834 +62626436623061313366353832623231356563643164613466383864643961303933666661366531 +65313563336333326130373932356537623738306262306636343562373530353435323362613135 +61383761346665376666386463636265326564663033306365333230646639376133326464633235 +38383939613832646235616232323839323338373136393038643864306233653335306664613037 +33343733393036633236656538356237316139353033393163366539336462323165626638613331 +31383764306166373834363134376637363532323934333337383639663665323563346266633130 +37353362616366616435303137663839343139666537376563316562643739623763616534656639 +36306134333633633361306465366363633134393831663134396166343034663636316336653230 +35373266616264656264343232336634353238346338313434313539613830656638356565323263 +31363662373437346563623061366434613861376533376362633637313536313862343637623032 +30306436373830626631373432313463346333643635396464623631346133663961663266313264 +32306636316665613733646165356565613733313964653262643933616462643863646234366236 +65343234393965323365373633663839383164326234373265613261326665353363326632643234 +39353037336535656333333636306332353434316434623631316361336232336639303238353362 +37626465643430346562393930626166376436343363306238646361633337383033386639353535 +61656339643532643133333930656235643566323962346564373866633235313462316530393961 +31613532306532636366306134313334633266303635373134383661643464663935326566656534 +34643334633162333435323264656566633365663038633537363635326532326562323631356264 +32326336313261333165313338613734663333616431326430356631623365636339386265396432 +33653036663336356530316461653534306636373739393032353664656462376630303961656164 +62383261303135626238613665353034333130623136663066366531613334306530303633616262 +66653839376265353937656435323735343932613462613431666138616364313938623638656561 +35373064626333366264626336303933323466623334656231633462626130323661393964323038 +32373864363833666437623136396261363666643334323730353438656534643937653138323632 +39633639353938353664663539653437333534373936316565313265383065376161666130323965 +61363562363637353330306165336432346232383030353631303662383232643662336238333634 +65623533666433623733643832646561316135323964363366616237633361666463363562313765 +32313231633437643738316264373666383338326135373765326462313237393663366132356366 +36386365326335343933653436313034333637303936313335626436666466623362326362306432 +66616530333939356462656361663938633239386231646435643735363065373439646664626239 +39303662623936333136613239616361316332323735333333383766613732643631633164646230 +65383263323032373231393239346133313737613965373964393139386437333064363331616631 +65633562323464386461326435383864363361323761356633343232613965386539393938376436 +38363732383031643561343366336633303635343161383637373165306562393536386237356161 +32323035323763646535393064343465366236323432646135663361306634366639663661616135 +34393464663865363735333238306234366165663939613930363864393831376239303361386662 +36303966303431396430303235623538343663356561616635373434646164373663353338373731 +30386630396532346436636436626666663937613062626230633033653933353266643232376230 +36373565326435306530383930303536636364376231393438333766343264306431323763336536 +61366361393037643463616636373963643061373935346561363833323866616237616639386536 +31323065396464333839326565376431646662386230613165316262313861613563643032353036 +32623865326263383465623733373565666463316334396536303139393431336436363639336366 +35353432313738616632643264613361653833363039356431373234383435393933653333623638 +34643265313561653662396364643030396138396238636632623466303134643466626134626565 +30633538353439323661306436663632363463613336306131353035363130633666333130636534 +34306135653566633739376336663065636233376463343166326436656236656462663864386662 +38616164356661393565383763623161303636356533666537663734336434643563613932313637 +65663732376434386361646231383139366135623264316132356264393037306266333063626636 +63376564303861623833626139393232363236383437346165396463363965383166636433613364 +31643536623837383839386332336361643364383735303231663133303934363133366531313066 +36663834656333663062663838613966303062343661306138346139383134663835376362323239 +37666164343063623364636235303331626134353565363764663036623838373463306330653963 +35383333386665663161623338636463366563323565393330323565343338336165333766663738 +35366534393538643462616363363739386331353563636135373932353466323762353131373739 +39326639343238663737386138363566326434633137363535326134323535326332646438336330 +36623762306162666162366539663961643335306430633166313364633433303235396365373133 +35326634636432623735333163653335656439326464313336316637396436306463303564326162 +34366464623631393730323939306561383066643733373639633566336466656531373637343733 +33353563303866393533343363323838336363373565343161366335346333333435363438666565 +35366365343363353636616662326439306161646465336365393061386530336464666632376266 +66386663623131613462626562336339306336303439343132353466623864613530353239303232 +66363230303033323162363265343530616639326566313532623566623430353563623539666165 +37393334313766356234393231323133336663336261633636383363363334313462373862653535 +36613037386534303338666463623830313636613030333136616161386161666236613036653133 +32666266313162363865326634353032646163646361623766383632626634363665376330373337 +65393938313935366636366562323432393038396230613862656534363462376230633638343239 +30366164363334313034313735306461653434356661333064326466663466356265396334636431 +37613361363537363464613365643962366230346631643939343836316438643862316631313539 +61616438313837313764643663393364393961373036333363393733363766373264353433633530 +30663861323238306366373836643862386332333164333965353431383165663036303836383538 +30653838633062623335386266363735393032643532363235333730626162396362343662646137 +61643839316464656234313463666534323038373733643666366231386636333536643032383132 +39653265386633386637393962373431306637666434656334306662613132383835363365643831 +36303635356432313038366361633164363937326333656131333032353363313931373065626138 +36363936663664333639653032636239343537623239663033366630373935353565383639666432 +63643939303236653962646261663766633264333566393264383032353063383938656233623163 +38373334376134623630633630623535343764356637313132303266336666323932363861343334 +38343039343636363337343531326537386166613063333331633030306137633134626365623830 +38373330376331383865303731323735323136663930316464396437646635326461343136626532 +64663462653331353930316432633263393930393237383466326339353834336430313365653533 +30643530383734363532623566353739323261616338356162613366666166306439376536653166 +64386437333333376330323032326664326361393162653262386163393639656266363163323936 +66333034353262623131356264353936313265336432613130643330343033363066663934623166 +65333538643564306330626432643135333164363566613237653939613836643361386130353330 +32336637623561633532653133303938353433306366373363666264363338613335656639643335 +62316462303466313435336166386635323865326237356266353063666363626462623039613239 +37336431343865643533653337613634386139626134343238386636623832393737643330386331 +33653834303465646433643733633461626263666466663936316561333439646438646439316235 +38623137363562363662303463666431663031623333616134633464356563303731343233363335 +32626231666234656361326538386265636365633539323765656565373661643766303234323863 +32653366323666663034386238316139653932633266353536326639353738353539333333373038 +35323131373637326564336638313865646666643837653165396437326130326562383166666533 +64393132313335333462323533373162313065643839613264393762346539386239313332646464 +31396431383763356662643663363733313537366662363833363538356431643438323635363032 +32613461316663643661386431383766313066386430353139653862623938643361366439633633 +37663461306365306334356631346332386331386331663862366634343564326131643534383666 +39313865653038653861623535326366303866336539633464306266376436383231326464343661 +61336436353663616236636632356535366361616131366161333931343331613534356538666630 +66343366386561623131633230316131616364663565353035613333663934353532643237646635 +31313436666464636463343336346337636131356532636635646164326363383737353861633563 +36383237333635616461636265653362386331393234393530313562333739383732323962386464 +66303466316439353565623061323065333835643664623862383634376331313936306536653135 +32306130396639373938346162323535346564326361343234663733376333306239303133636638 +33383233633337623431613464653831306538353462383231303533623632653434326536653930 +64643433313734333337643966376132336333663834386564336231356136333732303935366236 +66333332643433623764633030636166313936306362326132346234633137396534393731643762 +65643535653839313761623830313765326439333134386232393438643233626334663565666137 +65386532656162303939346162336263346234333635646364303232616165363138386166383437 +30313938393434653666363533633732623561386161356465343938633639633936666430646337 +34353737353236323066313136353933643162343266386632353063303164616438613066326330 +37623235333032363965343962343539333830343131646266656163616233356333346136616230 +65623730643261303862303233616163333364316631313838386262623637393565323736643435 +35623336343933396231383561663564626664623766613236623066616334323434363862633636 +61323333376338373334353061646161613964363733356563393236623634356565363037633832 +66656565633038373736663930346639396664373437666639383532376330653931373766336539 +32373365643065313935623566313037323764306230383737663031656138386538303666613731 +66616463356636393062613466646461323030343464656236323966663631626438346336343562 +33326666303037623634346339303161393566356632383938613861653130646232626133616162 +33313637316664323939313936393764653130393437653330353334646363393536353031646262 +38383963633639663134626334323662363635363338646332393535366534633765303963393266 +35323935303662303634346335653566326335626332346334383937626437393461353263316134 +66346265383532326530646336643433643062356130386333366665646438333232343963313761 +33303033636138653331323334346234306264373462613065633266613931633065323265643165 +37323561343036643931663734613938363131306537396537393335626537336563323064646363 +39633861656237663139363837363731366366653733353833306266643234646130616132383664 +30623464346235393962353966363339356435383633343364616230643433636132326231633861 +65663831663836623266666134353665363532323266623766323064383638356632313662666336 +34316266303235623330363537613438393335383839393330643630633763616462376661623064 +35373037303434343265363563346439633965336131373535323131363134396532663138636438 +63323562313538373638316134353262303632646461343631306561633337333861666332373961 +33366631633562666238373735376535316634623462316436393363356361643134343435373139 +34613765623839333735303338373765393031373361653638313866343137326664346166333931 +36323361653133613439333135386433303966373863353336623338623464653731333339616231 +38373962376535653037366261363061323636303631366465646631356332623734323163373339 +62396539313666373732326537663661336235646638326331333265303439613739363034303233 +63326535383835313562616666323461303930306430623662366331306333306432353132313536 +62356230336264653739393662633533663165363531326435656361633432336663393631666233 +33613638363835303130313362343034323935303966656563396239346131363462353765626631 +65323062306333393032663761656336356665313730336234376237393631626632663661366534 +61316636363262363835386535333537383030303764303439303165363465366333386636386163 +61376538633037356464666463386132643234613366303135663039333065383633373835333935 +36633135366563343135643764663033663730343336346333653838653435633330336663353765 +31666135663461623161373435663565376363316337363034396335316633366463346530613464 +32356164656164353936333436663835643565613532323332353266376237636434323539363466 +33373065323136343964636633616661633436623861363362336565656539363133616163333563 +39346238323961613537396234663333663861363933633632633535653166663239353264393139 +38316162656332383434313034626564653030323362663131353335643666306134306364316162 +39373937383339666534333833393866663766373265306562353361363731313338636436393933 +65616438356266303863366530303436613232303939643166353831663265393364653035343439 +35633236613434636631386166323938373831336434306164343933633330653564313761373831 +64633061633431393731633638376434303066313630346334643334333832363938313134326530 +64346464653163666630356630316334313139663132363931313534623564643935336132623538 +34353962333437623437643662356465336437653563633939336233336463613232333037343731 +35343663646366353266643239333832663465333164373337653134336564376661306133326565 +34323035316334393839366536316533393333303330313831363566373136653737326537633833 +34656335376439383661333162366264623234393765616232373066626236623230346465613962 +66623531643436336465663237346233343731313064636561396537623633313138646238333161 +66313236303634333831383263616632303066313731646339636438643530636333626565363462 +35313339653765663935336361663362383831653365633766303963386335643235316230373839 +38316436653463323361323335636663623266653033343433363761313237303033613139623434 +38386439643233333935333462383865663737346631303532323539326239333139346332363933 +34383132396534626564366662386463613432333632303864336438346164363232353232623663 +63653637646164373062393832373866326636353435316338646132303033356336663533393430 +30663539323963316434313030666637303266396434323637336666393839343030383465653637 +33383438313864323562313437313139356135636235613863343634333366316132303661373636 +38353531393038303165396562326339333264313338373030356162656461336665303236343161 +31643837383232356332356562356462313230313233323162393139623461393732393034623330 +31633335626430666534373464306364333733326361393632326465663265356335616139383364 +31373162666134343336313031326665303033366163366563303465383834336636623730353433 +33613265356139353066616632316634333262316662306262393636376633326361386633306339 +33646465326162623137393630626666353961363236613936303434343530373131613564336361 +39373362643465346531636136636366663966393235393366326432383331656134626138643137 +35383339653637636162346330343462383436313138666234623933663763376334376530366232 +65633633633034323766343031333233363239663133366531346265303465643762383530663631 +65343934636232353261303962393663393839326162333838616538373861623335333465373739 +63343531386537666335663732376239363963383162656665646436336430666666333736333432 +62353131363766663766346135643935363337656364363635396362626538366230326163646433 +33313435653133653361376664643663643463373262396364653934363061383462393639653835 +64643136363433616339313438663330623836353037646534656561636538663163366136303533 +33643131376365623236396238336130663039376562303562646465656366616630393563663261 +63363064616162376163363464303735363166623865626530646239613963663538323434613963 +63343830393732633131316564363237623366616132663532356633643935386266343330653831 +37623866353264366539393538633232333066633435313662343635393636313231373835633165 +39336230623465346661613839356134363833633333643335373861646135373439653166353830 +30303661636461373861336536623335633533653433633361376366326136323235636663626534 +36633465383065353730306636383936336264626366633437336632356232666462336661353762 +65636339353531623234303561626535616362343332343463373031653939643266396232306433 +33326438366263623033333262323761363962616130303138346336633230666336316465663935 +62376334613763373339633063333833376139623762363564356165373861306563323934373331 +34363930653565633562386630393764336135613038373035626633326335633762643033346536 +64613233353063313239356633353132343436393938336164333966646330323738393063303936 +65316330613335623034386464383636353364656234323631656136333236636430643535633565 +62656233386235336265336264343865396537393437303638373234323636353433613333656532 +38343734313361623733393538373961623164316537626462306261353238653332353531373031 +30613062656162643230636431333039313030653032343262643330376461313739636239333163 +37343131363138353432326264646232626639653231643339353863346332373761623033626437 +35636464383962313462623533616434343938346536373164333139393331653663613133653361 +37633139303533616637616430323232393634363066303731353534313762346434353363323231 +36306534396364666266383064363036393836306630356338616133346231393832653363333638 +39653766656631633333373836613331663766356633333731313437386239333165333832666434 +66316461383264326266346536646237303038366632666335343939376532353666363232383763 +30666263353566613730363133376561386630306236363363626663363134646434303239333438 +31323436313431623361376138313530343064383139373434336265613833656266353663326636 +65646564333732383231636637386461623661316131353132363061383634376338646533623862 +37663765306565313536363331653464613635383961376632333434316338623534633938393534 +65373438343135613934306562336639343530626538313738613636323430316666306162626661 +32313537636162613636643362616465316233326666633666343565393333616533333834623964 +63373064313639653834323332636463653431383733646531356239386535303831613762663837 +36336161323466653964316230313863373534373338366366626530373531666130303564343364 +62353062356439663462383462383863336433313661663161346438623263646432626531616138 +65663364636537366466303739616261373565636461653433336431626534613534306431373730 +65623939643138346664646439393633613133326538353465396665633662303938376430626463 +39656165666334336666326263623439373435306239646661346638356166326538633535613030 +30656630333666666430363636306262656163376465633966623662303932313031636461366166 +36323265336134613630663831646533633735393762373965313064383962393639313634303030 +32303038363362373036613237653231323237373466623931346166306366373161653464633433 +66616361393638353561393665383832666438343865623964336433336235646532393863383532 +62633537623062663533666531393339336565313031353334646466343134633536613333663235 +66396364373061373763396430646632303061616166363964373363386338313430343261363836 +66393838653835663731623030376563306237663736353461343137643432613761353832326136 +31393663346339646464313764343535383763303837623539613862666563393166393131303030 +62336535313937313031636434313738666533346634336639623430373633666261326230666532 +61313162336462373961313532656465383966663632376432643632613161323162626237626131 +65616137353739313864633436306362356438373231386639656530323634376133303465323062 +37343066306530646662306436373134363735336463323364383361323034353134363133303532 +63343936393962383633363831666434303465656462346536663161643231313862396635656133 +66363239383531306263646433613763383166653832346232373231646635326631633261633961 +64656263636134616137623333663631633533353666353265623862316562356432316164393264 +34313365363165313161663334303562303762363738376362373764346564306139383036346639 +36363463336532376232613731353630653236386165393130343561343665383534326132643666 +33373132656262386336626463386333376239646361623937636434363334356330626333343639 +33323164363939376332346165306638646332323736393632356661333838646237356436383032 +38653333326637376565386261326461613430306162376663313735636237666164356431346663 +63383738393564313262376234393130623137633634333236356363376533326137306130316437 +63616365613937393931313262383037346638346430613666653463636430626538376332663665 +63373833376465643461303863316462623637646235616430646638333363343835663234313561 +32313933373165376263393835326366306536653966663965616364643833643962363866363762 +37316133336437366634333631323465386166626436663661616232333363376334323264333161 +39313032643233353534663136636564343331353931313230343633656131346131666635313161 +39623431653734336637613139663731306434353334303234323864383163643966363163333431 +30623031386264313866663637326436383332353939636666326131626264313736656463663933 +37663131356435323762626635353233623132303230393464393366666433623032306638666237 +65366336623565623137363464313432633238363762363961333638343764633365623265333262 +38323066356431303938633164306439383161363936303765663737306564666338666633666337 +61653634343431323934623931623831666334646362383061613861653736353962366139666664 +31626430666165363936303161323735663335616164626166626232363132613034353932336238 +31643338303131643237316633653539633830323634623764333038333732636263343266343334 +30656430393664333637323064383430653834323836323237336334343638376337393936656530 +66356364346239346465303261373065313932306530353264636266643462386332303532336162 +66663535663833383262633237643661316530636561633332323937663066653137333036663666 +62636133326333333735356532353462353166396338373731393431646438316330343033373333 +31626331313638656438363235353436383736613735356233626166393866316532313432663463 +31626237623435613138653833366463396365376462363531376564373363656361306566383231 +6630 diff --git a/group_vars/all/apt_proxy.yml b/group_vars/apt_proxy/main.yml similarity index 80% rename from group_vars/all/apt_proxy.yml rename to group_vars/apt_proxy/main.yml index 290ae89..3e3a1f5 100644 --- a/group_vars/all/apt_proxy.yml +++ b/group_vars/apt_proxy/main.yml @@ -1,7 +1,7 @@ --- apt_proxy_port: 3142 apt_proxy_admin_user: admin -apt_proxy_admin_mdp: "{{ vault_apt_proxy_admin_mdp }}" +apt_proxy_admin_mdp: "{{ apt_proxy_admin_mdp }}" apt_proxy_allowed_clients: - "{{ intranet['ipv4'] }}/{{ intranet['netmaskv4'] }}" diff --git a/group_vars/apt_proxy/secrets.yml b/group_vars/apt_proxy/secrets.yml new file mode 100644 index 0000000..c21269f --- /dev/null +++ b/group_vars/apt_proxy/secrets.yml @@ -0,0 +1,12 @@ +$ANSIBLE_VAULT;1.1;AES256 +38363934386234643266663261656436346165636561613134646532303533383064306637346138 +6161393066393430653537393866613433386138396164380a326434313036373362663563396664 +31326630303565616634623462306234613438383430386364323938663065663166653266636139 +6162646665663666650a363737383736313662353062303766333963616133613634623634343062 +64393536663762343437663334323338373063333461333664353266653461626362356435636166 +33323061636562323434393735383936663463653364623333633138373761633364633864386666 +63666137353562633265616363343435376365363762663865396161373731353062656261326665 +64313537386534366361396134626462333865363666623139666661366634393530393933303636 +35623161373866343438343737656134356364383866313732353864623331393633326438656637 +61633964623836653735393264336236663732663130663838653530646363346362343935646163 +396561613834653532366531373339646165 diff --git a/host_vars/bismuth/main.yml b/host_vars/bismuth/main.yml index bdabb89..2f09b11 100644 --- a/host_vars/bismuth/main.yml +++ b/host_vars/bismuth/main.yml @@ -3,5 +3,13 @@ ansible_host: "bismuth.lan" ## Users users: - - g33kex: sudo - - antoine: sudo + g33kex: sudo + antoine: sudo + +## Network +interfaces: + eth0: + type: dhcp + +ipv4_forwarding: false +ipv6_forwarding: false diff --git a/host_vars/hindley/main.yml b/host_vars/hindley/main.yml index 783c65f..e1e07d2 100644 --- a/host_vars/hindley/main.yml +++ b/host_vars/hindley/main.yml @@ -3,10 +3,10 @@ ansible_host: "hindley.adh.auro.re" ## Users users: - - histausse: sudo - - g33kex: sudo - - thomyrock: sudo - - dorian: sudo + histausse: sudo + g33kex: sudo + thomyrock: sudo + dorian: sudo ## Networking interfaces: diff --git a/host_vars/hindley/secrets.yml b/host_vars/hindley/secrets.yml index caedca2..8d96e19 100644 --- a/host_vars/hindley/secrets.yml +++ b/host_vars/hindley/secrets.yml @@ -1,9 +1,9 @@ $ANSIBLE_VAULT;1.1;AES256 -33616139646133343635303262363364376264323635656530643766393139666165316561656666 -3963643939633835396136343761363839376562326162610a343365303635373761616137663231 -31326666303231366433343266616264313535333965666266396639633465626336653363343066 -6239353034383537630a313136323163313436646434646638316535313364653936373662326263 -32353363366632636537613134646639653833326462346137613661653832663035336234613638 -37373734663564346135643930613064666639333532306633363532306662633063386538343438 -33623439383037633235623762373437613665333537363664333235653466643536353030336337 -62306233636461326463 +61376264343163613261623830323664633639366466666462626538616634633233326664326462 +3663363361316438306162343163326364323937626430310a326566636131646534336536303130 +63393162363830323761313132633032616339653062666136363164323132643037316562613633 +6166366135323962650a353433346361643638613434653137396337663432303361656361633835 +36303965343635386130653230663330633361306665633861626163663264303761303235316639 +62613134353661373061383836633935343938623464333739643963386634663536353335616536 +62363838643832613662386630666334623931646536323035313531303139616639613839363137 +36333933353538613165 diff --git a/host_vars/sulfur/main.yml b/host_vars/sulfur/main.yml index 48d122d..7cf561a 100644 --- a/host_vars/sulfur/main.yml +++ b/host_vars/sulfur/main.yml @@ -5,8 +5,6 @@ ansible_host: sulfur.lan users: g33kex: sudo histausse: sudo - dorian: sudo - thomyrock: sudo ## Networking interfaces: diff --git a/host_vars/vanadium/main.yml b/host_vars/vanadium/main.yml index 9937ea3..0884bda 100644 --- a/host_vars/vanadium/main.yml +++ b/host_vars/vanadium/main.yml @@ -3,4 +3,24 @@ ansible_host: "vanadium.lan" ## Users users: - - g33kex: sudo + g33kex: sudo + +## Network +interfaces: + eno4: + type: manual + eno3: + type: manual + vmbr0: + type: dhcp + bridge: yes + interfaces: + - eno4 + vmbr1: + type: manual + bridge: yes + interfaces: + - eno3 + +ipv4_forwarding: false +ipv6_forwarding: false diff --git a/hosts b/hosts index bc7c3af..33c92a8 100644 --- a/hosts +++ b/hosts @@ -51,5 +51,5 @@ sulfur vanadium [backup] -barium +#barium diff --git a/roles/apt_cacher_ng/tasks/main.yml b/roles/apt_cacher_ng/tasks/main.yml index 0424cdf..4f577cc 100644 --- a/roles/apt_cacher_ng/tasks/main.yml +++ b/roles/apt_cacher_ng/tasks/main.yml @@ -29,9 +29,6 @@ - apt-cacher-ng state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Create config files template: diff --git a/roles/cloudinit/tasks/main.yml b/roles/cloudinit/tasks/main.yml index d59b580..ddee5b3 100644 --- a/roles/cloudinit/tasks/main.yml +++ b/roles/cloudinit/tasks/main.yml @@ -3,6 +3,13 @@ file: path: "/etc/sudoers.d/90-cloud-init-users" state: absent + +- name: Remove cloudinit netplan + file: + path: "/etc/netplan/50-cloud-init.yaml" + state: absent + when: ansible_facts["lsb"]["id"] == "Ubuntu" + - name: Disable cloudinit file: path: "/etc/cloud/cloud-init.disabled" diff --git a/roles/networking/tasks/main.yml b/roles/networking/tasks/main.yml index 1d2d3c1..9e54fd9 100644 --- a/roles/networking/tasks/main.yml +++ b/roles/networking/tasks/main.yml @@ -46,17 +46,15 @@ when: (ansible_facts["lsb"]["id"] == "Debian") and (lookup('dict', interfaces, wantlist=True) | selectattr('value.bridge', 'defined') | selectattr('value.bridge') | list) -- name: Enable ipv4 forwarding +- name: Set ipv4 forwarding ansible.posix.sysctl: name: net.ipv4.ip_forward - value: "'{{ ipv4_forwarding | int }}'" + value: "{{ ipv4_forwarding | int | default(0) }}" sysctl_set: true - when: ipv4_forwarding -- name: Enable ipv6 forwarding +- name: Set ipv6 forwarding ansible.posix.sysctl: name: net.ipv6.conf.all.forwarding - value: "'{{ ipv6_forwarding | int }}'" + value: "{{ ipv6_forwarding | int | default(0) }}" sysctl_set: true - when: ipv6_forwarding diff --git a/roles/ssh/templates/sshd_config.j2 b/roles/ssh/templates/sshd_config.j2 index 6ea7af0..85eab90 100644 --- a/roles/ssh/templates/sshd_config.j2 +++ b/roles/ssh/templates/sshd_config.j2 @@ -10,4 +10,4 @@ ChallengeResponseAuthentication no UsePAM yes AcceptEnv LANG LC_* Subsystem sftp /usr/lib/openssh/sftp-server -PrintMotd yes +PrintMotd no -- 2.38.5 From 0dba0bbd581378618c95feb32955a1e069bde384 Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Thu, 21 Jul 2022 21:07:19 +0200 Subject: [PATCH 13/19] fixed no_log toggle --- roles/apt_cacher_ng/tasks/main.yml | 2 +- roles/generate-cert/tasks/main.yml | 4 ++-- roles/prometheus-alert-manager/tasks/kassandra.yml | 2 +- roles/prometheus-blackbox-exporter/tasks/main.yml | 2 +- roles/prometheus/tasks/main.yml | 2 +- roles/synapse/tasks/main.yml | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/apt_cacher_ng/tasks/main.yml b/roles/apt_cacher_ng/tasks/main.yml index 4f577cc..4bb031a 100644 --- a/roles/apt_cacher_ng/tasks/main.yml +++ b/roles/apt_cacher_ng/tasks/main.yml @@ -47,7 +47,7 @@ group: apt-cacher-ng mode: '640' notify: Restart apt-cacher-ng - no_log: {{ enable_no_log | default('true') }} + no_log: "{{ enable_no_log | default('true') }}" # This is uggly, and overkill - name: Set cron job to clear the cache diff --git a/roles/generate-cert/tasks/main.yml b/roles/generate-cert/tasks/main.yml index ba8695e..7b90db8 100644 --- a/roles/generate-cert/tasks/main.yml +++ b/roles/generate-cert/tasks/main.yml @@ -79,7 +79,7 @@ dest: "/tmp/ansible_hacky_pki_ca.key" mode: u=rw,g=,o= delegate_to: localhost - no_log: {{ enable_no_log | default('true') }} + no_log: "{{ enable_no_log | default('true') }}" - name: Sign the certificate become: false @@ -100,7 +100,7 @@ owner: "{{ owner | default('root') }}" group: "{{ group | default('root') }}" mode: "{{ key_mode | default('u=rw,g=,o=') }}" - no_log: {{ enable_no_log | default('true') }} + no_log: "{{ enable_no_log | default('true') }}" - name: Send certificate to the server copy: diff --git a/roles/prometheus-alert-manager/tasks/kassandra.yml b/roles/prometheus-alert-manager/tasks/kassandra.yml index 09c1611..bdad442 100644 --- a/roles/prometheus-alert-manager/tasks/kassandra.yml +++ b/roles/prometheus-alert-manager/tasks/kassandra.yml @@ -35,7 +35,7 @@ group: nogroup mode: '0600' notify: Restart kassandra - no_log: {{ enable_no_log | default('true') }} + no_log: "{{ enable_no_log | default('true') }}" - name: Copy the CA cert copy: diff --git a/roles/prometheus-blackbox-exporter/tasks/main.yml b/roles/prometheus-blackbox-exporter/tasks/main.yml index a0d6caa..5b3af82 100644 --- a/roles/prometheus-blackbox-exporter/tasks/main.yml +++ b/roles/prometheus-blackbox-exporter/tasks/main.yml @@ -42,7 +42,7 @@ group: prometheus mode: '0640' notify: Restart blackbox-exporter - no_log: {{ enable_no_log | default('true') }} + no_log: "{{ enable_no_log | default('true') }}" #- name: Copy the web-config folder # template: diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml index aafcd41..e5c0efd 100644 --- a/roles/prometheus/tasks/main.yml +++ b/roles/prometheus/tasks/main.yml @@ -59,7 +59,7 @@ group: prometheus mode: '0640' notify: Restart prometheus - no_log: {{ enable_no_log | default('true') }} + no_log: "{{ enable_no_log | default('true') }}" - name: Add node targets file template: diff --git a/roles/synapse/tasks/main.yml b/roles/synapse/tasks/main.yml index f8eb41d..ce0538e 100644 --- a/roles/synapse/tasks/main.yml +++ b/roles/synapse/tasks/main.yml @@ -12,7 +12,7 @@ owner: synapse_user local: C template: template0 - no_log: {{ enable_no_log | default('true') }} + no_log: "{{ enable_no_log | default('true') }}" - name: Install apt utils apt: @@ -60,7 +60,7 @@ src: homeserver.yaml dest: /etc/matrix-synapse/homeserver.yaml notify: Restart synapse - no_log: {{ enable_no_log | default('true') }} + no_log: "{{ enable_no_log | default('true') }}" # --- DRAFT --- - name: Install nginx -- 2.38.5 From c3e70e2b5cc5c9f095fede15561da2045d2e4909 Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Thu, 21 Jul 2022 21:08:23 +0200 Subject: [PATCH 14/19] bumped submodule versions --- roles/matrix-bridge-discord | 2 +- roles/matrix-bridge-signal | 2 +- roles/matrix-bridge-telegram | 2 +- roles/postgre | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/matrix-bridge-discord b/roles/matrix-bridge-discord index 355f127..3c96034 160000 --- a/roles/matrix-bridge-discord +++ b/roles/matrix-bridge-discord @@ -1 +1 @@ -Subproject commit 355f127465676f299648b7f26808190730c1737c +Subproject commit 3c96034b253012a07e10eb23c2bb2163effaf74e diff --git a/roles/matrix-bridge-signal b/roles/matrix-bridge-signal index 0b8467d..cc98bfa 160000 --- a/roles/matrix-bridge-signal +++ b/roles/matrix-bridge-signal @@ -1 +1 @@ -Subproject commit 0b8467d8903cd738b29ea3fec42b55c0f2bbc648 +Subproject commit cc98bfa0dbbf167bf40d54a85513516d7254abf5 diff --git a/roles/matrix-bridge-telegram b/roles/matrix-bridge-telegram index aee4055..79a1de1 160000 --- a/roles/matrix-bridge-telegram +++ b/roles/matrix-bridge-telegram @@ -1 +1 @@ -Subproject commit aee4055a3fad824405ca1938b46792619bedeaba +Subproject commit 79a1de19232417987652386aef575fb0910d0f81 diff --git a/roles/postgre b/roles/postgre index 32b3a71..3e6d419 160000 --- a/roles/postgre +++ b/roles/postgre @@ -1 +1 @@ -Subproject commit 32b3a71f1e1d93f3cb681acb9143414b3230289f +Subproject commit 3e6d4199b531bd328ad51e577b0c6b7be0eaa76b -- 2.38.5 From c33d84d50d765951706996dcee06c83371673bdf Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Thu, 21 Jul 2022 21:59:10 +0200 Subject: [PATCH 15/19] groovy universe is not supported anymore --- books/apt_proxy.yml | 2 +- hosts | 6 +++- roles/apt_cacher_ng/tasks/main.yml | 44 +++++++++++++++--------------- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/books/apt_proxy.yml b/books/apt_proxy.yml index 2e63611..4beba54 100755 --- a/books/apt_proxy.yml +++ b/books/apt_proxy.yml @@ -1,6 +1,6 @@ #!/usr/bin/env ansible-playbook --- -- hosts: apt_proxy +- hosts: apt_cacher_ng roles: - apt_cacher_ng diff --git a/hosts b/hosts index 33c92a8..8813170 100644 --- a/hosts +++ b/hosts @@ -33,12 +33,16 @@ technetium [proxy] hindley +[apt_proxy:children] +vpn +apt_cacher_ng + [vpn] hindley sulfur technetium -[apt_proxy] +[apt_cacher_ng] hindley [prometheus] diff --git a/roles/apt_cacher_ng/tasks/main.yml b/roles/apt_cacher_ng/tasks/main.yml index 4bb031a..07b5c90 100644 --- a/roles/apt_cacher_ng/tasks/main.yml +++ b/roles/apt_cacher_ng/tasks/main.yml @@ -1,27 +1,27 @@ --- -- name: Use a newer version of apt cacher nc for ubuntu 20.04 - block: - - name: Set the default release - lineinfile: - path: /etc/apt/apt.conf.d/01-vendor-ubuntu - regexp: '^APT::Default-Release ' - line: "APT::Default-Release \"{{ ansible_facts['lsb']['codename'] }}\";" - - name: Pin node exporter - copy: - dest: /etc/apt/preferences.d/pin-apt-cacher-nc - content: | - Package: apt-cacher-nc - Pin: release n={{ ansible_facts['lsb']['codename'] }} - Pin-Priority: -10 +#- name: Use a newer version of apt cacher nc for ubuntu 20.04 +# block: +# - name: Set the default release +# lineinfile: +# path: /etc/apt/apt.conf.d/01-vendor-ubuntu +# regexp: '^APT::Default-Release ' +# line: "APT::Default-Release \"{{ ansible_facts['lsb']['codename'] }}\";" +# - name: Pin node exporter +# copy: +# dest: /etc/apt/preferences.d/pin-apt-cacher-nc +# content: | +# Package: apt-cacher-nc +# Pin: release n={{ ansible_facts['lsb']['codename'] }} +# Pin-Priority: -10 - Package: apt-cacher-nc - Pin: release n=groovy - Pin-Priority: 900 - - name: Add the repo from groovy - apt_repository: - repo: deb http://fr.archive.ubuntu.com/ubuntu groovy universe - state: present - when: ansible_facts['lsb']['id'] == 'Ubuntu' and ansible_facts['lsb']['codename'] == 'focal' +# Package: apt-cacher-nc +# Pin: release n=groovy +# Pin-Priority: 900 +# - name: Add the repo from groovy +# apt_repository: +# repo: deb http://fr.archive.ubuntu.com/ubuntu groovy universe +# state: present +# when: ansible_facts['lsb']['id'] == 'Ubuntu' and ansible_facts['lsb']['codename'] == 'focal' - name: Install apt-cacher-ng apt: -- 2.38.5 From 2b888e973f4bfc64f6086f67cce9c77138455063 Mon Sep 17 00:00:00 2001 From: Virgile Retault Date: Fri, 22 Jul 2022 11:20:26 +0200 Subject: [PATCH 16/19] finished moving group_vars where they belong --- TODO.md | 9 + books/dns.yml | 8 - books/gitea.yml | 8 - books/keycloak.yml | 8 - books/matrix.yml | 2 +- books/monitoring.yml | 12 +- books/update.yaml | 22 ++ group_vars/all/ca.yml | 3 +- .../all/generate_self_signed_certificate.yml | 3 - group_vars/all/install_gitea | 3 - group_vars/all/install_keycloak | 2 - group_vars/all/main.yml | 13 + group_vars/all/matrix.yml | 65 ---- group_vars/all/reverse_proxy_stream.yml | 4 - group_vars/all/vars.yml | 13 - group_vars/all/vault | 298 ------------------ group_vars/all/vault.example | 5 - group_vars/all/web_services.yml | 8 - group_vars/apt_proxy/secrets.yml | 25 +- group_vars/matrix/main.yml | 6 + group_vars/prometheus/main.yml | 11 + group_vars/prometheus/secrets.yml | 195 ++++++++++++ group_vars/{all => proxy}/in_memoriam.yml | 0 .../{all/revers_proxy.yml => proxy/main.yml} | 2 +- group_vars/synapse/main.yml | 43 +++ group_vars/synapse/secrets.example | 34 ++ group_vars/synapse/secrets.yml | 95 ++++++ hosts | 16 +- roles/configure_resolved/handlers/main.yml | 5 - roles/configure_resolved/tasks/main.yml | 23 -- .../tasks/main.yml | 5 +- roles/grafana/tasks/main.yml | 6 - roles/install_docker/tasks/main.yml | 38 --- roles/install_gitea/handlers/main.yml | 5 - roles/install_gitea/tasks/main.yml | 74 ----- .../templates/docker-compose.yml.j2 | 43 --- roles/install_keycloak/tasks/main.yml | 66 ---- .../templates/docker-compose.yml.j2 | 18 -- roles/install_keycloak/templates/dot_env.j2 | 4 - roles/install_nginx/tasks/main.yml | 3 - roles/postgre | 2 +- .../tasks/kassandra.yml | 3 - roles/prometheus-alert-manager/tasks/main.yml | 3 - .../tasks/main.yml | 3 - .../tasks/local_x509_collector.yml | 3 - roles/prometheus-node-exporter/tasks/main.yml | 49 ++- roles/prometheus/tasks/main.yml | 3 - roles/reverse_proxy_http/tasks/main.yml | 5 +- roles/reverse_proxy_stream/meta/main.yml | 2 - roles/reverse_proxy_stream/tasks/main.yml | 34 -- .../nginx/stream-available/reverse_proxy | 12 - roles/rp_synapse/tasks/main.yml | 5 +- roles/rp_synapse/templates/reverse_proxy | 3 + roles/share_file_web/tasks/main.yml | 5 +- roles/synapse/tasks/main.yml | 9 - 55 files changed, 492 insertions(+), 852 deletions(-) delete mode 100755 books/dns.yml delete mode 100755 books/gitea.yml delete mode 100755 books/keycloak.yml create mode 100755 books/update.yaml delete mode 100644 group_vars/all/generate_self_signed_certificate.yml delete mode 100644 group_vars/all/install_gitea delete mode 100644 group_vars/all/install_keycloak create mode 100644 group_vars/all/main.yml delete mode 100644 group_vars/all/matrix.yml delete mode 100644 group_vars/all/reverse_proxy_stream.yml delete mode 100644 group_vars/all/vars.yml delete mode 100644 group_vars/all/vault delete mode 100644 group_vars/all/vault.example delete mode 100644 group_vars/all/web_services.yml create mode 100644 group_vars/matrix/main.yml create mode 100644 group_vars/prometheus/main.yml create mode 100644 group_vars/prometheus/secrets.yml rename group_vars/{all => proxy}/in_memoriam.yml (100%) rename group_vars/{all/revers_proxy.yml => proxy/main.yml} (70%) create mode 100644 group_vars/synapse/main.yml create mode 100644 group_vars/synapse/secrets.example create mode 100644 group_vars/synapse/secrets.yml delete mode 100644 roles/configure_resolved/handlers/main.yml delete mode 100644 roles/configure_resolved/tasks/main.yml delete mode 100644 roles/install_docker/tasks/main.yml delete mode 100644 roles/install_gitea/handlers/main.yml delete mode 100644 roles/install_gitea/tasks/main.yml delete mode 100644 roles/install_gitea/templates/docker-compose.yml.j2 delete mode 100644 roles/install_keycloak/tasks/main.yml delete mode 100644 roles/install_keycloak/templates/docker-compose.yml.j2 delete mode 100644 roles/install_keycloak/templates/dot_env.j2 delete mode 100644 roles/reverse_proxy_stream/meta/main.yml delete mode 100644 roles/reverse_proxy_stream/tasks/main.yml delete mode 100644 roles/reverse_proxy_stream/templates/nginx/stream-available/reverse_proxy diff --git a/TODO.md b/TODO.md index 1302708..0ba2116 100644 --- a/TODO.md +++ b/TODO.md @@ -2,6 +2,11 @@ Stuff that I should do but will probably never do. +## Base + +- Add sudo configuration role +- Add hostname/hosts configuration role that works on Ubuntu and Debian + ## Polish the user role The role is fine, but could use some default filter, like for the shell value. @@ -37,4 +42,8 @@ setup: - disable cloud init - remove cloud init account and change the connenction variable for the vm +## Matrix + +- Potgres role should be redone, it is currently called too many times that could be globalized I think. Also the setting of timezone and locale is not idempotent + good luck diff --git a/books/dns.yml b/books/dns.yml deleted file mode 100755 index d56493d..0000000 --- a/books/dns.yml +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env ansible-playbook ---- - -# Reverse proxy -- hosts: proxy - roles: - - configure_resolved - - reverse_proxy_stream diff --git a/books/gitea.yml b/books/gitea.yml deleted file mode 100755 index c300b70..0000000 --- a/books/gitea.yml +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env ansible-playbook ---- - -- hosts: gitea_host - roles: - - install_docker - - generate_self_signed_certificate - - install_gitea diff --git a/books/keycloak.yml b/books/keycloak.yml deleted file mode 100755 index 5a895c1..0000000 --- a/books/keycloak.yml +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env ansible-playbook ---- - -- hosts: keycloak_host - roles: - - install_docker - - generate_self_signed_certificate - - install_keycloak diff --git a/books/matrix.yml b/books/matrix.yml index 6458b34..94c47e4 100755 --- a/books/matrix.yml +++ b/books/matrix.yml @@ -1,6 +1,6 @@ #!/usr/bin/env ansible-playbook --- -- hosts: matrix +- hosts: synapse roles: - synapse - matrix-bridge-discord diff --git a/books/monitoring.yml b/books/monitoring.yml index 31f80a2..a680dd8 100755 --- a/books/monitoring.yml +++ b/books/monitoring.yml @@ -1,11 +1,11 @@ #!/usr/bin/env ansible-playbook --- -- hosts: prometheus - roles: - - prometheus - - prometheus-alert-manager - - grafana - - prometheus-blackbox-exporter +#- hosts: prometheus +# roles: +# - prometheus +# - prometheus-alert-manager +# - grafana +# - prometheus-blackbox-exporter - hosts: server roles: diff --git a/books/update.yaml b/books/update.yaml new file mode 100755 index 0000000..0a711a0 --- /dev/null +++ b/books/update.yaml @@ -0,0 +1,22 @@ +#!/usr/bin/env ansible-playbook +--- +- name: Update + hosts: all + gather_facts: true + tasks: + - name: Update all packages with apt + apt: + name: "*" + state: latest + register: apt + when: ansible_os_family == "Debian" + - debug: msg={{ apt.stdout.split('\n')[:-1] }} + when: ansible_os_family == "Debian" + - name: Update all packages with pacamn + pacman: + update_cache: yes + upgrade: yes + register: pacman + when: ansible_os_family == "Archlinux" + - debug: msg={{ pacman.msg }} + when: ansible_os_family == "Archlinux" diff --git a/group_vars/all/ca.yml b/group_vars/all/ca.yml index 6c4c46a..52c50bf 100644 --- a/group_vars/all/ca.yml +++ b/group_vars/all/ca.yml @@ -1,6 +1,5 @@ --- -ca_passphrase: "{{ vault_ca_passphrase }}" -ca_key: "{{ vault_ca_key }}" + ca_cert: | -----BEGIN CERTIFICATE----- MIIFhzCCA2+gAwIBAgIUP+ptXLNUBVsZm5oYpynQd5mhB60wDQYJKoZIhvcNAQEL diff --git a/group_vars/all/generate_self_signed_certificate.yml b/group_vars/all/generate_self_signed_certificate.yml deleted file mode 100644 index 0ed0244..0000000 --- a/group_vars/all/generate_self_signed_certificate.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -country_name: FR -organization_name: Pains-Perdus diff --git a/group_vars/all/install_gitea b/group_vars/all/install_gitea deleted file mode 100644 index 979514a..0000000 --- a/group_vars/all/install_gitea +++ /dev/null @@ -1,3 +0,0 @@ ---- -gitea_ssh_port: 2222 -gitea_https_port: 8443 diff --git a/group_vars/all/install_keycloak b/group_vars/all/install_keycloak deleted file mode 100644 index 8ad462f..0000000 --- a/group_vars/all/install_keycloak +++ /dev/null @@ -1,2 +0,0 @@ ---- -keycloak_https_port: 7443 diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml new file mode 100644 index 0000000..1d07ad2 --- /dev/null +++ b/group_vars/all/main.yml @@ -0,0 +1,13 @@ +--- + +# Default prometheus serveur, to overide in host_vars or something +appointed_prometheus_server: hindley + +## DNS Servers +dns_server: 1.1.1.1 +dns_server_fallback: 1.0.0.1 + +## Self Signed certificates +country_name: FR +organization_name: Pains-Perdus + diff --git a/group_vars/all/matrix.yml b/group_vars/all/matrix.yml deleted file mode 100644 index 3e7bf0b..0000000 --- a/group_vars/all/matrix.yml +++ /dev/null @@ -1,65 +0,0 @@ ---- -matrix_server_name: pains-perdus.fr -matrix_local_server_name: synapse.pp.intra -matrix_enable_registration: False -synapse_postgre_user_pwd: "{{ vault_synapse_postgre_user_pwd }}" -matrix_max_upload_size: 50M -matrix_registration_shared_secret: "{{ vault_matrix_registration_shared_secret }}" -matrix_macaroon_secret: "{{ vault_matrix_macaroon_secret }}" -matrix_form_secret: "{{ vault_matrix_form_secret }}" - -matrix_apps_services: - - discord - - facebook - - signal - - instagram - - telegram - -# bridge discord -matrix_bridge_discord_postgre_user_pwd: "{{ vault_matrix_bridge_discord_postgre_user_pwd }}" -matrix_bridge_discord_client_ID: "{{ vault_matrix_bridge_discord_client_ID }}" -matrix_bridge_discord_botToken: "{{ vault_matrix_bridge_discord_botToken }}" - -# bridge facebook -matrix_bridge_facebook_postgre_user_pwd: "{{ vault_matrix_bridge_facebook_postgre_user_pwd }}" -# Those values are generated by the bridge the first time the bridge is launched. -# we copied the values generated from our test config -matrix_bridge_facebook_integration_manager_shared_secret: "{{ vault_matrix_bridge_facebook_integration_manager_shared_secret }}" -# matrix_bridge_facebook_as_token: "{{ vault_matrix_bridge_facebook_as_token }}" -# matrix_bridge_facebook_hs_token: "{{ vault_matrix_bridge_facebook_hs_token }}" -matrix_bridge_facebook_admins: - - g33kex - - histausse -matrix_bridge_facebook_allowed_external_user: - - '@dorianx:matrix.rezel.net' - -# bridge signal -matrix_bridge_signal_postgre_user_pwd: "{{ vault_matrix_bridge_signal_postgre_user_pwd }}" -matrix_bridge_signal_admins: - - g33kex - - histausse -matrix_bridge_signal_allowed_external_user: - - '@dorianx:matrix.rezel.net' - -# bridge instagram -matrix_bridge_instagram_postgre_user_pwd: "{{ vault_matrix_bridge_instagram_postgre_user_pwd }}" -matrix_bridge_instagram_admins: - - g33kex - - histausse -matrix_bridge_instagram_allowed_external_user: - - '@dorianx:matrix.rezel.net' - -# bridge telegram -matrix_bridge_telegram_postgre_user_pwd: "{{ vault_matrix_bridge_telegram_postgre_user_pwd }}" -matrix_bridge_telegram_admins: - - g33kex - - histausse -matrix_bridge_telegram_allowed_external_user: - - '@dorianx:matrix.rezel.net' -matrix_bridge_telegram_api_id: "{{ vault_matrix_bridge_telegram_api_id }}" -matrix_bridge_telegram_api_hash: "{{ vault_matrix_bridge_telegram_api_hash }}" -matrix_bridge_telegram_bot_token: "{{ vault_matrix_bridge_telegram_bot_token }}" - -# Not configured for now -matrix_stats_endpoint: https://127.0.0.1/report-usage-stats/push - diff --git a/group_vars/all/reverse_proxy_stream.yml b/group_vars/all/reverse_proxy_stream.yml deleted file mode 100644 index 5addcdf..0000000 --- a/group_vars/all/reverse_proxy_stream.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -reverse_proxy_stream: - - {from_port: 2222, type: "tcp", to: "azerty.fil.sand.auro.re:2222"} diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml deleted file mode 100644 index cfe8aed..0000000 --- a/group_vars/all/vars.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -dns_resolve_server: 1.1.1.1 - -# Default prometheus serveur, to overide in host_vars or something -appointed_prometheus_server: hindley - -grafana_admin_password: "{{ vault_grafana_admin_password }}" -grafana_domain_name: monitoring.deso-palaiseau.fr - -kassandra_username: cassandre -kassandra_password: "{{ vault_kassandra_password }}" -alert_rooms: - - "#monitoring:pains-perdus.fr" diff --git a/group_vars/all/vault b/group_vars/all/vault deleted file mode 100644 index dfe2425..0000000 --- a/group_vars/all/vault +++ /dev/null @@ -1,298 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -34386463633536616463363239343662653835336363636534393539363036636266363430653338 -3038303961656137316232323138313831346562653436630a383935336134393730353636616561 -35316461623438643438633566373439373030623664313735306233356161333462633266323131 -3063633139366539320a303138373264333762303235633566643236313530663838316335366633 -66393266356239623239336436666138633339346630383466373531356338653764633266333865 -33646363656564313737613833656139666537376464656233383965306463653465653731303237 -31653530363265313535636538346434646335663932323163303261316632366136646263316538 -36613438333135623661316130376131653733316633636566323530303031313235353536343561 -31643964393965333437633339366339303035323933346362376665626331616533343561613061 -35356164336139316266336636373363373662653237316636343964333133656438366539333637 -64646634306632383631346665336535316532643836663464636530313534663265343932346232 -33343465336663613434366135623131306136623361396331643062626563343437353839383230 -66643737316232383338623630343765633761343665306266666366343436376162366430613334 -65313664623634663635643162313063623239633332303138303964303030613439333264313539 -62346261643962386634356663613362646563323761643833393464656166363530373865376238 -37636166653464623164336165656530303532333738356664343664656637626239626363313265 -32643261626339663736303639316231623137326437653762343964633038663037326530343238 -33366631393664666236626664373736346666393462353165386538313462636330643166643335 -38306136353161393837643961386361666334656362643339383839303266616235383564373165 -63316564663037633234373835393138646161633632626563616330393934313531326438303133 -61663665386266363739623062643739313631356231633537666531333561633631633166353239 -63323131376231343236336463633839303463386138336436363634346539326435303466316337 -66636136663063666137653638353161646238613562366433373562323265643464316536623034 -33653138396438363863666538393837353035613561333532356239643231386133636130613832 -31396132643830323138616339383437623766653166386538383834646135313335396332323466 -38383434613134663435376238356239623433653632383137653565633032393735373465633130 -63393333646532396262313736343765666439656162666535656639613065343139336637323965 -61353866663961666335636262306561663864373637333365343035363138616635323366376363 -64636237346465373564333061366630393838326331343963346434643663643637653434373766 -61336161303332653836333332383063373330333939623132333332343862393661333962386431 -33376264613533616561313632626664616461303762613463616139366138353965633261653336 -63343462613233353231343136613937643937353866383637663739626433386334373531346535 -37393662343437373331313731613132633161323932323433373737303839373362343034663937 -64313830613436333364626136613033363632306466373465646366386663646437313232326635 -34393065616563663539623733353237323763343063326361363038616163336561653830313461 -37376366613162356133663762613763323863643737663163303364663066396263386632386664 -34353035663038646264353734613430363034643933316530376462623839323739653537343737 -65656130616563653137396635383162663537373463373037306662323362353336343139373639 -30386364323866336435666631653037633761623238663533626462393465633739393732396261 -63333135323562393632623966366534663564623464646432613134316161323338336330376435 -63653332643335396365356530666439343934616263333536353032383136343462626233383131 -36616162323739383063666462313666316630326238383037383463343566643764613934353833 -63653261373865356530343634323264323430323738623030663664323537383232623963333834 -62626436623061313366353832623231356563643164613466383864643961303933666661366531 -65313563336333326130373932356537623738306262306636343562373530353435323362613135 -61383761346665376666386463636265326564663033306365333230646639376133326464633235 -38383939613832646235616232323839323338373136393038643864306233653335306664613037 -33343733393036633236656538356237316139353033393163366539336462323165626638613331 -31383764306166373834363134376637363532323934333337383639663665323563346266633130 -37353362616366616435303137663839343139666537376563316562643739623763616534656639 -36306134333633633361306465366363633134393831663134396166343034663636316336653230 -35373266616264656264343232336634353238346338313434313539613830656638356565323263 -31363662373437346563623061366434613861376533376362633637313536313862343637623032 -30306436373830626631373432313463346333643635396464623631346133663961663266313264 -32306636316665613733646165356565613733313964653262643933616462643863646234366236 -65343234393965323365373633663839383164326234373265613261326665353363326632643234 -39353037336535656333333636306332353434316434623631316361336232336639303238353362 -37626465643430346562393930626166376436343363306238646361633337383033386639353535 -61656339643532643133333930656235643566323962346564373866633235313462316530393961 -31613532306532636366306134313334633266303635373134383661643464663935326566656534 -34643334633162333435323264656566633365663038633537363635326532326562323631356264 -32326336313261333165313338613734663333616431326430356631623365636339386265396432 -33653036663336356530316461653534306636373739393032353664656462376630303961656164 -62383261303135626238613665353034333130623136663066366531613334306530303633616262 -66653839376265353937656435323735343932613462613431666138616364313938623638656561 -35373064626333366264626336303933323466623334656231633462626130323661393964323038 -32373864363833666437623136396261363666643334323730353438656534643937653138323632 -39633639353938353664663539653437333534373936316565313265383065376161666130323965 -61363562363637353330306165336432346232383030353631303662383232643662336238333634 -65623533666433623733643832646561316135323964363366616237633361666463363562313765 -32313231633437643738316264373666383338326135373765326462313237393663366132356366 -36386365326335343933653436313034333637303936313335626436666466623362326362306432 -66616530333939356462656361663938633239386231646435643735363065373439646664626239 -39303662623936333136613239616361316332323735333333383766613732643631633164646230 -65383263323032373231393239346133313737613965373964393139386437333064363331616631 -65633562323464386461326435383864363361323761356633343232613965386539393938376436 -38363732383031643561343366336633303635343161383637373165306562393536386237356161 -32323035323763646535393064343465366236323432646135663361306634366639663661616135 -34393464663865363735333238306234366165663939613930363864393831376239303361386662 -36303966303431396430303235623538343663356561616635373434646164373663353338373731 -30386630396532346436636436626666663937613062626230633033653933353266643232376230 -36373565326435306530383930303536636364376231393438333766343264306431323763336536 -61366361393037643463616636373963643061373935346561363833323866616237616639386536 -31323065396464333839326565376431646662386230613165316262313861613563643032353036 -32623865326263383465623733373565666463316334396536303139393431336436363639336366 -35353432313738616632643264613361653833363039356431373234383435393933653333623638 -34643265313561653662396364643030396138396238636632623466303134643466626134626565 -30633538353439323661306436663632363463613336306131353035363130633666333130636534 -34306135653566633739376336663065636233376463343166326436656236656462663864386662 -38616164356661393565383763623161303636356533666537663734336434643563613932313637 -65663732376434386361646231383139366135623264316132356264393037306266333063626636 -63376564303861623833626139393232363236383437346165396463363965383166636433613364 -31643536623837383839386332336361643364383735303231663133303934363133366531313066 -36663834656333663062663838613966303062343661306138346139383134663835376362323239 -37666164343063623364636235303331626134353565363764663036623838373463306330653963 -35383333386665663161623338636463366563323565393330323565343338336165333766663738 -35366534393538643462616363363739386331353563636135373932353466323762353131373739 -39326639343238663737386138363566326434633137363535326134323535326332646438336330 -36623762306162666162366539663961643335306430633166313364633433303235396365373133 -35326634636432623735333163653335656439326464313336316637396436306463303564326162 -34366464623631393730323939306561383066643733373639633566336466656531373637343733 -33353563303866393533343363323838336363373565343161366335346333333435363438666565 -35366365343363353636616662326439306161646465336365393061386530336464666632376266 -66386663623131613462626562336339306336303439343132353466623864613530353239303232 -66363230303033323162363265343530616639326566313532623566623430353563623539666165 -37393334313766356234393231323133336663336261633636383363363334313462373862653535 -36613037386534303338666463623830313636613030333136616161386161666236613036653133 -32666266313162363865326634353032646163646361623766383632626634363665376330373337 -65393938313935366636366562323432393038396230613862656534363462376230633638343239 -30366164363334313034313735306461653434356661333064326466663466356265396334636431 -37613361363537363464613365643962366230346631643939343836316438643862316631313539 -61616438313837313764643663393364393961373036333363393733363766373264353433633530 -30663861323238306366373836643862386332333164333965353431383165663036303836383538 -30653838633062623335386266363735393032643532363235333730626162396362343662646137 -61643839316464656234313463666534323038373733643666366231386636333536643032383132 -39653265386633386637393962373431306637666434656334306662613132383835363365643831 -36303635356432313038366361633164363937326333656131333032353363313931373065626138 -36363936663664333639653032636239343537623239663033366630373935353565383639666432 -63643939303236653962646261663766633264333566393264383032353063383938656233623163 -38373334376134623630633630623535343764356637313132303266336666323932363861343334 -38343039343636363337343531326537386166613063333331633030306137633134626365623830 -38373330376331383865303731323735323136663930316464396437646635326461343136626532 -64663462653331353930316432633263393930393237383466326339353834336430313365653533 -30643530383734363532623566353739323261616338356162613366666166306439376536653166 -64386437333333376330323032326664326361393162653262386163393639656266363163323936 -66333034353262623131356264353936313265336432613130643330343033363066663934623166 -65333538643564306330626432643135333164363566613237653939613836643361386130353330 -32336637623561633532653133303938353433306366373363666264363338613335656639643335 -62316462303466313435336166386635323865326237356266353063666363626462623039613239 -37336431343865643533653337613634386139626134343238386636623832393737643330386331 -33653834303465646433643733633461626263666466663936316561333439646438646439316235 -38623137363562363662303463666431663031623333616134633464356563303731343233363335 -32626231666234656361326538386265636365633539323765656565373661643766303234323863 -32653366323666663034386238316139653932633266353536326639353738353539333333373038 -35323131373637326564336638313865646666643837653165396437326130326562383166666533 -64393132313335333462323533373162313065643839613264393762346539386239313332646464 -31396431383763356662643663363733313537366662363833363538356431643438323635363032 -32613461316663643661386431383766313066386430353139653862623938643361366439633633 -37663461306365306334356631346332386331386331663862366634343564326131643534383666 -39313865653038653861623535326366303866336539633464306266376436383231326464343661 -61336436353663616236636632356535366361616131366161333931343331613534356538666630 -66343366386561623131633230316131616364663565353035613333663934353532643237646635 -31313436666464636463343336346337636131356532636635646164326363383737353861633563 -36383237333635616461636265653362386331393234393530313562333739383732323962386464 -66303466316439353565623061323065333835643664623862383634376331313936306536653135 -32306130396639373938346162323535346564326361343234663733376333306239303133636638 -33383233633337623431613464653831306538353462383231303533623632653434326536653930 -64643433313734333337643966376132336333663834386564336231356136333732303935366236 -66333332643433623764633030636166313936306362326132346234633137396534393731643762 -65643535653839313761623830313765326439333134386232393438643233626334663565666137 -65386532656162303939346162336263346234333635646364303232616165363138386166383437 -30313938393434653666363533633732623561386161356465343938633639633936666430646337 -34353737353236323066313136353933643162343266386632353063303164616438613066326330 -37623235333032363965343962343539333830343131646266656163616233356333346136616230 -65623730643261303862303233616163333364316631313838386262623637393565323736643435 -35623336343933396231383561663564626664623766613236623066616334323434363862633636 -61323333376338373334353061646161613964363733356563393236623634356565363037633832 -66656565633038373736663930346639396664373437666639383532376330653931373766336539 -32373365643065313935623566313037323764306230383737663031656138386538303666613731 -66616463356636393062613466646461323030343464656236323966663631626438346336343562 -33326666303037623634346339303161393566356632383938613861653130646232626133616162 -33313637316664323939313936393764653130393437653330353334646363393536353031646262 -38383963633639663134626334323662363635363338646332393535366534633765303963393266 -35323935303662303634346335653566326335626332346334383937626437393461353263316134 -66346265383532326530646336643433643062356130386333366665646438333232343963313761 -33303033636138653331323334346234306264373462613065633266613931633065323265643165 -37323561343036643931663734613938363131306537396537393335626537336563323064646363 -39633861656237663139363837363731366366653733353833306266643234646130616132383664 -30623464346235393962353966363339356435383633343364616230643433636132326231633861 -65663831663836623266666134353665363532323266623766323064383638356632313662666336 -34316266303235623330363537613438393335383839393330643630633763616462376661623064 -35373037303434343265363563346439633965336131373535323131363134396532663138636438 -63323562313538373638316134353262303632646461343631306561633337333861666332373961 -33366631633562666238373735376535316634623462316436393363356361643134343435373139 -34613765623839333735303338373765393031373361653638313866343137326664346166333931 -36323361653133613439333135386433303966373863353336623338623464653731333339616231 -38373962376535653037366261363061323636303631366465646631356332623734323163373339 -62396539313666373732326537663661336235646638326331333265303439613739363034303233 -63326535383835313562616666323461303930306430623662366331306333306432353132313536 -62356230336264653739393662633533663165363531326435656361633432336663393631666233 -33613638363835303130313362343034323935303966656563396239346131363462353765626631 -65323062306333393032663761656336356665313730336234376237393631626632663661366534 -61316636363262363835386535333537383030303764303439303165363465366333386636386163 -61376538633037356464666463386132643234613366303135663039333065383633373835333935 -36633135366563343135643764663033663730343336346333653838653435633330336663353765 -31666135663461623161373435663565376363316337363034396335316633366463346530613464 -32356164656164353936333436663835643565613532323332353266376237636434323539363466 -33373065323136343964636633616661633436623861363362336565656539363133616163333563 -39346238323961613537396234663333663861363933633632633535653166663239353264393139 -38316162656332383434313034626564653030323362663131353335643666306134306364316162 -39373937383339666534333833393866663766373265306562353361363731313338636436393933 -65616438356266303863366530303436613232303939643166353831663265393364653035343439 -35633236613434636631386166323938373831336434306164343933633330653564313761373831 -64633061633431393731633638376434303066313630346334643334333832363938313134326530 -64346464653163666630356630316334313139663132363931313534623564643935336132623538 -34353962333437623437643662356465336437653563633939336233336463613232333037343731 -35343663646366353266643239333832663465333164373337653134336564376661306133326565 -34323035316334393839366536316533393333303330313831363566373136653737326537633833 -34656335376439383661333162366264623234393765616232373066626236623230346465613962 -66623531643436336465663237346233343731313064636561396537623633313138646238333161 -66313236303634333831383263616632303066313731646339636438643530636333626565363462 -35313339653765663935336361663362383831653365633766303963386335643235316230373839 -38316436653463323361323335636663623266653033343433363761313237303033613139623434 -38386439643233333935333462383865663737346631303532323539326239333139346332363933 -34383132396534626564366662386463613432333632303864336438346164363232353232623663 -63653637646164373062393832373866326636353435316338646132303033356336663533393430 -30663539323963316434313030666637303266396434323637336666393839343030383465653637 -33383438313864323562313437313139356135636235613863343634333366316132303661373636 -38353531393038303165396562326339333264313338373030356162656461336665303236343161 -31643837383232356332356562356462313230313233323162393139623461393732393034623330 -31633335626430666534373464306364333733326361393632326465663265356335616139383364 -31373162666134343336313031326665303033366163366563303465383834336636623730353433 -33613265356139353066616632316634333262316662306262393636376633326361386633306339 -33646465326162623137393630626666353961363236613936303434343530373131613564336361 -39373362643465346531636136636366663966393235393366326432383331656134626138643137 -35383339653637636162346330343462383436313138666234623933663763376334376530366232 -65633633633034323766343031333233363239663133366531346265303465643762383530663631 -65343934636232353261303962393663393839326162333838616538373861623335333465373739 -63343531386537666335663732376239363963383162656665646436336430666666333736333432 -62353131363766663766346135643935363337656364363635396362626538366230326163646433 -33313435653133653361376664643663643463373262396364653934363061383462393639653835 -64643136363433616339313438663330623836353037646534656561636538663163366136303533 -33643131376365623236396238336130663039376562303562646465656366616630393563663261 -63363064616162376163363464303735363166623865626530646239613963663538323434613963 -63343830393732633131316564363237623366616132663532356633643935386266343330653831 -37623866353264366539393538633232333066633435313662343635393636313231373835633165 -39336230623465346661613839356134363833633333643335373861646135373439653166353830 -30303661636461373861336536623335633533653433633361376366326136323235636663626534 -36633465383065353730306636383936336264626366633437336632356232666462336661353762 -65636339353531623234303561626535616362343332343463373031653939643266396232306433 -33326438366263623033333262323761363962616130303138346336633230666336316465663935 -62376334613763373339633063333833376139623762363564356165373861306563323934373331 -34363930653565633562386630393764336135613038373035626633326335633762643033346536 -64613233353063313239356633353132343436393938336164333966646330323738393063303936 -65316330613335623034386464383636353364656234323631656136333236636430643535633565 -62656233386235336265336264343865396537393437303638373234323636353433613333656532 -38343734313361623733393538373961623164316537626462306261353238653332353531373031 -30613062656162643230636431333039313030653032343262643330376461313739636239333163 -37343131363138353432326264646232626639653231643339353863346332373761623033626437 -35636464383962313462623533616434343938346536373164333139393331653663613133653361 -37633139303533616637616430323232393634363066303731353534313762346434353363323231 -36306534396364666266383064363036393836306630356338616133346231393832653363333638 -39653766656631633333373836613331663766356633333731313437386239333165333832666434 -66316461383264326266346536646237303038366632666335343939376532353666363232383763 -30666263353566613730363133376561386630306236363363626663363134646434303239333438 -31323436313431623361376138313530343064383139373434336265613833656266353663326636 -65646564333732383231636637386461623661316131353132363061383634376338646533623862 -37663765306565313536363331653464613635383961376632333434316338623534633938393534 -65373438343135613934306562336639343530626538313738613636323430316666306162626661 -32313537636162613636643362616465316233326666633666343565393333616533333834623964 -63373064313639653834323332636463653431383733646531356239386535303831613762663837 -36336161323466653964316230313863373534373338366366626530373531666130303564343364 -62353062356439663462383462383863336433313661663161346438623263646432626531616138 -65663364636537366466303739616261373565636461653433336431626534613534306431373730 -65623939643138346664646439393633613133326538353465396665633662303938376430626463 -39656165666334336666326263623439373435306239646661346638356166326538633535613030 -30656630333666666430363636306262656163376465633966623662303932313031636461366166 -36323265336134613630663831646533633735393762373965313064383962393639313634303030 -32303038363362373036613237653231323237373466623931346166306366373161653464633433 -66616361393638353561393665383832666438343865623964336433336235646532393863383532 -62633537623062663533666531393339336565313031353334646466343134633536613333663235 -66396364373061373763396430646632303061616166363964373363386338313430343261363836 -66393838653835663731623030376563306237663736353461343137643432613761353832326136 -31393663346339646464313764343535383763303837623539613862666563393166393131303030 -62336535313937313031636434313738666533346634336639623430373633666261326230666532 -61313162336462373961313532656465383966663632376432643632613161323162626237626131 -65616137353739313864633436306362356438373231386639656530323634376133303465323062 -37343066306530646662306436373134363735336463323364383361323034353134363133303532 -63343936393962383633363831666434303465656462346536663161643231313862396635656133 -66363239383531306263646433613763383166653832346232373231646635326631633261633961 -64656263636134616137623333663631633533353666353265623862316562356432316164393264 -34313365363165313161663334303562303762363738376362373764346564306139383036346639 -36363463336532376232613731353630653236386165393130343561343665383534326132643666 -33373132656262386336626463386333376239646361623937636434363334356330626333343639 -33323164363939376332346165306638646332323736393632356661333838646237356436383032 -38653333326637376565386261326461613430306162376663313735636237666164356431346663 -63383738393564313262376234393130623137633634333236356363376533326137306130316437 -63616365613937393931313262383037346638346430613666653463636430626538376332663665 -63373833376465643461303863316462623637646235616430646638333363343835663234313561 -32313933373165376263393835326366306536653966663965616364643833643962363866363762 -37316133336437366634333631323465386166626436663661616232333363376334323264333161 -39313032643233353534663136636564343331353931313230343633656131346131666635313161 -39623431653734336637613139663731306434353334303234323864383163643966363163333431 -30623031386264313866663637326436383332353939636666326131626264313736656463663933 -37663131356435323762626635353233623132303230393464393366666433623032306638666237 -65366336623565623137363464313432633238363762363961333638343764633365623265333262 -38323066356431303938633164306439383161363936303765663737306564666338666633666337 -61653634343431323934623931623831666334646362383061613861653736353962366139666664 -31626430666165363936303161323735663335616164626166626232363132613034353932336238 -31643338303131643237316633653539633830323634623764333038333732636263343266343334 -30656430393664333637323064383430653834323836323237336334343638376337393936656530 -66356364346239346465303261373065313932306530353264636266643462386332303532336162 -66663535663833383262633237643661316530636561633332323937663066653137333036663666 -62636133326333333735356532353462353166396338373731393431646438316330343033373333 -31626331313638656438363235353436383736613735356233626166393866316532313432663463 -31626237623435613138653833366463396365376462363531376564373363656361306566383231 -6630 diff --git a/group_vars/all/vault.example b/group_vars/all/vault.example deleted file mode 100644 index 198225f..0000000 --- a/group_vars/all/vault.example +++ /dev/null @@ -1,5 +0,0 @@ -vault_email: user@example.com - -# keycloak -vault_admin_keycloak: admin -vault_mdp_admin_keycloak: my_password diff --git a/group_vars/all/web_services.yml b/group_vars/all/web_services.yml deleted file mode 100644 index 9397b85..0000000 --- a/group_vars/all/web_services.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- - -reverse_proxy_sites: - - {from: hindley.pains-perdus.fr, to: "http://127.0.0.1:5000"} - -sharing_sites: - - {from: share.deso-palaiseau.fr, folder: "/home/histausse/www", user: histausse, group: histausse} - - {from: wiki.deso-palaiseau.fr, folder: "/home/histausse/wiki/public", user: histausse, group: histausse} diff --git a/group_vars/apt_proxy/secrets.yml b/group_vars/apt_proxy/secrets.yml index c21269f..865fc66 100644 --- a/group_vars/apt_proxy/secrets.yml +++ b/group_vars/apt_proxy/secrets.yml @@ -1,12 +1,15 @@ $ANSIBLE_VAULT;1.1;AES256 -38363934386234643266663261656436346165636561613134646532303533383064306637346138 -6161393066393430653537393866613433386138396164380a326434313036373362663563396664 -31326630303565616634623462306234613438383430386364323938663065663166653266636139 -6162646665663666650a363737383736313662353062303766333963616133613634623634343062 -64393536663762343437663334323338373063333461333664353266653461626362356435636166 -33323061636562323434393735383936663463653364623333633138373761633364633864386666 -63666137353562633265616363343435376365363762663865396161373731353062656261326665 -64313537386534366361396134626462333865363666623139666661366634393530393933303636 -35623161373866343438343737656134356364383866313732353864623331393633326438656637 -61633964623836653735393264336236663732663130663838653530646363346362343935646163 -396561613834653532366531373339646165 +30323236643561306338313061343932636537636639393739633834393033346366316339393865 +3661363066636462363234386661333831306534343332340a313261633732313435313634393161 +62323666376565386237643066626363366630643936666566393534376432386166356431326437 +3438393866366232310a666161646462666539356432633539356336376536616261353962373430 +65336564343862343536396362643032313961643561393634643461333236626661623065626436 +32303831336430376162353131316164306264613733396130353966346638633465306165626361 +65616563633065366562346130303561366166343935396630366364636637376430326431363364 +39663565613930333431363838636535313966353362396662653933666138646339343965613035 +34343965363761633835323339366339386462656261353463326333326563666664303863383530 +66646433636235333264336634303164336263376264666362643835656364636563653234346537 +33366232363736636234653733363135323161623564646166316363366137333161663266346534 +30353436633933666363393730393763313739636433316233376533653231393435353032306564 +32396434336364643431333361653937366361623338666431663436303965643635666335653939 +3132663337386166616336653961343335656232616238623631 diff --git a/group_vars/matrix/main.yml b/group_vars/matrix/main.yml new file mode 100644 index 0000000..1a00996 --- /dev/null +++ b/group_vars/matrix/main.yml @@ -0,0 +1,6 @@ +--- + +matrix_server_name: pains-perdus.fr +matrix_local_server_name: synapse.pp.intra +matrix_max_upload_size: 50M + diff --git a/group_vars/prometheus/main.yml b/group_vars/prometheus/main.yml new file mode 100644 index 0000000..ec233e8 --- /dev/null +++ b/group_vars/prometheus/main.yml @@ -0,0 +1,11 @@ +--- + +## Grafana +grafana_domain_name: monitoring.deso-palaiseau.fr + +## Kassandra +kassandra_username: cassandre +alert_rooms: + - "#monitoring:pains-perdus.fr" + + diff --git a/group_vars/prometheus/secrets.yml b/group_vars/prometheus/secrets.yml new file mode 100644 index 0000000..c1650e3 --- /dev/null +++ b/group_vars/prometheus/secrets.yml @@ -0,0 +1,195 @@ +$ANSIBLE_VAULT;1.1;AES256 +65306634353938626165666434636535366339323261666331623065303464613835663338303432 +3732313031393264346335333832343764393733376665610a346330363963373830613034633732 +34306534633733303334333765376262616138376132636633636539306232333037393439313463 +6236393237666564610a636535636333306361663633373263393730393835313635653839333239 +65353237656534663533666163383231393961323531393435373062366633343833666138333532 +31303162393261373839656535313735316361346264636161623237386430326138303964386664 +30373730666438663030306261356661353263643661613762656438303761363736356139663939 +34323665353762386533623565356532643337373066366530636361656233393136303963376537 +36326366643431303036373261333733663461653636353032313464626566613666343336363162 +30343935616538376630333434393138316131636561366264326165393530663336326464356531 +30623831343964306231336330326237313633323933323233313731663538663136343735393032 +36306361646434356263633433643438663730663961336533363264616339336536333462373839 +62383564663563653966366139663065316663356663383033653834363831356433393835366133 +37646561623339386464333761653166613063393739376330323734383139373437303337653933 +32356234366164316561366565326261373837316262363137616637623139346562396638323963 +39336466373338366463616337613239366131623635623461383565313662393565353839383265 +34323665626461643663313932656334623632363062313838363934306637323335656266653436 +39336439343132346633613562353366386338613164306262373032306166326430376165336537 +38623439306135643438643930323966633962633261653266613461633836386439633536303937 +65373862383263313833376438386436633563303233373466393335623239393731663834383933 +36333438663931613335383132343235636534663637323735653339386662356366306339336365 +38343763636638383337313564386564386535383736316331626531666238663337333238303935 +39636436393232306431663963616430646131616364383862653233353131396265393836366131 +33303762633533356332636139373661616436306366303430623864336435333363343663656533 +30316261663932393437626133386364326362636262366538623732373961306366356133323964 +35623635316264346635356266303237323535376362343738616564633865303236353861303636 +65393038616662653966616230393830323964336633656565313639616630613832303133636635 +31636436636432333739643133386236363039643430646232363632366664623866623963646431 +31373061636563393035343035393238653562623063366530363461613934666337376232626364 +35336161323234386666613136303935656635653631366339383863383635343566323561336537 +61643336623936393465623664666566623039636162346563333866386531356537643737363437 +39303530396331383536613762323636623235376238666434383635656461313636633130643732 +33333034656264623233373137303333656335323434353732343634333733316532643134653437 +39323762663535643563633163303435323264343031623764343930653138363433323162303866 +39393662333136633466343832326661623831313535363435323764303035636337653731336361 +31356231346562666430313062633935636432633238333034323437313935396266303039636234 +30653331313461386334616161663736303036386534306164653834346230363636613036656238 +38356564666166346439643836623237613832626432303833663866333564363830366634303466 +64626364333531343434373633373835643562633836343232633834373165366434396465663062 +33623932616461613233626664626539646435633964646237626263376361343934633166306265 +65626130376165383766373830383931303930366631633135323835653635633135616535333734 +62613532623066363363623933306666303265336134643739366230393139376361306530353832 +36643733346538376330353861646339623266613261613936663131663830313961373634303230 +30626132356335363064366663623734396365633366316239616263643062303538636432666633 +66663064616538626630346330316530303666633531653965663463333334386538656634356661 +38653266366638663164343865353230393663666430316661653565303839303061363639303063 +30666364626136633963396433326530313462613637346136396233373433623766643239383263 +34643139653239653661356265343330663736303563346536653037343833663364626562333361 +38343438393037326433646337663666343665336236373335613563623261383861313236346536 +34366630346164363038373130626537343938666264363136666665343561613630376131396261 +39653561306334343961346239343035633266326332353563353935306431396463303030373561 +38656134353539303466356635373039623730363862653930626465663763663165373639306461 +30653730366634356662396136376134616237343430396531343637363663313334666539306664 +34333266633335643366343531343865313863313761343661316566663235396235616263373032 +39316635363931616266613134663435313463643164373962616535393435366361323830346464 +34393431383866336664393262636666346561636335393661303264313065653264623966353766 +34393137386536343939353733626232373538623137393832326562376637313162353463653534 +35633761346164393838326239643036343536333532393536663134323965653964313632306366 +34313465356432613332653661383938366566616463323565386564366264613937626634343061 +31633365646438623565623964356362303033323765633434653563363362393036666139353530 +64353734313661613530626130616661616265353964353061373037386461356163643430306639 +39656138613233613164366332363162333339363361383437306562323530643430623363366264 +32343439656639663766333663343533663361303134383535653339373730343836653035643638 +33363033303965346632336665623364336539626361333162653837356562326161303432316637 +35346536666463373961616461383061663863616532646535623835333737396166616537313537 +65326231303464343936313636343666393738316139396238313337656333613863363361326435 +64653630666138666134633362313431353363303863376237316366346430303763616164356534 +37363833626562306638393866313537383661396131313837633430386361386136383837396166 +64373235353831323439343538376362373538366633386164663735353562353764313331363364 +37646232643861363833356137346261623232393566396461363139623030303738303266333737 +32396431383361396134653735383737653462613037663235383466303964396565633666633332 +36313364306330376464363465646632313531353863656665623531613563316530623461653334 +39373061633134363765316131653738383164643131643664323334656537353963623237626634 +31636565363334393266386365636338616666323464633336613536386434373339386537386235 +35333137383761663635656132333263336235356261373465323137316362353731653736366663 +61383864633930643862663062333336633863373434626435663635656630363438323831386533 +37646532613831336463343737653066316531323764323135626264373030626434633233623237 +35316135396330346135613731326535333961313331653736663266333836386464643261646533 +61376530616130303364343265303333336333656538653064643164316530306162326238303738 +61616635373430616432666362643536333633373638393663313838633434366566353530396532 +66353562353937646466633439313331353931333636393362356335656231633835323364316365 +37656465626539373562646334363839313331633563306434383663633531626663333930353133 +32613936333865396466373263643933623333633565653130373566323766666433316661636162 +64346366376437653961306564356236663136333935393336366639303831623133333236666539 +36393230663735613163336164626164633131653965333962653364393361366462323636656432 +33336634663664623132636437373138636539373538383466623064613266353862376530353835 +62303732656532373465616531376232626161356230653635396135383561396438373266656263 +30316637313563643539386435373462663334636631366633386633646135303039306663613635 +63313462373266663462656539353233623961353832346335333432633230636534323064326463 +64633336323032636236366138343862303534653330626431326334356535323235613631613636 +31306632363130626465306531356464306164383966306632363031636533393666656530623337 +31383231333463643864313863303032663034383635336436303733626534393165653530643861 +66663037326330363962373161633037383437646365643538646635616237633563303133316563 +31363932623534643034663264363466636531626262396561383137626235383864306364663865 +33373136656564623332366436336330343034323664646434616339343461336335613365653034 +33356165616261303561353934643630656563353133353733333961366362633136386532643166 +65333839366437633538313963636238303135633131326334663734623935353439646436373930 +34363162653333356264336566613837343139366666343338383266646637613835356537393839 +61343431613236653834306438306262323937343464633262346637616336383063333735303332 +31346632393334633037653164643937333761633936616461636331373164666337643536333430 +62363431373362653461616662636565666332623132643333353937343332326534306666396231 +37653832626333303635323364373163653837613631396437343434376532633331623431623663 +33353431306664316332626662396438393962623833386335653330636631306130636631633434 +31366661643033653962613938616233653433336462326538643930666362336663333237323164 +34343735663038336232336134353432626439316339393430623266333563666165326237626264 +64336365333461323361656665653537643966326362373338393864663363313930313565656165 +64613761616136366162333231383464663930663761306466643933386135613936303664643639 +61366231643433303733373934363965623261633961366232656135313462363265633334653234 +66616536616138313064316436333262323466363533313930303862663565313134636564636631 +62666336646263316530383632326635643838373632303263613637646332626638353136653439 +31653139383732653663653066373865613139373633636137353337303336626136303036396337 +38643232633736343666626363666431393462643166616434356237623634393263386337353132 +35373639323061373666626433343534303065346534393233643730396333626334303861306132 +33316666343035373365366638366463316464303233333733333661373139383035326363393431 +63633663373261373565616337313131303737353961373235333635323063353164383438626362 +63663965613733663065386437646562313230623261643237636362386535396264363062323738 +32616630373064356239386136343231313631326635633233653831393736636364636431356433 +61313866393165336133363738383131356466333136613635306364633139323935303038343663 +66636139346336303832613763363966393734356463373863316437663163346335333237376633 +35306639653936316430646264646437303132316432316437656536643734353263303062353233 +34663038323236333435306262313934386630396461633462383339666638616633316338326231 +36343338623161356431316363653734383039393133383839626532643630333737386163623164 +39353865643933306330636130326132663135386165633939383561306563663033356334663236 +37316566343561616130613062343166336132383039656465323562616364373035313139303338 +35613764643061623265393537663639393165636663613337343633613164623466393734623864 +64373565333132373264366534353864633432383631633531373061353135333365663762323032 +35366166356261616633383263343035353132313732626262383630353539303232623930633031 +37616638653731653965346566396233386539626534393666353762303565386432393162333064 +66333336383434303065373236383664663335316566326361303530666432666565666662383063 +66626631303565646166636334626539363164616166303234383339326632663838343235393037 +63353763366566323538366361376233376537303063386264643831353463386632313436393231 +38333838393832313531383937666137316132366339666634303061663133663733336636333435 +30363936356564636137613337643831306135366462663835643065646530363534363965653738 +61393530343037666231386334323363376262376265313462656366653535393038303962366166 +64656131623435323534353461386632643266623435666433313538663631653532303737303963 +63653931633131633461613933333437623665626537646136346232626630343737383136343331 +36316136303364343134653630643763353933616436643036313731336637653965366433343938 +34306337393530623339373364353465313063393537303136306632313537623564303937326333 +37383139643564393438303539656165306562343731366630353934663363313036636630653036 +30373432366362313834613339653935303434613936393938336461623933333935353965623739 +30313630393865316131386131346139346664626230636531336362393965383466356161333439 +66636432666432356638623437666362613935323134346137386536386133666336323534663262 +34336539643337616434333438643136313661636165356562633863343435613263323639326164 +39663738363462366239396438623037663235623562656135393866663534613731623761373034 +64663237383330643565393034636530336362636462623439323339373136333330666235316438 +35383461393032383663653532353636346137386363636362363765663865396133333333383731 +61613763633139303833373337323536306632373562346634356262313363323566646535616433 +37393864643637353035626665303435613733343133653064633033623861376365326431613332 +63333238666130313466333061633337383465666138393838613830656439383364393133303964 +39623233636665356165626534326163656436363831316334326238343638333931313464656237 +31656433616530363635653963613833613031346236636365396631316236323664346661653464 +31633537613732333165633965663037343338323538626535646537313330636462653063346235 +38633833643765346638636434356536313339303865636366346462666331306637653366386531 +61353938363662663030393039373536386332346433313565376564373135666566376238303932 +66663830356530313161646139643864313838373632613665666430663430656164323734636666 +34346633613932653863613830383933306232376636396230313862373532363039623061343338 +39623732653932336230663239373539323564313538363633623663363265333230653530363265 +35386661626631636336306637386630623564363733353330396232353931333032316262353133 +65616462376665343539343666643361626464666362386662316134626266336665353163346536 +38633532346366313339343733333962303535623534633931373331646433343033343535376466 +64383666373531363736653333383839386464653462613662633466663432633361376134343464 +37633166656531646261373262336334663065623532376161613132666637386334626239626236 +32323833353338393662613164326434666462626633383834386535313462643766343362326637 +36353239633938316563656564343538386231376464333837653430613634643834313533376232 +34623336366361383330643061643165353838613362643161393032656536376534353035623066 +36333430653034373561646234373238313739663035366261373961376132336666313539383163 +63383237393361633966626466656566613432316633376261353466333062323764323731626333 +62323334303237653136353166616337373762653564626262653233633435343838353239376261 +34353035316537383933623466313531333330363838313766373737346666376337323037636637 +32373937666638646539323762656431353866626236383534643130333166383363646637306335 +61313465363632623237333136326636383238646563366232623837316638313538313066396461 +35343739386237323137343964666639373433623338633738333832653565373936386431666164 +35313164303034663935313330313438353331303863613266386166303938616631343234663030 +33613535643334656638383663643133613935373734633935626332326536613963366464653230 +36613764386136316239333462303861326263323164353063666665636139653666653562393131 +37333062353164323530643439396662323666316262313266353831643362393864323739616363 +35626363353732663663353662376462363035303835323834383935396664616130623037663461 +62626135623562323963303830346233326662636166636162373263643231343634613632653930 +63333837383135646132393739333039306565353166323737666533663136306233373030373061 +39326136313631316665383561396564313830613464383165316130633438316637643330613361 +63353537633762353731366537386235356631653336363364393763356431643032656435613739 +36383835363135636162666366393035653034376466376433613266653031393463396239383065 +37326336633631373233346430363137386638333334363361313336386666353565396633373038 +35336663636262633263666265613163363666646164323334626137643432383564616235616562 +39336564383335313335653465643864633064393037386363373566323764366533326630333733 +31653137623261313263316631623531373831313564363936326431313633386166373032393161 +63363166336230376130633265666130396235353635336161643362343063326564613561383962 +36393830353030396566373736376333666536383236353361393365343137316130303965633630 +36306237663831336232633163393032653535396565333666373438643131616639383436353461 +39313263343964363838313737653065336335326535306231353266623830303232313365336466 +37303638303663643964623830343166393834326339376132643862383662386262636365303461 +64396462656632626436343966656131633732616563326130663730326137363262396530623430 +37616638313661313366353737663234343264653434313838656264636262643535316164373130 +3065323635386233366533373733323234393165643633626335 diff --git a/group_vars/all/in_memoriam.yml b/group_vars/proxy/in_memoriam.yml similarity index 100% rename from group_vars/all/in_memoriam.yml rename to group_vars/proxy/in_memoriam.yml diff --git a/group_vars/all/revers_proxy.yml b/group_vars/proxy/main.yml similarity index 70% rename from group_vars/all/revers_proxy.yml rename to group_vars/proxy/main.yml index 34aea68..685f861 100644 --- a/group_vars/all/revers_proxy.yml +++ b/group_vars/proxy/main.yml @@ -1,9 +1,9 @@ --- reverse_proxy_sites: - - {from: wiki.pains-perdus.fr, to: "https://azerty.fil.sand.auro.re:2443"} - {from: hindley.pains-perdus.fr, to: "http://127.0.0.1:5000"} - {from: "{{ grafana_domain_name }}", to: "http://127.0.0.1:3000"} sharing_sites: - {from: share.deso-palaiseau.fr, folder: "/home/histausse/www", user: histausse, group: histausse} + - {from: wiki.deso-palaiseau.fr, folder: "/home/histausse/wiki/public", user: histausse, group: histausse} diff --git a/group_vars/synapse/main.yml b/group_vars/synapse/main.yml new file mode 100644 index 0000000..34bb740 --- /dev/null +++ b/group_vars/synapse/main.yml @@ -0,0 +1,43 @@ +--- + +## Synapse +matrix_enable_registration: False + +matrix_apps_services: + - discord + - facebook + - signal + - instagram + - telegram + +# Not configured for now +matrix_stats_endpoint: https://127.0.0.1/report-usage-stats/push + +## Bridge facebook +matrix_bridge_facebook_admins: + - g33kex + - histausse +matrix_bridge_facebook_allowed_external_user: + - '@dorianx:matrix.rezel.net' + +## Bridge signal +matrix_bridge_signal_admins: + - g33kex + - histausse +matrix_bridge_signal_allowed_external_user: + - '@dorianx:matrix.rezel.net' + +## Bridge instagram +matrix_bridge_instagram_admins: + - g33kex + - histausse +matrix_bridge_instagram_allowed_external_user: + - '@dorianx:matrix.rezel.net' + +## Bridge telegram +matrix_bridge_telegram_admins: + - g33kex + - histausse +matrix_bridge_telegram_allowed_external_user: + - '@dorianx:matrix.rezel.net' + diff --git a/group_vars/synapse/secrets.example b/group_vars/synapse/secrets.example new file mode 100644 index 0000000..938593c --- /dev/null +++ b/group_vars/synapse/secrets.example @@ -0,0 +1,34 @@ +--- + +## TODO: replace this example file with proper documentation +## Synapse +synapse_postgre_user_pwd: +matrix_registration_shared_secret: +matrix_macaroon_secret: +matrix_form_secret: + +## Bridge discord +matrix_bridge_discord_postgre_user_pwd: +matrix_bridge_discord_client_ID: +matrix_bridge_discord_botToken: + +## Bridge facebook +matrix_bridge_facebook_postgre_user_pwd: +# Those values are generated by the bridge the first time the bridge is launched. +# we copied the values generated from our test config +matrix_bridge_facebook_integration_manager_shared_secret: + +## Bridge signal +matrix_bridge_signal_postgre_user_pwd: + +## Bridge instagram +matrix_bridge_instagram_postgre_user_pwd: + +## Bridge telegram +matrix_bridge_telegram_postgre_user_pwd: +matrix_bridge_telegram_api_id: +matrix_bridge_telegram_api_hash: +matrix_bridge_telegram_bot_token: + + + diff --git a/group_vars/synapse/secrets.yml b/group_vars/synapse/secrets.yml new file mode 100644 index 0000000..5889687 --- /dev/null +++ b/group_vars/synapse/secrets.yml @@ -0,0 +1,95 @@ +$ANSIBLE_VAULT;1.1;AES256 +63613062313131653261643433653535326438363161343337326234353165393065663066653938 +3362356639356131643030643264663136373764663933330a386138363330363636326266653936 +66333866353330386163643964626232363166353439363461626230363437306330386162653638 +3263323861623834660a326530633963666139323431393434333038336435303363393432616130 +64373938393430396665663035313937396632396332343434353361626636353636316134383130 +31363131353633613563666437646262373132363366363836616231306137323134326562383337 +39633161386132666162373831373036656632393737653937636164636437336366336338383030 +34313434336230623135643531316164613962623765333131653135663131613338396461386261 +66363137663935653734306461616366313636393633313765613764646535613938666664353932 +63643833323335356538366434393363373463646632306232623230663735626235653434306137 +31353034386162393431363938316261666431653766636464373735363661363338343861313564 +65613963616438323961333639613332663531663834636166653439666461353261383731343862 +31636535323932363539383034363535653865653366346432656332626665633766353363303738 +61653231663565613266363564316237323834373330626333623638343639343763393062396531 +37383833353839356563623034373737663436386130333932313835306437623065363166633635 +62653030313131636638323137383031623363663061376333616438343239353332333636626230 +35373034373830306165363235386263376130623065333037663366653937383935373666323661 +31303235376562643037316134326664353864386436316665633031363163623265306339313866 +63303936353434326234343363383139626265323132373638313064643665373065613162326635 +30313063376266383632626332343037633233366165636131363736303532326662663865343432 +31363366623032663233306333666635646366386433643066613336366532326266316634383765 +31363166626636333363643737313831326664613462663631313164386130373536653561303238 +62646362643937363339626265356132383966646231356462623831663736643763623665353763 +37313234363135396335313637613030313539396336333562303065613739353238663135386663 +62313536306263383232633232633639333461643039393739636235663761313230626532343934 +63623136326638646633303663363430396232376630306339343037663364336166353133366361 +65383732383033613633376265343362613864346230613733333130356566376537393934616630 +35656136356136353830636332616133623031613165353530666533613362633637343335633635 +37323033656533633936316366613965323532646538386264393234386431393364653763653763 +61626438636364623632646364633733366636376433336366346663383831303766303739653362 +39613265396232343435353065323361656635636336373637306163303730626536363166333364 +37623732383733633564623162623861373733323037643535663833383161313262636337613033 +62303033396237633530353031356232336533616432366232616262343335643536316437623430 +39373765313137376264656633646437346266316632356535376236396237363934396537623333 +30356433333339363164316437393233643337356439373634336466653466303136333531633630 +39313765356633353163376466666230633266383833623364383238323863663937356532653734 +62363266633235616662663166366136356532653932376636613466396330613234343766663530 +64353536383232353131313235383738333136666130356537646231346561373639373438656231 +30323032646431323436303231663935323330393230373762336631316236366462373433616365 +31396335353666393233653137393936303562663131643265326235306538326635363463343364 +37373064666335666563666332613132363431376230366163626132306134633831373632623765 +62613633323739393437366135396164383339356536663066636433393562396131393839386461 +37623231613566396436616439613263373366643534353965656562663834633937343633343565 +64303165313833613034613965356637633761633862633964316264323138383238366163643366 +66666461613066313638363432636666313166306363383636653361666565383035613161393333 +39376338636438343532376134363434666465363332653534363434663565653736613663323263 +66386361633230626331326638636161626331663233363365326665616637623962643233353436 +65306235346531636435313038313739643737303036326238353065663930626361316262653362 +65376565323038333466376366373430383138666631363465303134373561373131333533656233 +37383138343062306330396265373334386139623235323833323533613636373333363165303434 +31616336336434633834353963643330386565336565353533623532316664626665663936613231 +62666439386663393339373235623733383233653364623662666635306461656233323835393163 +30306261386362653134316537326238663634623830623466316438343862353131326361623035 +31346164376137616237333539333766333964366435343234333165656666643231333466646635 +63343337323336386661663862383034363865643565643131323932623737376231313235643939 +31323831363534633965623864326236626636376433633334326466643138636263356262373962 +62383937623439643364633832313663326231616463656266303530343835363236313239386164 +30363963383435336438366263313064653633393737623666616239353336643331303435323335 +31633562636339613363376236376135353735653331666132323033613666356535313834636330 +64363366383266303136313738633931383032666339653132656431646332306463353562326561 +36373764306361613761353163356430666363343561313864623963303166356437376136333732 +62303337346663636439616431306234353362353838333331636363626138303033373238656137 +37326432666164323262366637323162326364303665333431653537343932643465356332633433 +32663263653437316137636263356363366565656538373261333336336332313536363930336134 +34336435326531333037636133646639643564333934356431303737373731666433353061666539 +62663862343233393063353932633366653538643662393266343834626236353366363936396166 +34636139623533306366623061316266393062356562333134653236326365656161303962383061 +32643363386335363366636239343435303830653638333530363362323439373838656265366531 +36373031613962656632373839663431343338353465653535393861383965336232363731373533 +66623535653364333664373363636532323137643461326661353961303762343366323533636363 +38353436393137326235656434363332623565306362616561643837333034383266316362303230 +66303735353435393031663232363161333964303538633336663365393966636161376335306264 +36326435636162353664353161373037313437373765373231363434346530373739356137396133 +37383733346435666634633832373064303163656565393334646162313462356235383764353633 +35363738616162303239383964323135616232653562356233366262353533336131393231353332 +36646139356339386137323764336665346534623964613865646330323762666135326361336632 +38653935633933313762643565613332346364396462303366663064313966626262643430323766 +61333135616131643065613763666331653730386339343766303035613065343136616163386631 +35346234316361366464636464633431633039363631623863653630313262623030646666376664 +33656331383536643463663236393430373564373865396134633461373534616435333564396537 +37396664303363393036633537323334363339393230623463376235343234356666633162396362 +66333631616665663931616438333531633333356532343135633564626162613331663239333966 +64323235393764383639326236353439643934616564656432386537613934343537613330323463 +61656634383338653632383232393135323836616461333437363666376661353933306639656465 +35643333393435313330333134383866626530623730313230333437356435613335393835363734 +32616561643737623835326531373164393061353934656638643436643838363865336239616463 +35346563613630313534343864336234663838363638653230646464653765633162303231353532 +30643536333763353662353662653532636539396461373864303664313834343132343636636533 +37653637623630646461343433373232343863316234336339333466346238363863616161613036 +36353738393966366138383666626161366332633534306230316632326637393865353665356664 +33613737303638373461313462303565386664376238636262313638613161363233346661326531 +62643831363164336266363436356638383661343164376562656265363361353234323835313534 +37626461333639623739306634306131643334353335353465646363326537666431303537396634 +6134346232656665323561353433323661636262306232643735 diff --git a/hosts b/hosts index 8813170..67b13dc 100644 --- a/hosts +++ b/hosts @@ -30,9 +30,6 @@ bismuth technetium # Groups -[proxy] -hindley - [apt_proxy:children] vpn apt_cacher_ng @@ -42,14 +39,21 @@ hindley sulfur technetium +[matrix:children] +proxy +synapse + [apt_cacher_ng] hindley -[prometheus] +[synapse] +sulfur + +[proxy] hindley -[matrix] -sulfur +[prometheus] +hindley [proxmox] vanadium diff --git a/roles/configure_resolved/handlers/main.yml b/roles/configure_resolved/handlers/main.yml deleted file mode 100644 index 2937480..0000000 --- a/roles/configure_resolved/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Reload systemd-resolve - systemd: - name: systemd-resolved - state: restart diff --git a/roles/configure_resolved/tasks/main.yml b/roles/configure_resolved/tasks/main.yml deleted file mode 100644 index a3eff0f..0000000 --- a/roles/configure_resolved/tasks/main.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- name: Change the DNS server - lineinfile: - path: /etc/systemd/resolved.conf - insertafter: '[Resolve]' - regexp: '^#?DNS=' - line: "DNS={{ dns_resolve_server }}" - notify: Reload systemd-resolve - -- name: Remove the stub listener - lineinfile: - path: /etc/systemd/resolved.conf - insertafter: '[Resolve]' - regexp: '^#?DNSStubListener=' - line: "DNSStubListener=no" - notify: Reload systemd-resolve - -- name: Link resolve conf - file: - src: /run/systemd/resolve/resolv.conf - dest: /etc/resolv.conf - state: link - force: yes diff --git a/roles/generate_self_signed_certificate/tasks/main.yml b/roles/generate_self_signed_certificate/tasks/main.yml index 3fc83bf..334635b 100644 --- a/roles/generate_self_signed_certificate/tasks/main.yml +++ b/roles/generate_self_signed_certificate/tasks/main.yml @@ -4,9 +4,6 @@ name: python3-openssl state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Ensure the cert directory exists file: @@ -25,7 +22,7 @@ privatekey_path: "/var/certificates/{{ server_hostname }}_privkey.pem" country_name: "{{ country_name }}" organization_name: "{{ organization_name }}" - email_address: "{{ vault_email }}" + email_address: "{{ certificate_email }}" common_name: "{{ server_hostname }}" - name: Generate a Self Signed OpenSSL certificate diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml index 5f4be5b..cbd05c2 100644 --- a/roles/grafana/tasks/main.yml +++ b/roles/grafana/tasks/main.yml @@ -5,9 +5,6 @@ - apt-transport-https state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Add Graphana Repo Key apt_key: @@ -25,9 +22,6 @@ - grafana state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Configure Grafana template: diff --git a/roles/install_docker/tasks/main.yml b/roles/install_docker/tasks/main.yml deleted file mode 100644 index d9de1fa..0000000 --- a/roles/install_docker/tasks/main.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -- name: Add the docker repo key - apt_key: - url: https://download.docker.com/linux/debian/gpg - state: present - -- name: Add docker repo - apt_repository: - repo: deb [arch=amd64] https://download.docker.com/linux/debian buster stable - # TODO replace by "... /linux/debian $(lsb_release -cs) stable" - state: present - -- name: Install docker - apt: - update_cache: true - name: - - docker-ce - - docker-ce-cli - - containerd.io - state: latest - register: apt_result - retries: 3 - until: apt_result is succeeded - -# Official methode for docker compose, redundant with pip -#- name: Install docker-compose -# get_url: -# url: https://github.com/docker/compose/releases/download/1.28.0/docker-compose-Linux-x86_64 -# # TODO: replace by "...1.28.0/docker-compose-$(uname -s)-$(uname -m)" -# dest: /usr/local/bin/docker-compose -# mode: '0755' - -# Methode requiered by ansible docker_compose module -- name: Install docker and docker-compose - pip: - name: - - docker - - docker-compose>=1.28.0 diff --git a/roles/install_gitea/handlers/main.yml b/roles/install_gitea/handlers/main.yml deleted file mode 100644 index 3fbdb12..0000000 --- a/roles/install_gitea/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: restart gitea - docker_compose: - project_src: /var/local/gitea - restarted: yes diff --git a/roles/install_gitea/tasks/main.yml b/roles/install_gitea/tasks/main.yml deleted file mode 100644 index 524540b..0000000 --- a/roles/install_gitea/tasks/main.yml +++ /dev/null @@ -1,74 +0,0 @@ ---- -- name: Ensure the directory exist - file: - path: /var/local/gitea - state: directory - -- name: Ensure the user gitea exists - user: - name: gitea - create_home: no - password_lock: yes - -- name: Retrieve info about users - getent: - database: passwd - -- name: Warning - debug: - msg: This is a test server, do not use in production - -- name: Copy docker-compose.yml - template: - src: docker-compose.yml.j2 - dest: /var/local/gitea/docker-compose.yml - mode: 0644 - owner: root - group: staff - -- name: Start the container - docker_compose: - project_src: /var/local/gitea - -- name: Copy key - copy: - src: /var/certificates/{{ server_hostname }}_privkey.pem - dest: /var/local/gitea/gitea/key.pem - owner: gitea - group: gitea - mode: 0600 - remote_src: yes - notify: restart gitea - -- name: Copy certificate - copy: - src: /var/certificates/{{ server_hostname }}_cert.pem - dest: /var/local/gitea/gitea/cert.pem - owner: gitea - group: gitea - remote_src: yes - notify: restart gitea - -- name: Specify the link the private key - lineinfile: - path: /var/local/gitea/gitea/gitea/conf/app.ini - insertafter: '^\[server\]' - regexp: '^KEY_FILE' - line: KEY_FILE = /data/key.pem - notify: restart gitea - -- name: Specify the link the private key - lineinfile: - path: /var/local/gitea/gitea/gitea/conf/app.ini - insertafter: '^\[server\]' - regexp: '^CERT_FILE' - line: CERT_FILE = /data/cert.pem - notify: restart gitea - -- name: Use https - lineinfile: - path: /var/local/gitea/gitea/gitea/conf/app.ini - insertafter: '^\[server\]' - regexp: '^PROTOCOL' - line: PROTOCOL = https - notify: restart gitea diff --git a/roles/install_gitea/templates/docker-compose.yml.j2 b/roles/install_gitea/templates/docker-compose.yml.j2 deleted file mode 100644 index 9f670c9..0000000 --- a/roles/install_gitea/templates/docker-compose.yml.j2 +++ /dev/null @@ -1,43 +0,0 @@ -# {{ ansible_managed }} -# version: "3.8" - -networks: - gitea: - external: false - -services: - server: - image: gitea/gitea:1.13.1 - container_name: gitea - environment: - - USER_UID={{ getent_passwd["gitea"].1 }} - - USER_GID={{ getent_passwd["gitea"].2 }} - - DB_TYPE=postgres - - DB_HOST=db:5432 - - DB_NAME=gitea - - DB_USER=gitea - - DB_PASSWD=gitea - restart: always - networks: - - gitea - volumes: - - ./gitea:/data - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - ports: - - "{{ gitea_https_port }}:3000" - - "{{ gitea_ssh_port }}:22" - depends_on: - - db - - db: - image: postgres:9.6 - restart: always - environment: - - POSTGRES_USER=gitea - - POSTGRES_PASSWORD=gitea - - POSTGRES_DB=gitea - networks: - - gitea - volumes: - - ./postgres:/var/lib/postgresql/data diff --git a/roles/install_keycloak/tasks/main.yml b/roles/install_keycloak/tasks/main.yml deleted file mode 100644 index b291cbc..0000000 --- a/roles/install_keycloak/tasks/main.yml +++ /dev/null @@ -1,66 +0,0 @@ ---- -- name: Ensure the directory exist - file: - path: /var/local/keycloak - state: directory - -- name: Ensure the user keycloak exists - user: - name: keycloak - create_home: no - password_lock: yes - -- name: Retrieve info about users - getent: - database: passwd - -- name: Warning - debug: - msg: This is a test server, do not use in production - -- name: Copy env variables - template: - src: dot_env.j2 - dest: /var/local/keycloak/.env - mode: 0400 - owner: root - group: staff - -- name: Ensure the certificate directory exist - file: - path: /var/local/keycloak/certificates - state: directory - -- name: Copy key - copy: - src: /var/certificates/{{ server_hostname }}_privkey.pem - dest: /var/local/keycloak/certificates/tls.key - remote_src: yes - owner: keycloak - group: keycloak - mode: 0644 # 0600 -# I wanted to limite read access to the private key to one "keycloak" user, -# but It doesn't works because the user running some script inside the container -# has a fix uid (1000) and obviously this uid is taken on the host by the first -# user created... I hope you're serveur is well protected... - -- name: Copy certificate - copy: - src: /var/certificates/{{ server_hostname }}_cert.pem - dest: /var/local/keycloak/certificates/tls.crt - remote_src: yes - owner: keycloak - group: keycloak - -- name: Copy docker-compose.yml - template: - src: docker-compose.yml.j2 - dest: /var/local/keycloak/docker-compose.yml - mode: 0644 - owner: root - group: staff - -- name: Start the container - docker_compose: - project_src: /var/local/keycloak - diff --git a/roles/install_keycloak/templates/docker-compose.yml.j2 b/roles/install_keycloak/templates/docker-compose.yml.j2 deleted file mode 100644 index a102919..0000000 --- a/roles/install_keycloak/templates/docker-compose.yml.j2 +++ /dev/null @@ -1,18 +0,0 @@ -# {{ ansible_managed }} -# version: "3.8" - -services: - server: - image: jboss/keycloak - container_name: keycloak - restart: always - environment: - - USER_UID={{ getent_passwd["keycloak"].1 }} - - USER_GID={{ getent_passwd["keycloak"].2 }} - - "KEYCLOAK_USER=${USERNAME}" - - "KEYCLOAK_PASSWORD=${PASSWORD}" - volumes: - - ./certificates:/etc/x509/https - - /etc/localtime:/etc/localtime:ro - ports: - - "{{ keycloak_https_port }}:8443" diff --git a/roles/install_keycloak/templates/dot_env.j2 b/roles/install_keycloak/templates/dot_env.j2 deleted file mode 100644 index dd648b0..0000000 --- a/roles/install_keycloak/templates/dot_env.j2 +++ /dev/null @@ -1,4 +0,0 @@ -# {{ ansible_managed }} - -USERNAME={{ vault_admin_keycloak }} -PASSWORD={{ vault_mdp_admin_keycloak }} diff --git a/roles/install_nginx/tasks/main.yml b/roles/install_nginx/tasks/main.yml index 218ca39..fe31967 100644 --- a/roles/install_nginx/tasks/main.yml +++ b/roles/install_nginx/tasks/main.yml @@ -4,9 +4,6 @@ update_cache: true name: nginx state: latest - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Add wasm to mime type lineinfile: diff --git a/roles/postgre b/roles/postgre index 3e6d419..f774bc0 160000 --- a/roles/postgre +++ b/roles/postgre @@ -1 +1 @@ -Subproject commit 3e6d4199b531bd328ad51e577b0c6b7be0eaa76b +Subproject commit f774bc096487cba7fec6ed9e196032e169cfbb4a diff --git a/roles/prometheus-alert-manager/tasks/kassandra.yml b/roles/prometheus-alert-manager/tasks/kassandra.yml index bdad442..fb117f3 100644 --- a/roles/prometheus-alert-manager/tasks/kassandra.yml +++ b/roles/prometheus-alert-manager/tasks/kassandra.yml @@ -6,9 +6,6 @@ - python3.9-venv state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Create the kassandra user user: diff --git a/roles/prometheus-alert-manager/tasks/main.yml b/roles/prometheus-alert-manager/tasks/main.yml index be60549..6bb246b 100644 --- a/roles/prometheus-alert-manager/tasks/main.yml +++ b/roles/prometheus-alert-manager/tasks/main.yml @@ -5,9 +5,6 @@ - prometheus-alertmanager state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Setup the arguments for alertmanager template: diff --git a/roles/prometheus-blackbox-exporter/tasks/main.yml b/roles/prometheus-blackbox-exporter/tasks/main.yml index 5b3af82..cc580ce 100644 --- a/roles/prometheus-blackbox-exporter/tasks/main.yml +++ b/roles/prometheus-blackbox-exporter/tasks/main.yml @@ -5,9 +5,6 @@ - prometheus-blackbox-exporter state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Copy the CA cert copy: diff --git a/roles/prometheus-node-exporter/tasks/local_x509_collector.yml b/roles/prometheus-node-exporter/tasks/local_x509_collector.yml index e7c896b..0c82583 100644 --- a/roles/prometheus-node-exporter/tasks/local_x509_collector.yml +++ b/roles/prometheus-node-exporter/tasks/local_x509_collector.yml @@ -5,9 +5,6 @@ - moreutils state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Ensure /usr/share/prometheus-node-exporter exist file: diff --git a/roles/prometheus-node-exporter/tasks/main.yml b/roles/prometheus-node-exporter/tasks/main.yml index db8b2a8..1b2cc1c 100644 --- a/roles/prometheus-node-exporter/tasks/main.yml +++ b/roles/prometheus-node-exporter/tasks/main.yml @@ -1,27 +1,27 @@ --- -- name: Use a newer version of Node exporter for ubuntu 20.04 - block: - - name: Set the default release - lineinfile: - path: /etc/apt/apt.conf.d/01-vendor-ubuntu - regexp: '^APT::Default-Release ' - line: "APT::Default-Release \"{{ ansible_facts['lsb']['codename'] }}\";" - - name: Pin node exporter - copy: - dest: /etc/apt/preferences.d/pin-prometheus-node-exporter - content: | - Package: prometheus-node-exporter - Pin: release n={{ ansible_facts['lsb']['codename'] }} - Pin-Priority: -10 - - Package: prometheus-node-exporter - Pin: release n=groovy - Pin-Priority: 900 - - name: Add the repo from groovy - apt_repository: - repo: deb http://fr.archive.ubuntu.com/ubuntu groovy universe - state: present - when: ansible_facts['lsb']['id'] == 'Ubuntu' and ansible_facts['lsb']['codename'] == 'focal' +#- name: Use a newer version of Node exporter for ubuntu 20.04 +# block: +# - name: Set the default release +# lineinfile: +# path: /etc/apt/apt.conf.d/01-vendor-ubuntu +# regexp: '^APT::Default-Release ' +# line: "APT::Default-Release \"{{ ansible_facts['lsb']['codename'] }}\";" +# - name: Pin node exporter +# copy: +# dest: /etc/apt/preferences.d/pin-prometheus-node-exporter +# content: | +# Package: prometheus-node-exporter +# Pin: release n={{ ansible_facts['lsb']['codename'] }} +# Pin-Priority: -10 + +# Package: prometheus-node-exporter +# Pin: release n=groovy +# Pin-Priority: 900 +# - name: Add the repo from groovy +# apt_repository: +# repo: deb http://fr.archive.ubuntu.com/ubuntu groovy universe +# state: present +# when: ansible_facts['lsb']['id'] == 'Ubuntu' and ansible_facts['lsb']['codename'] == 'focal' - name: Install Prometheus Node exporter apt: @@ -31,9 +31,6 @@ state: latest update_cache: true install_recommends: false # Do not install smartmontools - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Install the local_x509 exporter diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml index e5c0efd..eb6318c 100644 --- a/roles/prometheus/tasks/main.yml +++ b/roles/prometheus/tasks/main.yml @@ -6,9 +6,6 @@ - prometheus-pushgateway state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Ensure the alert folder exist file: diff --git a/roles/reverse_proxy_http/tasks/main.yml b/roles/reverse_proxy_http/tasks/main.yml index 5ebf7fb..db4bf5f 100644 --- a/roles/reverse_proxy_http/tasks/main.yml +++ b/roles/reverse_proxy_http/tasks/main.yml @@ -6,9 +6,6 @@ - certbot - python3-certbot-nginx state: latest - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Ensure the cert directory exists file: @@ -38,7 +35,7 @@ loop: "{{ reverse_proxy_sites }}" - name: Generate Certificate for Domains - shell: certbot certonly --standalone -d {{ item.from }} -m {{ vault_email }} --noninteractive --agree-tos --redirect --pre-hook "sudo systemctl stop nginx" --post-hook "sudo systemctl start nginx" + shell: certbot certonly --standalone -d {{ item.from }} -m {{ certificate_email }} --noninteractive --agree-tos --redirect --pre-hook "sudo systemctl stop nginx" --post-hook "sudo systemctl start nginx" args: creates: "/etc/letsencrypt/live/{{ item.from }}/cert.pem" loop: "{{ reverse_proxy_sites }}" diff --git a/roles/reverse_proxy_stream/meta/main.yml b/roles/reverse_proxy_stream/meta/main.yml deleted file mode 100644 index ff0926f..0000000 --- a/roles/reverse_proxy_stream/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - role: install_nginx diff --git a/roles/reverse_proxy_stream/tasks/main.yml b/roles/reverse_proxy_stream/tasks/main.yml deleted file mode 100644 index 549aa0c..0000000 --- a/roles/reverse_proxy_stream/tasks/main.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- - -- name: Ensure the stream proxy conf available directory exists - file: - path: /etc/nginx/stream-available - state: directory - -- name: Ensure the stream proxy conf enabled directory exists - file: - path: /etc/nginx/stream-enabled - state: directory - -- name: Include the stream proxy configuration files - blockinfile: - path: /etc/nginx/nginx.conf - block: | - stream { - include /etc/nginx/stream-enabled/*; - } - -- name: Copy reverse proxy stream - template: - src: "nginx/stream-available/reverse_proxy" - dest: "/etc/nginx/stream-available/stream_{{ item.type }}_{{ item.from_port }}" - loop: "{{ reverse_proxy_stream }}" - -- name: Activate stream - file: - src: "/etc/nginx/stream-available/stream_{{ item.type }}_{{ item.from_port }}" - dest: "/etc/nginx/stream-enabled/stream_{{ item.type }}_{{ item.from_port }}" - state: link - force: yes - loop: "{{ reverse_proxy_stream }}" - notify: Reload nginx diff --git a/roles/reverse_proxy_stream/templates/nginx/stream-available/reverse_proxy b/roles/reverse_proxy_stream/templates/nginx/stream-available/reverse_proxy deleted file mode 100644 index fd86921..0000000 --- a/roles/reverse_proxy_stream/templates/nginx/stream-available/reverse_proxy +++ /dev/null @@ -1,12 +0,0 @@ -{{ ansible_managed | comment }} - -server { - {% if item.type == "udp" %} - listen {{ item.from_port }} udp; - {% else %} - listen {{ item.from_port }}; - {% endif %} - - proxy_pass {{ item.to }}; -} - diff --git a/roles/rp_synapse/tasks/main.yml b/roles/rp_synapse/tasks/main.yml index 1837c75..c6d66f8 100644 --- a/roles/rp_synapse/tasks/main.yml +++ b/roles/rp_synapse/tasks/main.yml @@ -10,9 +10,6 @@ - certbot - python3-certbot-nginx state: latest - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Ensure the cert directory exists file: @@ -20,7 +17,7 @@ state: directory - name: Generate Certificate for Domains - shell: certbot certonly --standalone -d {{ matrix_server_name }} -m {{ vault_email }} --noninteractive --agree-tos --redirect --pre-hook "sudo systemctl stop nginx" --post-hook "sudo systemctl start nginx" + shell: certbot certonly --standalone -d {{ matrix_server_name }} -m {{ certificate_email }} --noninteractive --agree-tos --redirect --pre-hook "sudo systemctl stop nginx" --post-hook "sudo systemctl start nginx" args: creates: "/etc/letsencrypt/live/{{ matrix_server_name }}/cert.pem" diff --git a/roles/rp_synapse/templates/reverse_proxy b/roles/rp_synapse/templates/reverse_proxy index 8ba5916..7b24f66 100644 --- a/roles/rp_synapse/templates/reverse_proxy +++ b/roles/rp_synapse/templates/reverse_proxy @@ -4,6 +4,9 @@ server { listen 443 ssl http2; listen [::]:443 ssl http2; + listen 8448 ssl http2; + listen [::]:8448 ssl http2; + server_name {{ matrix_server_name }}; ssl_certificate /etc/nginx/certs/{{ matrix_server_name }}.crt; diff --git a/roles/share_file_web/tasks/main.yml b/roles/share_file_web/tasks/main.yml index 3692806..33cf759 100644 --- a/roles/share_file_web/tasks/main.yml +++ b/roles/share_file_web/tasks/main.yml @@ -6,9 +6,6 @@ - certbot - python3-certbot-nginx state: latest - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Ensure the cert directory exists file: @@ -46,7 +43,7 @@ loop: "{{ sharing_sites }}" - name: Generate Certificate for Domains - shell: certbot certonly --standalone -d {{ item.from }} -m {{ vault_email }} --noninteractive --redirect --pre-hook "sudo systemctl stop nginx" --post-hook "sudo systemctl start nginx" + shell: certbot certonly --standalone -d {{ item.from }} -m {{ certificate_email }} --noninteractive --redirect --pre-hook "sudo systemctl stop nginx" --post-hook "sudo systemctl start nginx" args: creates: "/etc/letsencrypt/live/{{ item.from }}/cert.pem" loop: "{{ sharing_sites }}" diff --git a/roles/synapse/tasks/main.yml b/roles/synapse/tasks/main.yml index ce0538e..21ddc44 100644 --- a/roles/synapse/tasks/main.yml +++ b/roles/synapse/tasks/main.yml @@ -23,9 +23,6 @@ - debconf-utils state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Install the pgp key for the synapse repo copy: @@ -51,9 +48,6 @@ - matrix-synapse-py3 state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Configure synapse template: @@ -68,9 +62,6 @@ name: nginx state: latest update_cache: true - register: apt_result - retries: 3 - until: apt_result is succeeded - name: Generate self signed cert include_role: -- 2.38.5 From a7d84f2885e49158e91c632b90a2097e7e0550d5 Mon Sep 17 00:00:00 2001 From: g33kex Date: Fri, 22 Jul 2022 12:00:06 +0200 Subject: [PATCH 17/19] added monitoring group --- books/monitoring.yml | 14 +- group_vars/monitoring/main.yml | 56 ++++++++ group_vars/monitoring/secrets.yml | 183 ++++++++++++++++++++++++++ group_vars/prometheus/secrets.yml | 211 +++--------------------------- hosts | 7 +- 5 files changed, 269 insertions(+), 202 deletions(-) create mode 100644 group_vars/monitoring/main.yml create mode 100644 group_vars/monitoring/secrets.yml diff --git a/books/monitoring.yml b/books/monitoring.yml index a680dd8..e738a56 100755 --- a/books/monitoring.yml +++ b/books/monitoring.yml @@ -1,12 +1,12 @@ #!/usr/bin/env ansible-playbook --- -#- hosts: prometheus -# roles: -# - prometheus -# - prometheus-alert-manager -# - grafana -# - prometheus-blackbox-exporter +- hosts: prometheus + roles: + - prometheus + - prometheus-alert-manager + - grafana + - prometheus-blackbox-exporter -- hosts: server +- hosts: monitoring roles: - prometheus-node-exporter diff --git a/group_vars/monitoring/main.yml b/group_vars/monitoring/main.yml new file mode 100644 index 0000000..52c50bf --- /dev/null +++ b/group_vars/monitoring/main.yml @@ -0,0 +1,56 @@ +--- + +ca_cert: | + -----BEGIN CERTIFICATE----- + MIIFhzCCA2+gAwIBAgIUP+ptXLNUBVsZm5oYpynQd5mhB60wDQYJKoZIhvcNAQEL + BQAwUzELMAkGA1UEBhMCRlIxEzARBgNVBAgMClNvbWUtU3RhdGUxFTATBgNVBAoM + DFBhaW5zLVBlcmR1czEYMBYGA1UEAwwPQ0EgUGFpbnMtUGVyZHVzMB4XDTIxMDky + MTE0NDUxNloXDTMxMDkxOTE0NDUxNlowUzELMAkGA1UEBhMCRlIxEzARBgNVBAgM + ClNvbWUtU3RhdGUxFTATBgNVBAoMDFBhaW5zLVBlcmR1czEYMBYGA1UEAwwPQ0Eg + UGFpbnMtUGVyZHVzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4jG+ + 8N5YN91KghYjYTOBQ+lRYJ45X5S9mfcwwf8OIMGe+NyNkXx2GX4uYpZOitYOApI4 + rGnAjhll7tdZevzfdqpUDCYUDT6iR4BzL32k22mIN+iW6zQPaZetOU7VIA9V5TsM + WbDsftqh6fj3N4SwVMpHiuiajMkX8CIELxoXDAJULvwyreWOONlwDMObtVCHBIhM + uf1Jbx2DfRNS/w6lbHPCrZefMCea1FrSaotOANXxNgQfptX3fLZbhH5RiZQLDU8k + ZChAUoW9hE4+uiSOUMd2hl9XgCWHcGEMcKyWG+/lx8UUw3Zl+oOrfb+IWo5IByVZ + 8nV5aiTMCuRlcTcMHUuedRaPcWfl5ZaEOVzhYXIYM4Oa8ShqXuWqW0WZ8oIhI2ya + hTE03mIPV1nX3ucE9GsDZpnrj7t+qd8etiZXFGVihKEqVFfhzKRsPh4wgUKH/gwG + AJshPA9NyJ0JpzUaWQ2acUjo3Hg9WPSTaMb46FS7hUdZUcZZiwSq9JjHDNAUKjNY + zudKjTyqJXkqwhNvMfKWFIGYjldvZgQXzuT8XmSHYSKuLfH9Ko28FX0Aujye1TTH + MPljXruyO04Q7NUg/jqtxdsWRpH/qCt12PmRuIiXsNCAeLjSuc75H+AOPbNudJLT + w2AUTkfn3mw/XTwEBfemHAo6GAdtCDKo6GxBqvcCAwEAAaNTMFEwHQYDVR0OBBYE + FIh4sxxlmesmbVKPWKo81BXMFVqVMB8GA1UdIwQYMBaAFIh4sxxlmesmbVKPWKo8 + 1BXMFVqVMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAKipx6Nu + QwnYmwYPd3kUVBOj9ia0PVeE4LoUSRapzRTF2HilSIo9Sa7qD1HVxbWrghUPLjW/ + Ru04k82hxvAm26gc1XeqIBzpgZmxwF0QibCeuj1vDXsndACXVHd6Atvnl0rW4bEI + pVCqerXNu0T4STk2V/xNqndGMRp/vZX67BlyHAHD4el957R9RYlyxW6fADrHDKqk + tC1eTeQtEi5W7v9X3dNGdtFS+exDrYpUTHPDwM81u25oCGUFGsH3RlG7LUEQ5mYW + SsJ3EKpIkMxSZB3/GqttCIHi+yEMtwDDL3dN8UnVaTkRjVNQxraOUwe66QByGqnJ + 9YeQNpUfZxWFW/GW2fBAvD/RaLrLZ4ywhUze38ks4jsLnAIduawjQ8GlNg9i2MqD + zvDat41LWSCDjRUOfCp7fc9lMlI5blTafozrAddMV8YUs3bQ6XD0H31pP59jb7nc + 5kmwqH6RivbFZZYBquQVujiiI7d+9m+X9OfTZJTCpRPCGYZcLuqH7txyPhixxrZd + a8lWJ+5jHOdncV/ZWSB5JnjKbaMMEPcaTo3puEPt/yl74CR7UOJXr5oM0bVFKjas + 90hY5U+jPAcneCk2oc44R4NWuQ7qbsjPRfcxxi27DoLbhlmPp9jQwYQEqmdflcZ0 + zCTEq81KO2mAbJgTc/ahhcvAV/huJ5d8c9R1 + -----END CERTIFICATE----- +crl_distribution_points: + - full_name: "URI:https://ca.deso-palaiseau.fr/revocations.crl" + reasons: + - key_compromise + - ca_compromise + - affiliation_changed + - superseded + - cessation_of_operation + - certificate_hold + - privilege_withdrawn + - aa_compromise + - full_name: "URI:https://ca-pains-perdus.intra/revocations.crl" + reasons: + - key_compromise + - ca_compromise + - affiliation_changed + - superseded + - cessation_of_operation + - certificate_hold + - privilege_withdrawn + - aa_compromise diff --git a/group_vars/monitoring/secrets.yml b/group_vars/monitoring/secrets.yml new file mode 100644 index 0000000..1a2b783 --- /dev/null +++ b/group_vars/monitoring/secrets.yml @@ -0,0 +1,183 @@ +$ANSIBLE_VAULT;1.1;AES256 +35306430386637386563313131333565633136653435623965623463336130646566623139393861 +3264326634623533373663356438323334393466653162320a366339643733333062366165386263 +31613232356138663465323362333437313835616361346363316639313665393637303536613730 +3130386639343132300a376230643466616338333131616538313061663765626539396361336564 +61346433663339343235393935623663323739346539636431346334326366366266303937643435 +65616530643330363331343564373738633763366131323862353966363264383237366230663839 +65383162346330313231386439353238386163333662316135363564626132646333333936643834 +35346135336530656137636538616536343261306264336562363732343264326139663538616163 +34373730626262316531343336646236643333616136333231313864383336383839663534376263 +36636362373062316137376639616436363361393130353262653662316261616666346430373861 +61623031396365646538653036373232643465353766616332633535356230373661386538643234 +31656634313564316361373031383230383664646233656161323561636266346335316632316465 +32666131393066373233386437353738663937346638626463386434323234353738386630663063 +33316164326234666239643366393638363138633466623733326534376439323732303736613564 +36356432663738653862343461653030353230616566383261633431386336336637333064356362 +64373039633436353230613865346365373063376132643732633836323963336264633536643266 +36616361373939366132663035336364633238613731323531383564383636306264633561643931 +34333838366665316331363638373934313364356563373366363434666638343635323536383335 +31373661386135393338363337613839356232303730636137616561616636323732353238316365 +31396562313632373964653531656464396531663130313633363165306331356261303837643237 +35636661306234633662616166316539656433353064343665393964626437613965666234656132 +66333939343939333763373264343461353064313831626162666163313833343239376639653732 +38386631383662386538343537653061363466306430633836653538646166396465626434353836 +62346239336331333764373338633137313335386234376465353930376337373039373735323736 +39653936613964323462306433633833666337323065333663653639633363626537613539663138 +37383763356237323436633335383632393965376663653061383762356334346335663133393666 +39646235363639303536643133653862343236393939353733393632663830356662373332386435 +35656632613766343138613139626563653536383437326131333664666437396238333661313363 +30343838393334633235373462346665653538383165616534343165373339346437666332303365 +39633135363266396536346434333738613435616337333535316534366234356363353735633838 +64356532373631333564346232393734623638666135383138313237343730313565643538386665 +37653362623863366338313237363663316364666332373434363532613164333433376165613564 +38303561353165633763613434623266336334303264346231353439316536386263636135376264 +32356162343561373839653435653264663739346132656239323837616337393238663465393436 +65353134346663653237373731643232643733323464323239663534336335313038633939313732 +33656161616338326663396636386233666166623731383565326264373637646534383934633336 +32363534343538346461363639653864393939353432623336303732303935663831383337633461 +30333261396364656332343737353938363835613934303062666262653638353134363038393232 +34363433306433633331306237313765366234643939363331316337333261613336303136326338 +65373064646332353831656634343165363637383734313734383738653531373533393430666431 +34393230336562613561646432636132383537346161643362633337323538663038313834306637 +36316130316337333063343530376538653866333865626531633861366235633635666236613032 +36383933623463386131666133313036323030303533313863313863353639393135343264656536 +30636535356431623733656665653162663362666532393561343963646161636435663762643737 +31393833323534316466316163653231386138653663306365373561393533346636663233333163 +34323031383130343164633231383333373332653435626135343333303232663962666163633161 +30653333313430343831663937333462386162386165333835303261396333343664663538313931 +33663439663930323766333861393361316366656132666235616366653431623038363738313465 +66363165323735353539346431323435323865613833333166336631393463316332353335343839 +62383261393438303639323132393765363134623235323139663432373664383538626136303033 +36306631646135303165636436326538653134653332653134346466663031623735316131383261 +64313132323735666533306537303466623033323665656538306261623839383538363165333866 +39343235346566366333316361333639356238663833363236613065396232396338363539646461 +66653335376432636635613037383634383438653664633133636363356466366566653139376635 +64396365323861376631623838343465323036386538336431393834613336366230383263336364 +61323962353262646632653335386239653561343366313661333736316138303764333238333437 +32376332373234353538346232656234356634333032313661383762616637386539353465643139 +31383430333631313161353534626164316662656335396635663564366136633866353232623237 +63646136613764663261636264653162333563373061316539383133366165663932336536313136 +32343433343238383363336535333064623537383735326632636638333037353335613862333939 +66376666343438316332386334316134623033373166333435373064356366636262303237316662 +38316532656238633165373739636333643431373266616331626465666237323366656535396539 +37383633383032313134343332333839396334633431353239613338633634626538373465656665 +39303535653230306132303461626437636166336434376532653031653065353762383561363230 +65373430383031636464303236323063656336376364353137353135306137633835383363386262 +63643566663037386430303965343639653663636632343665323765343761383833373961356332 +65346466653334323239316161376435386135646531303264306430613237613836323939653433 +33653862313863363734616532643637343833646434623238646332383665306236613734376530 +38633935356164373937386163643961663861663665373332656561393965326464623065663631 +39656166633065356533373563376532383966653730613366643930333232356430653061323430 +34623262613939666336336265393763366638303162633232366232643566323239623135333364 +38666561396632313234666566376234663365356365346136383631386131393264626562336536 +32353264633133633435356263356261386665333032633035366236396637353433366464353035 +66383238613464383266343538643433366534313638366162633739383532343931313535313663 +33333365646636623135366265313432373762643635623736663364343838663063313862626239 +31396230336631343562333135376437613063613531323761383662313737373633313735626136 +62633035346636306535633866653033393930323465386438306636653131303465633837643839 +30343566613337333837656436383731333763353266646238376135623031306439656133333663 +66356134393438653335313435396463373338636164656336366161643737646237616165393837 +35386536633465666630616661393536376532373033336565373630643461643764663564656238 +63653330333938376362636562363530663866323865376362643938623764353063333933366266 +30643235643939323937393239636238346433326336303761333166326166363935383564613834 +38353030636133346432633761313036623566323962343436323165336137666366393835623163 +32623734326431656365356532326339663136356663623939313537343934373133353134396238 +61656163313934353039373739393630333832346439336133333936626135373638363138366463 +38616165613730323136386334653337313736343536333039373063393334646665623036323035 +66663162306231373266346237663431393464386631373862363562346536313866313239663239 +33353030636464386662366637626138393565383239613166303231633538343038323032353434 +62353138633961373930333239636263313463396537613933333261313632393939333562636636 +37336137623234623663663334623239646464333935636634313062333139616661666532386533 +39373864323030623834333337353565383834313837373334316334663835333362373439303466 +63316337353965396531373631363965313539303536666261376639373933353234643038326236 +62366535343535353833373531333838346466656538323235383339623566303031623630396630 +63363331666636316466666461306561343531346162353234386534646437383762386236376364 +30366431326132383964633565653866386265396263383539313063306537616166636337623639 +32653032653462366162666634626662613962646663336562383661366363643532636537336538 +63393831653032313866623462636364343466343331383166653233353666653262386436393366 +32613663666638386565346631653864373237353366333561303266646439316531663138626264 +33343833356663636162656663643963666266336265353532613331643266323764363138376237 +31653264386363373661336437616264633530386335663239353639626261383036386566313335 +33633335366566656434636361666566336436303539626538653632363864663134366635326634 +32373736396361333562646265333932633438643666363437323834313331646635323630333239 +66313763323334373839386232623332383162393162333733613136613031346336313239386236 +63653331626439636532613434383131373038663962326535663739356438336563343837393065 +39623838653036626332623661646337666462623734366331333766326566616233376465306464 +36663864653930303934396661303830613762643366376133666366343936323937366330356339 +62373061393363373065663565613064616463646233613164323633333463303065313264316432 +64663062386333396334623533386333323835646435616634613265326436303430616330663034 +61663936333935383237363733303164333766366136386131343762656232316336366237323331 +38333834376664656535376263393664316533353839393366623766663134623639663861386464 +32393831326334623534643232653961646363333861386463666431383035663465306130643937 +65356563326330383736636562356436363965356237343061666262386232663939636364396630 +39643131666332363333373537353735383165356539636434356234353239633333316561626362 +37323230613239316531346531633463376632333266656165316566363866623835336464346230 +63656530376339326165333761663239356238623933653762346430653832396435623730656466 +65333463353065346435333438336433616139313239326261376130616335633263366335333865 +62656362376432613137656163633833393962393934383766373262376537636532643164313662 +39653639623562303862646434366639626239346163616361626336666631303862643930393132 +30353766363461396465643335356530646365613132646637353738393363353033363462336434 +38633634383237653763303765336131666337323037386330363535336563313461303234343963 +33393265313736653165333330323964333862396331323837613432393361363863333064386463 +33383036373533376266363731646437376434613930393562643765353032636265323765363039 +61663939306432303266663634666437303931363835666339356563393365393034376138303132 +30663833326464663230613266636366613336633064396261333833633834383636396435316438 +39646539323562393163366138363364306334336463313566363464343037653333333834656231 +64656236363062356464613333346436636532346265653037373631353836383266663339323466 +66306235306462623936316261333336336661366138373937313531626339343161323131333931 +35633564633535663833623765656466356435303762663863373231396663326161623366333737 +61343534623331623238623334623961396634333630393366316135303238303864373365643766 +34326235313435366133336536376337623938366235633135346333653866326265363932663565 +39663939636665313333363936306533356564653739633139613435653563626466303137343064 +62346230353135306130306235356631643038336431323566326666643030306261393532383366 +37386562323232663038383661333561366264646662383738363562613631666665633930313335 +38343963616664306137623362393436383166613936353830393564346563373963663130653937 +30653932346436616238636537656364313538353561326162326139373032386432626632663461 +34623735373338303733323034333931383161313133346266396364373032313662663731376135 +64666133383566373462333066646634636631363963636436383936633963383766623236306439 +31393738646363306334353464333161373031373265653964326663626531363463333639373039 +33623734636433396566326436316638643638633739383739626639623136663266633133623264 +66333931653930333565356438636334613032363333326137623064306136386134666130383938 +62633931653366613331626332396538383536666562353533323265653533376133663461623732 +34326364363333363563353266626463626464396461333531303736336266646238353163333438 +65343432353332613264313638326431613963363635313963346637333034653565346561633935 +62346362653162656263356433316262386438396638636266613766313038336534376339643239 +31623934376465333763393665336661343866376337666666356433393765343532383936346432 +36636564313861323861323034613037626639356465323230313565386137616531363530326239 +31396661306130323465663631333636643934626530636339653162663430653332653764386565 +63653463353861383635323539633433383839356431326262343064323430333163636363386139 +31316132393362386261336262613263363261333931363637646630643530366266663264396532 +34643831663536616365633961623932336131303064333861636263323565363764346431306231 +36313831636436613239353665333638393762396163616566353932376431656666623838346363 +36613061346135303066643332336163393534363938663537383961363834613536666537613339 +37626336613464613433363863326261373235643535366661323930663866636135343330393830 +38633234663038666530383334613032646634643434613064363564373536386566666635363462 +33366233303636653435313934613063353337633131623236393831386433393564333533393237 +35396436346538373532653662646161653264383233666336623035656662633161323530376365 +31313534396336326438356433366466663934663135636531346537366265303135313038613531 +39313838313533663861626630666431343066336535653561313463323665633131393063393064 +33636536316365663937363932613838353234653236623634363439663362336631636264356664 +63386461613164613639626530376337313530343230663032393639323832303733623433623564 +39336430643961323761346539623165663635386338306337616637666438343561663364383539 +31386636643836343233383264656234616361613166633735353330383862626331643363656332 +65353730363038626636636537303335383937646135633363653134306361376364316362653731 +30363837333234386366393631363833316361313132343865376666636364643833356363663932 +35313362623166643461626133363730653737363839303139623662303264656362336331383030 +62303430623533623030383262346563613361396130396136376132383264633838656463646332 +39623333306539326337333638363137306235313539346238613732646233633430626130333138 +36313937653433373137323335393639633737333664636238653739353138373264643562613463 +34643661643538373037346433336237356334323731326163323836343332666338663663613436 +66376536323464353138303230323133366562363862353363386636396665353032643437653633 +65343832623636346565386134633763303261306263383336353936343162366663623265656639 +39383661623838643165646531356136316564646232643537373662386439343533356164326134 +36373335333733633435616132353963373130343038363965343166383835373131303435393031 +33653532313237623736323636353635313234343930663039353562633034373961376162623766 +37393965396635383936666565353336316433396632353738333833366134643433316438613134 +30333563656165333335643366343636623938383737333535386235383634356431333035613232 +37353433323730643361316337653735373862633030303764633331663836373837323662636134 +36383535616165323332636134303462653065336461393264656634393366666139663337393136 +61383566303762386531666364356433326434326632633766646664373661636434383033366138 +35363338626666313631343962326532376634633564656137363236613838346436376266323838 +35333166653930623166643861636562353831626432393536666535333435643765393066366339 +6135633232653265376433363338366662396266303261393232 diff --git a/group_vars/prometheus/secrets.yml b/group_vars/prometheus/secrets.yml index c1650e3..6c8e778 100644 --- a/group_vars/prometheus/secrets.yml +++ b/group_vars/prometheus/secrets.yml @@ -1,195 +1,18 @@ $ANSIBLE_VAULT;1.1;AES256 -65306634353938626165666434636535366339323261666331623065303464613835663338303432 -3732313031393264346335333832343764393733376665610a346330363963373830613034633732 -34306534633733303334333765376262616138376132636633636539306232333037393439313463 -6236393237666564610a636535636333306361663633373263393730393835313635653839333239 -65353237656534663533666163383231393961323531393435373062366633343833666138333532 -31303162393261373839656535313735316361346264636161623237386430326138303964386664 -30373730666438663030306261356661353263643661613762656438303761363736356139663939 -34323665353762386533623565356532643337373066366530636361656233393136303963376537 -36326366643431303036373261333733663461653636353032313464626566613666343336363162 -30343935616538376630333434393138316131636561366264326165393530663336326464356531 -30623831343964306231336330326237313633323933323233313731663538663136343735393032 -36306361646434356263633433643438663730663961336533363264616339336536333462373839 -62383564663563653966366139663065316663356663383033653834363831356433393835366133 -37646561623339386464333761653166613063393739376330323734383139373437303337653933 -32356234366164316561366565326261373837316262363137616637623139346562396638323963 -39336466373338366463616337613239366131623635623461383565313662393565353839383265 -34323665626461643663313932656334623632363062313838363934306637323335656266653436 -39336439343132346633613562353366386338613164306262373032306166326430376165336537 -38623439306135643438643930323966633962633261653266613461633836386439633536303937 -65373862383263313833376438386436633563303233373466393335623239393731663834383933 -36333438663931613335383132343235636534663637323735653339386662356366306339336365 -38343763636638383337313564386564386535383736316331626531666238663337333238303935 -39636436393232306431663963616430646131616364383862653233353131396265393836366131 -33303762633533356332636139373661616436306366303430623864336435333363343663656533 -30316261663932393437626133386364326362636262366538623732373961306366356133323964 -35623635316264346635356266303237323535376362343738616564633865303236353861303636 -65393038616662653966616230393830323964336633656565313639616630613832303133636635 -31636436636432333739643133386236363039643430646232363632366664623866623963646431 -31373061636563393035343035393238653562623063366530363461613934666337376232626364 -35336161323234386666613136303935656635653631366339383863383635343566323561336537 -61643336623936393465623664666566623039636162346563333866386531356537643737363437 -39303530396331383536613762323636623235376238666434383635656461313636633130643732 -33333034656264623233373137303333656335323434353732343634333733316532643134653437 -39323762663535643563633163303435323264343031623764343930653138363433323162303866 -39393662333136633466343832326661623831313535363435323764303035636337653731336361 -31356231346562666430313062633935636432633238333034323437313935396266303039636234 -30653331313461386334616161663736303036386534306164653834346230363636613036656238 -38356564666166346439643836623237613832626432303833663866333564363830366634303466 -64626364333531343434373633373835643562633836343232633834373165366434396465663062 -33623932616461613233626664626539646435633964646237626263376361343934633166306265 -65626130376165383766373830383931303930366631633135323835653635633135616535333734 -62613532623066363363623933306666303265336134643739366230393139376361306530353832 -36643733346538376330353861646339623266613261613936663131663830313961373634303230 -30626132356335363064366663623734396365633366316239616263643062303538636432666633 -66663064616538626630346330316530303666633531653965663463333334386538656634356661 -38653266366638663164343865353230393663666430316661653565303839303061363639303063 -30666364626136633963396433326530313462613637346136396233373433623766643239383263 -34643139653239653661356265343330663736303563346536653037343833663364626562333361 -38343438393037326433646337663666343665336236373335613563623261383861313236346536 -34366630346164363038373130626537343938666264363136666665343561613630376131396261 -39653561306334343961346239343035633266326332353563353935306431396463303030373561 -38656134353539303466356635373039623730363862653930626465663763663165373639306461 -30653730366634356662396136376134616237343430396531343637363663313334666539306664 -34333266633335643366343531343865313863313761343661316566663235396235616263373032 -39316635363931616266613134663435313463643164373962616535393435366361323830346464 -34393431383866336664393262636666346561636335393661303264313065653264623966353766 -34393137386536343939353733626232373538623137393832326562376637313162353463653534 -35633761346164393838326239643036343536333532393536663134323965653964313632306366 -34313465356432613332653661383938366566616463323565386564366264613937626634343061 -31633365646438623565623964356362303033323765633434653563363362393036666139353530 -64353734313661613530626130616661616265353964353061373037386461356163643430306639 -39656138613233613164366332363162333339363361383437306562323530643430623363366264 -32343439656639663766333663343533663361303134383535653339373730343836653035643638 -33363033303965346632336665623364336539626361333162653837356562326161303432316637 -35346536666463373961616461383061663863616532646535623835333737396166616537313537 -65326231303464343936313636343666393738316139396238313337656333613863363361326435 -64653630666138666134633362313431353363303863376237316366346430303763616164356534 -37363833626562306638393866313537383661396131313837633430386361386136383837396166 -64373235353831323439343538376362373538366633386164663735353562353764313331363364 -37646232643861363833356137346261623232393566396461363139623030303738303266333737 -32396431383361396134653735383737653462613037663235383466303964396565633666633332 -36313364306330376464363465646632313531353863656665623531613563316530623461653334 -39373061633134363765316131653738383164643131643664323334656537353963623237626634 -31636565363334393266386365636338616666323464633336613536386434373339386537386235 -35333137383761663635656132333263336235356261373465323137316362353731653736366663 -61383864633930643862663062333336633863373434626435663635656630363438323831386533 -37646532613831336463343737653066316531323764323135626264373030626434633233623237 -35316135396330346135613731326535333961313331653736663266333836386464643261646533 -61376530616130303364343265303333336333656538653064643164316530306162326238303738 -61616635373430616432666362643536333633373638393663313838633434366566353530396532 -66353562353937646466633439313331353931333636393362356335656231633835323364316365 -37656465626539373562646334363839313331633563306434383663633531626663333930353133 -32613936333865396466373263643933623333633565653130373566323766666433316661636162 -64346366376437653961306564356236663136333935393336366639303831623133333236666539 -36393230663735613163336164626164633131653965333962653364393361366462323636656432 -33336634663664623132636437373138636539373538383466623064613266353862376530353835 -62303732656532373465616531376232626161356230653635396135383561396438373266656263 -30316637313563643539386435373462663334636631366633386633646135303039306663613635 -63313462373266663462656539353233623961353832346335333432633230636534323064326463 -64633336323032636236366138343862303534653330626431326334356535323235613631613636 -31306632363130626465306531356464306164383966306632363031636533393666656530623337 -31383231333463643864313863303032663034383635336436303733626534393165653530643861 -66663037326330363962373161633037383437646365643538646635616237633563303133316563 -31363932623534643034663264363466636531626262396561383137626235383864306364663865 -33373136656564623332366436336330343034323664646434616339343461336335613365653034 -33356165616261303561353934643630656563353133353733333961366362633136386532643166 -65333839366437633538313963636238303135633131326334663734623935353439646436373930 -34363162653333356264336566613837343139366666343338383266646637613835356537393839 -61343431613236653834306438306262323937343464633262346637616336383063333735303332 -31346632393334633037653164643937333761633936616461636331373164666337643536333430 -62363431373362653461616662636565666332623132643333353937343332326534306666396231 -37653832626333303635323364373163653837613631396437343434376532633331623431623663 -33353431306664316332626662396438393962623833386335653330636631306130636631633434 -31366661643033653962613938616233653433336462326538643930666362336663333237323164 -34343735663038336232336134353432626439316339393430623266333563666165326237626264 -64336365333461323361656665653537643966326362373338393864663363313930313565656165 -64613761616136366162333231383464663930663761306466643933386135613936303664643639 -61366231643433303733373934363965623261633961366232656135313462363265633334653234 -66616536616138313064316436333262323466363533313930303862663565313134636564636631 -62666336646263316530383632326635643838373632303263613637646332626638353136653439 -31653139383732653663653066373865613139373633636137353337303336626136303036396337 -38643232633736343666626363666431393462643166616434356237623634393263386337353132 -35373639323061373666626433343534303065346534393233643730396333626334303861306132 -33316666343035373365366638366463316464303233333733333661373139383035326363393431 -63633663373261373565616337313131303737353961373235333635323063353164383438626362 -63663965613733663065386437646562313230623261643237636362386535396264363062323738 -32616630373064356239386136343231313631326635633233653831393736636364636431356433 -61313866393165336133363738383131356466333136613635306364633139323935303038343663 -66636139346336303832613763363966393734356463373863316437663163346335333237376633 -35306639653936316430646264646437303132316432316437656536643734353263303062353233 -34663038323236333435306262313934386630396461633462383339666638616633316338326231 -36343338623161356431316363653734383039393133383839626532643630333737386163623164 -39353865643933306330636130326132663135386165633939383561306563663033356334663236 -37316566343561616130613062343166336132383039656465323562616364373035313139303338 -35613764643061623265393537663639393165636663613337343633613164623466393734623864 -64373565333132373264366534353864633432383631633531373061353135333365663762323032 -35366166356261616633383263343035353132313732626262383630353539303232623930633031 -37616638653731653965346566396233386539626534393666353762303565386432393162333064 -66333336383434303065373236383664663335316566326361303530666432666565666662383063 -66626631303565646166636334626539363164616166303234383339326632663838343235393037 -63353763366566323538366361376233376537303063386264643831353463386632313436393231 -38333838393832313531383937666137316132366339666634303061663133663733336636333435 -30363936356564636137613337643831306135366462663835643065646530363534363965653738 -61393530343037666231386334323363376262376265313462656366653535393038303962366166 -64656131623435323534353461386632643266623435666433313538663631653532303737303963 -63653931633131633461613933333437623665626537646136346232626630343737383136343331 -36316136303364343134653630643763353933616436643036313731336637653965366433343938 -34306337393530623339373364353465313063393537303136306632313537623564303937326333 -37383139643564393438303539656165306562343731366630353934663363313036636630653036 -30373432366362313834613339653935303434613936393938336461623933333935353965623739 -30313630393865316131386131346139346664626230636531336362393965383466356161333439 -66636432666432356638623437666362613935323134346137386536386133666336323534663262 -34336539643337616434333438643136313661636165356562633863343435613263323639326164 -39663738363462366239396438623037663235623562656135393866663534613731623761373034 -64663237383330643565393034636530336362636462623439323339373136333330666235316438 -35383461393032383663653532353636346137386363636362363765663865396133333333383731 -61613763633139303833373337323536306632373562346634356262313363323566646535616433 -37393864643637353035626665303435613733343133653064633033623861376365326431613332 -63333238666130313466333061633337383465666138393838613830656439383364393133303964 -39623233636665356165626534326163656436363831316334326238343638333931313464656237 -31656433616530363635653963613833613031346236636365396631316236323664346661653464 -31633537613732333165633965663037343338323538626535646537313330636462653063346235 -38633833643765346638636434356536313339303865636366346462666331306637653366386531 -61353938363662663030393039373536386332346433313565376564373135666566376238303932 -66663830356530313161646139643864313838373632613665666430663430656164323734636666 -34346633613932653863613830383933306232376636396230313862373532363039623061343338 -39623732653932336230663239373539323564313538363633623663363265333230653530363265 -35386661626631636336306637386630623564363733353330396232353931333032316262353133 -65616462376665343539343666643361626464666362386662316134626266336665353163346536 -38633532346366313339343733333962303535623534633931373331646433343033343535376466 -64383666373531363736653333383839386464653462613662633466663432633361376134343464 -37633166656531646261373262336334663065623532376161613132666637386334626239626236 -32323833353338393662613164326434666462626633383834386535313462643766343362326637 -36353239633938316563656564343538386231376464333837653430613634643834313533376232 -34623336366361383330643061643165353838613362643161393032656536376534353035623066 -36333430653034373561646234373238313739663035366261373961376132336666313539383163 -63383237393361633966626466656566613432316633376261353466333062323764323731626333 -62323334303237653136353166616337373762653564626262653233633435343838353239376261 -34353035316537383933623466313531333330363838313766373737346666376337323037636637 -32373937666638646539323762656431353866626236383534643130333166383363646637306335 -61313465363632623237333136326636383238646563366232623837316638313538313066396461 -35343739386237323137343964666639373433623338633738333832653565373936386431666164 -35313164303034663935313330313438353331303863613266386166303938616631343234663030 -33613535643334656638383663643133613935373734633935626332326536613963366464653230 -36613764386136316239333462303861326263323164353063666665636139653666653562393131 -37333062353164323530643439396662323666316262313266353831643362393864323739616363 -35626363353732663663353662376462363035303835323834383935396664616130623037663461 -62626135623562323963303830346233326662636166636162373263643231343634613632653930 -63333837383135646132393739333039306565353166323737666533663136306233373030373061 -39326136313631316665383561396564313830613464383165316130633438316637643330613361 -63353537633762353731366537386235356631653336363364393763356431643032656435613739 -36383835363135636162666366393035653034376466376433613266653031393463396239383065 -37326336633631373233346430363137386638333334363361313336386666353565396633373038 -35336663636262633263666265613163363666646164323334626137643432383564616235616562 -39336564383335313335653465643864633064393037386363373566323764366533326630333733 -31653137623261313263316631623531373831313564363936326431313633386166373032393161 -63363166336230376130633265666130396235353635336161643362343063326564613561383962 -36393830353030396566373736376333666536383236353361393365343137316130303965633630 -36306237663831336232633163393032653535396565333666373438643131616639383436353461 -39313263343964363838313737653065336335326535306231353266623830303232313365336466 -37303638303663643964623830343166393834326339376132643862383662386262636365303461 -64396462656632626436343966656131633732616563326130663730326137363262396530623430 -37616638313661313366353737663234343264653434313838656264636262643535316164373130 -3065323635386233366533373733323234393165643633626335 +32373765643939613231393031333062613064343062616361633265393733366638626363663263 +3261633230383735643663303334313338666364613236340a393839333730386439353732303634 +39663536346132316634383837336530306661613963396664323436353034376539386162396666 +6562653730663434610a636133623133303830653830623565393734306161303439396637313536 +35313637393734326637333437336233643966383636663565623366666463393261303164313162 +31346137633165306261633034653234386263303239353332653762366163366630353630316464 +66336234633435626563386164656133353433393637633937663432303637653635633465663830 +34363565663039383366363433626531313737323333316465346165633338633735323663343734 +32376233323434663630333462666631633437643830363663376438623334336238636132653232 +62643462323735353462363536383262666663353964343532316130366232393232656364373832 +61363466336539356166373063306335363161363566383466323336313139386364323435313834 +37366432666430333036326439396539343664313261633261363465383666363364346231313461 +61323931343364633137303539343763663337343762313561336432613838323861396564326235 +38666436663236363463396261363430643032386435356665303438363239313263623364653639 +34653934623232613665346535383163383837353762626635633434663230343565336432303136 +33333962613339656566353833663037396133623466313932313064306466336630316331303235 +3363 diff --git a/hosts b/hosts index 67b13dc..6c0e7d3 100644 --- a/hosts +++ b/hosts @@ -30,6 +30,11 @@ bismuth technetium # Groups +[monitoring] +hindley +technetium +sulfur + [apt_proxy:children] vpn apt_cacher_ng @@ -59,5 +64,5 @@ hindley vanadium [backup] -#barium +barium -- 2.38.5 From 4f7f2c227484b4fdeb890e1ffed36a6a99c12373 Mon Sep 17 00:00:00 2001 From: g33kex Date: Fri, 22 Jul 2022 12:10:54 +0200 Subject: [PATCH 18/19] added all book --- books/all.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 books/all.yml diff --git a/books/all.yml b/books/all.yml new file mode 100755 index 0000000..bcbca86 --- /dev/null +++ b/books/all.yml @@ -0,0 +1,8 @@ +#!/usr/bin/env ansible-playbook +--- + +- import_playbook: base.yml +- import_playbook: apt_proxy.yml +- import_playbook: web_services.yml +- import_playbook: matrix.yml +- import_playbook: monitoring.yml -- 2.38.5 From ed0a699d81b9ac745dca3dbac140397fe5d1ea45 Mon Sep 17 00:00:00 2001 From: g33kex Date: Fri, 22 Jul 2022 13:47:50 +0200 Subject: [PATCH 19/19] fixed node exporter --- group_vars/all/users.yml | 283 +++++++++--------- host_vars/bismuth/main.yml | 2 +- hosts | 9 - roles/prometheus-node-exporter/tasks/main.yml | 2 +- 4 files changed, 143 insertions(+), 153 deletions(-) diff --git a/group_vars/all/users.yml b/group_vars/all/users.yml index e225549..1e4a24f 100644 --- a/group_vars/all/users.yml +++ b/group_vars/all/users.yml @@ -1,143 +1,142 @@ $ANSIBLE_VAULT;1.1;AES256 -34643163313033623533646261613134326363633963393462616363646533653464376238396333 -6234316430616461643164353666333163363463656537610a383539353261626465326363656332 -61386236373134306632326166323532393734383336633361353638306661656232643863323537 -3733396133303831660a323330643232613838646532643934373531313736366535363935636432 -33613535386139636432643561333630656233643431383530343766633434643134616536653263 -33343134373235666430306634303964666234616338396533306539383235373365653038626432 -62663632313838636638333839653833393530336233353530616633303835653333386432386264 -31333538666363333036353566353032346161376161616563623064363538343630303164363365 -37386263626231316335323133393265656430336639373765353237303632333364353761323665 -37313138386533383537656539666338623563336361663263316639363464363836666630633562 -38363239373937363637336437656364633731373164326161343539336330623231346230383038 -62646336336661613461643762353335303633396664666633643631616235623833626166663833 -63366637323635323663373831653631653265303837306636316266393337643031646638376362 -37626538663866616437343065323130343735646365373539363264663662353065363766646239 -38333132323630386237303536306164363137356433343964356235646166666334346439633434 -64623664333032323933396666376333366234303565663133373133366361383662383932363439 -37336535643735393564633564636362376130663734373762386238303431396631383239623730 -35396132633166303530353239383230653361313063353637626637666335633662633935616434 -37303538633937656566356636633665353962626536323064303465636137336163323261346632 -61393039326339363762323266353137343434313264666263386364643437313135323435626633 -38636139393139306238623339663634386566393565626561323830643739643234316532313831 -63393939383838616332623235316531653532323134346536356636363966356439386235623630 -62363963376432626332643361383737306563346361333134303332666662396163303031626534 -62313431376430663863356330323666343835376534636333313862333138303361353964383763 -65633438346234393735386531373637383630616631653536623562313937653062646238343732 -38613661646537303761366334393637303563666539366266313536326137356162303366363561 -31653864363830303730316436633964666462393466363433313834653335316530373538336432 -32326238643765353065303938376566626561393534353630323130653533333439313631323432 -63656131653336373230633336633763343462386330623463373033643037653066373966386363 -62353366663163643161393938643939643235613431323766643634333130346333633366356534 -30303661316333623564633736663162323132326538643330373238396434623231333563376361 -31356562303064316361343163613531316161376462616331376362663064303733346230613663 -66336262306233306435653731613134383964656664643466316562323231656138363738346137 -31373462333636373366333237383631313636346166643938333061356332623461393134303232 -39636564356139646232666337393864636663313065656431393532376537323761383664643635 -30383433323361363937303762333430303030623634666532623431396437356538346565626562 -39363633306662383632373038363661323335623164313165306335353439663639663035393463 -66386537313331363462363164363236356132626339663165386236656131343430353534613636 -66643761343565343837613337636433363736633337333865663230613861336465636239656439 -39306230663535366431336636326131616663613463306562363236353961353664626664313037 -38316264346635613061303436646539383932633636316130656634623034386161663864316533 -33316137323937303636613539633763346161393763326632373838373738316431376538666534 -61383761643834633664633737656230666331303463376337633964623536306463376266343661 -66356530626136646564616161333931313063363937303934626430386266363235343263333434 -33386530613236313764633035346332623034643235393666653431396436373264393135336236 -38346661666333333263633836323132313961303635313761343835346432623330383136323561 -61666331393939653435306236653538663136663330613935323465316538356233333764343233 -36653762346130323430626263373531613961333236663832323731653834346562333366323331 -64316539353065663236636337393133653039633536303461353136353062656262336334373931 -65653131376665613762383636643035396637656330333461393638356631323233643530633165 -39373731363034396535356330353339373433393738643166343237353665646161613064336335 -33323636633130366635633534616165366462623164353137656566363239636137363430323934 -33326434353532393564633265333232613038313737326330633338666634363464346536383865 -66613466613031336462373433316463383438663331313838613365643934333737613562313265 -62643135313832656464666130346565316230376239356438333932393338643765636466373663 -36373338353038313461353336643761313563356164366664623466326564653461393938626139 -34623963653035316664623363633731386636636230303964393537656333313632376238353735 -32333034663237643032623737613766633131643366376130623431316364653732363162333532 -30373564616262623135313331393331336635366235353761383263666339343739366363326463 -37386637613665393837323338646661623238396531663065616334363933663066356564303061 -36663639373734326231323661643666656161643134323638643966336565356366323136333261 -61663032313239663863643762393936636335386464646233303530396434333661336234663231 -35363335303730663732356133633732326633623366623861343532373861613261316339653133 -66653663306536633061613366636237626636653430616266666231613463663462353233336630 -65626631646635623838643139366333656662643239396539616436353361346331616430363932 -36366336376135353065383164633435323965316137323463626438663036336133373938636165 -64326166633732353632343534333338323431613535366633646238396133303363383062323534 -61663936626635323264376363383830366631323862383365626637623663383838366563656539 -31643336393537666263366263323162303064303439336662346133306534343738383265626433 -64623866633162663465383033336266373566633366363264613734623730376538386165663465 -34306135616665313136383663393961626466373365346566336363313939356330393064323839 -34393932336239303937613263396539383130353239393962633335366665313264646635613766 -62343963306566303465366234346463633438346430373230386262636464383331346363623965 -66303034356232386263313562353631633565383661363431353461616562613337303539353866 -37613166663662343537626138666230363632373562333362613662626439346233616537313139 -37346164323437616135383932306131326332363139393562626438383232373537386437383935 -36646263333737353534666137386330353961306361353663386638343830653462663331663765 -63643765613330383836323638666237366536346464663566336430626566303662636434313638 -31323537656332646530373836353363353535383438343233353530343563656634346664303266 -38333464366130663230613939663231653534643734666463643338646666623563313264393832 -64643939633762396231633664613530373435613139393033666164363534633437373433623166 -38356330663962346539633931303834633861333737326363383261336531363436613166303961 -35353336376634663031363031336231313062316264393936333265366138616331643265373832 -65343238666563356133383561623662393835613432636234343130626235396334303532353039 -64336430666138353638383932326339356633333763303964343933313736626335653036623637 -63363738373264343638326430626261363363663938386234633033623365643434313734353738 -34383234663231313462323935646265343937373334363834663536653665303766393032626432 -39303936646361663036326131333131323665343165663035323634333562363732313934386235 -62613666363966316630613036393861363162383437326538313432343364343330626234393234 -34643238313566333138636261646437363930316336366561343131656638623766633439393432 -36353332326665353465623135323538306230336361343863366132396539636266373938323964 -31633232613537633836396466616230613966646538616139323030323263326235346536636161 -65626235323731353863643861386463623837373462643536633663343965393933613736353761 -64346664623062373430396539313965323632363532646434656333333435633736396465333966 -30386365366632396434613365303962326130623665383364633566613238346665626339316364 -37653736353462376337353435333863343630353966656464363435663963666666666239643764 -33623763346462316437636462643433616166613436363661623538313339663234346664623765 -64326437306231313232313438326435643535636338623137353036646333303466316337333966 -65666462323831366364343430616663313034366133613165366135396263376565303136313634 -30633065323861306465376531633964393635323430306431326363336465653836613436643734 -63663064646564326265353364343632393537316636396530643531646333343563356561623566 -34353238343734353733383065356638323662646366663133626134353366336164373235353963 -33613636316564653231663432306531376539386463663631613232343834326135663437616439 -63363661343835393538393638613663653336396135356661396433386437636261333465613632 -36663737613737393864633266336132656563663166353633636637396231336435663662393339 -34383839373164303936383931396436323362653662663138376364376330653363393766623664 -65373434363062636465623632613636343030663730336364613234336165636665316536343463 -64363062656430316466313461643866633162626535303464646338633530343263383965303264 -39636665353265376332613064393534303565623330363062303763643465356266333735316536 -31343539653561333030373130393033326137366531373066393432343537633666653865643935 -66303436613662613338333966363464356332373434616562643063306330626338666163393133 -38653031393533616536646363643936396564386137663237616334303636366132363338333063 -66313237376362613530316330386561343165396533646233376466333336383337396464363038 -62616263363034343261343163363437383733636562346661353332633963303633663261626463 -64653331613836333062646462646130363862663535326634303035376532316365623639333231 -64303663346634373237633438333637343464366437343263396665313661326436303061353765 -65613733626364643964343637373531643337316364623963366466643364376631323732323563 -36613239643039656536376333333663323563616166313261336435333637393064356334373566 -30326462376464333536326632386164653362383962383938613438633136323032336238636335 -34636130353139326632626464636262643334653461636363346432636232613337303666373339 -66373637363265633732313832626232656466363062353532396536386538333233643261373939 -35313737643332303861633135376439613562353964383565346338613031343837326230663065 -37333432616661376634353965373665393965653231613863373831346162326339333331303561 -39663633393562326462623336613239333365633430656463663837323939346530373035626230 -32613964316438396262633961653531346639396130396261363661363139326536613366346333 -31363463666363343766636433633734613238323461323166326266636564613664616163373736 -64313237656433313965323834393361376166356165343965396336386261313765303166363165 -37636530303131313437343430646336336663356166656465653030663038333430323139316636 -37613766333936366535313739663966626364366639663638313866643563646336326535386235 -30613337636537373162306462633235656637376139336466666534613631313761323330633232 -38393563643239656435663432303465376530626233306531373962336232646331623838336262 -38353664346133303964646661656465363939626465393066333434373337356338363930666436 -61646234633135656137653564343963343232616339353335643334303939363833333431353864 -32326334636338346235663662616230663536323233396639616230393133323863373631323331 -36393436636232336333356136373333346162386136313831633438313337616261336539323734 -33663334313730303832363263363539346130623865333239633039636637666631326265653033 -37383430636634636133666137376638613932323538303033303134306139306366616565303438 -64323838303431316664343134613335643439343761363731306336363464366661316536303239 -39666339373163623339656266326265303934663263333236653065383637626464653236653665 -38653862303536336462666132366231616436313938326339363534303566653332323933373430 -37383264633763386136366165333131383830303138383733643038313935336634393665613536 -6337313238373563336135376230626566633332373630326333 +61636436366131323962383930303537366139383363383134643432386435616663653239623962 +3061313236386134333165353762313361643834336637660a313035623736366236383663353363 +61366139636330323332373331656433393066636135353038333134613530323634356230353130 +6234646531646636380a346132343965663164646465636666353236666232633339373766393664 +31393538653262386234636435316632656661613236333139326137346631346436346163346139 +33633339393237663234646133386564353234383636376231366637663435656239633561303861 +33343131383935643531313437663833333261373538626236393536303263376136353735633332 +30663065663337646336623262366233306531343038613863366136323237626533616338633161 +61323662333439343164666161363366303865353637383765336463356364663232343732663862 +37386633326336343263313531376663393038626562393133653630316137376363666530623734 +37616334396630303135346536363437636262343936393034303864653036623865653362646430 +65333733653231646337323836626331626130386663393738346333396261313133346636353766 +33343962616634323564623863613966366534376539363065656330653132663563663032316131 +64633162623262333035653436313265396337643662636465306361643635333834383032376637 +61393663363631633861363661376362333061626666396461653566316363613163646132366237 +65393661653532613731383537656530323461366666373962616666343666343437393039623464 +31666261323635346234326366633834333731316363303230616438383165616335326132333563 +61316364633237613832346165636664656462626538656462323332373633616132663361343232 +64376132373661306362613362363430316463636436393433303962393436646531356361353531 +35396162633039396362313065643431383538663330366535633036663136376566626464653835 +65316439636664333537663330623733616234643434396134323765373338653264333865393139 +37323561633030366134316633343036396437376265616261643239316461383638636265623230 +63396563653862343465613465623866666465346530303334353561343135366564393533303566 +38306532663536626532313539663737373838636432343961356134323431333330626566306563 +39346339363136343135356562306431326233643565353862343066376661313066636139323530 +63623131623238656132653966373863373466656565346461373233336135653337343863666335 +61613139303933313531346565393631373638616336313331633566663335326562366431386263 +38396530326165356366613564656432356365323566623865313763356539613134306239343035 +31356664396136373561316634616433643237303463626662646538313164333330393639313531 +62613434363137393430313934303266656265393636313165313637623430373339383265656665 +65656265396130373931346634613635636661333331323661346462336134383765643038383938 +66316566323366353363653230656431393239343237373663373632333338373939356137633361 +37613132376463366536623238396639666132333234363937616638343364303436373238666333 +33313839326339366131333835643464363461316262363234386564643238666464356561303362 +66343936353336313666633537666532323462666533386632633665303932366366323633623763 +36636637343562333161386330366337303863393333663261626138333631356366313464326163 +30653265326163623435333561626534303166646531636235666266643330636133303063333834 +30353134336531646639363438393566383465376136653561646165333633373765613065663565 +66616432353162323163623231613064346233373330643832393062346261386232333436396365 +35353562323639333236623037613534616338323130623332306234613465363532613564323162 +63316466323463636134326664393838356230313566383031353033343665303463393938356266 +30626639303166316636633465346338396632353932346533306332653636663464353865303463 +33313636623137353562663533343231376338303335313330653164613661666161376537643565 +65636532623033643065363665633538636138306439643139636538316262643132666366643034 +30623639333162363138636534643430396662616265303362653833383865343262383563623233 +62393261616563666635646564353534663132316230343163636665633730383039313633656663 +39376466316336623161316330343036333631343539353832333037346636653831633464333564 +64363564633565663932346665643535636438613732303163616663393835353166323763633030 +30646465393366343932326332386335393033616262643136383537613536326430646135383936 +34336164336231623930616236623839393434613034333432383565393266363439363537666236 +30386363346465366465373562303165383937336436393533323765383862386265393361323034 +64633361643365316434393665316134643163623465633963353035326363393133323565393463 +32373965656366353139393165643232343263623537613937393339353463386330663931323930 +65333238313364313132333930663466306335653933356335376131636639323038383131333965 +39336165626463323366316334626364376162623866666437653635306466393165336234316432 +34366138343239353336633135633665396666656236636639363861656532646364323132646231 +30646461333331623939653339646665653364373734373532343738383766643062613366623830 +39616462643637343735623433383139333437326337313161626131326634303966643237636463 +62306365346263383035353164323464363365653464383762306532356363663262643634633239 +63333034373964383963663837386136623164313561643836313731353932666631303331663132 +31383134646432626230373564383531366139313462333432363836616138316365656465613137 +35323364356237393661626437353432646665396330303966363137373066353137616265636537 +37383537396564396639373361336336646334313731633733313639393431393065343130663237 +62333264313435393736623062303330366636356635343830633238393732343564306430353864 +63376465633338613036353734613361383239393538323261323166393230366535396666616631 +30633039346636383135396131393337366333313132366532333033393538376433656134393537 +36666564666239663137333263666362396362643165666466623639613331626439663230653537 +63343838663338353461613738656361636362336638313761386166653036373937333366643536 +62343833326264323033643832636630636337666234343064663234373030343938386232613665 +63323834366334633232623333646561323564626232343231366261333962313037306561306430 +31623235343635313039646338323661376464363335656633313330303935353330396134366263 +37636537343739353535336233346536353830383532356162633330623138383233643339336135 +36666236643535333739623035313830343563623039376561323735633161343132373263383862 +35623238326238623464623839336632396563643938643465336136316434323738616565383335 +36353362633230663236623730623738326264626161336637666662386165383631353530333937 +39353761373239636665656537646332376464623632323563613130383464643932376162343061 +32633730393834316566366262623832343237306161653032313665653164346438666139383838 +62336662613732356239373833336131656165343435613431326536333832623033386663323163 +65306464333631323063616264656336323065373539346231316438373838626330356331366365 +62373437623761396334383662373434613364363530393862373238626436346434666532643563 +37393365346533643837383334643964346537353263633136323639353131323837336163343365 +66306631366162373238326237666438346162323565313633663534383236353037353939393230 +30633030613234326138343862386333653632326538396165663137373464326366383839323262 +39663636633831653066336436386336663366343031663038363732653231626666356164346338 +61303062316637653462636134393538623561323563663663636666623163393466386538643039 +62363437366138356161633531666331663133653261323261613838353835643566353335363165 +65643930656136336366616436656633656266303864643434656539363965666334313061643637 +33666236313730633239306561333765336563653564663864656265313137656565636434313431 +36353139323563636330376338363833613337646331666432646266373736623033303164333462 +38333930323461303333353137356330366237633763633663326333336539396261373932336437 +38396230326630666535386362383637626263366539326630336433663665363661306263633839 +64613561383066356561633064633233376637313131613633613561353330316534636261636136 +30653332306535623161393236653662623966393933326337653835633634366364653264356436 +33663534623766366461393835343936613034346132373366326661326132396333653863653665 +36396638363931623664663334306433353665356239373466383533636363356164333131623432 +30326433643033393333323739333866336539643864333065643639623333326238313766653134 +61613432613962346135373565346366376666656336316639373931346234623432333665666136 +30353533356561373364303265333836313932303966616164616261636561633664303465313236 +64616632336234343566306335306532373434643130366436643862343462643332386264333633 +30383363666135333566613065306164643536333933666434653030653466623332376565626234 +35306537616235666338323532633261643035626166646436656139393462663831373966636130 +30633236346131616133633137306430363933383036376136383831313466326631376532623934 +65666636326163393738633062366131373434346262616237633438313636663439643466343861 +61623335626330343031633737323738383231386432376161663261346162626565363563653238 +31393666623762663538653936343464303661396531383539663831623463366664653535323032 +31323264373234383539666263373236663132313338343039373264383961343162383837306464 +37666436313335376463363530623139653663623430393431646636653731333634306535336534 +35666131613266303263663339633432666134653235633664663939356334323139383130383632 +30303664386634376437333464393539323063306433356663343539353733373765373436643232 +39653737653239303365363739303964363065666664333262666134333134626438306635356537 +31393863383339383030653733646363373034666233373736396137353030323834373436343365 +64663938646265663431643339356565333265313938323265613963333262303630333332393663 +66646632386536393366623139303138616264613261346662393533643264373365333665356431 +37333261303838643232663331343266626366366637353831343736306461383037383535383235 +35323039306462323461393961393730646137646663346664316662373332613263613561396562 +32613665396538646336643439343061333933626239393765326139346135366439346138643130 +61393662336366626634666231346332326265346465353462336535666132656131303362303332 +62646163326137663139356539323939663165623233323339356438376366303330616333653239 +36393130656639366239633134656264646662336437623264653266613561393931303736383266 +38386639306631313936346265303237383266616431393838303264393632653138636136363938 +35633330383161616466343031643036323862643836346337306265336333666231633235316133 +63343032396435386131396561653933373165323231653633356365366636663335383661636432 +34326632353030633436353737373637353134646530343833626335346339646432393732623238 +63636136373737353963333438326130366239383435643038666331376265366431323662373361 +63376637373864646338626661336537663036313362663135393430623831663536653537343430 +64633337343561363637386436373536643239323862666431306262626265343335616330613266 +31313831386636376561303834366435333834363339623661376664636233666262626631666530 +38303961383062613230386136303361396131326237633434393361663061613436346631333064 +38633036383330303962313561306233326165373832303436613530383634653737656233383438 +37386464396330383935306365343461656530613862316665626632383732363032343436633636 +64376131623738306565346537643763316331663038613934313635323937626633363231653832 +30303933386632636637666162343039316432656164313839313030316162323666366338613430 +37393961393137313630303039323263356536363864373936313538393863326631623234663836 +30336239326466623666636235623031393631303838326564353835646666373234383637646364 +31633162393534323333373836353461363865353665613737653766343638663161386465376430 +33663165613163633535383931636137373034383365333764366138363765663962316461396334 +64656238613737633735353364313238303137346664643432323239653830356630623335346639 +39393033303038633438666232623764366665366634636433363439633833333133326538353931 +37646566353965626137363930666436616239323330626161336635383336643133643838353134 +64646563623264343931616239303130313165636266663539363638333438623831383933353264 +30306563313762336332643131663463363066376363623538663162656636323831 diff --git a/host_vars/bismuth/main.yml b/host_vars/bismuth/main.yml index 2f09b11..8e80981 100644 --- a/host_vars/bismuth/main.yml +++ b/host_vars/bismuth/main.yml @@ -8,7 +8,7 @@ users: ## Network interfaces: - eth0: + ens18: type: dhcp ipv4_forwarding: false diff --git a/hosts b/hosts index 6c0e7d3..d1a8c19 100644 --- a/hosts +++ b/hosts @@ -11,20 +11,12 @@ sulfur # Synapse technetium # Test [container] -krypton # Cybersecurity [physical] hindley # Various vanadium # Proxmox barium # Backup -# Distrubutions/info TODO: remove this and utilize facts instead to autodetect -[ubuntu] -hindley - -[debian_bullseye] -sulfur - [cloudinit] bismuth technetium @@ -65,4 +57,3 @@ vanadium [backup] barium - diff --git a/roles/prometheus-node-exporter/tasks/main.yml b/roles/prometheus-node-exporter/tasks/main.yml index 1b2cc1c..78788d9 100644 --- a/roles/prometheus-node-exporter/tasks/main.yml +++ b/roles/prometheus-node-exporter/tasks/main.yml @@ -112,7 +112,7 @@ - name: Put the new target list copy: content: "{{ new_server_node_target | to_nice_json }}" - dest: /etc/prometheus/node-targets.json + dest: /etc/prometheus/targets/node-targets.json delegate_to: "{{ appointed_prometheus_server }}" when: (lan_address + '|' + ansible_facts['nodename']) not in server_node_target.0.targets -- 2.38.5