From cebac4d3f1ca70e2f69405f8340db91c8c12a1f5 Mon Sep 17 00:00:00 2001 From: Anton Vakhrushev Date: Sat, 25 Feb 2023 17:47:37 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B7=D0=B0=D1=89=D0=B8=D1=82=D1=83=20=D0=BF=D0=B0=D1=80=D0=BE?= =?UTF-8?q?=D0=BB=D0=B5=D0=BC=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=B5=D1=80?= =?UTF-8?q?=D0=B2=D0=B8=D1=81=D0=B0=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 3 +++ ansible/templates/Caddyfile.j2 | 6 +++--- ansible/vars/vars.yml | 39 ++++++++++++++++++---------------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 0c105fb..8c742b7 100644 --- a/Makefile +++ b/Makefile @@ -66,3 +66,6 @@ list-tags: lint: ansible-lint "./ansible/configuration.yml" --exclude="./ansible/galaxy.roles/" -v || true ansible-lint "./ansible/roles/ssl-certificate/tasks/main.yml" -v || true + +caddy-hash-password: + docker run -it caddy:2.5.2 caddy hash-password --plaintext="$(PASS)" diff --git a/ansible/templates/Caddyfile.j2 b/ansible/templates/Caddyfile.j2 index 4db7ae7..98a8fe7 100644 --- a/ansible/templates/Caddyfile.j2 +++ b/ansible/templates/Caddyfile.j2 @@ -18,8 +18,8 @@ status.vakhrushev.me, :29999 { tls anwinged@ya.ru - # basicauth / { - # {{ netdata.login }} {{ netdata.password | password_hash('blowfish') | b64encode }} - # } + basicauth / { + {{ netdata.login }} {{ netdata.password_hash }} + } } diff --git a/ansible/vars/vars.yml b/ansible/vars/vars.yml index 8cabbc0..25e7a14 100644 --- a/ansible/vars/vars.yml +++ b/ansible/vars/vars.yml @@ -1,19 +1,22 @@ $ANSIBLE_VAULT;1.1;AES256 -36396531373934663831663236653535303262393035373861643832313630336534383661613065 -3232326562356434326662616534646439636161643366650a363331353232356131333932613263 -30636130643165663033393431336664346365313733663163626133343131353361626231353838 -3361626231626664650a363836323435623131323332663365636466393361353532643363643833 -34616439653361623333336132323236613065643435373239313535386663323230656234343930 -64316434666465363833636538666362663664336536643464346130353839306437623837303466 -30393534363839363131663161366435626565363837663363623562396636633261316362323432 -39313561663938633736623936323330343563343739623639643734313231613337396166346165 -30323930653366373665353664333464653730663239613036393239633838303261333436373562 -63313666613035663838323837393931663034663963326331626136373337376635653136356332 -38663062363035386237646332383936353836336461313264303034346435343138346538356636 -61383132316661366466386361323333353033346666326133333633626532376265613966616634 -63313335353565333635313362353034643062623633306339366663623636363732656235656166 -31306430346261353939623933306435666239313733643030346539353133623265373964393235 -33383562316232373166383065383562646536323565393136346666363832363066653231393565 -65633139353661663564656265323439643665616432386131633361643461386631646265633839 -61636334326666396237336137313332626666313936616462666137396638303030646136383166 -6132303361653036386630393766643962643430343164656663 +61643333376563373438636631326564663330626562633435616133633934623337333839353236 +6539383536656336356637633364626130363964653862660a393338363338353733613562623263 +31386464663433396639363162613264633361346464373130633236313939383138393437343234 +3963633030346331640a343031333032373364316365313865366531383334366161633438663735 +65353163346165353063316532623539643163353062373865356166306334636233396463643034 +38336663633133646439323362666266643030666333643963316334386136353063633237363361 +65303236626631313337623536353761633837646237653932323263393035336563383333646135 +63623161613639323361313566313531323934363234316266343165643936373766383431383865 +64653531383930653138313933643530653965616339313534346432656532666631323436313235 +31626331313962313236343264373864386466636333373935633537656639323263613636343236 +61656230633665653238353963653432626361373639666661303534343633353630323766613866 +34393835313037356631303432306137663631373535643863616663316565313739316336646264 +61363737306261633938336637383936643332633731333231653862653037663536633133383166 +37326536656339363934626230363065363132666137656334636635623534623637303232333739 +36613966653430336133656365363261383164626436623236653561623038376434316162653563 +64383232613365623365353135366334393830646330376137333732323239336231386238656464 +61393536663030623833633965316664383162653238343763393933333630303934666538626264 +36376437396561383037333064373039323834653264383732353466313162663437333530366163 +66613831643032376363326334393862383361326233353136383564366433346164343465653162 +39613836633663383166666232333064313865613961653932353831633763323132386532656166 +39623964396562343838653161393232663836663631393432373834373731646263