| 1 |
commit: b5153ffa5ea7fe2fd116ab191c558b5eb4226906 |
| 2 |
Author: Alexander Kurakin <kuraga333 <AT> mail <DOT> ru> |
| 3 |
AuthorDate: Fri Jan 27 15:17:27 2023 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 1 01:08:24 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5153ffa |
| 7 |
|
| 8 |
acct-user/*: remove ACCT_USER_HOME_OWNER if it is equal to default |
| 9 |
|
| 10 |
`acct-user.eclass`'s documentation [says](https://devmanual.gentoo.org/eclass-reference/acct-user.eclass/index.html): |
| 11 |
``` |
| 12 |
ACCT_USER_HOME_OWNER |
| 13 |
The ownership to use for the home directory, in chown ([user][:group]) syntax. |
| 14 |
Defaults to the newly created user, and its primary group. |
| 15 |
``` |
| 16 |
``` |
| 17 |
ACCT_USER_GROUPS (REQUIRED) |
| 18 |
List of groups the user should belong to. This must be a bash array. |
| 19 |
The first group specified is the user's primary group, while the remaining groups (if any) |
| 20 |
become supplementary groups. |
| 21 |
``` |
| 22 |
|
| 23 |
So we can remove in `acct-user/user/user-0.ebuild`: |
| 24 |
``` |
| 25 |
ACCT_USER_HOME_OWNER="user" |
| 26 |
``` |
| 27 |
Moreover if we have: |
| 28 |
``` |
| 29 |
ACCT_USER_GROUPS=( primary_group group2 ) |
| 30 |
``` |
| 31 |
, we can remove |
| 32 |
``` |
| 33 |
ACCT_USER_HOME_OWNER="user:primary_group" |
| 34 |
``` |
| 35 |
|
| 36 |
Signed-off-by: Alexander Kurakin <kuraga333 <AT> mail.ru> |
| 37 |
Closes: https://github.com/gentoo/gentoo/pull/29214 |
| 38 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 39 |
|
| 40 |
acct-user/automatic/automatic-0.ebuild | 3 +-- |
| 41 |
acct-user/ceph/ceph-0-r1.ebuild | 3 +-- |
| 42 |
acct-user/git/git-0-r2.ebuild | 3 +-- |
| 43 |
acct-user/goaccess/goaccess-0.ebuild | 3 +-- |
| 44 |
acct-user/headscale/headscale-0.ebuild | 3 +-- |
| 45 |
acct-user/munin-async/munin-async-0-r1.ebuild | 3 +-- |
| 46 |
acct-user/munin/munin-0-r1.ebuild | 3 +-- |
| 47 |
acct-user/named/named-0-r1.ebuild | 3 +-- |
| 48 |
acct-user/snapserver/snapserver-0.ebuild | 3 +-- |
| 49 |
acct-user/unifi/unifi-0-r1.ebuild | 3 +-- |
| 50 |
10 files changed, 10 insertions(+), 20 deletions(-) |
| 51 |
|
| 52 |
diff --git a/acct-user/automatic/automatic-0.ebuild b/acct-user/automatic/automatic-0.ebuild |
| 53 |
index 4b8f27357849..8972c4583c61 100644 |
| 54 |
--- a/acct-user/automatic/automatic-0.ebuild |
| 55 |
+++ b/acct-user/automatic/automatic-0.ebuild |
| 56 |
@@ -1,4 +1,4 @@ |
| 57 |
-# Copyright 1999-2021 Gentoo Authors |
| 58 |
+# Copyright 1999-2023 Gentoo Authors |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
|
| 61 |
EAPI=7 |
| 62 |
@@ -8,6 +8,5 @@ inherit acct-user |
| 63 |
ACCT_USER_ID=338 |
| 64 |
ACCT_USER_GROUPS=( automatic ) |
| 65 |
ACCT_USER_HOME="/var/lib/automatic" |
| 66 |
-ACCT_USER_HOME_OWNER="automatic:automatic" |
| 67 |
|
| 68 |
acct-user_add_deps |
| 69 |
|
| 70 |
diff --git a/acct-user/ceph/ceph-0-r1.ebuild b/acct-user/ceph/ceph-0-r1.ebuild |
| 71 |
index 7d26493d0bb5..56098366e894 100644 |
| 72 |
--- a/acct-user/ceph/ceph-0-r1.ebuild |
| 73 |
+++ b/acct-user/ceph/ceph-0-r1.ebuild |
| 74 |
@@ -1,4 +1,4 @@ |
| 75 |
-# Copyright 2019-2020 Gentoo Authors |
| 76 |
+# Copyright 2019-2023 Gentoo Authors |
| 77 |
# Distributed under the terms of the GNU General Public License v2 |
| 78 |
|
| 79 |
EAPI=7 |
| 80 |
@@ -9,7 +9,6 @@ DESCRIPTION="User for ceph" |
| 81 |
|
| 82 |
ACCT_USER_ID=267 |
| 83 |
ACCT_USER_HOME=/var/lib/ceph |
| 84 |
-ACCT_USER_HOME_OWNER=ceph:ceph |
| 85 |
ACCT_USER_GROUPS=( ceph ) |
| 86 |
|
| 87 |
acct-user_add_deps |
| 88 |
|
| 89 |
diff --git a/acct-user/git/git-0-r2.ebuild b/acct-user/git/git-0-r2.ebuild |
| 90 |
index 18e2d5f67173..d6388db32836 100644 |
| 91 |
--- a/acct-user/git/git-0-r2.ebuild |
| 92 |
+++ b/acct-user/git/git-0-r2.ebuild |
| 93 |
@@ -1,4 +1,4 @@ |
| 94 |
-# Copyright 2019-2022 Gentoo Authors |
| 95 |
+# Copyright 2019-2023 Gentoo Authors |
| 96 |
# Distributed under the terms of the GNU General Public License v2 |
| 97 |
|
| 98 |
EAPI=8 |
| 99 |
@@ -11,7 +11,6 @@ IUSE="git gitea gitolite" |
| 100 |
REQUIRED_USE="^^ ( git gitea gitolite )" |
| 101 |
|
| 102 |
ACCT_USER_ID=196 |
| 103 |
-ACCT_USER_HOME_OWNER=git:git |
| 104 |
ACCT_USER_HOME_PERMS=750 |
| 105 |
ACCT_USER_SHELL=/bin/sh |
| 106 |
ACCT_USER_GROUPS=( git ) |
| 107 |
|
| 108 |
diff --git a/acct-user/goaccess/goaccess-0.ebuild b/acct-user/goaccess/goaccess-0.ebuild |
| 109 |
index 8b93cdfe3a5d..bc260252062a 100644 |
| 110 |
--- a/acct-user/goaccess/goaccess-0.ebuild |
| 111 |
+++ b/acct-user/goaccess/goaccess-0.ebuild |
| 112 |
@@ -1,4 +1,4 @@ |
| 113 |
-# Copyright 1999-2022 Gentoo Authors |
| 114 |
+# Copyright 1999-2023 Gentoo Authors |
| 115 |
# Distributed under the terms of the GNU General Public License v2 |
| 116 |
|
| 117 |
EAPI=8 |
| 118 |
@@ -8,7 +8,6 @@ inherit acct-user |
| 119 |
ACCT_USER_ID=523 |
| 120 |
ACCT_USER_GROUPS=( goaccess ) |
| 121 |
ACCT_USER_HOME="/var/lib/goaccess" |
| 122 |
-ACCT_USER_HOME_OWNER="goaccess:goaccess" |
| 123 |
ACCT_USER_HOME_PERMS=0770 |
| 124 |
|
| 125 |
acct-user_add_deps |
| 126 |
|
| 127 |
diff --git a/acct-user/headscale/headscale-0.ebuild b/acct-user/headscale/headscale-0.ebuild |
| 128 |
index e30127cddfdb..23080db987f7 100644 |
| 129 |
--- a/acct-user/headscale/headscale-0.ebuild |
| 130 |
+++ b/acct-user/headscale/headscale-0.ebuild |
| 131 |
@@ -1,4 +1,4 @@ |
| 132 |
-# Copyright 2022 Gentoo Authors |
| 133 |
+# Copyright 1999-2023 Gentoo Authors |
| 134 |
# Distributed under the terms of the GNU General Public License v2 |
| 135 |
|
| 136 |
EAPI=8 |
| 137 |
@@ -8,7 +8,6 @@ inherit acct-user |
| 138 |
DESCRIPTION="Headscale Server hosting user" |
| 139 |
|
| 140 |
ACCT_USER_ID=514 |
| 141 |
-ACCT_USER_HOME_OWNER=headscale:headscale |
| 142 |
ACCT_USER_HOME_PERMS=750 |
| 143 |
ACCT_USER_GROUPS=( headscale ) |
| 144 |
ACCT_USER_HOME=/var/lib/headscale |
| 145 |
|
| 146 |
diff --git a/acct-user/munin-async/munin-async-0-r1.ebuild b/acct-user/munin-async/munin-async-0-r1.ebuild |
| 147 |
index 813b903cb181..a11cabd62269 100644 |
| 148 |
--- a/acct-user/munin-async/munin-async-0-r1.ebuild |
| 149 |
+++ b/acct-user/munin-async/munin-async-0-r1.ebuild |
| 150 |
@@ -1,4 +1,4 @@ |
| 151 |
-# Copyright 2019-2020 Gentoo Authors |
| 152 |
+# Copyright 2019-2023 Gentoo Authors |
| 153 |
# Distributed under the terms of the GNU General Public License v2 |
| 154 |
|
| 155 |
EAPI=7 |
| 156 |
@@ -9,7 +9,6 @@ DESCRIPTION="user for munin async proxy node" |
| 157 |
|
| 158 |
ACCT_USER_GROUPS=( munin ) |
| 159 |
ACCT_USER_HOME="/var/spool/munin-async" |
| 160 |
-ACCT_USER_HOME_OWNER="munin-async:munin" |
| 161 |
ACCT_USER_ID=178 |
| 162 |
ACCT_USER_SHELL=/bin/sh |
| 163 |
|
| 164 |
|
| 165 |
diff --git a/acct-user/munin/munin-0-r1.ebuild b/acct-user/munin/munin-0-r1.ebuild |
| 166 |
index 67505d6ce354..08f9f00552be 100644 |
| 167 |
--- a/acct-user/munin/munin-0-r1.ebuild |
| 168 |
+++ b/acct-user/munin/munin-0-r1.ebuild |
| 169 |
@@ -1,4 +1,4 @@ |
| 170 |
-# Copyright 2019-2020 Gentoo Authors |
| 171 |
+# Copyright 2019-2023 Gentoo Authors |
| 172 |
# Distributed under the terms of the GNU General Public License v2 |
| 173 |
|
| 174 |
EAPI=7 |
| 175 |
@@ -9,7 +9,6 @@ DESCRIPTION="user for munin" |
| 176 |
|
| 177 |
ACCT_USER_GROUPS=( munin ) |
| 178 |
ACCT_USER_HOME="/var/lib/munin" |
| 179 |
-ACCT_USER_HOME_OWNER="munin:munin" |
| 180 |
ACCT_USER_ID=177 |
| 181 |
|
| 182 |
acct-user_add_deps |
| 183 |
|
| 184 |
diff --git a/acct-user/named/named-0-r1.ebuild b/acct-user/named/named-0-r1.ebuild |
| 185 |
index 103b3149f63d..4ca236119be0 100644 |
| 186 |
--- a/acct-user/named/named-0-r1.ebuild |
| 187 |
+++ b/acct-user/named/named-0-r1.ebuild |
| 188 |
@@ -1,4 +1,4 @@ |
| 189 |
-# Copyright 2020 Gentoo Authors |
| 190 |
+# Copyright 1999-2023 Gentoo Authors |
| 191 |
# Distributed under the terms of the GNU General Public License v2 |
| 192 |
|
| 193 |
EAPI=7 |
| 194 |
@@ -9,7 +9,6 @@ DESCRIPTION="User for net-dns/bind" |
| 195 |
|
| 196 |
ACCT_USER_ID=40 |
| 197 |
ACCT_USER_HOME=/etc/bind |
| 198 |
-ACCT_USER_HOME_OWNER=named:named |
| 199 |
ACCT_USER_GROUPS=( named ) |
| 200 |
|
| 201 |
acct-user_add_deps |
| 202 |
|
| 203 |
diff --git a/acct-user/snapserver/snapserver-0.ebuild b/acct-user/snapserver/snapserver-0.ebuild |
| 204 |
index daa84b06e5a0..b4b8bbda6968 100644 |
| 205 |
--- a/acct-user/snapserver/snapserver-0.ebuild |
| 206 |
+++ b/acct-user/snapserver/snapserver-0.ebuild |
| 207 |
@@ -1,4 +1,4 @@ |
| 208 |
-# Copyright 2020 Gentoo Authors |
| 209 |
+# Copyright 1999-2023 Gentoo Authors |
| 210 |
# Distributed under the terms of the GNU General Public License v2 |
| 211 |
|
| 212 |
EAPI=7 |
| 213 |
@@ -8,7 +8,6 @@ inherit acct-user |
| 214 |
DESCRIPTION="Server user for media-sound/snapcast" |
| 215 |
|
| 216 |
ACCT_USER_GROUPS=( "snapserver" ) |
| 217 |
-ACCT_USER_HOME_OWNER="snapserver" |
| 218 |
ACCT_USER_HOME_PERMS=0770 |
| 219 |
ACCT_USER_ID=374 |
| 220 |
|
| 221 |
|
| 222 |
diff --git a/acct-user/unifi/unifi-0-r1.ebuild b/acct-user/unifi/unifi-0-r1.ebuild |
| 223 |
index b5370b3f510d..6e7e3dae218f 100644 |
| 224 |
--- a/acct-user/unifi/unifi-0-r1.ebuild |
| 225 |
+++ b/acct-user/unifi/unifi-0-r1.ebuild |
| 226 |
@@ -1,4 +1,4 @@ |
| 227 |
-# Copyright 2019-2020 Gentoo Authors |
| 228 |
+# Copyright 2019-2023 Gentoo Authors |
| 229 |
# Distributed under the terms of the GNU General Public License v2 |
| 230 |
|
| 231 |
EAPI=7 |
| 232 |
@@ -9,7 +9,6 @@ DESCRIPTION="A user for the UniFi Controller" |
| 233 |
|
| 234 |
ACCT_USER_GROUPS=( "unifi" ) |
| 235 |
ACCT_USER_HOME="/var/lib/unifi" |
| 236 |
-ACCT_USER_HOME_OWNER="unifi:unifi" |
| 237 |
ACCT_USER_ID="113" |
| 238 |
|
| 239 |
acct-user_add_deps |
Archives