Skip to content

Commit 47f8b19

Browse files
author
Gianni Stubbe
committed
fix: Updated wud
1 parent 7fdf58f commit 47f8b19

8 files changed

Lines changed: 76 additions & 34 deletions

File tree

‎playbooks/host_vars/bejbegiavm01.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,14 @@ cloudflared:
7676
30386539343235616237363535376530383364626331343330316231353864653562656562343463
7777
31666565393963633964623339373133393536393130356330633034373566326331653363646237
7878
36353962383230376465323564323332666239663064333963306364663862383363
79+
80+
wud_registry_logins:
81+
WUD_REGISTRY_HUB_PUBLIC_LOGIN: "bejbegiavm01fraise"
82+
WUD_REGISTRY_HUB_PUBLIC_PASSWORD: !vault |
83+
$ANSIBLE_VAULT;1.1;AES256
84+
31666334373731396164393162643864636131346263646464366331663435346536366339303330
85+
3436323835393166383734333833383832363537306533660a633439633835313734316631626663
86+
63303732623837366534646230323432376662636331326164363834303365326161626363613439
87+
3665393664643462650a313465386539613466323265393233386338356139303634373964636439
88+
35383364646335663264373637396663303664386662393534353233653038386462306564353963
89+
3239386537656236653761633933303664373235313235346439

‎playbooks/host_vars/beokpdcovm01.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,27 @@ prometheus:
7474
speedtest: true
7575
pbs_exporter: true
7676

77+
wud_registry_logins:
78+
WUD_REGISTRY_HUB_PUBLIC_LOGIN: "beokpdcovm01fraise"
79+
WUD_REGISTRY_HUB_PUBLIC_PASSWORD: !vault |
80+
$ANSIBLE_VAULT;1.1;AES256
81+
34393966326332633062333833636435396163666532613262383638656433626335323738613861
82+
6564343166376364393636363933363736633932376261640a663361613739613462633636386232
83+
61366434323833306433326633336263303034343331313863373436326464636531303632313035
84+
3764333733353834610a356266383962663036323533616566613839623031373832356638313261
85+
37396264393634663462326136616361313961643465376363303137333466633231
86+
WUD_REGISTRY_CUSTOM_SOLIDTIME_URL: https://registry.on-premise.solidtime.io
87+
WUD_REGISTRY_CUSTOM_SOLIDTIME_LOGIN: op-72971212
88+
WUD_REGISTRY_CUSTOM_SOLIDTIME_PASSWORD: "{{ solidtime_registry_pass }}"
89+
90+
solidtime_registry_pass: !vault |
91+
$ANSIBLE_VAULT;1.1;AES256
92+
62663437373265363363663064313033636363303738396239303465353764323931376464633436
93+
3730303138336335313436343533373734373065326632620a303262373066313161313362303830
94+
65353265633836303563353139336362653862663632373861326162623666363932613964353764
95+
6562653834393365330a646463626231616463386163636333343937383333363161326130373431
96+
37326332376631623636333231316562376264633538313761646161666439366161
97+
7798
# Shared secret for the prometheus@pbs!exporter token configured on every PBS.
7899
pbs_exporter_api_token: !vault |
79100
$ANSIBLE_VAULT;1.1;AES256

‎playbooks/host_vars/beokpdcovm02.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,14 @@ firewall:
1212
sets: "{{ firewall_sets_all + firewall_sets_internal }}"
1313
filter:
1414
input: "{{ firewall_filter_input_host + firewall_filter_input_all }}"
15+
16+
wud_registry_logins:
17+
WUD_REGISTRY_HUB_PUBLIC_LOGIN: "beokpdcovm02fraise"
18+
WUD_REGISTRY_HUB_PUBLIC_PASSWORD: !vault |
19+
$ANSIBLE_VAULT;1.1;AES256
20+
35323362373531626336656335323935636535616136626430306536383838336633613135303766
21+
6138376134383738656337316432373265303339386662360a653935303935313937393665643463
22+
37643364373530666332353335306332663366626132323436653062396365323633616636323934
23+
6665613936343031380a313063376434393333363331313734653534383737373364316463313563
24+
34336631623463343038326436383036623765303161316139626161643233353966323931653732
25+
6133616537383263346363633361616631616363356364633830

‎roles/n8n/tasks/main.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,11 @@
4040
DB_POSTGRESDB_HOST: postgres
4141
DB_POSTGRESDB_USER: "{{ postgres_user }}"
4242
DB_POSTGRESDB_PASSWORD: "{{ postgres_password }}"
43-
WEBHOOK_URL: https://n8n.frai.se
43+
N8N_WEBHOOK_URL: https://n8n.frai.se
4444
N8N_HOST: n8n.frai.se
4545
N8N_EDITOR_BASE_URL: https://n8n.frai.se
4646
N8N_PROXY_HOPS: "1"
4747
N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS: "true"
48-
N8N_RUNNERS_ENABLED: "true"
4948
state: started
5049
restart: true
5150
restart_policy: always

‎roles/solidtime/vars/main.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@ solidtime_postgres_pass: !vault |
99
3766366136313366650a303332336436376364623435323064313863373963366466356530396233
1010
62333737313562376661643130373662663264666165313863633838663336666236373232383462
1111
6331396231356534653163373661343539636434333537303461
12-
solidtime_registry_pass: !vault |
13-
$ANSIBLE_VAULT;1.1;AES256
14-
62663437373265363363663064313033636363303738396239303465353764323931376464633436
15-
3730303138336335313436343533373734373065326632620a303262373066313161313362303830
16-
65353265633836303563353139336362653862663632373861326162623666363932613964353764
17-
6562653834393365330a646463626231616463386163636333343937383333363161326130373431
18-
37326332376631623636333231316562376264633538313761646161666439366161
1912
solidtime_app_key: !vault |
2013
$ANSIBLE_VAULT;1.1;AES256
2114
61656330666232333336363462363036393763623364646336333332343964343333356564633635

‎roles/wud/defaults/main.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
wud_n8n_path: !vault |
3+
$ANSIBLE_VAULT;1.1;AES256
4+
31356663383334663234346364346436656238656435653431323063663037323264643534626266
5+
6334333334376462643934393837323166396536636434650a393637636664306366623661336338
6+
63623364613730616135616536333139343333336164626362623336636562306466383138666333
7+
6139373834343739310a663736383737613361353038633831323864663266376364636231306531
8+
64316463366365636362613438653832666537363938303465633535316362636633633535356163
9+
3035623535313032376633383465393932393462333139343738
10+
# IN N8N Set: "Bearer <Token>" as value header auth value and "Authorization" as header name
11+
wud_n8n_bearer: !vault |
12+
$ANSIBLE_VAULT;1.1;AES256
13+
30323135326331336566653234343463646134306434316264353837666663333239333565643135
14+
3131626664633333633762383661336362613961343161610a383631353034383138313865336563
15+
66343433313962343039323264386336633037663763333535356363633939663135613666306566
16+
3734366631336464390a333766326565663334363765363635363161646539346565643931393334
17+
38383936653031646434323965646333393239623764653463666464323439633537393862636233
18+
3761376266373563303166353436643830666331393866376239
19+
wud_registry_logins:
20+
WUD_REGISTRY_HUB_PUBLIC_LOGIN: "{{ docker_login.username }}"
21+
WUD_REGISTRY_HUB_PUBLIC_PASSWORD: "{{ docker_login.password }}"

‎roles/wud/tasks/main.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,19 @@
1414
timeout: 10s
1515
retries: 3
1616
start_period: 10s
17-
env:
17+
env: "{{ static_dict | combine(wud_registry_logins) | combine (wud_extra_registries | default({}) ) }}"
18+
restart: true
19+
state: healthy
20+
restart_policy: always
21+
pull: true
22+
labels:
23+
traefik.enable: "false"
24+
vars:
25+
static_dict:
1826
WUD_SERVER_PORT: "9103"
1927
WUD_WATCHER_LOCAL_CRON: "33 4 * * *"
20-
WUD_WATCHER_LOCAL_WATCHDIGESTDEFAULT: "true"
28+
WUD_REGISTRY_HUB_PUBLIC_WATCHDIGEST: "true"
29+
WUD_REGISTRY_HUB_PUBLIC_SUPPRESSDIGESTWATCHWARNING: "true"
2130
WUD_TRIGGER_DOCKER_UPGRADEANY_AUTO: "true"
2231
WUD_TRIGGER_DOCKER_UPGRADEANY_PRUNE: "true"
2332
WUD_TRIGGER_HTTP_NOTIFYANY_AUTO: "true"
@@ -26,9 +35,3 @@
2635
WUD_TRIGGER_HTTP_NOTIFYANY_SIMPLEBODY: "{{ inventory_hostname }}"
2736
WUD_TRIGGER_HTTP_NOTIFYANY_AUTH_TYPE: BEARER
2837
WUD_TRIGGER_HTTP_NOTIFYANY_AUTH_BEARER: "{{ wud_n8n_bearer }}"
29-
restart: true
30-
state: healthy
31-
restart_policy: always
32-
pull: true
33-
labels:
34-
traefik.enable: "false"

‎roles/wud/vars/main.yml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)