From 6739a0b2b0f478605e67fac278a09a9e8bf77f02 Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Thu, 26 May 2022 20:10:23 +0200 Subject: [PATCH] cojedzie: Bump version to 2022.2.0 --- services/cojedzie/environment | 2 ++ services/cojedzie/vars/main.yml | 1 - vars/databases.yml | 14 ++++++++++++++ vars/services.yml | 5 +++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/services/cojedzie/environment b/services/cojedzie/environment index 35b8bb2..b3fbcd7 100644 --- a/services/cojedzie/environment +++ b/services/cojedzie/environment @@ -1,3 +1,5 @@ MERCURE_URL=http://mercure/.well-known/mercure MERCURE_PUBLIC_URL=https://{{ cojedzie_domain }}/.well-known/mercure MERCURE_JWT_SECRET={{ cojedzie_mercure_jwt_key }} + +DATABASE_URL=mysql://{{ cojedzie_database.user }}:{{ cojedzie_database.password }}@{{ database_mysql_host }}/{{ cojedzie_database.name }}?serverVersion=mariadb-10.7.1 diff --git a/services/cojedzie/vars/main.yml b/services/cojedzie/vars/main.yml index 14dd345..b8884c7 100644 --- a/services/cojedzie/vars/main.yml +++ b/services/cojedzie/vars/main.yml @@ -1,6 +1,5 @@ --- cojedzie_domain: cojedzie.pl -cojedzie_version: '2021.2.0' cojedzie_update_cron: 0 0 4 * * * cojedzie_gtm: "" cojedzie_mercure_jwt_key: !vault | diff --git a/vars/databases.yml b/vars/databases.yml index 5c89bf5..9e4cef8 100644 --- a/vars/databases.yml +++ b/vars/databases.yml @@ -13,6 +13,7 @@ mysql_databases: - name: keylighter - name: shitcode - name: cojedzie-next + - name: cojedzie mysql_users: - name: gitea @@ -66,4 +67,17 @@ mysql_users: 3662646135666461310a353561383261313130623132636366363264393639613963386162613330 31303239636231636633366530333530643063303434623763363731616635663639636135316666 3737323335303065376633356238303961323331396666366636 + - name: cojedzie + priv: cojedzie.*:ALL + host: '172.%' + password: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 35346533366533313962656662613965626139646164656536616361353137386137353962616137 + 3639333138656330326431643362363737656536376661350a343430386361653732333932393265 + 65363865616465623965643564376330316437653665646332353663613038343765316663313837 + 3662646135666461310a353561383261313130623132636366363264393639613963386162613330 + 31303239636231636633366530333530643063303434623763363731616635663639636135316666 + 3737323335303065376633356238303961323331396666366636 + + mysql_user_passwords: "{{ mysql_users|items2dict(key_name='name', value_name='password') }}" diff --git a/vars/services.yml b/vars/services.yml index 8e61a30..063f6d4 100644 --- a/vars/services.yml +++ b/vars/services.yml @@ -69,7 +69,12 @@ service_config: www_data_users: ["{{ ansible_user }}"] cojedzie: + cojedzie_version: '2022.2.0' cojedzie_gtm: GTM-TQNX386 + cojedzie_database: + name: cojedzie + user: cojedzie + password: "{{ mysql_user_passwords['cojedzie'] }}" cojedzie-next: cojedzie_database: