diff --git a/justfile b/justfile index c2d8248..f43d520 100644 --- a/justfile +++ b/justfile @@ -1,18 +1,26 @@ playbook_dir := "${ANSIBLE_LOCAL}/ansible-hpa-playbook" +project_files := "project_files" edit-repo-vault: - @ansible-vault edit ./repo_vars/vault.yml + @ansible-vault edit \ + --vault-id "consults@$SCRIPTS/vault-gopass-client" \ + ./repo_vars/vault.yml create-repo-vault: - @ansible-vault create ./repo_vars/vault.yml + @ansible-vault create \ + --vault-id "consults@$SCRIPTS/vault-gopass-client" \ + ./repo_vars/vault.yml edit-project-vault: - @ansible-vault edit ./vault.yml + @ansible-vault edit \ + --vault-id "consults@$SCRIPTS/vault-gopass-client" \ + {{project_files}}/vault.yml create-project dir *ARGS: @ansible-playbook {{playbook_dir}}/main.yml \ --inventory {{playbook_dir}}/inventory.ini \ + --vault-id "consults@$SCRIPTS/vault-gopass-client" \ --tags setup-project \ - --extra-vars "output_dir={{dir}}" \ + --extra-vars "project_dir={{dir}}" \ --extra-vars "@{{justfile_directory()}}/repo_vars/vars.yml" \ {{ARGS}} diff --git a/project_files/vars.yml b/project_files/vars.yml index 80e6a33..edc5723 100644 --- a/project_files/vars.yml +++ b/project_files/vars.yml @@ -10,8 +10,6 @@ # vars: "repo_vars" # repo: (optional if using a repo as a template) template: - path: "/path/to/template/on/local/disk" - vars: "repo_vars" # When using a git repository as a template dir. In general, it's # probably best to pin to a particular version of the repo template # instead of a branch. @@ -19,7 +17,9 @@ template: # repo: # url: "https://example.com/repo.git" # version: "main" - repo: {} + repo: + url: "https://git.housh.dev/hhe/consult-template.git" + version: "main" author_name: "{{ vault_author_name }}" diff --git a/project_files/vault.yml b/project_files/vault.yml index 8ca65ff..a8cbc14 100644 --- a/project_files/vault.yml +++ b/project_files/vault.yml @@ -1,34 +1,34 @@ -$ANSIBLE_VAULT;1.1;AES256 -64663764623565346536303437303736666430393336663438636535383832616362323464323036 -3835313138323563346665353538303432313435613330630a623535623133323735333730653836 -31303262613937316662346237653937386431656166383538393836306362366635393839643436 -6163313838313334380a376130653263623930396338313466323265356661306633346434386362 -62303036646238326537346233633635616531333839623332616634626263366532313264646164 -64653364366561636438643439653739303066623831383735353333326635376561386133626261 -30626433623234396166616237376132393565616266316662363533653865313838356563613036 -39666163633531346334333335633962623330313030666636623334663165663438383531643731 -37306132663035613539303837323631333033633939306132346662303636306665396262663561 -36666238623133306434643761353533356535613535646663353535653634376539636231376236 -37626263393936363036306433643734373363383562356236633035343838393437663739353661 -35313936396136313864363364363339333838643861336364313862313665316232346631376536 -38313332323638303937386637363638373332643266613536383364373832643036653763356436 -65646662313839626231336139303666363765396138633061396161386666346135393162393336 -37623332663935623233616366336634363437653862633832656237643633346237313234396538 -37303061653430656562366635353939633234383733373832643635623065653766393465653561 -61643334626261323664636564666432646463666463353538663432656330303466666533326230 -36373931646261323866313839636565663133663265636133616630313032353661643033373061 -32663065336338303966343461623535623666656138663365616632663366386262356539383965 -61303266616164376462386139663462626362383139396563326631376437343236346366613232 -38653365393439316637383933356665666163343937306366303838646465353361313437386465 -30646536396432316462303738346161643438636439306239643163353362326436353230633837 -66306333356335366332633533613230343138643539626263393434373038316661643832343338 -66626233373838346137326162666364366566653536666234346633633531303436653137383561 -35336530633831313330383934343537616433323337393334363466613765653239353430313166 -31363831353936346266623832366463663739383438396663356330323163623163366536346333 -31313036386133356530623934613830323435343338326630393933613464656438653530336131 -65323066373761626664663866323937373637396133656438323233626230363132313031363231 -64346135613461363137343038643662353362623162366262613438653737656664393264396134 -33626431343463636139663836363533646335626336383863616634643134393737633962636162 -62636533643961303036303039663233313362353463656532313336303031653566623539653939 -61626337653735353734343035633036636339373034376139363264326463613339393635343462 -63313162303635383239313664333563303433333136616136633532313730363962 +$ANSIBLE_VAULT;1.2;AES256;consults +35313865356261316335353964613035396565343239393165626162353034363363656631393161 +3635643130393561633834366632313563333731643337390a313831336631343664623162393137 +36666363353937383636613061396365336535353665373163333465333133333262613033323862 +3366653636343964300a353431303535653863653939646335393238643330613862383834643931 +66663234303762323762316162336337613939376362663362383166316338653435373862663935 +32656336666435353565396334353739353836303565643034326634666431313036633865636566 +38663038376633616462623533353364373639626533316466353037663462643735326135623161 +31646463633633623733356434623665326236306238383232363866356536343734336566373434 +65333238373636326363646561346561613032393662613535343739663935626132373636386266 +64663636643836343562353363313530613630373463333639626435616437333262346663373133 +65306431303539376664333065636232326434326334666433313061383539353137333666333332 +32623730383566376131616634373139373639623336316461333931623863386533306564393736 +31333537313966613633353062396236303533643133386635666635333964666161346430306365 +38663132663262363430343663336562616130306439636432333234366634343432353035623164 +32663335313731386539613661656338336339643731393331326163653362366430373061646633 +63383532386632336238393461393266353934363235383431666339613938636363393066393966 +61633934396530303565616563323365393864356232613034393461656163313462313231616335 +32386239643138663339333066336334323738343264623831366433653737616335356261663635 +31613063363938633335616261636137373561366165373636316232363032366666316238323338 +30313936656635313538663165393063386539633565346431623133613237356535343663663331 +30326162633731656238613837393165623337666463613964326165663536323638353036386663 +66313763613735313563626161306436383837353039396164653838383161306235396536626434 +35653766353932336532643434643034363464363366323762356337366431623262643338363866 +64393237346538613130363636636234353535343236373334643662653037636262656663383463 +65613039353239366662353130653930383233313666653136363966303138653562343630303464 +62366232306234333134666462306439656634363266666263623664343035643562646633666364 +31346263376131326463306332376231646264346661346365353665623331636261626664366131 +64666133303930613965653533366133633165663166653637663736326265393461393834353433 +64656536613430313864366162383064616439633434656362333164373665393664663062386661 +34356339613836323135333966646430643534306431633665376237636264616638323065646138 +64666464366138373334316434333463386236303963616162623231373962646565393863663334 +33363330376633336364303034623765326138306335326136613665313963613361343564383364 +39373039636366323962343339303963353636353730333163363365326131666336 diff --git a/repo_vars/vars.yml b/repo_vars/vars.yml index 6123944..5bdf258 100644 --- a/repo_vars/vars.yml +++ b/repo_vars/vars.yml @@ -3,7 +3,7 @@ document_title: "Home Performance Report" template: - path: "{{ lookup('env', 'HOME') }}/projects/consult-template/" + path: "{{ lookup('env', 'REPOS') }}/hhe-consult-template/" vars: repo_vars # Files to copy to the project directory when setting up a new consult project. diff --git a/repo_vars/vault.yml b/repo_vars/vault.yml index 1ef9c0f..354b11b 100644 --- a/repo_vars/vault.yml +++ b/repo_vars/vault.yml @@ -1,14 +1,14 @@ -$ANSIBLE_VAULT;1.1;AES256 -30346161643637316365613566633434316464333935313632346438616137363038663361633833 -6366336433373863333439313362663362303633333934360a616366613136623938356138363737 -37656136643965316465333735616564303963333830613234616230616638393963376134613931 -3265613362396339300a626432343731333532313663393336616233396231393765346464643632 -30666532346362363939313066303264663564336334666435376539623130383231383862636633 -33373839356637646464373733356262646538363065353639323265643638306331383663653432 -63626361633965623765393735383230643430613237653637373734663730386638656632366530 -30366664616465623361313339633930323536646165356563343234623934343664346132316235 -34343063353465646565333736323865386433373434363937616634643361306537353832613066 -32623838336535323936333763616531356235623764663734373730343439333035643264316464 -36363531616261626364663666663661656633306664643337373738363264366239313532633936 -33346638343231666636366431333832366337616536353030343365356233343633343365323834 -3439 +$ANSIBLE_VAULT;1.2;AES256;consults +63633864356131333232633035373230306261383962313137343563313832316332313664656339 +6461373230646437653939323732626364333830373435350a323133636333326564333138626433 +61393365383036666231303031653534373630613164623836653534303965313932326266336537 +6430373836326237330a336434356664663235346435313339646662626430623464333737373531 +61626437643639333136633432653136663831313539313463656536326263383537623331316461 +34393931323536373239656162313539383835346162363665666630316266646137333365623037 +66323062396661333134363732303463373835323034303933656461323734653466363638343863 +62323938623131623034623562313838623263353163663964363265343437393035396331656435 +31326362323534653635306663366365316538313134343538646631663933636239326133363864 +39383333353932316435643665373337333134383535633133356136616134663535373932353238 +35306235633365393735323539396363383535313930316434306363636438633934373266313837 +63333764653566643435326533383836343365313932336336396665623062323530366266343139 +3738