bundles/grafana/items.py: fix permissions

bundles/gitea/items.py

@@ -2,10 +2,15 @@ from os.path import join
 from bundlewrap.utils.dicts import merge_dict
 
 
-version = version=node.metadata.get('gitea/version')
+version = node.metadata.get('gitea/version')
+assert not version.startswith('v')
+arch = node.metadata.get('system/architecture')
+
+print(f'https://codeberg.org/forgejo/forgejo/releases/download/v{version}/forgejo-{version}-linux-{arch}')
 
 downloads['/usr/local/bin/gitea'] = {
-    'url': f'https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-amd64',
+    # https://forgejo.org/releases/
+    'url': f'https://codeberg.org/forgejo/forgejo/releases/download/v{version}/forgejo-{version}-linux-{arch}',
     'sha256_url': '{url}.sha256',
     'triggers': {
         'svc_systemd:gitea:restart',

bundles/gitea/metadata.py

@@ -11,7 +11,17 @@ defaults = {
         },
     },
     'gitea': {
-        'conf': {},
+        'conf': {
+            'database': {
+                'DB_TYPE': 'postgres',
+                'HOST': 'localhost:5432',
+                'NAME': 'gitea',
+                'USER': 'gitea',
+                'PASSWD': database_password,
+                'SSL_MODE': 'disable',
+                'LOG_SQL': 'false',
+            },
+        },
     },
     'postgresql': {
         'roles': {
@@ -83,15 +93,6 @@ def conf(metadata):
                     'INTERNAL_TOKEN': repo.vault.password_for(f'{node.name} gitea internal_token'),
                     'SECRET_KEY': repo.vault.password_for(f'{node.name} gitea security_secret_key'),
                 },
-                'database': {
-                    'DB_TYPE': 'postgres',
-                    'HOST': 'localhost:5432',
-                    'NAME': 'gitea',
-                    'USER': 'gitea',
-                    'PASSWD': database_password,
-                    'SSL_MODE': 'disable',
-                    'LOG_SQL': 'false',
-                },
                 'service': {
                     'NO_REPLY_ADDRESS': f'noreply.{domain}',
                 },

nodes/home.server.py

@@ -66,7 +66,7 @@
             'download_server': 'netcup.mails',
         },
         'gitea': {
-            'version': '1.19.1',
+            'version': '1.20.4-1',
             'domain': 'git.sublimity.de',
             'conf': {
                 'mailer': {