fix(general): Remove separate home for gitea user

2022-05-10 13:40:27 +02:00
parent 670dc9c945
commit 8e60cabc64
32 changed files with 1 additions and 33 deletions
--- a/.cruft.json
+++ b/.cruft.json
@@ -31,7 +31,6 @@
          "conf": "/etc/gitea",
          "custom": "/var/lib/gitea/custom",
          "data": "/var/lib/gitea/data",
-          "home": "/var/lib/gitea/home",
          "internal_token_uri": "file:///etc/gitea/internal_token",
          "log": "/var/log/gitea",
          "repos": "/var/lib/gitea/data/gitea-repositories",
--- a/gitea/package/install.sls
+++ b/gitea/package/install.sls
@@ -8,8 +8,7 @@
 Gitea user/group is present:
  user.present:
    - name: {{ gitea.lookup.user }}
-    - home: {{ gitea.lookup.paths.home }}
-    - createhome: true  # does not work on Windows/MacOS
+    - home: {{ gitea.lookup.paths.work }}
    - shell: {{ gitea.lookup.shell }}
    - empty_password: true
    - fullname: Git Version Control
--- a/gitea/parameters/defaults.yaml
+++ b/gitea/parameters/defaults.yaml
@@ -18,7 +18,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/pillar.example
+++ b/pillar.example
@@ -86,7 +86,6 @@ gitea:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/almalinux-8.yaml
+++ b/test/integration/default/files/_mapdata/almalinux-8.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-1.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/arch-base-latest.yaml
+++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/centos-6.yaml
+++ b/test/integration/default/files/_mapdata/centos-6.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/centos-7.yaml
+++ b/test/integration/default/files/_mapdata/centos-7.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/centos-8.yaml
+++ b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/debian-10.yaml
+++ b/test/integration/default/files/_mapdata/debian-10.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/debian-11.yaml
+++ b/test/integration/default/files/_mapdata/debian-11.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/debian-9.yaml
+++ b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/fedora-31.yaml
+++ b/test/integration/default/files/_mapdata/fedora-31.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/fedora-32.yaml
+++ b/test/integration/default/files/_mapdata/fedora-32.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/fedora-33.yaml
+++ b/test/integration/default/files/_mapdata/fedora-33.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/fedora-34.yaml
+++ b/test/integration/default/files/_mapdata/fedora-34.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/fedora-35.yaml
+++ b/test/integration/default/files/_mapdata/fedora-35.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/fedora-36.yaml
+++ b/test/integration/default/files/_mapdata/fedora-36.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/opensuse-15.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-15.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/rockylinux-8.yaml
+++ b/test/integration/default/files/_mapdata/rockylinux-8.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/ubuntu-16.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/ubuntu-18.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/integration/default/files/_mapdata/ubuntu-20.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@@ -20,7 +20,6 @@ values:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/salt/pillar/default.sls
+++ b/test/salt/pillar/default.sls
@@ -19,7 +19,6 @@ gitea:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories
--- a/test/salt/pillar/upstart.sls
+++ b/test/salt/pillar/upstart.sls
@@ -19,7 +19,6 @@ gitea:
      conf: /etc/gitea
      custom: /var/lib/gitea/custom
      data: /var/lib/gitea/data
-      home: /var/lib/gitea/home
      internal_token_uri: file:///etc/gitea/internal_token
      log: /var/log/gitea
      repos: /var/lib/gitea/data/gitea-repositories