diff --git a/.cruft.json b/.cruft.json index 91e692f..6df77a2 100644 --- 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", diff --git a/gitea/package/install.sls b/gitea/package/install.sls index fb29779..9f4590f 100644 --- 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 diff --git a/gitea/parameters/defaults.yaml b/gitea/parameters/defaults.yaml index e998daf..9a6e941 100644 --- 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 diff --git a/pillar.example b/pillar.example index 744bce1..a3fc4ae 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml index 58aff21..bfb4d97 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/amazonlinux-1.yaml b/test/integration/default/files/_mapdata/amazonlinux-1.yaml index 61014d5..6e133ee 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml index 12762c7..e48e230 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml index 166f98f..6e61634 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/centos-6.yaml b/test/integration/default/files/_mapdata/centos-6.yaml index a86eb4d..8a29203 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index cd6962f..160879a 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index c95a2a7..e3d0525 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index a432b80..b47709d 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml index 9fe8b2d..2640a27 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index 55bcd3d..2de2816 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/fedora-31.yaml b/test/integration/default/files/_mapdata/fedora-31.yaml index cfc21ba..077707a 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml index 9f4ace8..64ba8d6 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml index bed3fb7..c0c2929 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml index fc28699..08a94f0 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/fedora-35.yaml b/test/integration/default/files/_mapdata/fedora-35.yaml index 5b8d27c..35108e5 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/fedora-36.yaml b/test/integration/default/files/_mapdata/fedora-36.yaml index 731b46f..18817b2 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml index 71b9826..4e2559b 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml index 71b9826..4e2559b 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index 0708fda..8aa3aca 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index 035aeca..a445b39 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml index f5db34c..c02ef31 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml index 0603c49..a644e6a 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/rockylinux-8.yaml b/test/integration/default/files/_mapdata/rockylinux-8.yaml index c1e88d7..6105d0d 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml index cf6a1f0..a7fc3c0 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 83b6fee..364286a 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index c6c74e1..9784399 100644 --- 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 diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls index 8a8c427..b39021c 100644 --- 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 diff --git a/test/salt/pillar/upstart.sls b/test/salt/pillar/upstart.sls index 8a8c427..b39021c 100644 --- 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