cojedzie-next: Use mysql database

services/cojedzie-next/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

services/cojedzie-next/stack.yml

@@ -15,6 +15,9 @@ services:
     deploy:
       mode: replicated
       replicas: 1
+      update_config:
+        parallelism: 1
+        order: start-first
       labels:
         - traefik.enable=true
         - traefik.http.routers.{{ service }}-api.rule=Host(`{{ cojedzie_domain }}`) && PathPrefix(`/api/`)
@@ -22,24 +25,6 @@ services:
         - traefik.http.routers.{{ service }}-api.tls=true
         - traefik.http.routers.{{ service }}-api.tls.certresolver=lets-encrypt
         - traefik.http.services.{{ service }}-api.loadbalancer.server.port=8080
-
-  update-job:
-    image: registry.kadet.net/cojedzie/api:next
-    command: ["console", "app:update", "--async"]
-    networks: 
-      - default
-    volumes: 
-      - db_data:/var/db
-    env_file:
-      - ./environment
-    deploy:
-      mode: replicated
-      replicas: 0
-      labels:
-        - "swarm.cronjob.enable=true"
-        - "swarm.cronjob.schedule={{ cojedzie_update_cron }}"
-      restart_policy:
-        condition: none
   
   cron:
     image: registry.kadet.net/cojedzie/cron:next
@@ -91,9 +76,13 @@ services:
       - api
     environment:
       - APP_GTM={{ cojedzie_gtm }}
+      - APP_MAPTILER_KEY={{ cojedzie_maptiler }}
     deploy:
       mode: replicated
       replicas: 1
+      update_config:
+        parallelism: 1
+        order: start-first
       labels:
         - traefik.enable=true
         - traefik.http.routers.{{ service }}-front.rule=Host(`{{ service }}.{{ main_domain }}`) || Host(`{{ cojedzie_domain }}`)

services/cojedzie-next/vars/main.yml

@@ -10,3 +10,4 @@ cojedzie_mercure_jwt_key: !vault |
           3739383365353837310a613931333264386365663730646163383639383563313066643438326465
           30633666343736323539326133626664356462356466323366633738613436636535353963663536
           3837383838613130646365633232613530303863393866613830
+cojedzie_maptiler: 1gwEkcI3lbNcEb0MOoOu

vars/databases.yml

@@ -12,6 +12,7 @@ mysql_databases:
   - name: wipe
   - name: keylighter
   - name: shitcode
+  - name: cojedzie-next
 
 mysql_users:
   - name: gitea
@@ -54,5 +55,15 @@ mysql_users:
           65373333353830613433663533633265303965356234396136326631626239646533383761326135
           3365633834336464340a616133656265663039353236666565316431383631656435303166393538
           63323630626239396263626536306632356635373535366335666265396630353430
-
+  - name: cojedzie-next
+    priv: cojedzie-next.*: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') }}"

vars/services.yml

@@ -71,6 +71,12 @@ service_config:
   cojedzie:
     cojedzie_gtm: GTM-TQNX386
 
+  cojedzie-next: 
+    cojedzie_database:
+      name: cojedzie-next
+      user: cojedzie-next
+      password: "{{ mysql_user_passwords['cojedzie-next'] }}"
+
   registry:
     registry_users:
       - name: kadet