[MediaWiki-commits] [Gerrit] labs/toollabs[master]: Remove toolwatcher
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/336425 ) Change subject: Remove toolwatcher .. Remove toolwatcher toolwatcher has been replaced by operation/puppet's modules/role/files/labs/db/maintain-dbusers.py and modules/toollabs/files/maintain-kubeusers. The directories cgi-bin and public_html are no longer created by default. Change-Id: I644bc5cd8d2d2cc0d94d3a8884ff8b33e11dd135 --- M configure.ac M debian/changelog M debian/misctools.install M debian/misctools.manpages M misctools/.gitignore M misctools/Makefile.am D misctools/toolwatcher D misctools/toolwatcher.8.in 8 files changed, 7 insertions(+), 63 deletions(-) Approvals: Tim Landscheidt: Looks good to me, approved jenkins-bot: Verified diff --git a/configure.ac b/configure.ac index 5041f1f..1cc660e 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,6 @@ misctools/Makefile misctools/become.1 misctools/list-user-databases.1 - misctools/toolwatcher.8 src/Makefile src/take.1 tests/Makefile]) diff --git a/debian/changelog b/debian/changelog index b17cf44..c6f5d53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +toollabs (1.19~dev) unstable; urgency=medium + + * Remove toolwatcher + + -- Tim Landscheidt Tue, 07 Feb 2017 15:57:45 + + toollabs (1.18) unstable; urgency=medium * jsub: Change IOError string substitution conversion from '%e' diff --git a/debian/misctools.install b/debian/misctools.install index 7493d64..8480b2b 100644 --- a/debian/misctools.install +++ b/debian/misctools.install @@ -2,4 +2,3 @@ usr/bin/list-user-databases usr/bin/take usr/bin/setup-tomcat -usr/sbin/toolwatcher diff --git a/debian/misctools.manpages b/debian/misctools.manpages index e198cda..52c8ebc 100644 --- a/debian/misctools.manpages +++ b/debian/misctools.manpages @@ -1,4 +1,3 @@ debian/tmp/usr/share/man/man1/become.1 debian/tmp/usr/share/man/man1/list-user-databases.1 debian/tmp/usr/share/man/man1/take.1 -debian/tmp/usr/share/man/man8/toolwatcher.8 diff --git a/misctools/.gitignore b/misctools/.gitignore index c4d5659..5b26402 100644 --- a/misctools/.gitignore +++ b/misctools/.gitignore @@ -2,4 +2,3 @@ /Makefile.in /become.1 /list-user-databases.1 -/toolwatcher.8 diff --git a/misctools/Makefile.am b/misctools/Makefile.am index c8e19e7..4d2ee2b 100644 --- a/misctools/Makefile.am +++ b/misctools/Makefile.am @@ -1,3 +1,2 @@ -man_MANS = become.1 list-user-databases.1 toolwatcher.8 +man_MANS = become.1 list-user-databases.1 bin_SCRIPTS = become list-user-databases setup-tomcat -sbin_SCRIPTS = toolwatcher diff --git a/misctools/toolwatcher b/misctools/toolwatcher deleted file mode 100755 index 35d0d50..000 --- a/misctools/toolwatcher +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# -# Copyright © 2013 Marc-André Pelletier -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -cd /data/project -export HOME=/root -PREFIX=$(cat /etc/wmflabs-project) - -while true; do -# Iterate over all service groups of this project. -getent passwd | sed -ne "s/^$PREFIX\\.\([^:]\+\):.*\$/\\1/p;" | while read TOOL; do -# If the service group's home directory doesn't exist already, -# create it with a basic structure and especially set setgid -# on the directories so that files created are owned by the -# service group's group. -if [ ! -d "$TOOL" ]; then -logger -t toolwatcher "Creating tool $TOOL" - -mkdir -m u=rwx,g=rwsx,o=rx "$TOOL" "$TOOL/public_html" -chown -R "$PREFIX.$TOOL:$PREFIX.$TOOL" "$TOOL" -fi -done - -# Sleep for two minutes. -sleep 120 -done diff --git a/misctools/toolwatcher.8.in b/misctools/toolwatcher.8.in deleted file mode 100644 index db072cb..000 --- a/misctools/toolwatcher.8.in +++ /dev/null @@ -1,19 +0,0 @@ -.TH TOOLWATCHER 8 @TOOLLABS_RELEASEDATE@ @PACKAGE_VERSION@ "Wikimedia Labs Tools misctools" -.SH NAME -toolwatcher \- create home directories for tool accounts -.SH SYNOPSIS -.B toolwatcher -.SH DESCRIPTION -.B toolwatcher -is a daemon that creates a basic directory structure with useful -permiss
[MediaWiki-commits] [Gerrit] labs/toollabs[master]: Remove toolwatcher
Tim Landscheidt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/336425 ) Change subject: Remove toolwatcher .. Remove toolwatcher toolwatcher has been replaced by operation/puppet's modules/role/files/labs/db/maintain-dbusers.py and modules/toollabs/files/maintain-kubeusers. The directories cgi-bin and public_html are no longer created by default. Change-Id: I644bc5cd8d2d2cc0d94d3a8884ff8b33e11dd135 --- M configure.ac M debian/changelog M debian/misctools.install M debian/misctools.manpages M misctools/.gitignore M misctools/Makefile.am D misctools/toolwatcher D misctools/toolwatcher.8.in 8 files changed, 7 insertions(+), 63 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/25/336425/1 diff --git a/configure.ac b/configure.ac index 5041f1f..1cc660e 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,6 @@ misctools/Makefile misctools/become.1 misctools/list-user-databases.1 - misctools/toolwatcher.8 src/Makefile src/take.1 tests/Makefile]) diff --git a/debian/changelog b/debian/changelog index b17cf44..c6f5d53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +toollabs (1.19~dev) unstable; urgency=medium + + * Remove toolwatcher + + -- Tim Landscheidt Tue, 07 Feb 2017 15:57:45 + + toollabs (1.18) unstable; urgency=medium * jsub: Change IOError string substitution conversion from '%e' diff --git a/debian/misctools.install b/debian/misctools.install index 7493d64..8480b2b 100644 --- a/debian/misctools.install +++ b/debian/misctools.install @@ -2,4 +2,3 @@ usr/bin/list-user-databases usr/bin/take usr/bin/setup-tomcat -usr/sbin/toolwatcher diff --git a/debian/misctools.manpages b/debian/misctools.manpages index e198cda..52c8ebc 100644 --- a/debian/misctools.manpages +++ b/debian/misctools.manpages @@ -1,4 +1,3 @@ debian/tmp/usr/share/man/man1/become.1 debian/tmp/usr/share/man/man1/list-user-databases.1 debian/tmp/usr/share/man/man1/take.1 -debian/tmp/usr/share/man/man8/toolwatcher.8 diff --git a/misctools/.gitignore b/misctools/.gitignore index c4d5659..5b26402 100644 --- a/misctools/.gitignore +++ b/misctools/.gitignore @@ -2,4 +2,3 @@ /Makefile.in /become.1 /list-user-databases.1 -/toolwatcher.8 diff --git a/misctools/Makefile.am b/misctools/Makefile.am index c8e19e7..4d2ee2b 100644 --- a/misctools/Makefile.am +++ b/misctools/Makefile.am @@ -1,3 +1,2 @@ -man_MANS = become.1 list-user-databases.1 toolwatcher.8 +man_MANS = become.1 list-user-databases.1 bin_SCRIPTS = become list-user-databases setup-tomcat -sbin_SCRIPTS = toolwatcher diff --git a/misctools/toolwatcher b/misctools/toolwatcher deleted file mode 100755 index 35d0d50..000 --- a/misctools/toolwatcher +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# -# Copyright © 2013 Marc-André Pelletier -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -cd /data/project -export HOME=/root -PREFIX=$(cat /etc/wmflabs-project) - -while true; do -# Iterate over all service groups of this project. -getent passwd | sed -ne "s/^$PREFIX\\.\([^:]\+\):.*\$/\\1/p;" | while read TOOL; do -# If the service group's home directory doesn't exist already, -# create it with a basic structure and especially set setgid -# on the directories so that files created are owned by the -# service group's group. -if [ ! -d "$TOOL" ]; then -logger -t toolwatcher "Creating tool $TOOL" - -mkdir -m u=rwx,g=rwsx,o=rx "$TOOL" "$TOOL/public_html" -chown -R "$PREFIX.$TOOL:$PREFIX.$TOOL" "$TOOL" -fi -done - -# Sleep for two minutes. -sleep 120 -done diff --git a/misctools/toolwatcher.8.in b/misctools/toolwatcher.8.in deleted file mode 100644 index db072cb..000 --- a/misctools/toolwatcher.8.in +++ /dev/null @@ -1,19 +0,0 @@ -.TH TOOLWATCHER 8 @TOOLLABS_RELEASEDATE@ @PACKAGE_VERSION@ "Wikimedia Labs Tools misctools" -.SH NAME -toolwatcher \- create home directories for tool accounts -.SH SYNOPSIS -.B toolwatcher -.SH DESCRIPTION -.B toolwatcher -is a daemon that creates a basic directory structure with useful -permissio
