[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-worker/, dev-util/buildbot-worker/files/

["Brian Dolbec" <dolsen@gentoo.org>]

commit:     dcb7a06231e1c51664c529b1aa651395908fb498
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed May 13 20:46:40 2020 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed May 13 20:46:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb7a062

dev-util/buildbot-worker: Set correct permissions in pkg_config

Update buildbot.tac.sample to match current master.cfg.sample settings.
This allows for the worker to connect to the hello-world sample bot properly
provided it is on the same host as the master.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild | 4 +++-
 dev-util/buildbot-worker/buildbot-worker-9999.ebuild  | 4 +++-
 dev-util/buildbot-worker/files/buildbot.tac.sample    | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild
index 4c141f7b354..be5258cd998 100644
--- a/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild
@@ -114,7 +114,7 @@ pkg_config() {
 	if [[ ! -d "${instance_path}" ]]; then
 		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
 	fi
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
 	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
 		|| die "Moving sample configuration failed"
 	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
@@ -122,6 +122,8 @@ pkg_config() {
 
 	if [[ ! -d "${instance_log_path}" ]]; then
 		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
 	fi
 	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
 		|| die "Unable to create link to log file"

diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index 4c141f7b354..be5258cd998 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -114,7 +114,7 @@ pkg_config() {
 	if [[ ! -d "${instance_path}" ]]; then
 		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
 	fi
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
 	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
 		|| die "Moving sample configuration failed"
 	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
@@ -122,6 +122,8 @@ pkg_config() {
 
 	if [[ ! -d "${instance_log_path}" ]]; then
 		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
 	fi
 	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
 		|| die "Unable to create link to log file"

diff --git a/dev-util/buildbot-worker/files/buildbot.tac.sample b/dev-util/buildbot-worker/files/buildbot.tac.sample
index ee3d7ca3cef..19bd941911b 100644
--- a/dev-util/buildbot-worker/files/buildbot.tac.sample
+++ b/dev-util/buildbot-worker/files/buildbot.tac.sample
@@ -29,9 +29,9 @@ maxRotatedFiles = 10
 port = 9989
 
 # worker settings
-worker_name = 'worker-1'
-passwd = 'mypasswd'
-buildmaster_host = 'mybuildbot.foobar.org'
+worker_name = 'example-worker'
+passwd = 'pass'
+buildmaster_host = 'localhost'
 keepalive = 600
 umask = None
 maxdelay = 300