From a32d0332071996b4e7981f15de3fd2eb7a53b24f Mon Sep 17 00:00:00 2001 From: David Kilias Date: Sun, 27 Aug 2023 15:35:56 +0200 Subject: [PATCH 1/2] repair shlink env vars --- host-pottwal.yml | 2 ++ host_vars/pottwal.n39.eu/vars.yml | 1 + host_vars/pottwal.n39.eu/vault | 60 ++++++++++++++++--------------- 3 files changed, 35 insertions(+), 28 deletions(-) diff --git a/host-pottwal.yml b/host-pottwal.yml index 5ff3e0e..865d72d 100644 --- a/host-pottwal.yml +++ b/host-pottwal.yml @@ -106,9 +106,11 @@ restart_policy: unless-stopped env: TZ: "{{ timezone }}" + DEFAULT_DOMAIN: "{{ shlink_domain_name }}" SHORT_DOMAIN_HOST: "{{ shlink_domain_name }}" SHORT_DOMAIN_SCHEMA: https GEOLITE_LICENSE_KEY: "{{ shlink_geolite_license_key }}" + INITIAL_API_KEY: "{{ shlink_initial_api_key }}" tags: - shlink diff --git a/host_vars/pottwal.n39.eu/vars.yml b/host_vars/pottwal.n39.eu/vars.yml index 043bf74..74d5f04 100644 --- a/host_vars/pottwal.n39.eu/vars.yml +++ b/host_vars/pottwal.n39.eu/vars.yml @@ -18,6 +18,7 @@ shlink_host_port: 8083 shlink_domain_name: sl.n39.eu shlink_image: shlinkio/shlink:3.6.3 shlink_geolite_license_key: "{{ vault_shlink_geolite_license_key }}" +shlink_initial_api_key: "{{ vault_shlink_initial_api_key }}" hedgedoc_host_port: 8084 hedgedoc_domain_name: pad.n39.eu diff --git a/host_vars/pottwal.n39.eu/vault b/host_vars/pottwal.n39.eu/vault index 46c64c9..9abc0b9 100644 --- a/host_vars/pottwal.n39.eu/vault +++ b/host_vars/pottwal.n39.eu/vault @@ -1,29 +1,33 @@ $ANSIBLE_VAULT;1.1;AES256 -36323939613063633135363636383432613564373438396333343037326336636161333964306435 -3565366536396132653632363434303934646166666336330a393465396433636563393361303263 -61636534643461646135656432363632376238393865643536386265336365356231373937396133 -6239333333353736370a343933386133643635666435333133656136353638613139353162396131 -38316637343437643532373435333138323639613335323466633938366635383964393131326566 -38633164373461663230613936363433383635383834326165333335323164366339633235306638 -63333764343438633763353430333236653939343531353336613532663934306263343236336562 -31623162623932303635616633623037353732663333643239623534653466326434363935646566 -64643666656266326331636362356462656163356163646538613430333335376138393938633531 -38313036356661366132396334373837373134646339383863333532336537333464313135623937 -32313461363030626138393330326364363063663865366665343031336136386430373335356536 -66323639316133656535636533633139333834653430353132333663386236643138636663353761 -65616239353135393762323965326339326332383430393034663965316164613039323037666463 -39653036373164643236353833323362616530346662373334623164313930613462386134323739 -33613664623833313763653964356631303136333831376232323430336561626562313737373065 -36393762353438363966636638376633663938363965303536393432626636363838623062616366 -33386461343737633931393635643137613934383964623736316434303234633238323436316633 -35376634663965303734636562363066666562663038386663373936643431663436363263393432 -66666139633133613032646564313330643364636637363039386261386666343663643164383535 -38666461656231626438623037343338323535323933353537623837623738616330646165613464 -65356132666333636564343531373337386130656439393864373331666130346162653238396331 -39616239666432313762383738336337336638623261323766396630623932313630383364376432 -38663434346562613465623438363265363632613639666361366332643061343930316131623361 -63616539646535393537616433313266343339616638383130636232646536616537383663393232 -34623438633063613364333466323432386634653737326432336232623630623865366663663561 -37643466303032383932653263633634343335663439333936366333396437346562316237303635 -39643462336133313162326237323535393431316439343439363138383738383263656433356463 -39623234666137376665 +34373163393834623634633434373737303738383439616433633236363937633764666231373964 +6330396333366432343765313738396461333133656236350a356239656636363764303464323737 +32353330336364663833386631303364323861326664633937383132373735373337393431646633 +3763323461363561390a393034333364663633396462646632393362613733363239633061616139 +30383461363565346464306263613363396237373233346361333137626539613463336665343134 +66623461623634386134636334386561356230373138643039653335353866356630646536376438 +33643232313037356261303034383232623863323030616134386530646366636230616432316639 +33346637316435353365343434613230353934613262653964643563303938326433373938636539 +30643633636134666135393166313334353336343132346564313637333837323036623331326134 +32643166663165343739663936356432633739303265333536336365646435313162623638353434 +30613335306134623238666261666537366631633133663162346464396138383139613331346436 +34363232356163373534393062303137663732366237313732323465613463323837386561666164 +37346535393263343661303436353739323364323663626135373330303038383135653564623734 +62383337666362653633323130613264303133653731643965666461383030656562373832333731 +36333632353763363931326235613164646364306162643533353038613239386632336662346532 +38626135323233386462646533633536396235396465643635383834306631613234646336656134 +64616530346466666231623432323462623438643333373838396666356465386230383737663731 +35356262613064366433363263373033636632363135386531616636313337663536643437623061 +66353333376530663765376432323933363730646237646535663533346333633263346563343337 +61313461323966393536303961623037353432326632336132306134343332663462666230353732 +65613832633134386266373337396439333637343139626136636237383632366232363837383539 +37353965323061336365653366343064653739346363623662373734323065323162353035363938 +62326664306232356134306563646338666635333531663338396239636539356664333937663636 +36303032333962653335326261366362373035626463303933393666633832393762326435386361 +36353065363762363638303833616133663330393532313233306135653034656562626435633834 +62383833306633346662383439313037633763353737333234373234303962666262316638326461 +62373765643432663134643561623261326265306437306439353966336364373931376261333963 +65353938376463313463623037303566366435323938326633353334323731333134353137356165 +39346563303536356565663333393061613231653565646435373839626235633032316333646566 +37303232396139653531633836663461623464316332666632363435313566326262666562626130 +63613937323335336630383261363334396366623161343730623662363533323430326334353063 +31343938346434613765 From 4415d8fadc9fb7c1e0cda592a6964b8122913614 Mon Sep 17 00:00:00 2001 From: David Kilias Date: Mon, 28 Aug 2023 00:10:43 +0200 Subject: [PATCH 2/2] remove obsolete env vars from shlink container --- host-pottwal.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/host-pottwal.yml b/host-pottwal.yml index 865d72d..cb7ec06 100644 --- a/host-pottwal.yml +++ b/host-pottwal.yml @@ -107,8 +107,6 @@ env: TZ: "{{ timezone }}" DEFAULT_DOMAIN: "{{ shlink_domain_name }}" - SHORT_DOMAIN_HOST: "{{ shlink_domain_name }}" - SHORT_DOMAIN_SCHEMA: https GEOLITE_LICENSE_KEY: "{{ shlink_geolite_license_key }}" INITIAL_API_KEY: "{{ shlink_initial_api_key }}" tags: