From 49b96071a2a5f7a9ddccafe2a3176bc3db8e8199 Mon Sep 17 00:00:00 2001
From: Jim Hague <jim.hague@acm.org>
Date: Sun, 12 May 2024 10:59:12 +0100
Subject: [PATCH] Change gitea package provider.

The old one seems to have died.
---
 states/gitea/app.ini  |  2 +-
 states/gitea/init.sls | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/states/gitea/app.ini b/states/gitea/app.ini
index 921d6f6..e108bfe 100644
--- a/states/gitea/app.ini
+++ b/states/gitea/app.ini
@@ -1,5 +1,5 @@
 APP_NAME = Gitea: Git with a cup of tea
-RUN_USER = git
+RUN_USER = gitea
 RUN_MODE = prod
 
 [database]
diff --git a/states/gitea/init.sls b/states/gitea/init.sls
index 1f5ed13..49e1e51 100644
--- a/states/gitea/init.sls
+++ b/states/gitea/init.sls
@@ -1,8 +1,13 @@
+git_repo_key:
+  file.managed:
+    - name: /etc/apt/trusted.gpg.d/morph027-gitea.asc
+    - source: https://packaging.gitlab.io/gitea/gpg.key
+    - skip_verify: true
+
 gitea_repo:
   pkgrepo.managed:
-    - name: deb http://mirrors.dotsrc.org/osdn/storage/g/r/ra/raspbian-addons/debian precise main
-    - key_url: https://apt.raspbian-addons.org/KEY.gpg
-    - file: /etc/apt/sources.list.d/respbian-addons.list
+    - name: deb https://packaging.gitlab.io/gitea gitea main
+    - file: /etc/apt/sources.list.d/morph027-gitea.list
 
 gitea:
   pkg.installed
@@ -12,6 +17,9 @@ gitea_app_ini:
     - name: /etc/gitea/app.ini
     - source: salt://gitea/app.ini
     - template: jinja
+    - user: gitea
+    - group: gitea
+    - mode: '0600'
   service.running:
     - name: gitea
     - restart: true
@@ -21,8 +29,8 @@ gitea_app_ini:
 var_lib_gitea_directory:
   file.directory:
     - name: /var/lib/gitea
-    - user: git
-    - group: git
+    - user: gitea
+    - group: gitea
     - recurse:
       - user
       - group