Site => SiteRepo

seed/forgejo-formation/dictionaries/32_forgejo.yml

@@ -1,4 +1,8 @@
 version: '0.10'
+services:
+- service:
+  - name: oauth2-client
+    disabled: true
 variables:
 - family:
   - name: network
@@ -25,23 +29,25 @@ variables:
         mandatory: true
       - name: forgejo_site
         hidden: true
-        provider: Site
+        provider: SiteRepo
         mandatory: true
       - name: forgejo_site_user
         type: unix_user
         hidden: true
         mandatory: true
-        provider: Site:username
+        provider: SiteRepo:username
       - name: forgejo_site_email
         type: mail
         hidden: true
         mandatory: true
-        provider: Site:email
+        provider: SiteRepo:email
       - name: forgejo_site_password
         type: password
         hidden: true
         mandatory: true
-        provider: Site:password
+        provider: SiteRepo:password
+  - name: oauth2_client
+    disabled: true
 constraints:
 - fill:
   - name: get_password

seed/site-formation/dictionaries/23_site.yml

@@ -4,7 +4,7 @@ services:
   - name: nginx
     override: null
   - name: site_update
-    engine: none
+    engine: cheetah
     target: timers
     file:
     - text: /sbin/site_update
@@ -27,21 +27,22 @@ variables:
     - variable:
       - name: site_domain_name
         hidden: true
-        supplier: Site
+        supplier: SiteRepo
+        mandatory: true
       - name: site_user_name
         type: unix_user
         hidden: true
-        supplier: Site:username
+        supplier: SiteRepo:username
         value:
         - text: site
       - name: site_user_mail
         type: mail
-        description: Email de l'utilisateur Site dans Forgejo
+        description: Email de l'utilisateur "site" dans Forgejo
-        supplier: Site:email
+        supplier: SiteRepo:email
       - name: site_user_password
         type: password
         hidden: true
-        supplier: Site:password
+        supplier: SiteRepo:password
 constraints:
 - fill:
   - name: get_password

seed/site-formation/templates/site_update.service

@@ -4,6 +4,7 @@ After=risotto.target
 
 [Service]
 Type=oneshot
+ExecStartPre=/usr/bin/timeout 60 bash -c 'while ! 3<> /dev/tcp/%%site_domain_name/3000; do sleep 1; done'
 ExecStart=/usr/local/lib/sbin/site_update
 
 [Install]