Compare commits

..

2 commits

16 changed files with 484 additions and 9473 deletions

View file

@ -7,6 +7,7 @@ retry_files_enabled = False
inventory = ./hosts inventory = ./hosts
stdout_callback = debug stdout_callback = debug
library = ./library library = ./library
httpapi_plugins = ./httpapi
filter_plugins = ./filter_plugins filter_plugins = ./filter_plugins
ansible_managed = Ansible managed ansible_managed = Ansible managed
nocows = 1 nocows = 1

View file

@ -1,297 +1,301 @@
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
35353866373931343963333639323431636465303562306166333735383462353032323461613232 31363365626330383335343937663363393666373333613263633537393036633561303539636237
3666653438393936356535633661363838613233323932370a656439316234356339613532663237 6336356130386139393464346638663632323831393634620a633130333865326334363730643066
39373439366432363533303961396466623366323339383735316531653538633264393264353337 31336133303234633732333632646136663239623438666665636166636637373365656230396564
3937323861616530640a666361323164353338306336616564663466616630393839613833373933 3230303438643962650a636463653030343064396663616636323731373231633066363864356138
65613161323164613334656631333336343262363835323962343662333133366561306139636261 39313363653132656332303261333936343766326233366530376133383335643565613530323864
61656532666563333063356231636565626631633436623531313938663930396362343031356534 38353836623334396136653639373835396461316633356433303735626262303638366435393663
34303565623832366664303561643137626433333164623730623639656439346639616164623865 39643032383365356362303062646464663766663665656665316132653333333065363031333131
31613462316439613937313138313830323334373337366630323331393537633437303063353363 39363739326664313839326362326231636165623265326663313262636237633266386361666235
66383930353930616137303436383864363439326139643361356231373939306439633332666232 31396561333166323433363036353263373363393731383132386335363262343766613035643635
38363061636139346430373263613932336361356262656138663233386464373839366630303765 62653862643164353661313832303061343333356566636665646361623535616230616337666434
35343064336533373238396430393536366438653534366565373733313962616364313061626133 36663236656131386536383030383836373864633866633639306661663765306539626366663333
37666538313038643865346461626537353930366264643162376530353536623863656236303433 63393531366363626637316566336565393738653961376138363137633732306365643964366539
31336561336131383635393238366464653934613130363831306335643935373033303162353534 36636632343034303461613061383235363766313265373131336362383562326335333531356365
38353832653664633061646331653634393963333038306635313464636136616366313962333431 33323965653530653038656132623837346166306662663263616232323365613362626361363966
39363934643266646131653236303138636163326663373765373761663062656463643162373038 35333530643736313830633365393530303631366439363339316236613936623564613033356437
34656163633964626235366539663132396666623363303632363236303831613532393931373761 38666535613438663535626266633864353232613238333432626136646634663730303832323232
65613435353162346233323533383537316231363437653239343233636533333966613066343932 31663438366463303766653836376530326432343863376130343466636163303131323864623237
30626636306531333736613965396432373130356238313136336434356133353435643065626261 65393565316562323161623961333931643464393063383833666533656332323335313762616661
32633732613361376261363831363866333332393132643439626639383438663438366330386534 33633535666133623437346235663938643630613432333436643237356336303165613931303035
31303532323461303862346364386532663839323163653366356136666131363839663635343166 38623631303466656131346663396234316531383436616664623539396339336637643232306666
38353962326430383561333630623030623536353838633231393763393238316530363939343536 61313665333962306263396538326432373939623265396433643166396365376134343662643537
66323562336334376234613436373237303562363831323038366232393161356262653864663037 61623032316161643731383332396131383739633832656332386537646638303264303039656135
34363436356332633363363963613635346337613438326436333836386534353738646166643333 61333231373330383963323237306161383332656436626233333732653266353835623431643365
65356637366431326132363432663662346638383439383766646531363662356266313961356239 32343464303834303464373265386537333866323730653231643033383662616661613166633164
31323236393538363662643662643535623633663738343266636163363835383030646661363966 63373534383736616464653436613932353365633865323434363335343931393730313435653930
36366466386666613364313166353366333131343061353135306135656663323461303338346666 31353138353637383439386132303663623238373839313631633136613733373861386666346364
32626231613738316233636361633337343635656334336536663865633465326639373966303137 31353532653039623566316262623831323339313761653531636161323030343865613030613238
39383731303862353637386438306136303765333136653465663963663930383037343130316466 64393934666139376433643463653230393336623037636264613137313836303532303162626461
33343932383033643530323136316632386230366338373362366462666233336530393561353933 37303634343638303034643330653633346632633530643430666233636633373561663636306432
36356330386361303562666339306265663539616434336264373832636139313365633065343763 30386133313863653935646630306230656237663366383664626336653938373562353261643531
31323633346536366635646562356266373964616338366165376331306561663938396661396164 34393634646434653163323061633331363763356234393066653732333463303031373134666438
31363438326439343964666439356339326661666136303461343436303533363630353735633038 63363830383961336130396638353939316233356566613132313861363439633362303133303961
38383365363739333034373031326530353962646661343039616230396132323833626162643964 34383766613461303636366165616333636630323262383764386161373833633664356566393365
65363165333233643738373638353537343162366265316661353563353862623134663362633261 36376365663436383831383230303336333334633935343835376337393037303933376332376332
32343364333236363738333130316538666536306664363661616536336264363438396464666533 66656261653338646661663433326437653732613733316336623438636537343365643937393635
37616533363936356335663562366563303564623530303762363034343435326666356162316535 61313863396565346364623063346666353832636534323831323164383536663237623866343232
61363133326263653937373037643930343565336166643939663466316232313535333965303737 30346539373462316336323739373262383231383866363333356664653534666330343735326265
35313566353963616632313763366561633039626239353236323438383261663066323334333632 61623433643839663332336233356265653865366335326432373436393236366561373236666638
62393265396235636461653862383830613634393431396131323439613362366463633239383761 33323435396136616262363032393134613633663639336337333636373865626162343433346630
39343361663463633332666666346339363334366330393936373433353034653765323130383335 36636330643066386239333266663135313465396638636263393061646236373536633335663164
63336338653333356438323264356162316638336338343033326639303237656663633233383735 30333363653336316330313133353934663838366534626235613237376362643432656239653831
34646535633831636238316564373035353635383738356133326664626566623766366535333439 66643862343830303337343963623633613832356561653861656561306136663830633264303963
30326437613539373163323464323635316632633930353931303466376661396135623031623133 34633130386537656561633763366165323762363663373031616663343330316432306537353136
33653735336230666665616638353561623235343439666135386165313436306666643837616166 39346336303138646237383662303564636230326131393761663835303538366335313465363531
37613964663837373137383736393063333037366433643632333963623038623636653639343936 63313062323934613163646434376566613330616435646438643466633462306339333065373736
32383532613430623563623565633665663030616530643735653563303035616530313463643431 30613730376330663964336636666633303131343363373832366135333866383039333564353766
31663361383835613631336638343338373639613532313561313231353765316237653431663462 39366335646165396337613134363138373163656139386432633738356439383235356462653463
65366162326630656566663731316262336536303032386336666263326265316564336339316430 34326234316130613632363531313139383761616461356563303939336365356436363764363834
31643066633438663562343730393534663338613165633635356333323635653161346136336261 34393530383463613766363134663433353937356261313763333438313461653865303038373861
30313332383065633335396131656136613932346331343632386235643764363235376531376437 32333037356330326237313536653539396630626537343136633761663134666337343830646134
61303130316537633830366662366237303934306561333134366463646464386530623631346264 65333832653438313262343933376362633831646262646163343730636666643164656433343561
30356536613932613264643835356637356364653038383130366237656232333031313163643332 61353635663663323438626464323161373437613964623639333132336431666131393932636339
34393865323162613936613264313864613734373032386266653432616535636464363463633564 66623135336339366161376661633332613638613439323664393138386630373564643965383061
37343661623935353365333831623631386439343237383933313337393065653934303065313634 63373332666233386132643661326331623433306531646262346235326563633437326532366361
61396163323937643837643636343337343231616265643765313932346462373735323737326663 35396436313233323932343230373731333861393664386661303164363137653564646465626566
66316135646663376537613663373432393865623038363239356265303362326161366462356138 31633839346563633866383531643535656461663232626239363034623832633661616132323532
65336536626634366363623865656234363335343662333134613835393635623434393036316638 64323361333330623936623166343162353337333163376330303962356333333033636639613065
35366431653463626665663861303333363038666131643861646465663761623364333162343761 64336535366262626538343731393466353563383266633865383538646131626562323537643936
64396131643136323634643461656339616361323030626166303930623838343438393465653364 33636634383864313862646634633135396264613465336139346162333562376361356363646231
66633037616633316534386639306438363863363530376131363332353536656533393161313931 30633235653238383435643964633631363162623262396364333964303935653639616338326432
34386636643737353738323265363435636239353261373466383430346461383932323634346466 65643163393337613065663939316561656364666432666330356161373463383038666430626265
33666436343130643032626562613165396334323937353663376162643266646539353932313137 36336636626438323531623939303666613536376438633163613966326464373134316162636162
62336162646535346631623332376334336538326530356233646239306337633365373562653166 36383135313862326466633861396533343932653539333338373634643535633461393864616463
32383639353431666137396631663237313436393434626531316365666335306466363639626663 66303232613837666532633932623766353638353632306562316138623339653638663063663131
63643861656537306133343138633535323737346538643063363330383366313362653933383365 37353866623261303762633765626338393735353934613336616130613035643430363665303263
34313230663163303730326361303337373136346161353132626362623461343661663964333765 64353964643766316238343938663333373331303861383862653138393563393063366539646264
37353165333762346539333730333731366532623531343962333037336464666530396437353666 35643033633861643032623463656561326637643833303466313236316435313663626530666565
62313035323234643236343534663434356264643830636433323831313364663762646130306362 64343237656465633065613738646162373734356163643965643737633764343537313134623931
32316530643230313230376662383439343639343336633431623135626134353134383030396264 36396530636138376363336234383363306632386236643538656436366165616166306439643139
38623933356332336231343434663563653332633237653966663964646232623637313231366638 39626366336433303636393835666539343863636132633232376566363438363264663866303233
30363966373362363432376562656436356338356561303133643432303736376234643632663137 62623361386234343137393537363866626261313033636630643339353937636666333934663839
34336630356362303132343737376637303939623133363663306133383465613263356632383030 39386337623032383032623064383735313964376333333136323562313733333238373566343764
61346138316538353638343833366261366534353963326162303866393430333964653333346539 64656461626461316463646663383165323531626338653062326237323030626136346332336665
64386161663435646331613834363336373738396338653263323937623163663236366636343239 32346434313761343766366334616535633730366639613839626564633763363738326331313835
36383135343763636139393331663139323431376562353165353662396165653235633464363035 66336162363064316332313835333362343664356138633933393536303231373761396637393361
31393233636561366639373566623738636537363235666234633534376238323163363238393237 30643736313335376339316562343764303033643039396566653538653438663061323233653233
64316132666530336135353434623866363739643830646463656536336136646334393064303630 39636665303763356362623765376562643633303533646637356333643830356332333563363463
65343964613265333934306432313739633134663131666433386630303132663866343532363835 37353464646137393234393332383364323834313831653666353464396433656431343037313264
38353237343630653561636365656561313636623065363836333663363934643162656534623864 36363163633164623035356436376330666531336166333465333133613964336338613666363365
62373763353961646235613465646630306562386531396364386164633065643763396437316466 38636532623830373830303838353038323562656662646662376533656432313638343538383436
32376564616562656136346563383266303963666136663863626137653462373430363363336364 61396533303235633238613464393637386339376565306465633339373331396363663931643062
35333133303463363663356365626365613036633835323334653264626637353634373665643036 35666331363836353566626537333561613136323161333237323331613762373564373637323839
65663736323235353964326466376163313630323265333631323866663137313665626238396130 63333139643565663331376431346231303232386633363930323638323833626236303265663938
64653832626639626633376231326534303530373937396235366239626639356234363238633336 35663932343662653837383338353162356539303435313438613030663738313636643335323166
34343064393334613732356332633361613633643039366537623465303739663635626365656631 38343861343861636232363662316635306662336438663363653265356637353063643234633464
64343936613536636438313232376564376539623261623539346564303036303131366561643564 62646332396466353564653330643935306263623137366430343562626533323362306138343936
61623630393032666636366338336266656264353631393061383162323766616530323734326134 62616636663233656639626565626139303864666263393436323332666134646261376333343236
31623962373435323730323830373239363738663164653338623836386636626337623739366566 32633139303231343865373937633766653162663832323636396333353732323635336533643363
61663835623038626266653062666264663639363763623139393862633061356164323530666665 63363538613736623039306564626433323632653766636163376234383838613266353566363039
31623538333264633735643839376433653934383663333130336133653235313631336163343134 33333364373366636661356136393131323164613666623066343266326662333865376131313335
33653533613430323834653730326661323462316338636338393063653866316335626633323137 64343137326637373235346563313431656132313639333731336661383236396263666463396534
32653262353964653131343430383661643231383135643332616462343231323266333430373061 36366634623336643161363135386562303961353464346465396532613862353734653464316137
62623136393239356166393964323830623239613434636361633365353862646130373865643136 32643861346132623439633566383335626636383534323465626637353338356361386532646366
66346336363866393762353633353638663433363332356131626639326166393234313765346138 36663931376538653232623830346531316430366336646364656561656665306565636438323662
64613431333139376139343234666664313236633031393938663431376336643133323964303938 65313433303637663663346662366333396530373834633235363338666136663433346531303063
64616536613462306363613639613132383361393535333362363630393230636532316634373231 32386634316366343236303232363961633630613264346139306532333563343832366366326636
63313839323263663237373937323361373533616465643830396666376661616631646561663130 61343931623566663566633065616233623537323165633062633235646664353165313561326665
66376266363338666133313263653733646365653034653538333332623861323833633033393234 33666561303765366334626137376263623637323732373732306634323336373639643238653764
39633834343231663166376333633635366261616561643363393137383736303436383339633734 38303335366264313464623036383639353632353938613732383631363432336539313233333536
30623939343939373038656461333464353033313632643138393334373565383331326430653263 36653933343863313936346230383736333238613031636330613435666231633432363737663831
66343630396135633636366337353061363730333364376664623234333434356661323935626633 64323364616663356464366630666363303836636535346333396166623036306163616133643566
63336465343661393636333663306361386432373235313337353361333735373436633832633439 35353038616535386330363863643865326561633463623239633436653639353866336438383435
30653766373230383364396638366237643932633364663639643661393438653339393031616338 30383136353535323362326231626438333731363565313163616363623433306366643532383366
62396632353063376566333261356662356265373733323631363263396337383631383733393034 65346166306432373861383665316535653432336530363930383965663733333837633663613266
65616434356530306661636633363333353138303631626565636637313738353338343334633533 63333961333965663432356239383263613238333464646561353164643866343433363964616164
39313232356166623939383864346665626333363132663033326430366565336339306465343337 36353739326530653735383363666134623961623135373836316663313434396532653137613865
34613736356534653534363034366431653861613534663261633739366361373134323566376335 30323932396363633737303634393464396331303461373030646137616536396263393762386532
31313263313262353162353039623634653534346363323131633362323035633337366536366561 31303038343138633231306665313263373262633634356634303062643063333964306631616663
64323432353236383839643662383138373938373834323262386364376162663839366232313433 66633936653762613234666438376234363833393136366331323734633430373262373264663066
38643662613065663863636664636162333830353131636238383439323439316363383935623731 32643032653838646133336334323066646239313965653462383935643334316631653932656363
62393964636137653935313338343465396633333461643032383730313139396462393936383630 35663333343736353735376533616536626262313566373737376237623738646335393833316561
63353166633735623364653264643934666438383739663461373332623631323932333162303630 35633332383230666539336237313538303930316634363762353261323137623932336536343365
39353637353437636537613935306539633163613334303833393832616338323061633532303361 32633665313835333563366636343334643138643165396438396661636264323737643836636438
63656635333331376561363962386135303963303030396564356534333037623635613963313666 62616564333737313437353139666639613666333766343061333562376436373032643939626364
65303664316164613835343930623338326235363933623533343961666664323836316231613465 32393438353663346666636131613563643835373566336238623139333832663630343463643237
65373931666331326634316463663134613031363636363434643839386239333164333538393831 63643231306539383762346663363862363335373562326231616335633462623465613832353065
65653935623431373238326231343439666635623730393639636131386162373466316164356263 33666164356237666535343637643832393261633163666336663139653165383463376130666438
37316539656230316336303265646339303139306262396536633533366261346238393335393765 31326161356131356437386133646264383536363166393233386533613335363765376366653361
39376630306639353862323834343830646330643737653631633361326134613666613430323433 62323231663762643239346430643136646439323938343464626664323839616163346436646433
64363965653063316432353431386533386661386239636332323139393933653063643865646338 33396261383634653935393630636562366636323438346664656131613332313631356534663638
34626433393731343535313766303237313866613166663333616535323661666362613439376166 61643464316337316339646532653835333235633031613139616537333431363165613663376461
62626430363661303630346265383863613162356535306165633537383038613131346561306330 33663865343738636137333833363238616162656339616230336637653162366434616435303130
61623435626363623762313832313031363665623933656238623131303362326137313266316630 35323136366336336231353832633633626366343866376338393932343061363665653331656337
32366664633963626463613562643666383637383831343234666435373564306635343730373665 63336133353532646464316630393465373437616131666563633664356165636466343932623666
36643436633066373962303965373663376266323133343233323563393065633162383237323162 62393033643031613337653366643065303831666662616263623338363462343836313366313265
38656336306432623330616234373936306163646330313734653864386464646535666331616335 32663563383539653632346333613033616432323137636430633536623931616532373664613666
32623163356337326665333731656438393633326638363635353733663861323934333536393338 36363161333739306265313032643666376339366233646332346265633636353166346236356163
33656231373166313761643030363437373638366461653038363565623633623035393564643161 63626535373230303961373133643965366466363231316534616635383762623361303662336262
38663064356239393034323761386435396437386534633734353938653239323533333531363965 32343732366463303733383431306633343933316639616439633730396530633562356432353935
36316636353864626461303936313632663261353437396238363930626239336139323561373133 64313135313838303533386638626236336434623663386330613532663361316564626561313062
61366330386135363039303166326231656331653632343261306531653731313465396131643330 35383433323332363335323035366332643234633332393338636236373138353362306262366364
35616432613631636264333263363239616435303436653936386165343335356337343032386239 35663336356632663034636430353537386464353635663738626465326235613034326136616433
37373230623366653834663031343738643063616661363138316262643635343439333838363632 62643438653730303262306466633864336538393337366566623437396261323934633234663366
34353236393730363262303439313132663735336463323432303036366361666338363237313664 66366136313134373237656430326465383332383936386631626563373630383538633165386537
39366434303839356163616136336237643061373633343737333036653362643635643536386436 31306635313837363236356132623531616631303438613061336131383437336265383633646562
30336636333464626464326332343333656535666431353338336438346335346433313934346231 66386130343766373033613936626236653633343036353130653062353733353431346635656262
32326231636262346232636366393361623830316238303537666164626339383061633765333039 63623530613563396430633963343165616262613233376130646563323732626130623831343762
30633539666535366539383061396461313437383537656239393131326538636536356536643735 39323132646632363535633137323436343563363836336239623332366435313961353062366635
66653336343364346635383761613731666263366465643336636661323263386364653035333062 31356466623238343431303936643730653066353062636463333265633935663866646363363834
33616364393664613363383937653530356138316363633335386232336531373835303732383962 31353233393335303463663230303537653166303630646236646665633861343331643361656233
65643264656134393663653333346531316365323730383363373564323133333032373330643232 33383462636239376537346232353036303837626231396133313338656235376234653835313535
63373239366435643738353130353333646136303530643065383066313035366239326664363830 38313434346561636261346165323530393839663731613764656230303935336465333161326333
36626366646264643130326261363536313835356638636139636434333362366363313133316130 30313065363133613237643864353734626265623238336635633666326562333933623763666639
61383734636433313433303466323265386132363862643131613666306162396437643166393630 37633037356365336339373730336239386134376631636531663861623738343237343031656364
32613464313530316262353938383735336262663939323730626662663235303638303065663939 63373239663362346634353866646664366539656264316164323131316437353237303731643336
33636234383033393237303865633961333462663232363562386637333335373565663261363933 39343839353737333031303931343939633964353564643237643764663939613130353135623439
31356436613138653765663162646566326134313736316130356336663536643466623331653039 31613337316565366365353164356662623130346363366139633563306338636532393962326432
38616465306532666434333534356464666663613263383430336465376133393032623762323237 34363264303032643338373564333063333366393561623864303932363264383362636234343137
63343462373834383566393466366332303235323865343730373062343739363265343164623262 63333661653636326638656363313632663564363131316530336464623635626235366234343663
38346539343533636435626133306662623865653934666665363063356162326461316561383261 34643564313238393461373538333664646333643635316665343662633438383733346337353238
33666362656635323262353066356330616263326134613635336261343438393838326438613435 66613562643630636463626530333833616132623330666236383333353361373663353164343130
64343336393034303330323563346233653135633439386465653065633339643032636662313531 32373831643531653732656362663137343431346664333136333233356636623736323262386163
38356234326632336161666666353030366238626262353831393532306166363432633939383166 30303032656366363938373935643439653466303963626136303564613535356436393065613733
66316136333838653433383439623366333062313833616366656566393965393665613738303833 37616633303034363031623865393437323135366263353231636433303962646436363734383930
38326139366330393863623365383963306361613665643962376664636134353533623836643362 64646332303039643530303034643339653133336635306163383732316630373531666161393638
39626166353138646666633136363662393565336333393638626534636330313632326333353366 64373264623532313131316138343937393965313531396638383966393231323164393034623630
39353133666532306531343137353834353133633165613566323135313362333962303637663965 64646339653261636432656633326262613962313436353662323031623438346335326433333838
63383730663562646563333763356135613537666332393537663062653662623938353434323136 61623063396535303566323839656636343738616363393839316633613439636466316536623930
39663965616437653232623333363762616233316530303833376332396165616635336532653035 32633237316466306561646532656635346132633034646636393633336564653232356630323234
36306331643232336664363733376632323630616139353030343930343166623433616234616539 61353161303138353666373539626465656636333464653130643036663962353935393334626331
34393131303363626166383037336262323662393431356463616665343463363432356132313531 38373461643439366331656634633663356133616133613132613438303765633232633266303932
37653331336165626435343162663662386662613164336439636465363335386233383065393535 33636465336362303231616239333630333662356463316335623363323463383238353165316436
31396466636465336164383563326236356463393831363534656536616664613361346463613837 32343664376631313530646664356133353562336264346434376536616339336264613463346135
35366562623432353166303836353261313233663864626665663837336233653237373031393636 30626430353530353336333964323466356636353330383636333736386336323530326430383662
64343763386361626232633032316466373161666536313363633765653365656538343130326566 31333364396665663134633235346332623432303236623535326539313437393939333762663535
38396534323433343634333139333063633531343631316163346135643037323034633835363963 64363239616235666561303761336234303533313566373236333337616534383732363039383862
32343963653263663438666537653963376133633661393562623131636465386266616166366566 30633132633666383666653131303761316164363866353134343934333439633234363930623636
36343963623262656162303337366365616263376363366161373236323166353834616262393061 34613336363339616435343862633339653337653064356533333232313331663634616365373832
39393239303335623332346236356335393836636533386432653164656334613738393533623764 38313137363630303639333836633831366630366663303235343831633066363661353631383661
36363136353034633934323066323335626138353763333537353761303930623930353062373932 66643961663535363032316236613330303734316238616531333964633739313535316265616261
30656339663333373431633763366433366266316563393332613334633966633339633230303166 66353035656333633761626333633762376637333331633832386639343939363536383563363265
61346264386134623962316532343664386637303738333835343036633038323137323961323837 64363031336464653636323665313237333733653434663834376639653265613133336531333362
33376431316465373165663338623538636136343538666235333334373664323463326336336334 36343135306437663762383832613139633337353439626338373639373636646430376331356631
32303361393134653338646563643636356361366133633634393731343332313437643731366634 66346665306633613337303162306633616661323336393866663330653162613930326563376137
30386466333965356135303732663433316363376438623764653464343564353835626435333230 30663762396330356339376237316537656565383533313866383835383465376164363835346433
30646238393266643137373037326136306337306130343739633933626134643364326534386464 64646566376431326561373165326539333566316566323163396136626132313536636464323630
65303531623335663766623037663630376366333631363165633762616564396538643866313465 34653462396231613534623263396438653966396466656265363562346230646165316631613733
35343265663336303537663962643536653937373839313435383337353036313239653263323061 38353164653932666164346362396634653131616562616138323731663331383731353038356335
63653865656461363334646466396135663338383065646464656631636666643030376363633333 36386334613562646636616338666662383065313661303738333430396639343132623231363239
30333331636438656238326534656165396233633131306562336263653330396366343964313434 36643433343135646533656233623539383333356331313037333331393231373866313364326165
66653862386531306236336339353935653335616638643831393430613533643533626135313835 64343737326234663532646463626430393034303638613862363330323631386238356438623531
64313065373564323132663531626436623465663766663566643964353361303336386464386463 36333035393436303636346366316332303432386537333863333861373139666638343239626539
38373036613536386436373535323664333231663437643962373339653236393339653064363530 33643937633332666466333762353835663034653033346666633830313966356466313739353735
61393835343230356234376630613230326637636534336564383139366663663136306665363363 30353836653861376436333837303635613737366337393564373438323330613939626632626633
66373237373530303062333935633634313766316461666439666433616236346434623535343531 35633866626631656137363832353037346532326562373334613834393764613664653030333633
30383264303536653236363533383561613636303662663935303761353065336631353735376365 39346332633834646639353230623130343266396533373262636539343761363466333038386264
63343162646663623736336638306465666233343031656137393037623035613236373930633131 35313530393061336166366130663364623133646364373137383366653633343961616163656539
36366633656131633563336561323835343766356131343038643761663966656364376430366636 30666136613232626134656366616338363338646563393263666634313261666261336239353166
36316633633736353436666539303039383231333437653666313435616536626434653833376532 33653465333563633963373439306166313638623436616633326631396562623636323139643266
66376130653339643564646139633238643266316633363137313038363061386163613863313733 36383232666430346664646630376437613333646630316634353437386439633661346536643437
66633665613537303834393233376463343965343664343564343832376238383064373262336162 34633737383431636239643364666334613831343532653031643539663838653765636133366663
61313163303632373261383563363964353731363739306337333161333130656235363631343761 36396531353730653262326661633538313535346139613462373765346332616439373561663861
61353265633338336466623830396466646233333039323065333636303035363563373366396334 61353237396263343735663662626131356336343230666234333338613264373039653066633261
37366637306430396262376539653134396536643931643563386666623364346635363138373937 39396162346335376134393435633139653362363361376239663435636566646462666231613334
61613232386666343033383031363439373335396362643130656235653066376537373062333363 66616565396136343836373636653661366263613466663838366536346532633831663330303265
39373737316136303835616639363162363839376635666237353064323433373961326338393263 39646333646538356164363030306262303137336238626564353030363239303635383633336561
34343162336336623530653531663136366136353139343561623532633139366533386263316364 32633837336634343838323162643162353566633036326330643339356330313539366432333262
36306134356666343230643639303766343466353562643130363063343330393232663161306266 61363036306164646661666139343637653733656438346533323731393366643862306663663666
66336435356265396330366566373137323265623431386535396665313335666332616233383664 31366538666632303135376365646534653630383963653463616532383865656166383663386135
63656663363366613431366632306230633265306663336439306263646132626631363663643861 32656631393463343830363434333238613938383562313838386563363163636666333739353262
30373330653637623733653165336132643965623232383839623535326336643239333133313030 31613933303635366333353537323639646263353833333636316361623938633030663037306235
32326634643238333163383562393134623532363561393364616430366532633862396438306433 62653639363461316435353735323934366334363238336133303266316461336237313662366136
33653235303639383333633035656533633165653137326130643961393965346266383861616333 64356435393063383537633363346465643462646366333137656235373132306234343466666239
37306266393231336666343333643530353230383239343931303838623335303262313130616162 63666230643731343762616565643439376134306666663836323131383237303364316537303535
65383962613965646438323065303962663965333231323139303438343631396363666330653330 31646435373935306634373835333165336338383466383062313932633666656165303033643165
61323839333863343034356363366433313039383963303063346237366261363861643839396362 33343532363663653631653066666431666261303035303035656235366362306338396235356630
31346637303032356463303564303562313639643563396261326538353834363737323235646430 33643936653930636439646334346531386336373161653138303661373637356333653266343638
64343230336539663237306235623662333062396238383135616231383837366339376633663938 38353464326639396564643233373932353462623038393337616662393562303436643164356331
65313739333065383335323437396232323564363733333437363133613766653334396431333036 30633662323336386565613532323639363562663938626630316235343363363831383338313632
38333038656339363132346362333863643261376335666536306231316630303437306231646565 38303865346136653030616565313731316566653263323834313366346664383263303032356636
61666334623736373832613366376438323664653531393938353234303030633532653561313665 37613865636337613731313232626132343462313033303139373733303961623430613337366631
63613064663564646235373234326661303562646139323330343330343139633462646131353038 62356465393334303964333865616664383330646238386130383164323839376539366163303530
62663535393738626432633564663564653663393937656634666137646363643365353930373266 63383234356130366331393231633539663535383862643032306631653366316461653536373837
66373162373165653533383862363835346133313234326162393331666566316439633133316633 30346133313532316531353231653838303733616364316232373933326465393134623666636437
66393733373333653630363334353833363565336338613361396335326166643630623133303466 34623730346561303466346138373066626630623834393033383164646164316362323036396239
31663037663766356531663039386232316138393266333035613364316539353837653763616666 30663030663566363739396462313266353163316635303965333636656232636536386133383032
32376431383965633138666536386532663761343537646266643566373132343762383966326233 38396431346635343230353863393335666534303738653561653063323531343863633562306462
38373766353962323362366330383564636236363961333535313064313039343933346439396237 37336161373661383235333066383364333638356634636162623235626335633730653161333436
66616631633539623537633164363665393239643633663338393765336434653930356662656164 62623330393738313439376266646430663135313361356366396232366135383636313437386232
65366533633336313832633166376265376634613635363563643866323730343139306537323863 30653463393265383439636235353466363230633336313363383130343535633062373561336162
61373461363237653634666331366436356335306265643639373034666131626238336632346632 36383639636537353761653537376236633166356434336139323066323333396230376537333634
34613062346532656530626364343938636162383862653538353563363035346339623839663261 37363263623233346666613366323363323334663238303162346239353438646532323230333434
39663438396362383866663336643035653833336466663037313764326434373061626232646333 32323238323733646637663862313831373638613965643439393738326330346361663532333663
63336336383366333538613331303863356430373764363930363061383036343836386561663362 65343039323533613363326462613133613633646363393632373864376634323262626330323131
63663232373563343461306131333263376437623534346562626536376138393939373064333231 65306336313463316462656265323039363364653139653330616164373565653064316533383862
31303464656332383036616661656565313063346231623634356638326239343536316162613335 37613130646435626331366537363465396434383430623435333536623139663133393335633831
34663232326438333966313663336465373833646634353934323361343833373661633265313239 66373365386235323662633838383634353435636562343137313065393239353638666466653666
62656533656338376562323861396665353166623732623139353431336439386263363235316132 35333166356162616235623932666438656132613363626364333265326363326361333634303435
35373933613236616362396363323031633166633837383634313638656430373634383563616463 65363365313230353464376339373165393031356331366263626165643163653031376236636536
38353738636631626639636135363561623935646365316161376166653461356430326362623738 66313865663665666561366132336635346334373064613330383039616631313535336238666637
64386537373230303239356334313663616336393439623431616639643233353662306265373232 62353730313430343839313064316131316538383139623535643034393531633161613463613462
39343066353564316433653361333766363535636533626338386434646531653432313034393134 34366132333230666664363838303834343364356463323864343564646331666665376234666138
62653733313636653331356363396531313136346136303661656466333138363366616530306536 62663839343463386464613933616666333833656133343932653635303466323736333834373635
66373532626230313739306432363433313736316261383837393737356333326236323261613965 32336630613561383535343962336166336330316235303666663433343837613266613239633436
36373064636138373134373530363533613031376362386334393464383062663663313234643432 30393064326337363466306135326439653466316637356432653934623836633237383234393639
64363232376137613231313862386561313131376133376466393630383737306666393738613265 37386437643838313234366632666165613239356635613939333061396436333536623162646430
66646236646632313832633366333335313239363763326464326361326263346636326332376336 65663035373030336434636262343363613533333730663736626363653138303561333435313936
31306230373963636135643235306537623930636164346366623862303838653238373030653035 66616666643430393330663332663530636466366463363432333262666336343532346530373431
35653634393532653566323063323761643738616532376262623163393461346334393034643862 34636565633365333561326132626364353732326465336263363230366236653365613663363063
62653835363236303732386365626464346131363231336431316233643132383566356531346237 66363630623661303035343564383038356533363633626433626335373965326661353338623162
66333933386539396366333565653938396564643464663165323535386262623532666237393630 30326237643935373735343062633662386436343537343865326133643238613637323466323963
65336262636630386633626335636231616332353965356335666362313562643738306263376230 35653936663830303336653039343564663961333461643135366464303736373230646264663639
63323938633237363431386639613830633765353232313236336233363736363566346237616637 30303965646263373638316432383631646236386538323030636231323232383163386262663461
61656234376562323162656432393665393930313736313439316261363264333865356139343233 30333934656636306532386538323265653766613039623730616566313165663766666537353362
63636638646332626365383839373765383864346532383236386266656635653333343032313231 31376330393361303961393865343932623462393430666334393064383236363535306365323437
65626233313634333533653436626134373632363565653230656161613963323334613262646530 34653737663932636361323463633861386133663738383432323239316165376461343864643136
66636331396130613934363939653238343463396639363731393363643830663362373439646337 30323437366363346534316262643232653766636463313433613538396437386563313332393134
63396435376637666563333165623338386337613638366339656561366538366635363037366531 63363361633035336463636662326135663335396461313064343734353235346263346166386237
32306235666231303762356665613738323336306465613531313964626631313731373963353964 63386263613466346365333462633639633934616464336433363032313164326232383130613636
32616632376534316532643531386635386330313866326265393736376538616431323238333562 39346332373234386133626465333564626537386364306130356462366663343163376336313434
36373238656361323336383466363563623333306634373164366134376635373262353533653330 34316537303863326330386636646638323238386461636162653265356531636664363539396432
38643233363737356564653834316435336439663562343366353866336662356138323566363061 32393664393139353638343730333334623566353266666631343166626666363236646266363839
63313336323435343861393164313130346438343862366530363233643266393964316265663535 38376130353765346430336662373237306362656337376138643431613234656133616139323136
65323739306536373331326338326132383265343939663336303534633537393637353639636561 39323130326361303830316338656666356661633232346231306362633532623163373337643238
64656432313636366434313465626562626638613232653230373530363234306537363665646633 31393834363035623564613262386163663830663333303931643037386135643939623230363539
33326163663830353166643662386637323438366334386533303664356631653561323032666265 32613661623532323334653132626362383763363439386134613430343966623533396265376562
61333165363636363634353461613039313362373863663739323231663230643635663466323430 30666437663836373732373662323062623039383733373532653934333564336431356134336236
37393431333733313134326231313234353930663365646637386639643535316362626232323430 65353964373364393062643462623630303530336337333435396230613230313034636337303431
32363631353565323663393235343336663930373439663861613661636433356366633065343935 32633461643064386664393235623331303765366636366531663564386633313534363764343864
61356636323039656230353264646166626633316430653162383638336265653865373536643036 65356466343832333665373534633232386133373234636234373863313735373335316164343236
35653166333765366231636163666638383262613432646334663430323565333538626665343763 65333763383866666634616438643966643966623262646364636166613361383031316663393962
32646663356565646362646261343436383039623635666439643762616463656361386631313637 62396361336635656466633834393833303437336362393137643530646139356133376631373964
61616164383734353634306633636338623837356230626263653161616664613266356432653335 38343563363331393938633266346635626531393266396331373834363538356231356437613130
30646434346436383565343138623264386630333832386134666463313936383364333364383232 32373334666235623131376439386638373230306432646233306635326634363265663035316463
39393066333666653734616463343530643537613437623766313237353033623662336137356534 35656438346231623866643836343630316538613261616662323639343538303334376233386666
35303635623232333230363362353137656235373539316163653863326666383237303235316164 31643432383265623339616133313238623835666364393365636539353764623065653233333362
34623138346261366238303037653764366537333561623135656236663435316565303931353939 64623833386430383532376266353336613833323362623162333739363737326365303730333165
34663932303239393836363663343735313632333639633733323564343039346436343935373430 65636630386630313965393834366431356633623136336264626461393833306562353235653036
66313863643361306161373634373738383462313831643161333230646435313261383534396464 66353035373765613634306633313234353761353263653138313237663064346461343264616339
39663466643864666433366531323866333935373833663661323833623734646265393035613966 34393065303636336361373666643738306634366437383661356439373231376232306262333238
62393165653135643737343333346232356638646437326664396466333063666135653338623266 33653433366432643733663261363931336436343461373166646634623163323838633238613536
34663133636164386164636434666231643163343930353863306538333337643762616661366366 37363839383935646238363931633431383034343735316230323639353637613338313432363430
63646336613433623862356365633563633235396337356535376335636633636563333738383061 31636233353737626633623062323330613534356135316338366166323533363331303032323866
33326136393530353964666639633638643433653736376637386638336561643061323635373565 36643166303363623335396162636265343933616330626634623336623430386664623466636563
65393836613638313165313262376166643561623131363836363531616232663333333063393039 63623837323363343263643263663764626637666438353263333230636335323566336636396263
35643938626132383439393761623165303730396365323665613663643961663466393937333731 35626335386433623631336264643334616166323138313164363063353533646334353031633963
30643662663034616631343336343236613437376362366234343436376563303466633030323465 34373736356333316566636135383833386631646631383132366534333331623137303030353837
64626536333465626430333336353038336539313531303933633466333633336364363961353861 31653131343761656634373964656633343363326233663566663164313631323839306365346333
31636135303332343733313637326461643264636236313331643438613365393733383764653432 32636662383362326362336533623666333265306236633663626236623637643366383662643462
65346533616130396233613863633331613638316462366364346465353234373531393137336165 35653465373937386332393737373435393863396436396433376137643639336430326266343037
36666336333036396262663661343962663763316531393765346536646236613331626139383230 62316464333066643665323630363166653064396230636136316363356431376438626661346662
32623665353463326633646466376232343333666465616633333033663031643262663732323230 65343664333961366264336439303337663066363238663062326536336333373865313633386436
36363439613934643037393562333237636262306330356638666235333361376136623462313736 63643064393761393034616463633430376436306563363838633363656330333164313066303030
33373163336134316563353031616339336234623738373230323335623130376265386130333235 63303534356231636532386236393137336132313966623032626361623434383934633735643039
64616261633232316131633062623163333135323737376462383539663137366539656261396238 35303564663632353063336437653162643361633537313166323561353531346133353733633333
31363232356361376264373863663362346535346136313834623761333037343435326339633735 31366330636235393639373566633365306664373432353930653061303764643461303164636165
33656465376264326334356365346437343062343631663430346561656531653662646530316133 35393363653836396662393036313435393231663131343431656265306566336263373039363866
64396563376263306533306565623163316238326264306330393465333737303062363030343662 38366334393639636233313636323636386239626531363931306439633764666163376363623934
65333633643635643737323231343664613735336230393835346132613331366266336434623937 30383130623435666263313834633362316561326664666234323033633637626664366634383866
65616366633734373434333837326465613862633930626435623165633964313732373936346434 66383762623234376363336162613365366135343564313564326131373036353832383935353533
30643161633238343435623538316134616161313461616538653161383032313038666638376432 66616565616266356336643064313138343337363165653138633532313739306433616163366237
64646564626231656664306235633031356564373432626561386135653136313062383861323130 31343663613234353336323265636235346161333765663635306230653030396366653132333864
34393331316439613363636631666262343334393739303631633936623964343938373334623230 31366436373938303531633032636534663463623534363865313135643939373232313230386262
39343031663565333431333731363966623730666335346164623662373265643732306662393663 61623039326639633834616564643137656666376638356637316636663032656230616431313035
39336137326533643533623865313934336464633634613436616438373531636562313762383666 32646231623435313334333330333737633138346439613631653661393562306238346135636263
37386365333361626362 38363430316464383432313835646235643666666634346462616630646562366135643035316631
66336330653930643631616130613330653435373334356138386136373338613530316439363561
63346264626433383661313737313639333465383430343061383364383334393330656337396134
61326362303664613037393336666330313232646238613339626137663934623134323630363731
38626234663834303362

View file

@ -90,14 +90,6 @@ firewall__zones:
addrs: addrs:
- 2a09:6840:128::98 - 2a09:6840:128::98
- 10.128.0.98 - 10.128.0.98
re2o-ldap.adm:
addrs:
- 2a09:6840:128::21
- 10.128.0.21
ldap-replica-edc.adm:
addrs:
- 2a09:6840:128::4:249
- 10.128.4.249
nextcloud.adm: nextcloud.adm:
addrs: addrs:
- 2a09:6840:128::58 - 2a09:6840:128::58
@ -131,10 +123,6 @@ firewall__zones:
addrs: addrs:
- 2a09:6840:211::1:1 - 2a09:6840:211::1:1
- 10.211.1.1 - 10.211.1.1
grafana.ext:
addrs:
- 2a09:6840:211::1:7
- 10.211.1.7
ns-1.pub: ns-1.pub:
addrs: addrs:
- 2a09:6840:215::1:2 - 2a09:6840:215::1:2
@ -155,14 +143,6 @@ firewall__zones:
addrs: addrs:
- 45.66.111.216 - 45.66.111.216
- 2a09:6840:215::1:216 - 2a09:6840:215::1:216
log-1.int:
addrs:
- 10.206.1.9
- 2a09:6840:206::1:9
log-2.int:
addrs:
- 10.206.1.10
- 2a09:6840:206::1:10
firewall__input: firewall__input:
- iif: - iif:
@ -288,25 +268,6 @@ firewall__forward:
tcp: tcp:
dport: 9090 dport: 9090
verdict: accept verdict: accept
# Prometheus for Grafana nixos
- src: grafana.ext
dst: prometheus.int
protocols:
tcp:
dport: 9090
verdict: accept
- src: grafana.ext
dst: re2o-ldap.adm
protocols:
tcp:
dport: 389
verdict: accept
- src: grafana.ext
dst: ldap-replica-edc.adm
protocols:
tcp:
dport: 389
verdict: accept
# Admin VPN clients # Admin VPN clients
- src: vpn-clients - src: vpn-clients
dst: infra dst: infra
@ -381,12 +342,6 @@ firewall__forward:
tcp: tcp:
dport: 3000 dport: 3000
verdict: accept verdict: accept
- src: proxy.pub
dst: grafana.ext
protocols:
tcp:
dport: 80
verdict: accept
- src: proxy.pub - src: proxy.pub
dst: nextcloud.adm dst: nextcloud.adm
protocols: protocols:

View file

@ -16,10 +16,6 @@ pve_auth__users:
password: "{{ vault_pve_passwords.jeltz }}" password: "{{ vault_pve_passwords.jeltz }}"
groups: groups:
- admin - admin
korenstin:
password: "{{ vault_pve_passwords.korenstin }}"
groups:
- admin
otthorn: otthorn:
password: "{{ vault_pve_passwords.otthorn }}" password: "{{ vault_pve_passwords.otthorn }}"
groups: groups:
@ -28,4 +24,12 @@ pve_auth__users:
password: "{{ vault_pve_passwords['v-lafeychine'] }}" password: "{{ vault_pve_passwords['v-lafeychine'] }}"
groups: groups:
- admin - admin
pz2891:
password: "{{ vault_pve_passwords.pz2891 }}"
groups:
- admin
loutr:
password: "{{ vault_pve_passwords.loutr }}"
groups:
- admin
... ...

View file

@ -268,12 +268,6 @@ knotd__hosts:
ns-master.int: ns-master.int:
- 2a09:6840:128:0::110 - 2a09:6840:128:0::110
- 10.128.0.110 - 10.128.0.110
log-1.int:
- 2a09:6840:206::1:9
- 10.206.1.9
log-2.int:
- 2a09:6840:206::1:10
- 10.206.1.10
dns-1.int: dns-1.int:
- 2a09:6840:206::1:1 - 2a09:6840:206::1:1
- 10.206.1.1 - 10.206.1.1
@ -349,9 +343,6 @@ knotd__hosts:
collabora.ext: collabora.ext:
- 2a09:6840:211::1:1 - 2a09:6840:211::1:1
- 10.211.1.1 - 10.211.1.1
grafana.ext:
- 2a09:6840:211::1:7
- 10.211.1.7
proxy.pub: proxy.pub:
- 2a09:6840:215::1:1 - 2a09:6840:215::1:1
- 45.66.111.206 - 45.66.111.206
@ -387,14 +378,17 @@ knotd__zones:
- target: - target:
- ns-1.pub.infra - ns-1.pub.infra
- ns-2.pub.infra - ns-2.pub.infra
- ns-3.ovh.infra
- name: infra - name: infra
target: target:
- ns-1.pub.infra - ns-1.pub.infra
- ns-2.pub.infra - ns-2.pub.infra
- ns-3.ovh.infra
- name: test - name: test
target: target:
- ns-1.pub.infra - ns-1.pub.infra
- ns-2.pub.infra - ns-2.pub.infra
- ns-3.ovh.infra
- name: adm - name: adm
target: target:
- serge - serge
@ -442,7 +436,6 @@ knotd__zones:
target: proxy-ovh target: proxy-ovh
- name: - name:
- grafana - grafana
- grafana-ng
- nextcloud - nextcloud
- cloud - cloud
- office - office
@ -502,6 +495,7 @@ knotd__zones:
- target: - target:
- ns-1.pub.infra.auro.re. - ns-1.pub.infra.auro.re.
- ns-2.pub.infra.auro.re. - ns-2.pub.infra.auro.re.
- ns-3.ovh.infra.auro.re.
mx: mx:
- exchange: mx - exchange: mx
preference: 5 preference: 5
@ -530,6 +524,7 @@ knotd__zones:
- target: - target:
- ns-1.pub.infra.auro.re. - ns-1.pub.infra.auro.re.
- ns-2.pub.infra.auro.re. - ns-2.pub.infra.auro.re.
- ns-3.ovh.infra.auro.re.
hosts: "{{ knotd__hosts['infra.auro.re'] }}" hosts: "{{ knotd__hosts['infra.auro.re'] }}"
108.66.45.in-addr.arpa: 108.66.45.in-addr.arpa:
@ -546,6 +541,7 @@ knotd__zones:
- target: - target:
- ns-1.pub.infra.auro.re. - ns-1.pub.infra.auro.re.
- ns-2.pub.infra.auro.re. - ns-2.pub.infra.auro.re.
- ns-3.ovh.infra.auro.re.
109.66.45.in-addr.arpa: 109.66.45.in-addr.arpa:
dnssec_policy: ripe dnssec_policy: ripe
notify: notify:
@ -560,6 +556,7 @@ knotd__zones:
- target: - target:
- ns-1.pub.infra.auro.re. - ns-1.pub.infra.auro.re.
- ns-2.pub.infra.auro.re. - ns-2.pub.infra.auro.re.
- ns-3.ovh.infra.auro.re.
110.66.45.in-addr.arpa: 110.66.45.in-addr.arpa:
dnssec_policy: ripe dnssec_policy: ripe
notify: notify:
@ -574,6 +571,7 @@ knotd__zones:
- target: - target:
- ns-1.pub.infra.auro.re. - ns-1.pub.infra.auro.re.
- ns-2.pub.infra.auro.re. - ns-2.pub.infra.auro.re.
- ns-3.ovh.infra.auro.re.
reverse_hosts: "{{ knotd__hosts['adh.auro.re'] reverse_hosts: "{{ knotd__hosts['adh.auro.re']
| ip_filter(['45.66.110.0/24']) | ip_filter(['45.66.110.0/24'])
| add_origin_keys('adh.auro.re.') }}" | add_origin_keys('adh.auro.re.') }}"
@ -591,6 +589,7 @@ knotd__zones:
- target: - target:
- ns-1.pub.infra.auro.re. - ns-1.pub.infra.auro.re.
- ns-2.pub.infra.auro.re. - ns-2.pub.infra.auro.re.
- ns-3.ovh.infra.auro.re.
reverse_hosts: "{{ knotd__hosts['auro.re'] reverse_hosts: "{{ knotd__hosts['auro.re']
| ip_filter(['45.66.111.0/24']) | ip_filter(['45.66.111.0/24'])
| add_origin_keys('auro.re.') }}" | add_origin_keys('auro.re.') }}"
@ -608,6 +607,7 @@ knotd__zones:
- target: - target:
- ns-1.pub.infra.auro.re. - ns-1.pub.infra.auro.re.
- ns-2.pub.infra.auro.re. - ns-2.pub.infra.auro.re.
- ns-3.ovh.infra.auro.re.
reverse_hosts: "{{ knotd__hosts['auro.re'] reverse_hosts: "{{ knotd__hosts['auro.re']
| ip_filter(['2a09:6840::/32']) | ip_filter(['2a09:6840::/32'])
| add_origin_keys('auro.re.') | add_origin_keys('auro.re.')

View file

@ -37,10 +37,6 @@ caddy__routes_https:
reverse: reverse:
- "[2a09:6840:128::98]:3000" - "[2a09:6840:128::98]:3000"
- 10.128.0.98:3000 - 10.128.0.98:3000
grafana-ng.auro.re:
reverse:
- "[2a09:6840:211::1:7]:80"
- 10.211.1.7:80
office.auro.re: office.auro.re:
reverse: reverse:
- "[2a09:6840:211::1:1]:9980" - "[2a09:6840:211::1:1]:9980"

View file

@ -4,8 +4,6 @@ switch_vars:
location: "Local_de_Brassage_EdC" location: "Local_de_Brassage_EdC"
host: 10.130.4.11 host: 10.130.4.11
port: 80 port: 80
username: "{{ vault_switch.username }}"
password: "{{ vault_switch.password }}"
delete_vlans: [] delete_vlans: []
vlans: vlans:
- id: 40 - id: 40
@ -53,7 +51,7 @@ switch_vars:
- id: 9 - id: 9
name: "Room_Ouest_352" name: "Room_Ouest_352"
- id: 10 - id: 10
name: "Borne_Adh_Ouest_252" name: "Room_Ouest_252"
- id: 11 - id: 11
name: "Room_Ouest_273" name: "Room_Ouest_273"
- id: 12 - id: 12

View file

@ -46,7 +46,7 @@ switch_vars:
lldp: "LPAS_TX_AND_RX" lldp: "LPAS_TX_AND_RX"
loop_protect: true loop_protect: true
- id: 4 - id: 4
name: "Not_used" name: "Room_edc_Aile_Ouest_58"
lldp: "LPAS_TX_AND_RX" lldp: "LPAS_TX_AND_RX"
loop_protect: true loop_protect: true
- id: 5 - id: 5

View file

@ -62,7 +62,7 @@ switch_vars:
lldp: "LPAS_TX_AND_RX" lldp: "LPAS_TX_AND_RX"
loop_protect: true loop_protect: true
- id: 8 - id: 8
name: "Not_used" name: "Room_edc_Aile_Ouest_252"
lldp: "LPAS_TX_AND_RX" lldp: "LPAS_TX_AND_RX"
loop_protect: true loop_protect: true
- id: 9 - id: 9

8939
how

File diff suppressed because it is too large Load diff

54
httpapi/aruba.py Normal file
View file

@ -0,0 +1,54 @@
from ansible.module_utils.six.moves.urllib.error import HTTPError
from ansible_collections.ansible.netcommon.plugins.plugin_utils.httpapi_base import (
HttpApiBase,
)
import json
class HttpApi(HttpApiBase):
def login(self, username, password):
"""
Log in to the rest api.
Return True if the connection has succeeded and False otherwise.
"""
data = {"userName": username, "password": password}
response = self.send_request("login-sessions", data, method="POST")
if response.status_code != 201:
return AnsibleAuthentificationFailure(message="Plop!")
data = response.json()
if not "cookie" in data:
return False
self.headers["cookie"] = data["cookie"]
return True
def logout(self):
"""
Log out of the rest api.
Return True if connection has succeeded and False otherwise
"""
response = self.delete("/login-sessions")
if response.status_code != 204:
return False
self.headers.pop("cookie")
return True
def send_request(self, path, data, method="GET"):
headers = {"Content-Type": "application/json"}
api = self.connection.get_option("api")
uri = f"/rest/{api}/{path}"
if not data:
data = {}
content = json.dumps(data)
try:
response, content = self.connection.send(uri, content, method=method, headers=headers)
except HTTPError as exc:
return exc.code, exc.read()
return response.read()

View file

@ -73,107 +73,58 @@ EXAMPLES = """
""" """
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection
import json # class SwitchApi:
import os # def __init__(self, port, host, use_proxy, api="v1"):
import requests # self.headers = {"Content-Type": "application/json"}
import time # self.url_base = f"http://{host}:{port}/rest/{api}"
class SwitchApi: # self.proxies = None
def __init__(self, port, host, use_proxy, api="v1"): # if use_proxy:
self.headers = {'Content-Type': 'application/json'} # http_proxy = os.getenv("HTTP_PROXY")
self.url_base = f"http://{host}:{port}/rest/{api}" # all_proxy = os.getenv("ALL_PROXY")
self.proxies = None # if http_proxy != "":
if use_proxy: # self.proxies = {"http": http_proxy}
http_proxy = os.getenv("HTTP_PROXY") # elif all_proxy != "":
all_proxy = os.getenv("ALL_PROXY") # self.proxies = {"http": all_proxy}
if http_proxy != "": # def post(self, url, data=None):
self.proxies = {'http': http_proxy} # kwargs = {"headers": self.headers}
elif all_proxy != "": # if data is not None:
self.proxies = {'http': all_proxy} # kwargs["data"] = data
# if self.proxies is not None:
# kwargs["proxies"] = self.proxies
def login(self, username, password): # return requests.post(self.url_base + url, **kwargs)
"""
Log in to the rest api.
Return True if the connection has succeeded and False otherwise.
"""
data = {"userName": username, "password": password}
max_retries = 3
for i in range(max_retries):
try:
response = self.post("/login-sessions", data = json.dumps(data),)
break
except requests.exceptions.ConnectionError as err:
if i == max_retries-1:
raise err
time.sleep(1)
if response.status_code != 201: # def get(self, url, data=""):
return False # kwargs = {"headers": self.headers}
# if data is not None:
# kwargs["data"] = data
# if self.proxies is not None:
# kwargs["proxies"] = self.proxies
data = response.json() # return requests.get(self.url_base + url, **kwargs)
if not 'cookie' in data:
return False
self.headers['cookie'] = data['cookie'] # def delete(self, url, data=""):
return True # kwargs = {"headers": self.headers}
# if data is not None:
# kwargs["data"] = data
# if self.proxies is not None:
# kwargs["proxies"] = self.proxies
def logout(self): # return requests.delete(self.url_base + url, **kwargs)
"""
Log out of the rest api.
Return True if connection has succeeded and False otherwise
"""
response = self.delete("/login-sessions")
if response.status_code != 204:
return False
self.headers.pop('cookie')
return True
def post(self, url, data = None): # def put(self, url, data=""):
kwargs = { # kwargs = {"headers": self.headers}
"headers": self.headers # if data is not None:
} # kwargs["data"] = data
if data is not None: # if self.proxies is not None:
kwargs["data"] = data # kwargs["proxies"] = self.proxies
if self.proxies is not None:
kwargs["proxies"] = self.proxies
return requests.post(self.url_base + url, **kwargs) # return requests.put(self.url_base + url, **kwargs)
def get(self, url, data = ""):
kwargs = {
"headers": self.headers
}
if data is not None:
kwargs["data"] = data
if self.proxies is not None:
kwargs["proxies"] = self.proxies
return requests.get(self.url_base + url, **kwargs)
def delete(self, url, data = ""):
kwargs = {
"headers": self.headers
}
if data is not None:
kwargs["data"] = data
if self.proxies is not None:
kwargs["proxies"] = self.proxies
return requests.delete(self.url_base + url, **kwargs)
def put(self, url, data = ""):
kwargs = {
"headers": self.headers
}
if data is not None:
kwargs["data"] = data
if self.proxies is not None:
kwargs["proxies"] = self.proxies
return requests.put(self.url_base + url, **kwargs)
def required_modification(current_conf, modification): def required_modification(current_conf, modification):
@ -184,33 +135,37 @@ def required_modification(current_conf, modification):
return True return True
return False return False
def throw_err(msg, url, status, response):
raise Exception(
msg + ":",
"Url: " + url,
"Status code: " + status,
"Response: " + response,
)
def configure(module, config, api, current_path="", create_method=None):
path = "/" + str(config["path"]) def configure(connection, config, check_mode, current_path="", create_method=None):
path = str(config["path"])
url = current_path + path url = current_path + path
check_mode = module.check_mode
changed = False changed = False
before = {"path": path} before = {"path": path}
after = {"path": path} after = {"path": path}
if not "path" in config: if not "path" in config:
api.logout()
raise Exception("A path must be specified.") raise Exception("A path must be specified.")
# If removing configuration # If removing configuration
if "delete" in config and config["delete"]: if "delete" in config and config["delete"]:
# Get the configuration # Get the configuration
response = api.get(url) status, response = connection.send_request(url, None, method="GET")
if response.status_code == 404: if status == 404:
before["delete"] = True before["delete"] = True
elif response.status_code in (200, 201, 202, 203, 204): elif status in (200, 201, 202, 203, 204):
before["data"] = response.json() before["data"] = response.json()
else: else:
api.logout() throw_err("Failed to check the old configuration",
raise Exception( f"Url: {url}",
"Failed to check the old configuration:", f"Status code: {status}",
f"Url: {response.url}",
f"Status code: {response.status_code}",
f"Response: {response.text}", f"Response: {response.text}",
) )
@ -251,20 +206,17 @@ def configure(module, config, api, current_path="", create_method=None):
# If create or edit # If create or edit
elif "data" in config and type(config["data"]) is dict: elif "data" in config and type(config["data"]) is dict:
# Get the configuration # Get the configuration
response = api.get(url) status, response = connection.send_request(url, None, method="GET")
new_data = {} new_data = {}
if response.status_code == 404: if status == 404:
before["delete"] = True before["delete"] = True
elif response.status_code in (200, 201, 202, 203, 204): elif status in (200, 201, 202, 203, 204):
before["data"] = response.json() before["data"] = response.json()
new_data = before["data"].copy() new_data = before["data"].copy()
else: else:
api.logout() throw_err(
raise Exception( "Failed to check the old configuration",
"Failed to check the old configuration:", url, status, response
f"Url: {response.url}",
f"Status code: {response.status_code}",
f"Response: {response.text}",
) )
# If required, modify # If required, modify
@ -317,7 +269,11 @@ def configure(module, config, api, current_path="", create_method=None):
) )
new_data.update(config["data"]) new_data.update(config["data"])
after["data"] = new_data after["data"] = new_data
changed = changed or (not "data" in before) or after["data"] != before["data"] changed = (
changed
or (not "data" in before)
or after["data"] != before["data"]
)
# Configure the subpaths # Configure the subpaths
if "subpath" in config and type(config["subpath"]) is list: if "subpath" in config and type(config["subpath"]) is list:
@ -328,66 +284,47 @@ def configure(module, config, api, current_path="", create_method=None):
after["subpath"] = [] after["subpath"] = []
for subconf in config["subpath"]: for subconf in config["subpath"]:
response = configure( response = configure(
module, subconf, connection,
subconf,
api, api,
current_path=url, current_path=url + "/",
create_method=create_method create_method=create_method,
) )
changed = changed or response["changed"] changed = changed or response["changed"]
before["subpath"].append(response["diff"]["before"]) before["subpath"].append(response["diff"]["before"])
after["subpath"].append(response["diff"]["after"]) after["subpath"].append(response["diff"]["after"])
return { return {"changed": changed, "diff": {"after": after, "before": before}}
"changed": changed,
"diff": {"after": after, "before": before}
}
def run_module(): def run_module():
module_args = dict( module_args = {
config=dict(type='dict', required=True), "config": {"type": "dict", "required": True},
username=dict(type='str', required=True), "port": {"type": "int", "required": True},
password=dict(type='str', required=True, no_log=True), "host": {"type": "str", "required": True},
port=dict(type='int', required=True), "version": {"type": "str", "required": False, "default": "v1"},
host=dict(type='str', required=True), "use_proxy": {"type": "bool", "required": False, "default": False},
version=dict(type='str', required=False, default='v1'), }
use_proxy=dict(type='bool', required=False, default=False),
)
module = AnsibleModule( module = AnsibleModule(argument_spec=module_args, supports_check_mode=True)
argument_spec=module_args, connection = Connection(module._socket_path)
supports_check_mode=True
) connection.set_option("host", module.params["host"])
connection.set_option("port", module.params["port"])
connection.set_option("api", module.params["version"])
connection.set_option("use_proxy", module.params["use_proxy"])
result = { result = {
"changed": False, "changed": False,
} }
# api connection
api = SwitchApi(
module.params["port"],
module.params["host"],
module.params["use_proxy"],
api = module.params["version"]
)
login_success = api.login(
module.params["username"],
module.params["password"],
)
if not login_success:
module.fail_json(msg='login failed', **result)
return
try: try:
response = configure(module, module.params["config"], api) response = configure(connection, module.params["config"], module.check_mode)
except Exception as msg: except Exception as msg:
module.fail_json(msg="\n".join(msg.args), **result) module.fail_json(msg="\n".join(msg.args), **result)
return return
api.logout()
result.update(response) result.update(response)
if module.check_mode:
module.exit_json(**result)
module.exit_json(**result) module.exit_json(**result)
@ -395,5 +332,5 @@ def main():
run_module() run_module()
if __name__ == '__main__': if __name__ == "__main__":
main() main()

View file

@ -1,7 +1,8 @@
#!/usr/bin/env ansible-playbook #!/usr/bin/env ansible-playbook
--- ---
- hosts: - hosts:
- pve_network - pve
- vm
roles: roles:
- pve_auth - locales
... ...

View file

@ -2,13 +2,25 @@
--- ---
- hosts: - hosts:
- switch - switch
connection: httpapi
gather_facts: false
environment: environment:
HTTP_PROXY: "socks5://localhost:3000" HTTP_PROXY: "socks5://localhost:3000"
connection: httpapi
gather_facts: false
vars: vars:
ansible_network_os: aruba
ansible_user: "{{ vault_switch.username }}"
ansible_password: "{{ vault_switch.password }}"
ansible_httpapi_use_ssl: false
ansible_httpapi_validate_certs: false
switch: switch:
use_proxy: true use_proxy: true
roles: roles:
- switch-system - switch-system
- switch-vlans - switch-vlans

View file

@ -1,8 +1,6 @@
--- ---
- name: Configure switch - name: Configure switch
switch_config: switch_config:
username: "{{ switch_vars.username }}"
password: "{{ switch_vars.password }}"
port: "{{ switch_vars.port }}" port: "{{ switch_vars.port }}"
host: "{{ switch_vars.host }}" host: "{{ switch_vars.host }}"
use_proxy: "{{ switch.use_proxy }}" use_proxy: "{{ switch.use_proxy }}"
@ -15,8 +13,6 @@
- name: Configure sntp - name: Configure sntp
switch_config: switch_config:
username: "{{ switch_vars.username }}"
password: "{{ switch_vars.password }}"
port: "{{ switch_vars.port }}" port: "{{ switch_vars.port }}"
host: "{{ switch_vars.host }}" host: "{{ switch_vars.host }}"
use_proxy: "{{ switch.use_proxy }}" use_proxy: "{{ switch.use_proxy }}"
@ -29,8 +25,6 @@
- name: Configure sntp servers - name: Configure sntp servers
switch_config: switch_config:
username: "{{ switch_vars.username }}"
password: "{{ switch_vars.password }}"
port: "{{ switch_vars.port }}" port: "{{ switch_vars.port }}"
host: "{{ switch_vars.host }}" host: "{{ switch_vars.host }}"
use_proxy: "{{ switch.use_proxy }}" use_proxy: "{{ switch.use_proxy }}"
@ -53,11 +47,6 @@
- name: Configure loop-protect - name: Configure loop-protect
switch_config: switch_config:
username: "{{ switch_vars.username }}"
password: "{{ switch_vars.password }}"
port: "{{ switch_vars.port }}"
host: "{{ switch_vars.host }}"
use_proxy: "{{ switch.use_proxy }}"
version: v7 version: v7
config: config:
path: loop_protect path: loop_protect

View file

@ -4,7 +4,6 @@
ansible_2_16 ansible_2_16
python313Packages.jinja2 python313Packages.jinja2
python313Packages.requests python313Packages.requests
python313Packages.pydantic_1
python313Packages.pysocks python313Packages.pysocks
python313Packages.dns python313Packages.dns
]; ];