Adding metadata

6 files changed, 63 insertions, 38 deletions

diff --git a/acct-user/git/Manifest b/acct-user/git/Manifest
new file mode 100644
index 000000000000..cf27caf3f516
--- /dev/null
+++ b/acct-user/git/Manifest
@@ -0,0 +1,2 @@
+EBUILD git-0-r2.ebuild 1181 BLAKE2B 8cfc061c7fa4faeec62f5639ffe61b93be73b139f614290caa4bfb94f3e4da2b5ab4adae577366f7925aa02b880bfbc673bec122e7411c4c19275fcaaa450ba4 SHA512 1e97d32a4a98014e6c6c827dbd4daf3edcb66682a5aa21da6e07016a2f3fd869ed78c7a137e2000254d67ac19435361399d43dc3d929fc5904af90bfd9fe8505
+MISC metadata.xml 606 BLAKE2B 787204a850f49144fbabd6e23bfaedf8eaa2fedb73f73d3b2bad5e35381bad8c1237595556466f786cfbca34b2624fd2b8e4d275263af619cb855097a37a27ec SHA512 4271a1b1aa2533b5b0276b7c3950cc05f0e3723879cbede4479e7c4bddf3ced3e4c3c04b5e0e2a18225d387a1205c791a694e73c969a9ea12dfefa4da7f9c74e
diff --git a/acct-user/git/git-0-r2.ebuild b/acct-user/git/git-0-r2.ebuild
new file mode 100644
index 000000000000..9af0a163ed4e
--- /dev/null
+++ b/acct-user/git/git-0-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="Git repository hosting user"
+
+IUSE="gitea gitlab gitolite"
+REQUIRED_USE="^^ ( gitea gitlab gitolite )"
+
+ACCT_USER_ID=196
+ACCT_USER_HOME_OWNER=git:git
+ACCT_USER_HOME_PERMS=750
+ACCT_USER_SHELL=/bin/sh
+ACCT_USER_GROUPS=( git )
+
+RDEPEND="acct-group/redis"
+
+acct-user_add_deps
+
+pkg_setup() {
+	if use gitea; then
+		ACCT_USER_HOME=/var/lib/gitea
+	elif use gitlab; then
+		ACCT_USER_HOME=/var/lib/gitlab
+		ACCT_USER_GROUPS+=( redis )
+	elif use gitolite; then
+		ACCT_USER_HOME=/var/lib/gitolite
+	else
+		die "Incorrect USE flag combination"
+	fi
+}
+
+pkg_postinst() {
+	acct-user_pkg_postinst
+	elog "For GitLab the git user has to be unlocked but doesn't"
+	elog "need a password as only ssh public key login is used."
+	elog "Changing the password field of git in /etc/shadow:"
+	if [ $(passwd -S git | cut -d" " -f2) == "P" ]; then
+		eerror "Change canceled, because the git user has a real password."
+		eerror "Run \"usermod -p '*' git\" to do the change manually."
+	else
+		usermod -p '*' git
+		elog "Changed the password field from \"!\" to \"*\"."
+	fi
+}
diff --git a/acct-user/git/git-0-r3.ebuild b/acct-user/git/git-0-r3.ebuild
deleted file mode 100644
index d6388db32836..000000000000
--- a/acct-user/git/git-0-r3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="Git repository hosting user"
-
-IUSE="git gitea gitolite"
-REQUIRED_USE="^^ ( git gitea gitolite )"
-
-ACCT_USER_ID=196
-ACCT_USER_HOME_PERMS=750
-ACCT_USER_SHELL=/bin/sh
-ACCT_USER_GROUPS=( git )
-
-acct-user_add_deps
-
-pkg_setup() {
-	if use git; then
-		ACCT_USER_HOME=/var/lib/git
-	elif use gitea; then
-		ACCT_USER_HOME=/var/lib/gitea
-	elif use gitolite; then
-		ACCT_USER_HOME=/var/lib/gitolite
-	else
-		die "Incorrect USE flag combination"
-	fi
-}
diff --git a/acct-user/git/metadata.xml b/acct-user/git/metadata.xml
index afc9b7c8d0a0..210e19bc9d9c 100644
--- a/acct-user/git/metadata.xml
+++ b/acct-user/git/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="project">
+    <email>dev@liguros.net</email>
+    <name>Development</name>
+  </maintainer>
   <maintainer type="person">
     <email>mgorny@gentoo.org</email>
     <name>Michał Górny</name>
@@ -8,6 +12,8 @@
   <use>
     <flag name="gitea">Set home directory for git hosting
 			via <pkg>www-apps/gitea</pkg>.</flag>
+    <flag name="gitlab">Set home directory for gitlab hosting
+			via <pkg>www-apps/gitlabhq</pkg>.</flag>
     <flag name="gitolite">Set home directory for git hosting
 			via <pkg>dev-vcs/gitolite</pkg>
 			or <pkg>dev-vcs/gitolite-gentoo</pkg>.</flag>
diff --git a/acct-user/gitlab-runner/gitlab-runner-1-r2.ebuild b/acct-user/gitlab-runner/gitlab-runner-0.ebuild
index 1ef6553cff04..f4ca7f532046 100644
--- a/acct-user/gitlab-runner/gitlab-runner-1-r2.ebuild
+++ b/acct-user/gitlab-runner/gitlab-runner-0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2021 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
+EAPI=7
 
 inherit acct-user
 
 DESCRIPTION="Dedicated user for gitlab-runner"
 
-ACCT_USER_ID=510
-ACCT_USER_GROUPS=( gitlab-runner )
+ACCT_USER_ID=125
+ACCT_USER_GROUPS=( gitlab )
 
 ACCT_USER_HOME=/var/lib/gitlab-runner
+ACCT_USER_HOME_OWNER=gitlab-runner:gitlab
 ACCT_USER_HOME_PERMS=0770
 
 acct-user_add_deps
diff --git a/acct-user/gitlab-runner/metadata.xml b/acct-user/gitlab-runner/metadata.xml
index 17492b5107c4..75e2e665e6b4 100644
--- a/acct-user/gitlab-runner/metadata.xml
+++ b/acct-user/gitlab-runner/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>williamh@gentoo.org</email>
-    <name>William Hubbs</name>
+  <maintainer type="project">
+    <email>dev@liguros.net</email>
+    <name>Development</name>
   </maintainer>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>