From e3ee9d347d4c3841d3683bc81064fb50f4fae158 Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Tue, 17 Sep 2019 10:18:43 +0200 Subject: [PATCH] cleanup --- group_vars/all/vars.yml | 9 +------- group_vars/all/vault.yml | 48 +++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 33 deletions(-) diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index 137c8c4..b2dc1eb 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -81,14 +81,7 @@ prosody_domain: jabber.binary-kitchen.de radius_secret: "{{ vault_radius_secret }}" root_keys: -- "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1McRltT0B2bAN1pVDQ+ApJL/rhnvu9gAyGamXwGAgt3V5Q/+VT+KY+0x2T5kgPsuBOio/SDKPY6zoadomU+l3QXtfiE797j7rOjHrIUJor6fMubpVg8jU9E9pytN/vgYSVy286hLmTnHNjTZYlwhMCFA2xAJfyutypY0igAlUh6NNL3PK0LRESd12ttavDX65R2zZpJqBTcKZEXt8y1D+YArxmAa09cS9X4SH8z5h1HWHJ3G60U2nIrdPegADnUXitL5Fup5xok89B4zpILRXz9PmnLXHCTXLu4DamIFPbObnXyjT9gsSMAkOUc6m8TzVgek/7ImL/hQiZU2woQ9p moepman" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJBmZnJLG1WRppbLtOAJw3E4LgLRK0NirfCgpovhhU6h moepman" -- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIETMJ1JTX+xKC7ML8Or+8wunwy1rjIkp7MfeZLzLIyvP tomoto" -- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINPlktM2x11cNBMKurf57MLE1XcOm2sGQXguc0tl1vYd rudi@helheim" +- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINPlktM2x11cNBMKurf57MLE1XcOm2sGQXguc0tl1vYd kishi" slapd_san: ldap.binary.kitchen - -zammad_domain: zammad.binary-kitchen.de -zammad_dbname: zammad -zammad_dbuser: zammad -zammad_dbpass: "{{ vault_zammad_dbpass }}" diff --git a/group_vars/all/vault.yml b/group_vars/all/vault.yml index cc9da1a..deadc0c 100644 --- a/group_vars/all/vault.yml +++ b/group_vars/all/vault.yml @@ -1,26 +1,24 @@ $ANSIBLE_VAULT;1.1;AES256 -30633066386634326339363932653361343134656532383161353139376335303532393166386262 -3164663530626430386166393730393034633138656139650a353164356561396365303332356430 -38356664306237393166323835383836663936613334333361643732343331616661376666393932 -6135613235353831350a616431326561633463656162333439623130386161383862376432383435 -61303234656530316366353431393631393930626566323866396132643934623931363266316630 -39303861373632386336363136653536383063663539316434623632353266333630643135303630 -31636366623639616534383862323234376639376564646132383537626436616365663266366434 -66363761356431633238313666333536656463613762343634346364323261613163373866373962 -35393530303830383666326436313264636536613239613037353964343661366531343934323538 -37303737343639623130323034396339363533666337656331353738363339626236643838346266 -34333937666465643864303864333533643836383965353138343136356437396136643634326137 -38626532616666656139306133613561623438316536323830636665333566386165336261323666 -30323038313434343134653630373035383837373561373932383464633433623266653032343865 -39653036623762626263613764393165656362373231386463653534393232373562346330656531 -36623636626538613036303231633462366232366631643831653131343464366265373464653838 -63633335633936623930333062336233663366356663326663623539323662633737616638623534 -65623730646461343835326539303866303966353632316335313834636133326330393939373338 -65643561393131343461323235656339373831613835393832346165343565326436336163643064 -65613865393435333733326539643864353632643466336335616665336630613230333834376337 -38346233303437393032393735653438663662333334643539393666643234383232386366333138 -63303737333366333663353361623534653039383038636234363066646165643166356263356535 -30393466643464393935396163336533306163323164383233333834643630353939643165333132 -30626532336666623033333565333763353864613333646561663338343038363632643564363835 -32323036613662336637303662383061333039376232643164376238393839326639323837616337 -6334 +30656432303661346131643637306565653465333430373264396639383937626533626130346131 +3965323538356638613931663034326365626333336364380a373865363966303835376134353336 +37376162383264663332363563343430663137623364613239613338383939376133653662666431 +6235613339626636360a326639373535383761343535653136343138383338323733373037636538 +62623437666531656235373133393561323835393330323035656566646632303561366532653039 +39636139333833313938643262383331363935616566303461323636343735303238343862303861 +62313836323863643533313063323233306337633932393366393264343236366235356662333937 +65366431613433336337346530663566613862333161613164633133356561653962326262643735 +37636230356233333637623233633236323166616662343732343539376530336135306437313164 +61323737353632666137393137356463333532313331633631653538613065303232663434633564 +36616562323830373532646236373765623438376661383933646238353833663239653562356431 +39623135366533373934363561363532326638363330366330353061333930373032386539636264 +32353337653265656232333063653964613230643061653930653861356230363931623736333738 +35656365306564313933666139613066633237656538666261613130326163373636636136666161 +33633964663834356166343764383439396561393336393662653834396562373530313235363532 +65383430663261363163623362663135626334626234356539366132643539323461633632303233 +64616230316632356338663537666130396234316562616331316463383563376365326437643735 +63666162356163343839636439653437643539636430386238626162373735663831636362646239 +65636135343430623233383936326130646436336364636263633066373630386461333631356366 +36353832376635303138643830643665643739663364356261633466636637643636613133623633 +30316137393464343236326535613935366163613232386131343230336433616266653234323138 +31343836306331353134653733383332633661316363343234303639353736306236356365303634 +366130346637323334313961613135623663