[gentoo-commits] repo/gentoo:master commit in: acct-user/nginx/

[gentoo-commits] repo/gentoo:master commit in: acct-user/nginx/

[Conrad Kostecki]

commit:     41b4fdbca7e5fb94e677fa48b3d177bd372c44b8
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 10:52:09 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat May 14 11:27:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41b4fdbc

acct-user/nginx: new package, add 0

Bug: https://bugs.gentoo.org/701254
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 acct-user/nginx/metadata.xml   |  8 ++++++++
 acct-user/nginx/nginx-0.ebuild | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/acct-user/nginx/metadata.xml b/acct-user/nginx/metadata.xml
new file mode 100644
index 000000000000..542a8a19f0f6
--- /dev/null
+++ b/acct-user/nginx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+</pkgmetadata>

diff --git a/acct-user/nginx/nginx-0.ebuild b/acct-user/nginx/nginx-0.ebuild
new file mode 100644
index 000000000000..959c00fdf8c4
--- /dev/null
+++ b/acct-user/nginx/nginx-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID="82"
+ACCT_USER_GROUPS=( "nginx" )
+ACCT_USER_HOME="/var/lib/nginx"
+
+acct-user_add_deps

[gentoo-commits] repo/gentoo:master commit in: acct-user/nginx/

[Sam James]

commit:     0207657e1e83d1945adb36bf58d50ae3c0804413
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Nov  8 15:34:24 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 11:52:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0207657e

acct-user/nginx: add USE=mgraph

Misses migration after acct-user got introduced.

Introduced USE-flags needed for net-mail/mailgraph

BannedEapiCommand
'gpasswd' banned in EAPI 7, used on line 81 'gpasswd -a apache mgraph'

Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 acct-user/nginx/metadata.xml      | 1 +
 acct-user/nginx/nginx-0-r2.ebuild | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/acct-user/nginx/metadata.xml b/acct-user/nginx/metadata.xml
index d5e1b5439249..e2269995015a 100644
--- a/acct-user/nginx/metadata.xml
+++ b/acct-user/nginx/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<use>
 		<flag name="icingaweb2">Prepare group membership for <pkg>www-apps/icingaweb2</pkg></flag>
+		<flag name="mgraph">Prepare group membership for <pkg>net-mail/mailgraph</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/acct-user/nginx/nginx-0-r2.ebuild b/acct-user/nginx/nginx-0-r2.ebuild
index 79087c812736..d3de2d164909 100644
--- a/acct-user/nginx/nginx-0-r2.ebuild
+++ b/acct-user/nginx/nginx-0-r2.ebuild
@@ -9,7 +9,7 @@ ACCT_USER_ID="82"
 ACCT_USER_GROUPS=( "nginx" )
 ACCT_USER_HOME="/var/lib/nginx"
 
-IUSE="icingaweb2"
+IUSE="icingaweb2 mgraph"
 
 acct-user_add_deps
 
@@ -18,9 +18,15 @@ RDEPEND+="
 		acct-group/icingacmd
 		acct-group/icingaweb2
 	)
+	mgraph? (
+		acct-group/mgraph
+	)
 "
 
 pkg_setup() {
 	# www-apps/icingaweb2
 	use icingaweb2 && ACCT_USER_GROUPS+=( icingacmd icingaweb2 )
+
+	# net-mail/mailgraph
+	use mgraph && ACCT_USER_GROUPS+=( mgraph )
 }

[gentoo-commits] repo/gentoo:master commit in: acct-user/nginx/

[Sam James]

commit:     2af3c3b70709a2e4272fb5a63d653147d6ffe0ac
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Nov  8 15:32:56 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 11:52:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af3c3b7

acct-user/nginx: add USE=icingaweb2

Misses migration after acct-user got introduced.

Introduced USE-flags needed for www-apps/icingaweb2

BannedEapiCommand
'usermod' banned in EAPI 7,
used on line 45 'usermod -a -G icingacmd,icingaweb2 nginx'

Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 acct-user/nginx/metadata.xml      |  3 +++
 acct-user/nginx/nginx-0-r1.ebuild | 12 ------------
 acct-user/nginx/nginx-0-r2.ebuild | 26 ++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/acct-user/nginx/metadata.xml b/acct-user/nginx/metadata.xml
index 115e9d64a669..d5e1b5439249 100644
--- a/acct-user/nginx/metadata.xml
+++ b/acct-user/nginx/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<use>
+		<flag name="icingaweb2">Prepare group membership for <pkg>www-apps/icingaweb2</pkg></flag>
+	</use>
 </pkgmetadata>

diff --git a/acct-user/nginx/nginx-0-r1.ebuild b/acct-user/nginx/nginx-0-r1.ebuild
deleted file mode 100644
index f6b6ea4ea30f..000000000000
--- a/acct-user/nginx/nginx-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID="82"
-ACCT_USER_GROUPS=( "nginx" )
-ACCT_USER_HOME="/var/lib/nginx"
-
-acct-user_add_deps

diff --git a/acct-user/nginx/nginx-0-r2.ebuild b/acct-user/nginx/nginx-0-r2.ebuild
new file mode 100644
index 000000000000..79087c812736
--- /dev/null
+++ b/acct-user/nginx/nginx-0-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID="82"
+ACCT_USER_GROUPS=( "nginx" )
+ACCT_USER_HOME="/var/lib/nginx"
+
+IUSE="icingaweb2"
+
+acct-user_add_deps
+
+RDEPEND+="
+	icingaweb2? (
+		acct-group/icingacmd
+		acct-group/icingaweb2
+	)
+"
+
+pkg_setup() {
+	# www-apps/icingaweb2
+	use icingaweb2 && ACCT_USER_GROUPS+=( icingacmd icingaweb2 )
+}