from:"\"Tim Landscheidt \\\\\\$Code Review\\\\\\$\""

[MediaWiki-commits] [Gerrit] Make qacct usable - change (operations/puppet)

2013-06-25 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70425


Change subject: Make qacct usable
..

Make qacct usable

With this change, we push the Grid Engine accounting file from the
master every five minutes to the shared project directory and pull it
from there to the individual submit hosts roughly a minute later.
This gives users a granularity that should be sufficient for most
development work.

We use temporary files to achieve atomicity and prevent qacct reading
incomplete files.

This change assumes that a grid engine master (gridengine::master) is
never a submit host (gridengine::submit_host).  Otherwise in the worst
case accounting information added between the push and the pull would
be lost.

This fixes bug #48696.

Bug: 48696
Change-Id: I29f0e42e4f49a406565344c31a7c93924bcd7408
---
M modules/gridengine/manifests/master.pp
M modules/gridengine/manifests/submit_host.pp
2 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/70425/1

diff --git a/modules/gridengine/manifests/master.pp 
b/modules/gridengine/manifests/master.pp
index 462dd96..b6af171 100644
--- a/modules/gridengine/manifests/master.pp
+++ b/modules/gridengine/manifests/master.pp
@@ -25,4 +25,11 @@
   }
 
   include monitoring
+
+  cron { "push-accounting-to-shared":
+command => "cp -f /var/lib/gridengine/default/common/accounting 
/data/project/.system/accounting.tmp && mv -f 
/data/project/.system/accounting.tmp /data/project/.system/accounting",
+user => root,
+minute => [0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55],
+ensure => present;
+  }
 }
diff --git a/modules/gridengine/manifests/submit_host.pp 
b/modules/gridengine/manifests/submit_host.pp
index f4df502..76e2d80 100644
--- a/modules/gridengine/manifests/submit_host.pp
+++ b/modules/gridengine/manifests/submit_host.pp
@@ -10,6 +10,13 @@
 ensure => latest,
 }
 
+cron { "pull-accounting-from-shared":
+  command => "cp -f /data/project/.system/accounting 
/var/lib/gridengine/default/common/accounting.tmp && mv -f 
/var/lib/gridengine/default/common/accounting.tmp 
/var/lib/gridengine/default/common/accounting",
+  user => root,
+  minute => [1, 6, 11, 16, 21, 26, 31, 36, 41, 46, 51, 56],
+  ensure => present;
+}
+
 # Not actually possible in the labs
 #  @@sshkey { $fqdn:
 #  ensure => present,

-- 
To view, visit https://gerrit.wikimedia.org/r/70425
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I29f0e42e4f49a406565344c31a7c93924bcd7408
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Complete rename of subpackage tools to misctools - change (labs/toollabs)

2013-06-26 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70656


Change subject: Complete rename of subpackage tools to misctools
..

Complete rename of subpackage tools to misctools

Change-Id: I9c142a702f3b2d89c350a31849d003bf89d3dab8
---
M debian/control
A debian/misctools.install
D debian/tools.install
R misctools/become
R misctools/rmtool
R misctools/toolwatcher
6 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/56/70656/1

diff --git a/debian/control b/debian/control
index ab22176..75f3472 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@
 Package: misctools
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Miscelaneous Labs-specific tools
- Miscelaneous Labs-specific Tools used on Tool Labs
+Description: Miscellaneous Labs-specific tools
+ Miscellaneous Labs-specific Tools used on Tool Labs
 
 Package: jobutils
 Architecture: all
diff --git a/debian/misctools.install b/debian/misctools.install
new file mode 100644
index 000..7116393
--- /dev/null
+++ b/debian/misctools.install
@@ -0,0 +1,3 @@
+misctools/become /usr/bin
+misctools/toolwatcher /usr/sbin
+misctools/rmtool /usr/sbin
diff --git a/debian/tools.install b/debian/tools.install
deleted file mode 100644
index 3eb6a68..000
--- a/debian/tools.install
+++ /dev/null
@@ -1,3 +0,0 @@
-tools/become /usr/bin
-tools/toolwatcher /usr/sbin
-tools/rmtool /usr/sbin
diff --git a/tools/become b/misctools/become
similarity index 100%
rename from tools/become
rename to misctools/become
diff --git a/tools/rmtool b/misctools/rmtool
similarity index 100%
rename from tools/rmtool
rename to misctools/rmtool
diff --git a/tools/toolwatcher b/misctools/toolwatcher
similarity index 100%
rename from tools/toolwatcher
rename to misctools/toolwatcher

-- 
To view, visit https://gerrit.wikimedia.org/r/70656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c142a702f3b2d89c350a31849d003bf89d3dab8
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add debian/.gitignore - change (labs/toollabs)

2013-06-26 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70660


Change subject: Add debian/.gitignore
..

Add debian/.gitignore

Change-Id: I909f4a7e1c89693309056006ccc23f9ebfa278c1
---
A debian/.gitignore
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/60/70660/1

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 000..6fec785
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,7 @@
+/files
+/jobutils
+/jobutils.debhelper.log
+/jobutils.substvars
+/misctools
+/misctools.debhelper.log
+/misctools.substvars

-- 
To view, visit https://gerrit.wikimedia.org/r/70660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I909f4a7e1c89693309056006ccc23f9ebfa278c1
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix dependencies - change (labs/toollabs)

2013-06-26 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70733


Change subject: Fix dependencies
..

Fix dependencies

${shlibs:Depends} is only needed for packages providing or requiring
shared libraries (which we don't until the compilation of take.cc is
done by the package), while ${perl:Depends} was missing for the Perl
scripts.

Change-Id: I47f10a73d4edef27f4085eb47f744e76b29a5418
---
M debian/control
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/33/70733/1

diff --git a/debian/control b/debian/control
index 75f3472..ebcc2a9 100644
--- a/debian/control
+++ b/debian/control
@@ -12,13 +12,13 @@
 
 Package: misctools
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}
 Description: Miscellaneous Labs-specific tools
  Miscellaneous Labs-specific Tools used on Tool Labs
 
 Package: jobutils
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, gridengine-client, 
libstring-shellquote-perl
+Depends: ${misc:Depends}, ${perl:Depends}, gridengine-client, 
libstring-shellquote-perl
 Description: Set of utilities to use on wikimedia bots and tools cluster
  This package will install jstart (jsub) and jstop, the Tool Labs (more)
  user-friendly wrappers to submit jobs to the gridengine

-- 
To view, visit https://gerrit.wikimedia.org/r/70733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I47f10a73d4edef27f4085eb47f744e76b29a5418
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix syntax error in debian/control - change (labs/toollabs)

2013-06-26 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70734


Change subject: Fix syntax error in debian/control
..

Fix syntax error in debian/control

Change-Id: Iac5abf5cef5b67b1b289e0997d5a7f555498173c
---
M debian/control
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/34/70734/1

diff --git a/debian/control b/debian/control
index ebcc2a9..3352e96 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: toollabs
 Section: utils
 Priority: extra
-Maintainer: Marc-André Pelletier ,
+Maintainer: Marc-André Pelletier 
 Uploaders: Marc-André Pelletier ,
  Carl Fürstenberg ,
  Petr Bena 

-- 
To view, visit https://gerrit.wikimedia.org/r/70734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac5abf5cef5b67b1b289e0997d5a7f555498173c
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Use autotools as build system - change (labs/toollabs)

2013-06-26 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70771


Change subject: Use autotools as build system
..

Use autotools as build system

Change-Id: I87079303477ebbc15404f4ab2ce04377032e2632
---
A .gitignore
A Makefile.am
A configure.ac
M debian/.gitignore
M debian/jobutils.install
D debian/jobutils.links
M debian/jobutils.manpages
M debian/misctools.install
M debian/rules
A jobutils/.gitignore
A jobutils/Makefile.am
A jobutils/bin/.gitignore
A jobutils/bin/Makefile.am
A jobutils/man/.gitignore
A jobutils/man/Makefile.am
A misctools/.gitignore
A misctools/Makefile.am
17 files changed, 56 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/71/70771/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..97cb339
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+/Makefile
+/Makefile.in
+/aclocal.m4
+/autom4te.cache
+/build-aux
+/config.log
+/config.status
+/configure
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 000..774dde8
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = jobutils misctools
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 000..3adb2c6
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,14 @@
+AC_INIT([toollabs], [1.0.4dev], [mpellet...@wikimedia.org])
+AC_CONFIG_AUX_DIR([build-aux])
+
+AM_INIT_AUTOMAKE([foreign no-dist silent-rules -Wall -Werror])
+AC_PROG_INSTALL
+AC_PROG_LN_S
+
+AC_CONFIG_FILES([Makefile
+ jobutils/Makefile
+ jobutils/bin/Makefile
+ jobutils/man/Makefile
+ misctools/Makefile])
+
+AC_OUTPUT
diff --git a/debian/.gitignore b/debian/.gitignore
index 6fec785..57c129f 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,3 +1,5 @@
+/autoreconf.after
+/autoreconf.before
 /files
 /jobutils
 /jobutils.debhelper.log
@@ -5,3 +7,4 @@
 /misctools
 /misctools.debhelper.log
 /misctools.substvars
+/tmp
diff --git a/debian/jobutils.install b/debian/jobutils.install
index a3b0f4a..3b8bf2f 100644
--- a/debian/jobutils.install
+++ b/debian/jobutils.install
@@ -1 +1,5 @@
-jobutils/bin/* /usr/bin
+usr/bin/job
+usr/bin/jstart
+usr/bin/jstop
+usr/bin/jsub
+usr/bin/qcronsub
diff --git a/debian/jobutils.links b/debian/jobutils.links
deleted file mode 100644
index e4214dd..000
--- a/debian/jobutils.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/bin/jsub /usr/bin/jstart
-/usr/bin/jsub /usr/bin/qcronsub
diff --git a/debian/jobutils.manpages b/debian/jobutils.manpages
index 360d854..bde9a92 100644
--- a/debian/jobutils.manpages
+++ b/debian/jobutils.manpages
@@ -1 +1,3 @@
-jobutils/man/*
+debian/tmp/usr/share/man/man1/jstart.1
+debian/tmp/usr/share/man/man1/jstop.1
+debian/tmp/usr/share/man/man1/jsub.1
diff --git a/debian/misctools.install b/debian/misctools.install
index 7116393..20e481b 100644
--- a/debian/misctools.install
+++ b/debian/misctools.install
@@ -1,3 +1,3 @@
-misctools/become /usr/bin
-misctools/toolwatcher /usr/sbin
-misctools/rmtool /usr/sbin
+usr/bin/become
+usr/sbin/rmtool
+usr/sbin/toolwatcher
diff --git a/debian/rules b/debian/rules
index c916ab4..cc628e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@
 
 
 %:
-   dh $@ 
+   dh $@ --with autoreconf
 
 # Test that Perl scripts not have compilation errors.
 override_dh_auto_test:
diff --git a/jobutils/.gitignore b/jobutils/.gitignore
new file mode 100644
index 000..b336cc7
--- /dev/null
+++ b/jobutils/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/jobutils/Makefile.am b/jobutils/Makefile.am
new file mode 100644
index 000..f3ac5b3
--- /dev/null
+++ b/jobutils/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = bin man
diff --git a/jobutils/bin/.gitignore b/jobutils/bin/.gitignore
new file mode 100644
index 000..b336cc7
--- /dev/null
+++ b/jobutils/bin/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/jobutils/bin/Makefile.am b/jobutils/bin/Makefile.am
new file mode 100644
index 000..764fc98
--- /dev/null
+++ b/jobutils/bin/Makefile.am
@@ -0,0 +1,6 @@
+bin_SCRIPTS = job jstop jsub
+
+install-exec-hook:
+   cd $(DESTDIR)$(bindir) && \
+ $(LN_S) jsub jstart && \
+ $(LN_S) jsub qcronsub
diff --git a/jobutils/man/.gitignore b/jobutils/man/.gitignore
new file mode 100644
index 000..b336cc7
--- /dev/null
+++ b/jobutils/man/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/jobutils/man/Makefile.am b/jobutils/man/Makefile.am
new file mode 100644
index 000..c9b180d
--- /dev/null
+++ b/jobutils/man/Makefile.am
@@ -0,0 +1 @@
+man_MANS = jstart.1 jstop.1 jsub.1
diff --git a/misctools/.gitignore b/misctools/.gitignore
new file mode 100644
index 000..b336cc7
--- /dev/null
+++ b/misctools/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/misctools/Makefile.am b/misctools/Makefile.am
new file mode 100644
index 000..62e39ae
--- /dev/null
+++ b/

[MediaWiki-commits] [Gerrit] Package take - change (labs/toollabs)

2013-06-28 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/71112


Change subject: Package take
..

Package take

Change-Id: I8ada3b5000be02e5750f7f69a7ca7f8f6caea8f0
---
M Makefile.am
M configure.ac
M debian/misctools.install
M debian/rules
A src/.gitignore
A src/Makefile.am
6 files changed, 17 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/12/71112/1

diff --git a/Makefile.am b/Makefile.am
index 774dde8..3a64156 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = jobutils misctools
+SUBDIRS = jobutils misctools src
diff --git a/configure.ac b/configure.ac
index 3adb2c6..11af986 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,11 +4,13 @@
 AM_INIT_AUTOMAKE([foreign no-dist silent-rules -Wall -Werror])
 AC_PROG_INSTALL
 AC_PROG_LN_S
+AC_PROG_CXX
 
 AC_CONFIG_FILES([Makefile
  jobutils/Makefile
  jobutils/bin/Makefile
  jobutils/man/Makefile
- misctools/Makefile])
+ misctools/Makefile
+ src/Makefile])
 
 AC_OUTPUT
diff --git a/debian/misctools.install b/debian/misctools.install
index 20e481b..f383236 100644
--- a/debian/misctools.install
+++ b/debian/misctools.install
@@ -1,3 +1,4 @@
 usr/bin/become
+usr/bin/take
 usr/sbin/rmtool
 usr/sbin/toolwatcher
diff --git a/debian/rules b/debian/rules
index cc628e0..29a6355 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,11 @@
 %:
dh $@ --with autoreconf
 
+# Make take setuid.
+override_dh_fixperms:
+   dh_fixperms
+   chmod u+s debian/misctools/usr/bin/take
+
 # Test that Perl scripts not have compilation errors.
 override_dh_auto_test:
perl -cw jobutils/bin/job
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 000..5f96fc7
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,4 @@
+/Makefile
+/Makefile.in
+/take
+/take.o
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 000..6541b6b
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,3 @@
+bin_PROGRAMS = take
+
+take_SOURCES = take.cc

-- 
To view, visit https://gerrit.wikimedia.org/r/71112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ada3b5000be02e5750f7f69a7ca7f8f6caea8f0
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Move test suite from debian/rules to autotools - change (labs/toollabs)

2013-06-28 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/71114


Change subject: Move test suite from debian/rules to autotools
..

Move test suite from debian/rules to autotools

Change-Id: Ibfb5e4d0d254a51e1463997f4a99722f5502e1d6
---
M Makefile.am
M configure.ac
M debian/rules
A tests/.gitignore
A tests/Makefile.am
A tests/testsuite.at
6 files changed, 65 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/14/71114/1

diff --git a/Makefile.am b/Makefile.am
index 3a64156..f7532e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = jobutils misctools src
+SUBDIRS = jobutils misctools src tests
diff --git a/configure.ac b/configure.ac
index 11af986..92d1b80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
 AC_INIT([toollabs], [1.0.4dev], [mpellet...@wikimedia.org])
 AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_TESTDIR([tests])
 
 AM_INIT_AUTOMAKE([foreign no-dist silent-rules -Wall -Werror])
 AC_PROG_INSTALL
@@ -11,6 +12,7 @@
  jobutils/bin/Makefile
  jobutils/man/Makefile
  misctools/Makefile
- src/Makefile])
+ src/Makefile
+ tests/Makefile])
 
 AC_OUTPUT
diff --git a/debian/rules b/debian/rules
index 29a6355..9abbdf3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,8 +24,3 @@
 override_dh_fixperms:
dh_fixperms
chmod u+s debian/misctools/usr/bin/take
-
-# Test that Perl scripts not have compilation errors.
-override_dh_auto_test:
-   perl -cw jobutils/bin/job
-   perl -cw jobutils/bin/jsub
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 000..6d95a17
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,6 @@
+/Makefile
+/Makefile.in
+/atconfig
+/package.m4
+/testsuite
+/testsuite.log
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 000..431f129
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,35 @@
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+   :;{ \
+ echo '# Signature of the current package.' && \
+ echo 'm4_define([AT_PACKAGE_NAME],' && \
+ echo '  [$(PACKAGE_NAME)])' && \
+ echo 'm4_define([AT_PACKAGE_TARNAME],' && \
+ echo '  [$(PACKAGE_TARNAME)])' && \
+ echo 'm4_define([AT_PACKAGE_VERSION],' && \
+ echo '  [$(PACKAGE_VERSION)])' && \
+ echo 'm4_define([AT_PACKAGE_STRING],' && \
+ echo '  [$(PACKAGE_STRING)])' && \
+ echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \
+ echo '  [$(PACKAGE_BUGREPORT)])'; \
+ echo 'm4_define([AT_PACKAGE_URL],' && \
+ echo '  [$(PACKAGE_URL)])'; \
+   } >'$(srcdir)/package.m4'
+
+TESTSUITE = $(srcdir)/testsuite
+
+check-local: atconfig $(TESTSUITE)
+   $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
+
+installcheck-local: atconfig $(TESTSUITE)
+   $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \
+ $(TESTSUITEFLAGS)
+
+clean-local:
+   test ! -f '$(TESTSUITE)' || \
+$(SHELL) '$(TESTSUITE)' --clean
+
+AUTOM4TE = $(SHELL) $(top_srcdir)/build-aux/missing --run autom4te
+AUTOTEST = $(AUTOM4TE) --language=autotest
+$(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4
+   $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+   mv $@.tmp $@
diff --git a/tests/testsuite.at b/tests/testsuite.at
new file mode 100644
index 000..8c0cead
--- /dev/null
+++ b/tests/testsuite.at
@@ -0,0 +1,20 @@
+# Test suite for toollabs.
+
+# Initialize autotest.
+AT_INIT()
+AT_COLOR_TESTS()
+
+# AT_TOOLLABS_PERL_COMPILE(FILE)
+# --
+# Test if FILE is compilable with "perl -cw".  FILE is relative to the
+# top source directory.
+m4_define([AT_TOOLLABS_PERL_COMPILE],
+[AT_SETUP([Checking $1 for compilation errors])
+AT_CHECK_UNQUOTED([perl -cw $top_srcdir/$1], [0], [], [$top_srcdir/$1 syntax OK
+])
+AT_CLEANUP()
+])
+
+# Test that Perl scripts do not have compilation errors.
+AT_TOOLLABS_PERL_COMPILE([jobutils/bin/job])
+AT_TOOLLABS_PERL_COMPILE([jobutils/bin/jsub])

-- 
To view, visit https://gerrit.wikimedia.org/r/71114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfb5e4d0d254a51e1463997f4a99722f5502e1d6
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add tests for jsub - change (labs/toollabs)

2013-06-28 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/71115


Change subject: Add tests for jsub
..

Add tests for jsub

Change-Id: Ic7300c6c3c54b62ffa8508330920dc72f95a3bd1
---
M jobutils/bin/jsub
M tests/Makefile.am
A tests/dummy.sh
M tests/testsuite.at
4 files changed, 135 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/15/71115/1

diff --git a/jobutils/bin/jsub b/jobutils/bin/jsub
index 20f683a..4c6098a 100755
--- a/jobutils/bin/jsub
+++ b/jobutils/bin/jsub
@@ -246,7 +246,7 @@
   push @args, '-q', $queue, '-b', 'y', $prog, @ARGV;
 }
 
-my $h = harness(['/usr/bin/qsub', @args], \$qsubinput, \$qsuboutput, 
\$qsuberror);
+my $h = harness([exists ($ENV {'JOBUTILS_QSUB'}) ? $ENV {'JOBUTILS_QSUB'} : 
'/usr/bin/qsub', @args], \$qsubinput, \$qsuboutput, \$qsuberror);
 if (!run ($h)) {
 print STDOUT $qsuboutput;
 print STDERR $qsuberror;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 431f129..f0ee409 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,7 +18,8 @@
 TESTSUITE = $(srcdir)/testsuite
 
 check-local: atconfig $(TESTSUITE)
-   $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
+   $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH=jobutils/bin:tests \
+ $($(TESTSUITEFLAGS)
 
 installcheck-local: atconfig $(TESTSUITE)
$(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \
@@ -33,3 +34,5 @@
 $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4
$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
mv $@.tmp $@
+
+check_SCRIPTS = dummy.sh
diff --git a/tests/dummy.sh b/tests/dummy.sh
new file mode 100755
index 000..c2d56e6
--- /dev/null
+++ b/tests/dummy.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# This script dumps arguments to dummy.args, STDIN to dummy.in,
+# dummy.out to STDOUT, dummy.err to STDERR and exits with the status
+# contained in dummy.exitcode.
+
+# Abort on any error.
+set -e
+
+if [ $# -gt 0 ]; then
+  while [ $# -gt 1 ]; do
+printf '%q ' "$1"
+shift
+  done
+  printf '%q\n' "$1"
+fi > dummy.args
+cat > dummy.in
+cat dummy.out
+cat dummy.err 1>&2
+
+read EXITCODE < dummy.exitcode
+
+exit $EXITCODE
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 8c0cead..dce1ced 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -15,6 +15,113 @@
 AT_CLEANUP()
 ])
 
+# _AT_TOOLLABS_JSUB(ARGS,
+#   OUTPUT,
+#   ERROR,
+#   STATUS,
+#   EXPARGS,
+#   EXPINPUT,
+#   EXPOUTPUT,
+#   EXPERROR,
+#   EXPSTATUS)
+# --
+# Check if jsub called with ARGS calls a qsub mock-up with EXPARGS and
+# EXPINPUT and upon receiving OUTPUT, ERROR and STATUS from a spawned
+# qsub mock-up produces EXPOUTPUT, EXPERROR and EXPSTATUS
+# respectively.
+m4_define([_AT_TOOLLABS_JSUB],
+[AT_DATA([dummy.out], [$2])
+AT_DATA([dummy.err], [$3])
+AT_DATA([dummy.exitcode], [$4
+])
+AT_CHECK([JOBUTILS_QSUB=dummy.sh jsub $1], [$9], [$7], [$8])
+AT_CHECK_UNQUOTED([cat dummy.args], [0], [$5], [])
+AT_CHECK([cat dummy.in], [0], [$6], [])
+])
+
+# AT_TOOLLABS_JSUB(TEST-GROUP-NAME,
+#  ARGS,
+#  OUTPUT,
+#  ERROR,
+#  STATUS,
+#  EXPARGS,
+#  EXPINPUT,
+#  EXPOUTPUT,
+#  EXPERROR,
+#  EXPSTATUS)
+# -
+# Test if jsub called with ARGS calls a qsub mock-up with EXPARGS and
+# EXPINPUT and upon receiving OUTPUT, ERROR and STATUS from a spawned
+# qsub mock-up produces EXPOUTPUT, EXPERROR and EXPSTATUS
+# respectively.  Use TEST-GROUP-NAME for identification.
+m4_define([AT_TOOLLABS_JSUB],
+[AT_SETUP([$1])
+_AT_TOOLLABS_JSUB([$2], [$3], [$4], [$5], [$6], [$7], [$8], [$9], [$10])
+AT_CLEANUP()
+])
+
 # Test that Perl scripts do not have compilation errors.
 AT_TOOLLABS_PERL_COMPILE([jobutils/bin/job])
 AT_TOOLLABS_PERL_COMPILE([jobutils/bin/jsub])
+
+# Test jsub.
+
+# We use mainly true for tests, as jsub determines the path to the
+# script internally and we can predict with a great certainty that
+# true will be in /bin/true.
+
+# These tests will create two files (true.err and true.out) in the
+# home directory of the calling user.
+AT_TOOLLABS_JSUB([Normal call], [true], [Your job 501377 ("true") has been 
submitted
+], [], [0], [-e $HOME/true.err -o $HOME/true.out -N true -hard -l 
h_vmem=262144k -q task -b y /bin/true
+], [], [Your job 501377 ("true") has been submitted
+], [], [0])
+AT_TOOLLABS_JSUB([Quiet call], [-quiet true], [Your job 501377 ("true") has 
been submitted
+], [], [0], [-e $HOME/true.err -o $HOME/true.out -N true -hard -l 
h_vmem=262144k -q task -b y /bin/true
+], [], [], [], [0])
+
+# Test that umasks are handled properly.
+AT_SETUP([-o points to a non-existing file])
+_AT_TOOLLABS_JSUB

[MediaWiki-commits] [Gerrit] Add mariadb-client to toollabs's exec_environ - change (operations/puppet)

2013-07-02 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/71636


Change subject: Add mariadb-client to toollabs's exec_environ
..

Add mariadb-client to toollabs's exec_environ

Change-Id: If1d49c18e48e8348cc6a091df101d7a27daa528f
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/71636/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 07619c7..ffd6e37 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -20,6 +20,7 @@
   include identd
 
   package { [
+  'mariadb-client',  # For /usr/bin/mysql.
   'mdbtools',# Bug #48805.
   'python-genshi',   # Bug #48863.
   'python-genshi-doc',   # Bug #48863.

-- 
To view, visit https://gerrit.wikimedia.org/r/71636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1d49c18e48e8348cc6a091df101d7a27daa528f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add packages for Checkwiki to toollabs's exec_environ - change (operations/puppet)

2013-07-02 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/71657


Change subject: Add packages for Checkwiki to toollabs's exec_environ
..

Add packages for Checkwiki to toollabs's exec_environ

Change-Id: I7bcd837e5e28f94258504d3489a3b9fa631afb3a
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/71657/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index ffd6e37..ae18246 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -20,6 +20,9 @@
   include identd
 
   package { [
+  'libdata-compare-perl',# For Checkwiki.
+  'libtest-exception-perl',  # For Checkwiki.
+  'libxml-xpathengine-perl', # For Checkwiki.
   'mariadb-client',  # For /usr/bin/mysql.
   'mdbtools',# Bug #48805.
   'python-genshi',   # Bug #48863.

-- 
To view, visit https://gerrit.wikimedia.org/r/71657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bcd837e5e28f94258504d3489a3b9fa631afb3a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add option -quiet to jsub. - change (labs/toollabs)

2013-05-26 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/65642


Change subject: Add option -quiet to jsub.
..

Add option -quiet to jsub.

The option -quiet suppresses any output if the job submission was
successful.

Change-Id: Ia1a9250a378c5c63b0f7208360d3c5b52f44e2b3
---
M packages/jobutils/usr/local/bin/jsub
1 file changed, 26 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/42/65642/1

diff --git a/packages/jobutils/usr/local/bin/jsub 
b/packages/jobutils/usr/local/bin/jsub
index 08f2cb8..879b6f8 100755
--- a/packages/jobutils/usr/local/bin/jsub
+++ b/packages/jobutils/usr/local/bin/jsub
@@ -1,12 +1,13 @@
 #! /usr/bin/perl
 
+use IPC::Run qw(harness run);
 use String::ShellQuote;
 
 my %qsubargs = (
'-a' => 1, '-b' => 1, '-cwd' => 0, '-e' => 1, '-hard' => 0, '-i' => 1, 
'-j' => 1,
'-l' => 1, '-now' => 1, '-N' => 1, '-o' => 1, '-p' => 1, '-q' => 1, 
'-soft' => 0,
'-sync' => 1, '-v' => 1, '-wd' => 1,
-   '-mem' => 1, '-once' => 0, '-stderr' => 0, '-continuous' => 0,
+   '-mem' => 1, '-once' => 0, '-stderr' => 0, '-continuous' => 0, '-quiet' 
=> 0,
 );
 my %qsargs;
 my @args;
@@ -14,6 +15,7 @@
 my $once = 0;
 my $stderr = 0;
 my $continuous = 0;
+my $quiet = 0;
 my $script = $0;
 my $queue = 'task';
 $script = $1 if $script =~ m{/([^/]+)$};
@@ -47,6 +49,7 @@
another is already started or queued.
  -continuous   Start a self-restarting job on the continuous
queue (default if invoked as 'jstart')
+ -quietIf successful, don't output anything
 
 Unlike qsub, if you do not specify output and error files, output is appended
 by default to files named .err and .out in your home directory
@@ -109,6 +112,8 @@
   } elsif($opt eq '-continuous') {
 $continuous = 1;
 $once = 1;
+  } elsif($opt eq '-quiet') {
+$quiet = 1;
   } else {
 if($opt eq '-l') {
   $memory = $1  if $optval =~ s/h_vmem=([0-9]+[mMgGkK]),?//;
@@ -149,19 +154,30 @@
 push @args, '-o', $out unless defined $qsargs{'-o'};
 push @args, '-N', $jobname, '-hard', '-l', "h_vmem=$memory";
 
+my ($qsubinput, $qsuboutput, $qsuberror);
+
 if($continuous) {
   push @args, '-q', 'continuous';
-  push @args, '-b', $sqargs{'-b'}  if defined $qsargs{'-b'};
-  open QSUB, '|-', '/usr/bin/qsub', @args or die "\[$now\] unable to start 
qsub: $!\n";
-  print QSUB "#!/bin/bash\n";
-  print QSUB "while ! " . shell_quote($prog, @ARGV) . "; do\n";
-  print QSUB "  sleep 5\n";
-  print QSUB "done\n";
-  close QSUB;
+  push @args, '-b', $sqargs{'-b'} if defined $qsargs{'-b'};
+  $qsubinput = "#!/bin/bash\n"   .
+   "while ! " . shell_quote($prog, @ARGV) . "; do\n" .
+   "  sleep 5\n" .
+   "done\n";
 } else {
+  $qsubinput = '';
   $queue = $qsargs{'-q'} if defined $qsargs{'-q'};
   push @args, '-q', $queue, '-b', 'y', $prog, @ARGV;
-  exec '/usr/bin/qsub', @args;
-  die "\[$now\] qsub failed: $!\n";
 }
 
+my $h = harness(['/usr/bin/qsub', @args], \$qsubinput, \$qsuboutput, 
\$qsuberror);
+if (!run ($h)) {
+print STDOUT $qsuboutput;
+print STDERR $qsuberror;
+exit ($h->result ());
+}
+
+# Suppress output if the user requested so.
+if (!$quiet) {
+print STDOUT $qsuboutput;
+print STDERR $qsuberror;
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/65642
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1a9250a378c5c63b0f7208360d3c5b52f44e2b3
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix typo and enable warnings. - change (labs/toollabs)

2013-05-26 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/65643


Change subject: Fix typo and enable warnings.
..

Fix typo and enable warnings.

Change-Id: Ied7d1daf101313f2ef4cae90a725d37a8a79e676
---
M packages/jobutils/usr/local/bin/jsub
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/43/65643/1

diff --git a/packages/jobutils/usr/local/bin/jsub 
b/packages/jobutils/usr/local/bin/jsub
index 08f2cb8..1ab3132 100755
--- a/packages/jobutils/usr/local/bin/jsub
+++ b/packages/jobutils/usr/local/bin/jsub
@@ -1,4 +1,7 @@
-#! /usr/bin/perl
+#!/usr/bin/perl -w
+
+use strict;
+use warnings;
 
 use String::ShellQuote;
 
@@ -151,7 +154,7 @@
 
 if($continuous) {
   push @args, '-q', 'continuous';
-  push @args, '-b', $sqargs{'-b'}  if defined $qsargs{'-b'};
+  push @args, '-b', $qsargs{'-b'}  if defined $qsargs{'-b'};
   open QSUB, '|-', '/usr/bin/qsub', @args or die "\[$now\] unable to start 
qsub: $!\n";
   print QSUB "#!/bin/bash\n";
   print QSUB "while ! " . shell_quote($prog, @ARGV) . "; do\n";

-- 
To view, visit https://gerrit.wikimedia.org/r/65643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied7d1daf101313f2ef4cae90a725d37a8a79e676
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tool Labs: Add more user requested packages to exec_environ. - change (operations/puppet)

2013-05-27 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/65705


Change subject: Tool Labs: Add more user requested packages to exec_environ.
..

Tool Labs: Add more user requested packages to exec_environ.

Bug: 48805
Bug: 48862
Bug: 48863
Change-Id: I10a5e31bb287077356931f12ab11bc59c31671cb
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/65705/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index b0de2a9..b6fa329 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -19,6 +19,10 @@
   include generic::locales::international
 
   package { [
+  'mdbtools',# Bug #48805.
+  'python-genshi',   # Bug #48863.
+  'python-genshi-doc',   # Bug #48863.
+  'tree',# Bug #48862.
   'nodejs',
   'php5-curl',
   'mono-runtime',

-- 
To view, visit https://gerrit.wikimedia.org/r/65705
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10a5e31bb287077356931f12ab11bc59c31671cb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix jstart to start only one job instance. - change (labs/toollabs)

2013-05-27 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/65707


Change subject: Fix jstart to start only one job instance.
..

Fix jstart to start only one job instance.

https://wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Help#Continuous_jobs_.28such_as_bots.29
promises that "jstart script" "is equivalent to jsub -once -continuous
script".

Bug: 48816
Change-Id: Ie3a70c7418d5ea2897a4b331c50f6adf0fb7f816
---
M packages/jobutils/usr/local/bin/jsub
M packages/jobutils/usr/share/man/man1/jstart.1
M packages/jobutils/usr/share/man/man1/jsub.1
3 files changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/07/65707/1

diff --git a/packages/jobutils/usr/local/bin/jsub 
b/packages/jobutils/usr/local/bin/jsub
index 08f2cb8..616de2a 100755
--- a/packages/jobutils/usr/local/bin/jsub
+++ b/packages/jobutils/usr/local/bin/jsub
@@ -18,7 +18,7 @@
 my $queue = 'task';
 $script = $1 if $script =~ m{/([^/]+)$};
 
-$continuous = 1 if $script eq 'jstart';
+$continuous = $once = 1 if ($script eq 'jstart');
 
 my @options;
 while($#ARGV > 0) {
@@ -44,7 +44,8 @@
  -mem   Request  amount of memory for the job.
(number prefixed by 'k', 'm' or 'g')
  -once Only start one job with that name, fail if
-   another is already started or queued.
+   another is already started or queued (default
+   if invoked as 'jstart').
  -continuous   Start a self-restarting job on the continuous
queue (default if invoked as 'jstart')
 
diff --git a/packages/jobutils/usr/share/man/man1/jstart.1 
b/packages/jobutils/usr/share/man/man1/jstart.1
index 33cd924..2d02a2e 100644
--- a/packages/jobutils/usr/share/man/man1/jstart.1
+++ b/packages/jobutils/usr/share/man/man1/jstart.1
@@ -12,7 +12,8 @@
  \-mem   Request  amount of memory for the job.
(number prefixed by 'k', 'm' or 'g')
  \-once Only start one job with that name, fail if
-   another is already started or queued.
+   another is already started or queued (default if
+   invoked as 'jstart').
  \-continuous   Start a self-restarting job on the continuous
queue (default if invoked as 'jstart')
 
diff --git a/packages/jobutils/usr/share/man/man1/jsub.1 
b/packages/jobutils/usr/share/man/man1/jsub.1
index a3ae4d9..4bebf2b 100644
--- a/packages/jobutils/usr/share/man/man1/jsub.1
+++ b/packages/jobutils/usr/share/man/man1/jsub.1
@@ -12,7 +12,8 @@
  \-mem   Request  amount of memory for the job.
(number prefixed by 'k', 'm' or 'g')
  \-once Only start one job with that name, fail if
-   another is already started or queued.
+   another is already started or queued (default if
+   invoked as 'jstart').
  \-continuous   Start a self-restarting job on the continuous
queue (default if invoked as 'jstart')
 

-- 
To view, visit https://gerrit.wikimedia.org/r/65707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3a70c7418d5ea2897a4b331c50f6adf0fb7f816
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix typo in jsub. - change (labs/toollabs)

2013-06-06 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/67288


Change subject: Fix typo in jsub.
..

Fix typo in jsub.

Change-Id: Ife1d5e67076327826eaaf3ea8c37b21a6ff26dcc
---
M packages/jobutils/usr/local/bin/jsub
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/88/67288/1

diff --git a/packages/jobutils/usr/local/bin/jsub 
b/packages/jobutils/usr/local/bin/jsub
index f689052..f1e62c3 100755
--- a/packages/jobutils/usr/local/bin/jsub
+++ b/packages/jobutils/usr/local/bin/jsub
@@ -183,7 +183,7 @@
 
 if($continuous) {
   push @args, '-q', 'continuous';
-  push @args, '-b', $sqargs{'-b'} if defined $qsargs{'-b'};
+  push @args, '-b', $qsargs{'-b'} if defined $qsargs{'-b'};
   $qsubinput = "#!/bin/bash\n"   .
"while ! " . shell_quote($prog, @ARGV) . "; do\n" .
"  sleep 5\n" .

-- 
To view, visit https://gerrit.wikimedia.org/r/67288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife1d5e67076327826eaaf3ea8c37b21a6ff26dcc
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix warnings. - change (labs/toollabs)

2013-06-09 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/67643


Change subject: Fix warnings.
..

Fix warnings.

Change-Id: I8f82e1161c9a84e5935a934d8dc3d4e6b64963f4
---
M packages/jobutils/usr/local/bin/jsub
1 file changed, 17 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/43/67643/1

diff --git a/packages/jobutils/usr/local/bin/jsub 
b/packages/jobutils/usr/local/bin/jsub
index f1e62c3..78f34fd 100755
--- a/packages/jobutils/usr/local/bin/jsub
+++ b/packages/jobutils/usr/local/bin/jsub
@@ -6,20 +6,6 @@
 use IPC::Run qw(harness run);
 use String::ShellQuote;
 
-sub memparse_kb {
-  # parses an XXK, XXm, XXg to the # of kilobytes
-  $arg = $_[0];
-  if ($arg =~ m/^([1-9][0-9]*)([mgk])$/i) {
-$amount = $1;
-$unit = $2;
-if($unit =~ m/[mg]/i) {$amount *= 1024};
-if($unit =~ m/[g]/i) {$amount *= 1024};
-  } else {
-die "$script: memory value must be an integer followed by 'k', 'm' or 'g': 
$_[0]\n";
-  }
-  return $amount;
-}
-
 my %qsubargs = (
'-a' => 1, '-b' => 1, '-cwd' => 0, '-e' => 1, '-hard' => 0, '-i' => 1, 
'-j' => 1,
'-l' => 1, '-now' => 1, '-N' => 1, '-o' => 1, '-p' => 1, '-q' => 1, 
'-soft' => 0,
@@ -36,6 +22,21 @@
 my $script = $0;
 my $queue = 'task';
 $script = $1 if $script =~ m{/([^/]+)$};
+
+sub memparse_kb {
+  # parses an XXK, XXm, XXg to the # of kilobytes
+  my $arg = $_[0];
+  if ($arg !~ m/^([1-9][0-9]*)([mgk])$/i) {
+die "$script: memory value must be an integer followed by 'k', 'm' or 'g': 
$_[0]\n";
+  }
+
+  my $amount = $1;
+  my $unit = $2;
+  if($unit =~ m/[mg]/i) {$amount *= 1024};
+  if($unit =~ m/[g]/i) {$amount *= 1024};
+
+  return $amount;
+}
 
 $continuous = $once = 1 if ($script eq 'jstart');
 $once = 1 if $script eq 'qcronsub';
@@ -135,9 +136,9 @@
 if($opt eq '-l') {
   $memory = memparse_kb($1) if $optval =~ s/h_vmem=([0-9]+[mMgGkK]),?//;
   if ($optval =~ s/virtual_free=([0-9]+[mMgGkK]),?//) {
-$vfmem = memparse_kb($1);
+my $vfmem = memparse_kb($1);
 if ($vfmem > $memory) {
-$new_mem = $vfmem * 1.1;
+my $new_mem = $vfmem * 1.1;
 print "WARNING: virtual_free=${vfmem}k is larger than 
h_vmem=${memory}k. Setting h_vmem=${new_mem}k\n";
 $memory = $new_mem;
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/67643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f82e1161c9a84e5935a934d8dc3d4e6b64963f4
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Make job output files private by default. - change (labs/toollabs)

2013-06-09 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/67644


Change subject: Make job output files private by default.
..

Make job output files private by default.

Job output files are created by SGE with permissions 644 by default.
There has been concern that these files may contain passwords in stack
traces.

With this change, if job output files do not exist, they are
pre-created with permissions 600 for user accounts and 660 for tool
accounts.  SGE will just append to these files and not change the
permissions.

To fine-tune, users may supply the option "-umask UMASK" which will
override the default umask.  UMASK is interpreted as octal,
i. e. "-umask 022" does what one would expect.

This fixes bug #48818.

Bug: 48818
Change-Id: I94a2bd4af699d2d0c19cc429a56b932381510cf9
---
M packages/jobutils/usr/local/bin/jsub
M packages/jobutils/usr/share/man/man1/jstart.1
M packages/jobutils/usr/share/man/man1/jsub.1
3 files changed, 35 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/44/67644/1

diff --git a/packages/jobutils/usr/local/bin/jsub 
b/packages/jobutils/usr/local/bin/jsub
index 78f34fd..d10b896 100755
--- a/packages/jobutils/usr/local/bin/jsub
+++ b/packages/jobutils/usr/local/bin/jsub
@@ -11,6 +11,7 @@
'-l' => 1, '-now' => 1, '-N' => 1, '-o' => 1, '-p' => 1, '-q' => 1, 
'-soft' => 0,
'-sync' => 1, '-v' => 1, '-wd' => 1,
'-mem' => 1, '-once' => 0, '-stderr' => 0, '-continuous' => 0, '-quiet' 
=> 0,
+   '-umask' => 1,
 );
 my %qsargs;
 my @args;
@@ -37,6 +38,10 @@
 
   return $amount;
 }
+
+# Set default umask for output files depending on whether we're called
+# by a user or a tool.
+my $umask = $> >= 5 ? 0007 : 0077;
 
 $continuous = $once = 1 if ($script eq 'jstart');
 $once = 1 if $script eq 'qcronsub';
@@ -69,6 +74,7 @@
if invoked as 'jstart' or 'qcronsub').
  -continuous   Start a self-restarting job on the continuous
queue (default if invoked as 'jstart')
+ -umask Set umask for output files if they don't exist
  -quietIf successful, don't output anything
 
 Unlike qsub, if you do not specify output and error files, output is appended
@@ -130,6 +136,10 @@
   } elsif($opt eq '-continuous') {
 $continuous = 1;
 $once = 1;
+  } elsif($opt eq '-umask') {
+die ("$script: umask must be an octal value: $optval\n")
+  unless ($optval =~ /^[0-7]+$/);
+$umask = oct ($optval);
   } elsif($opt eq '-quiet') {
 $quiet = 1;
   } else {
@@ -163,7 +173,29 @@
 $out = $qsargs{'-o'} if defined $qsargs{'-o'};
 $err = $out if defined $qsargs{'-j'} and $qsargs{'-j'} =~ m/^[yY]/;
 
-open STDERR, ">>$err" unless $stderr;
+# For STDOUT and STDERR we do the same dance:
+# - If the output file exists, we do nothing (the output file being a
+#   directory is a subset of this).
+# - Otherwise, we touch the output file once with the set umask or --
+#   for the error output file and if -stderr was not given -- redirect
+#   STDERR to the file with the set umask.
+my $oldumask = umask ($umask);
+if (!-e $out) {
+  open (my $tempfh, '>>', $out) or
+die ("Couldn't touch '$out': $!");
+  close ($tempfh);
+}
+if (!-d $err) {
+  if ($stderr) {
+open (my $tempfh, '>>', $err) or
+  die ("Couldn't touch '$err': $!");
+close ($tempfh);
+  } else {
+open (STDERR, '>>', $err) or
+  die ("Couldn't redirect STDERR to '$err': $!");
+  }
+}
+umask ($oldumask);
 
 my $now = localtime;
 
diff --git a/packages/jobutils/usr/share/man/man1/jstart.1 
b/packages/jobutils/usr/share/man/man1/jstart.1
index 25fb4f6..8fb4d2a 100644
--- a/packages/jobutils/usr/share/man/man1/jstart.1
+++ b/packages/jobutils/usr/share/man/man1/jstart.1
@@ -16,6 +16,7 @@
invoked as 'jstart').
  \-continuous   Start a self-restarting job on the continuous
queue (default if invoked as 'jstart')
+ \-umask Set umask for output files if they don't exist
  \-quietSuppress output if job could be submitted.
 
 Unlike qsub, if you do not specify output and error files, output is appended
diff --git a/packages/jobutils/usr/share/man/man1/jsub.1 
b/packages/jobutils/usr/share/man/man1/jsub.1
index 0c747e4..03e5215 100644
--- a/packages/jobutils/usr/share/man/man1/jsub.1
+++ b/packages/jobutils/usr/share/man/man1/jsub.1
@@ -16,6 +16,7 @@
invoked as 'jstart').
  \-continuous   Start a self-restarting job on the continuous
queue (default if invoked as 'jstart')
+ \-umask Set umask for output files if they don't exist
  \-quietSuppress output if job could be submitted.
 
 Unlike qsub, if you do not specify output and error files, output is appended

-- 
To view, visit https://gerrit.wikimedia.org/r/67644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-Mes

[MediaWiki-commits] [Gerrit] Fix Puppet path to gridengine file. - change (operations/puppet)

2013-06-10 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/67899


Change subject: Fix Puppet path to gridengine file.
..

Fix Puppet path to gridengine file.

Change-Id: Ib3fcb38f2af5fd8cd48b36c34d710eb696ddfde8
---
M modules/gridengine/manifests/master.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/67899/1

diff --git a/modules/gridengine/manifests/master.pp 
b/modules/gridengine/manifests/master.pp
index e31e491..462dd96 100644
--- a/modules/gridengine/manifests/master.pp
+++ b/modules/gridengine/manifests/master.pp
@@ -12,7 +12,7 @@
   class monitoring {
file { "/usr/local/sbin/grid-ganglia-report":
  mode => 0555,
- source => "puppet:///files/gridengine/grid-ganglia-report",
+ source => "puppet:///modules/gridengine/grid-ganglia-report",
  ensure => present;
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/67899
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3fcb38f2af5fd8cd48b36c34d710eb696ddfde8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Add python-beautifulsoup to exec_environ. - change (operations/puppet)

2013-08-19 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/79921


Change subject: Tools: Add python-beautifulsoup to exec_environ.
..

Tools: Add python-beautifulsoup to exec_environ.

Change-Id: Iace9084770311f408c531ee1e2ca2b057f1ea81e
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/79921/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index eab5f06..66234be 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -80,6 +80,7 @@
 
   # Python libraries
   'python-apport',
+  'python-beautifulsoup',# For valhallasw.
   'python-celery',
   'python-celery-with-redis',
   'python-egenix-mxdatetime',

-- 
To view, visit https://gerrit.wikimedia.org/r/79921
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iace9084770311f408c531ee1e2ca2b057f1ea81e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Add python-oursql to exec_environ - change (operations/puppet)

2013-08-21 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/80327


Change subject: Tools: Add python-oursql to exec_environ
..

Tools: Add python-oursql to exec_environ

Change-Id: I1e3e3b0671a5fe874cc07e7b77dcef31a72fa118
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/80327/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 52fbb55..77e4a7c 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -104,6 +104,7 @@
   'python-mysqldb',
   'python-newt',
   'python-nose',
+  'python-oursql',   # For danilo et al.
   'python-problem-report',
   'python-redis',
   'python-requests',

-- 
To view, visit https://gerrit.wikimedia.org/r/80327
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e3e3b0671a5fe874cc07e7b77dcef31a72fa118
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] WIP: Tools: Add infrastructure for AWStats - change (operations/puppet)

2013-08-21 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/80332


Change subject: WIP: Tools: Add infrastructure for AWStats
..

WIP: Tools: Add infrastructure for AWStats

WORK IN PROGRESS, DO NOT COMMIT

This change is part of an effort to simplify and standardize the web
server log creation and distribution.

Previously, access logs were collected in a distributed manner on all
webservers and saved on an NFS share.  Instead this change siphons the
data centrally from the web proxy.

A significant problem for the processing of the log data by AWStats is
the daily log rotation.  Synchronizing this process between different
hosts, perhaps even a grid job, is nontrivial.  Instead, we run the
AWStats update process on the web proxy, hourly per cron and on demand
from logrotate.  The memory and CPU footprint of the AWStats update
process is small enough that there is no concern that this could
impede the proxy's performance so it does not warrant replacing the
direct execution of the AWStats update process with for example a
spool system.

To redact the log, we use a sed command instead of logsplitter so that
we do not have to worry about managing the latter's compilation and
deployment.

Another challenge is redundancy of data.  While we could save the
redacted version of the log to disk, it is not necessary from a time
or load viewpoint compared to dynamic redaction.  Also, as this would
likely mean that the redacted log would be in the realm of the awstats
tool but writable by root as the web server process, we would have to
be very careful to not open up security holes.  Instead we rely on
dynamic redaction and sudo for privileges.

Change-Id: Ic7c542214c754e0e790308b1fae1aeba1cc2890a
---
A modules/toollabs/files/awstats/awstats-filter.sh
A modules/toollabs/files/awstats/logrotate
A modules/toollabs/files/awstats/sudoers
M modules/toollabs/manifests/webproxy.pp
4 files changed, 56 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/80332/1

diff --git a/modules/toollabs/files/awstats/awstats-filter.sh 
b/modules/toollabs/files/awstats/awstats-filter.sh
new file mode 100644
index 000..38db36a
--- /dev/null
+++ b/modules/toollabs/files/awstats/awstats-filter.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# This file is managed by Puppet.
+
+exec sed -ne 's/^[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+ - - \(\[[^]]\+\]\) 
"\(GET\) \/\([^\/]\+\)\/.* \(HTTP\/1.1\)" \([0-9]\{3\}\) \([0-9]\+\) 
.*$/127.0.0.1 - - \1 "\2 \/\3 \4" \5 \6/p;' /var/log/apache2/access.log
diff --git a/modules/toollabs/files/awstats/logrotate 
b/modules/toollabs/files/awstats/logrotate
new file mode 100644
index 000..f968d18
--- /dev/null
+++ b/modules/toollabs/files/awstats/logrotate
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# This file is managed by Puppet.
+
+exec /usr/bin/sudo -niu local-awstats /data/project/awstats/refresh-awstats.sh
diff --git a/modules/toollabs/files/awstats/sudoers 
b/modules/toollabs/files/awstats/sudoers
new file mode 100644
index 000..20f2bb0
--- /dev/null
+++ b/modules/toollabs/files/awstats/sudoers
@@ -0,0 +1,5 @@
+# sudo policy for AWStats.
+
+# This file is managed by Puppet.
+
+local-awstats tools-webproxy = NOPASSWD: /usr/local/sbin/awstats-filter.sh
diff --git a/modules/toollabs/manifests/webproxy.pp 
b/modules/toollabs/manifests/webproxy.pp
index eb044f6..4dc08f8 100644
--- a/modules/toollabs/manifests/webproxy.pp
+++ b/modules/toollabs/manifests/webproxy.pp
@@ -14,5 +14,45 @@
   include toollabs::infrastructure
 
   #TODO: apache config
-}
 
+  # AWStats infrastructure.
+  file { "/usr/local/sbin/awstats-filter.sh":
+ensure => file,
+mode => "0755",
+owner => "root",
+group => "root",
+source => "puppet:///modules/toollabs/awstats/awstats-filter.sh";
+  }
+
+  file { "/etc/logrotate.d/httpd-prerotate":
+ensure => directory,
+mode => "0755",
+owner => "root",
+group => "root";
+  }
+
+  file { "/etc/logrotate.d/httpd-prerotate/awstats.sh":
+ensure => file,
+mode => "0755",
+owner => "root",
+group => "root",
+require => File["/etc/logrotate.d/httpd-prerotate"],
+source => "puppet:///modules/toollabs/awstats/logrotate";
+  }
+
+  file { "/etc/sudoers.d/awstats":
+ensure => file,
+mode => "0440",
+owner => "root",
+group => "root",
+source => "puppet:///modules/toollabs/awstats/sudoers";
+  }
+
+  cron { "awstats-update":
+ensure => present,
+minute => 14,
+hour => "*",
+user => local-awstats,
+command => "/data/project/awstats/refresh-awstats.sh";
+  }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/80332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7c542214c754e0e790308b1fae1aeba1cc2890a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

_

[MediaWiki-commits] [Gerrit] Tools: Allow bastions to access other hosts with HBA - change (operations/puppet)

2013-08-01 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/77144


Change subject: Tools: Allow bastions to access other hosts with HBA
..

Tools: Allow bastions to access other hosts with HBA

This sets HostbasedAuthentication and EnableSSHKeysign to yes in
/etc/ssh_config.

Change-Id: I42f9f55641d82beb0191924a0bc7657e4987d28e
---
A modules/toollabs/files/bastion-ssh_config
M modules/toollabs/manifests/bastion.pp
2 files changed, 65 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/77144/1

diff --git a/modules/toollabs/files/bastion-ssh_config 
b/modules/toollabs/files/bastion-ssh_config
new file mode 100644
index 000..cf234e1
--- /dev/null
+++ b/modules/toollabs/files/bastion-ssh_config
@@ -0,0 +1,57 @@
+# This file is managed by puppet!
+
+# This is the ssh client system-wide configuration file.  See
+# ssh_config(5) for more information.  This file provides defaults for
+# users, and the values can be changed in per-user configuration files
+# or on the command line.
+
+# Configuration data is parsed as follows:
+#  1. command line options
+#  2. user-specific file
+#  3. system-wide file
+# Any configuration value is only changed the first time it is set.
+# Thus, host-specific definitions should be at the beginning of the
+# configuration file, and defaults at the end.
+
+# Site-wide defaults for some commonly used options.  For a comprehensive
+# list of available options, their meanings and defaults, please see the
+# ssh_config(5) man page.
+
+Host *
+#   ForwardAgent no
+#   ForwardX11 no
+#   ForwardX11Trusted yes
+#   RhostsRSAAuthentication no
+#   RSAAuthentication yes
+#   PasswordAuthentication yes
+#   GSSAPIAuthentication no
+#   GSSAPIDelegateCredentials no
+#   GSSAPIKeyExchange no
+#   GSSAPITrustDNS no
+#   BatchMode no
+#   CheckHostIP yes
+#   AddressFamily any
+#   ConnectTimeout 0
+#   StrictHostKeyChecking ask
+#   IdentityFile ~/.ssh/identity
+#   IdentityFile ~/.ssh/id_rsa
+#   IdentityFile ~/.ssh/id_dsa
+#   Port 22
+#   Protocol 2,1
+#   Cipher 3des
+#   Ciphers 
aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
+#   MACs hmac-md5,hmac-sha1,umac...@openssh.com,hmac-ripemd160
+#   EscapeChar ~
+#   Tunnel no
+#   TunnelDevice any:any
+#   PermitLocalCommand no
+#   VisualHostKey no
+#   ProxyCommand ssh -q -W %h:%p gateway.example.com
+SendEnv LANG LC_*
+HashKnownHosts yes
+GSSAPIAuthentication yes
+GSSAPIDelegateCredentials no
+
+# Enable accessing other hosts with host-based authentication.
+HostbasedAuthentication yes
+EnableSSHKeysign yes
diff --git a/modules/toollabs/manifests/bastion.pp 
b/modules/toollabs/manifests/bastion.pp
index 2e17bb0..07daef8 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -16,6 +16,14 @@
 toollabs::exec_environ,
 toollabs::dev_environ
 
+  file { "/etc/ssh/ssh_config":
+ensure => file,
+mode => "0444",
+owner => "root",
+group => "root",
+source => "puppet:///modules/toollabs/files/bastion-ssh_config",
+  }
+
   class { 'gridengine::submit_host':
 gridmaster => $gridmaster,
   }

-- 
To view, visit https://gerrit.wikimedia.org/r/77144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42f9f55641d82beb0191924a0bc7657e4987d28e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Manage obsolete files in /usr/local/bin - change (operations/puppet)

2013-08-01 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/77234


Change subject: Tools: Manage obsolete files in /usr/local/bin
..

Tools: Manage obsolete files in /usr/local/bin

/usr/local/bin had some obsolete versions of scripts that since then
have been moved to /usr/bin.  To properly manage those, we add
symbolic links pointing to /usr/bin.  Also, the requirement of the
jobutils package is moved from toollabs::bastion and
toollabs::webserver to gridengine::submit_host.

Change-Id: I28ff4ea1806f0f58e1738cf8194f44ea49085608
---
M modules/gridengine/manifests/submit_host.pp
M modules/toollabs/manifests/bastion.pp
M modules/toollabs/manifests/webserver.pp
3 files changed, 17 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/77234/1

diff --git a/modules/gridengine/manifests/submit_host.pp 
b/modules/gridengine/manifests/submit_host.pp
index 76e2d80..68fe717 100644
--- a/modules/gridengine/manifests/submit_host.pp
+++ b/modules/gridengine/manifests/submit_host.pp
@@ -6,7 +6,7 @@
gridmaster => $gridmaster,
}
 
-package { "gridengine-client":
+package { [ "gridengine-client", "jobutils" ]:
 ensure => latest,
 }
 
@@ -17,6 +17,14 @@
   ensure => present;
 }
 
+# Temporary hack to manage obsolete files in /usr/local/bin.
+# TODO: Remove when no longer needed.
+file { [ "/usr/local/bin/job", "/usr/local/bin/jstart",
+ "/usr/local/bin/jstop", "/usr/local/bin/jsub"]:
+  ensure => link,
+  target => regsubst(name, "^/usr/local/bin/", "/usr/bin/")
+}
+
 # Not actually possible in the labs
 #  @@sshkey { $fqdn:
 #  ensure => present,
diff --git a/modules/toollabs/manifests/bastion.pp 
b/modules/toollabs/manifests/bastion.pp
index 2e17bb0..c3a037c 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -45,10 +45,17 @@
 source => "puppet:///modules/toollabs/sql",
   }
 
-  package { [ 'jobutils', 'misctools' ]:
+  package { "misctools":
 ensure => latest,
   }
 
+  # Temporary hack to manage obsolete files in /usr/local/bin.
+  # TODO: Remove when no longer needed.
+  file { "/usr/local/bin/become":
+ensure => link,
+target => "/usr/bin/become"
+  }
+
   # TODO: cron setup
 }
 
diff --git a/modules/toollabs/manifests/webserver.pp 
b/modules/toollabs/manifests/webserver.pp
index e700a27..6ff3ffa 100644
--- a/modules/toollabs/manifests/webserver.pp
+++ b/modules/toollabs/manifests/webserver.pp
@@ -25,12 +25,6 @@
 ensure => present
   }
 
-  package { [
-  'jobutils',
-  ]:
-ensure => latest
-  }
-
   file { "$store/submithost-$fqdn":
 ensure => file,
 owner => 'root',

-- 
To view, visit https://gerrit.wikimedia.org/r/77234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28ff4ea1806f0f58e1738cf8194f44ea49085608
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix syntax error - change (operations/puppet)

2013-08-02 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/77348


Change subject: Fix syntax error
..

Fix syntax error

Change-Id: Ibaf9782e3b2657d61506874b97c8ec163ca4d25e
---
M manifests/role/otrs.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/77348/1

diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index 18af9b1..bf257f6 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -17,7 +17,7 @@
 
 # enable modperl
 #apache_module { 'perl': name => 'perl',
-}
+#}
 
 file {
 '/etc/apache2/sites-available/ticket.wikimedia.org':

-- 
To view, visit https://gerrit.wikimedia.org/r/77348
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibaf9782e3b2657d61506874b97c8ec163ca4d25e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Grid Engine: Link to accounting instead of pulling it - change (operations/puppet)

2013-08-02 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/77452


Change subject: Grid Engine: Link to accounting instead of pulling it
..

Grid Engine: Link to accounting instead of pulling it

The initial thought behind pulling the accounting file to the local
machine was that in that way qacct did not need network availability
to work.  However, as when /data/project is not accessible the host is
not really usable at all, we can replace the pull with a symbolic
link.

Change-Id: Ia308ce1c140813df5bc31b71cb839184c12a53ba
---
M modules/gridengine/manifests/submit_host.pp
1 file changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/52/77452/1

diff --git a/modules/gridengine/manifests/submit_host.pp 
b/modules/gridengine/manifests/submit_host.pp
index 76e2d80..e22e028 100644
--- a/modules/gridengine/manifests/submit_host.pp
+++ b/modules/gridengine/manifests/submit_host.pp
@@ -11,10 +11,12 @@
 }
 
 cron { "pull-accounting-from-shared":
-  command => "cp -f /data/project/.system/accounting 
/var/lib/gridengine/default/common/accounting.tmp && mv -f 
/var/lib/gridengine/default/common/accounting.tmp 
/var/lib/gridengine/default/common/accounting",
-  user => root,
-  minute => [1, 6, 11, 16, 21, 26, 31, 36, 41, 46, 51, 56],
-  ensure => present;
+  ensure => absent,
+}
+
+file { "/var/lib/gridengine/default/common/accounting":
+  ensure => link,
+  target => "/data/project/.system/accounting",
 }
 
 # Not actually possible in the labs

-- 
To view, visit https://gerrit.wikimedia.org/r/77452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia308ce1c140813df5bc31b71cb839184c12a53ba
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Enable Ganglia monitoring for Redis - change (operations/puppet)

2013-08-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/77722


Change subject: Tools: Enable Ganglia monitoring for Redis
..

Tools: Enable Ganglia monitoring for Redis

Change-Id: Id9e9745e13759a46cdc8ec3feb853cda349074c6
---
M modules/toollabs/manifests/redis.pp
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/77722/1

diff --git a/modules/toollabs/manifests/redis.pp 
b/modules/toollabs/manifests/redis.pp
index 5ed66ee..9c88499 100644
--- a/modules/toollabs/manifests/redis.pp
+++ b/modules/toollabs/manifests/redis.pp
@@ -38,4 +38,7 @@
 },
 monitor => true
 }
+
+# Enable Ganglia monitoring.
+include redis::ganglia
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/77722
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9e9745e13759a46cdc8ec3feb853cda349074c6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Enable Ganglia monitoring for Exim - change (operations/puppet)

2013-08-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/77848


Change subject: Tools: Enable Ganglia monitoring for Exim
..

Tools: Enable Ganglia monitoring for Exim

Change-Id: I4146115a54f26eef75dc998bf28ed8a4b983e946
---
M modules/toollabs/manifests/mailrelay.pp
1 file changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/77848/1

diff --git a/modules/toollabs/manifests/mailrelay.pp 
b/modules/toollabs/manifests/mailrelay.pp
index 148eb96..81493e2 100644
--- a/modules/toollabs/manifests/mailrelay.pp
+++ b/modules/toollabs/manifests/mailrelay.pp
@@ -37,5 +37,21 @@
 source =>  "puppet:///modules/toollabs/exim4.default.mailrelay",
 notify => Service['exim4'],
   }
+
+  # Enable Ganglia monitoring.
+  file { '/usr/local/bin/collect_exim_stats_via_gmetric':
+owner => 'root',
+group => 'root',
+mode => 0755,
+source => 'puppet:///files/ganglia/collect_exim_stats_via_gmetric';
+  }
+
+  cron {
+'collect_exim_stats_via_gmetric':
+  user => 'root',
+  command => '/usr/local/bin/collect_exim_stats_via_gmetric',
+  require => File['/usr/local/bin/collect_exim_stats_via_gmetric'],
+  ensure => present;
+  }
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/77848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4146115a54f26eef75dc998bf28ed8a4b983e946
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] WORK IN PROGRESS: Add robots.txt - change (labs/toollabs)

2013-08-06 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/77916


Change subject: WORK IN PROGRESS: Add robots.txt
..

WORK IN PROGRESS: Add robots.txt

Change-Id: Iae5afae0985e0209677074b07f5f663efb17ffa4
---
A www/robots.txt
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/16/77916/1

diff --git a/www/robots.txt b/www/robots.txt
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/www/robots.txt

-- 
To view, visit https://gerrit.wikimedia.org/r/77916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae5afae0985e0209677074b07f5f663efb17ffa4
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Puppetize tips.sh - change (operations/puppet)

2013-08-09 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/78486


Change subject: Tools: Puppetize tips.sh
..

Tools: Puppetize tips.sh

Change-Id: Iad5685e0fe559108d36ae50d43c28fcce809eace
---
A modules/toollabs/files/tips.sh
M modules/toollabs/manifests/bastion.pp
2 files changed, 60 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/78486/1

diff --git a/modules/toollabs/files/tips.sh b/modules/toollabs/files/tips.sh
new file mode 100644
index 000..34551ca
--- /dev/null
+++ b/modules/toollabs/files/tips.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# Disable when non-interactive.
+if ! tty -s; then
+exit 0
+fi
+
+# Check if user wants to display tips.
+if [ -f ~/.suppresstips ]; then
+exit 0
+fi
+
+# Check if there is a tip DB.
+if [ ! -f /data/project/.system/tips ]; then
+exit 0
+fi
+
+# Don't display tips for root and tool accounts.
+if [ $UID -eq 0 ] || [ "${USER:0:6}" = "local-" ]; then
+exit 0
+fi
+
+# Check shell level.
+if [ "$SHLVL" -gt 1 ]; then
+exit 0
+fi
+
+# If user is sysadmin print the sysadmin motd instead.
+if groups | fgrep -qw local-admin; then
+if [ -f /etc/motd.sysadmin ]; then
+echo
+echo
+cat /etc/motd.sysadmin
+fi
+
+# We don't want to show tips to sysadmins.
+exit 0
+fi
+
+echo -e "\n\033[0;1;4mDid you know\033[0m that `shuf -n 1 
/data/project/.system/tips`\n"
diff --git a/modules/toollabs/manifests/bastion.pp 
b/modules/toollabs/manifests/bastion.pp
index 2e17bb0..ecb7b8c 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -45,6 +45,26 @@
 source => "puppet:///modules/toollabs/sql",
   }
 
+  # Display tips.
+  package { 'grep':
+ensure => present,
+  }
+
+  file { "/etc/profile.d/tips.sh":
+ensure => file,
+mode => "0755",
+owner => "root",
+group => "root",
+source => "puppet:///modules/toollabs/tips.sh",
+require => Package['grep'],
+  }
+
+  file { [ '/data/project/.system/tips.sh',
+   '/data/project/.system/bin/tips.sh',
+   '/data/project/.system/bin/tips2.sh' ]:
+ensure => absent,
+  }
+
   package { [ 'jobutils', 'misctools' ]:
 ensure => latest,
   }

-- 
To view, visit https://gerrit.wikimedia.org/r/78486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad5685e0fe559108d36ae50d43c28fcce809eace
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Test that Perl scripts are compilable before packaging. - change (labs/toollabs)

2013-06-12 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/68330


Change subject: Test that Perl scripts are compilable before packaging.
..

Test that Perl scripts are compilable before packaging.

Change-Id: I366825b809c1e228b1b39e9aac403e9202156faa
---
M debian/rules
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/30/68330/1

diff --git a/debian/rules b/debian/rules
index c30bbdb..c916ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,3 +19,8 @@
 
 %:
dh $@ 
+
+# Test that Perl scripts not have compilation errors.
+override_dh_auto_test:
+   perl -cw jobutils/bin/job
+   perl -cw jobutils/bin/jsub

-- 
To view, visit https://gerrit.wikimedia.org/r/68330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I366825b809c1e228b1b39e9aac403e9202156faa
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix variable declaration and enable warnings in job. - change (labs/toollabs)

2013-06-12 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/68331


Change subject: Fix variable declaration and enable warnings in job.
..

Fix variable declaration and enable warnings in job.

Change-Id: I5c674e2b201a140153fdb950c82f254e106407c9
---
M jobutils/bin/job
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/31/68331/1

diff --git a/jobutils/bin/job b/jobutils/bin/job
index f8e697e..083281f 100755
--- a/jobutils/bin/job
+++ b/jobutils/bin/job
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl -w
 #
 # Copyright © 2013 Marc-André Pelletier 
 # 
@@ -14,6 +14,9 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
+
+use strict;
+use warnings;
 
 my $mode;
 $mode = shift  if $#ARGV>0 and $ARGV[0] eq '-v';
@@ -38,7 +41,7 @@
 
 my $name = shift;
 
-my $jnum, $jname, $jstate, $jstart;
+my ($jnum, $jname, $jstate, $jstart);
 
 open XML, "/usr/bin/qstat -xml|" or die "qstat: $!";
 while() {

-- 
To view, visit https://gerrit.wikimedia.org/r/68331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c674e2b201a140153fdb950c82f254e106407c9
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] job: Initialize $mode. - change (labs/toollabs)

2013-06-17 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/69157


Change subject: job: Initialize $mode.
..

job: Initialize $mode.

Change-Id: I1847f4a8f140bf93cfa9a13ce7d8f001fff25d96
---
M jobutils/bin/job
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/57/69157/1

diff --git a/jobutils/bin/job b/jobutils/bin/job
index 083281f..13cf48f 100755
--- a/jobutils/bin/job
+++ b/jobutils/bin/job
@@ -1,11 +1,11 @@
 #!/usr/bin/perl -w
 #
 # 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
@@ -18,7 +18,7 @@
 use strict;
 use warnings;
 
-my $mode;
+my $mode = '';
 $mode = shift  if $#ARGV>0 and $ARGV[0] eq '-v';
 $mode = shift  if $#ARGV>0 and $ARGV[0] eq '-q';
 

-- 
To view, visit https://gerrit.wikimedia.org/r/69157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1847f4a8f140bf93cfa9a13ce7d8f001fff25d96
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix "jsub -continuous" quoting issues. - change (labs/toollabs)

2013-05-10 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/63165


Change subject: Fix "jsub -continuous" quoting issues.
..

Fix "jsub -continuous" quoting issues.

"jsub -continuous" failed if either an argument to an option
or a part of the command line to be executed contained "'"s.
This fixes bug 48334 by using 3-argument open for the former
and String::ShellQuote for the latter.

Bug:48334
Change-Id: I5198d2ee0592f8756905a18139ad2f50fa1cba84
---
M packages/jobutils/usr/local/bin/jsub
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/65/63165/1

diff --git a/packages/jobutils/usr/local/bin/jsub 
b/packages/jobutils/usr/local/bin/jsub
index 756ee1d..2d5b47d 100755
--- a/packages/jobutils/usr/local/bin/jsub
+++ b/packages/jobutils/usr/local/bin/jsub
@@ -1,5 +1,7 @@
 #! /usr/bin/perl
 
+use String::ShellQuote;
+
 my %qsubargs = (
'-a' => 1, '-b' => 1, '-cwd' => 0, '-e' => 1, '-hard' => 0, '-i' => 1, 
'-j' => 1,
'-l' => 1, '-now' => 1, '-N' => 1, '-o' => 1, '-p' => 1, '-q' => 1, 
'-soft' => 0,
@@ -111,9 +113,9 @@
 
 if($continuous) {
   push @args, '-q', 'continuous';
-  open QSUB, "|/usr/bin/qsub '".join("' '", @args)."'" or die "\[$now\] unable 
to start qsub: $!\n";
-  print QSUB "#! /bin/bash\n";
-  print QSUB "while ! '$prog' '".join("' '", @ARGV)."' ; do\n";
+  open QSUB, '|-', '/usr/bin/qsub', @args or die "\[$now\] unable to start 
qsub: $!\n";
+  print QSUB "#!/bin/bash\n";
+  print QSUB "while ! " . shell_quote($prog, @ARGV) . "; do\n";
   print QSUB "  sleep 5\n";
   print QSUB "done\n";
   close QSUB;

-- 
To view, visit https://gerrit.wikimedia.org/r/63165
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5198d2ee0592f8756905a18139ad2f50fa1cba84
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tool Labs: Add libstring-shellquote-perl to exec_environ. - change (operations/puppet)

2013-05-10 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/63211


Change subject: Tool Labs: Add libstring-shellquote-perl to exec_environ.
..

Tool Labs: Add libstring-shellquote-perl to exec_environ.

Bug: 48334
Change-Id: Ic4554b8526dbc4f29651d7f1eb4d3cb07a4505b3
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/63211/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 6bb4ef8..a93c4cd 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -54,6 +54,7 @@
   'libpcsclite1',
   'libquadmath0',
   'libstring-diff-perl',
+  'libstring-shellquote-perl',   # For jsub.
   'libsvn1',
   'mariadb-common',
   'openjdk-7-jre-headless',

-- 
To view, visit https://gerrit.wikimedia.org/r/63211
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4554b8526dbc4f29651d7f1eb4d3cb07a4505b3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Be more liberal with invocations of jsub & Co. - change (labs/toollabs)

2013-05-10 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/63212


Change subject: Be more liberal with invocations of jsub & Co.
..

Be more liberal with invocations of jsub & Co.

Currently, for example only "jstart" and
"/usr/local/bin/jstart" are recognized as invocations of
jstart.  This patch allows also "./jstart" to be recognized
as such.  This is mostly useful for testing purposes.

Change-Id: I1793d0ce8f9fa7f20279ed4f6050f3bebcf20ec1
---
M packages/jobutils/usr/local/bin/jsub
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/12/63212/1

diff --git a/packages/jobutils/usr/local/bin/jsub 
b/packages/jobutils/usr/local/bin/jsub
index 2d5b47d..ae74d9c 100755
--- a/packages/jobutils/usr/local/bin/jsub
+++ b/packages/jobutils/usr/local/bin/jsub
@@ -15,7 +15,7 @@
 my $continuous = 0;
 my $script = $0;
 my $queue = 'task';
-$script = $1 if $script =~ m{/([^/]+)$};
+$script = $1 if $script =~ m{([^/]+)$};
 
 $continuous = 1 if $script eq 'jstart';
 

-- 
To view, visit https://gerrit.wikimedia.org/r/63212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1793d0ce8f9fa7f20279ed4f6050f3bebcf20ec1
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add Ganglia statistics to grid engine. - change (operations/puppet)

2013-05-18 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/64511


Change subject: Add Ganglia statistics to grid engine.
..

Add Ganglia statistics to grid engine.

Statistics for the grid jobs in pending, running and error state are
forwarded every minute to Ganglia via gmetric under the "SGE"
grouping.

Bug: 48338
Change-Id: I48a65620d2fa5ee0fa3d147f9157af60c44c31c3
---
A modules/gridengine/files/grid-ganglia-report
M modules/gridengine/manifests/master.pp
2 files changed, 56 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/64511/1

diff --git a/modules/gridengine/files/grid-ganglia-report 
b/modules/gridengine/files/grid-ganglia-report
new file mode 100755
index 000..86b54c1
--- /dev/null
+++ b/modules/gridengine/files/grid-ganglia-report
@@ -0,0 +1,34 @@
+#!/usr/bin/perl -w
+
+use encoding 'utf8';
+use strict;
+use warnings;
+
+use XML::LibXML;
+
+# Read qstat information into XML DOM.
+open (QSTAT, '-|', '/usr/bin/qstat', '-u', '*', '-xml') or die ("Couldn't read 
qstat");
+my $DOM = XML::LibXML->load_xml (IO => *QSTAT) or die ($!);
+close (QSTAT);
+
+# Initialize counters.
+my %Counters = ('sge_pending' => 0,
+'sge_running' => 0,
+'sge_error'   => 0);
+
+# Iterate over all jobs.
+foreach my $Node ($DOM->findnodes (q!//job_list/state!)) {
+my $State = $Node->textContent ();
+if ($State =~ /^qw/) {
+$Counters {'sge_pending'}++;
+} elsif ($State =~ /[rRt]/) {
+$Counters {'sge_running'}++;
+} elsif ($State =~ /E/) {
+$Counters {'sge_error'}++;
+}
+}
+
+# Update Ganglia.
+for my $Name (keys (%Counters)) {
+system ('/usr/bin/gmetric', '--group', 'SGE', '--name', $Name, '--value', 
$Counters {$Name}, '--type', 'uint16') and die ($!);
+}
diff --git a/modules/gridengine/manifests/master.pp 
b/modules/gridengine/manifests/master.pp
index eb7cd12..e31e491 100644
--- a/modules/gridengine/manifests/master.pp
+++ b/modules/gridengine/manifests/master.pp
@@ -1,12 +1,28 @@
-# gridengine.pp
-
+# gridengine/master.pp
 
 class gridengine::master {
-   class { 'gridengine':
-   gridmaster => $fqdn,
-   }
+  class { 'gridengine':
+   gridmaster => $fqdn,
+  }
 
   package { "gridengine-master":
-ensure => latest,
+   ensure => latest,
   }
+
+  class monitoring {
+   file { "/usr/local/sbin/grid-ganglia-report":
+ mode => 0555,
+ source => "puppet:///files/gridengine/grid-ganglia-report",
+ ensure => present;
+   }
+
+   cron { "grid-ganglia-report":
+ command => "/usr/local/sbin/grid-ganglia-report",
+ user => root,
+ ensure => present,
+ require => File["/usr/local/sbin/grid-ganglia-report"];
+   }
+  }
+
+  include monitoring
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/64511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I48a65620d2fa5ee0fa3d147f9157af60c44c31c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add script sql to Tools. - change (operations/puppet)

2013-05-21 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/64847


Change subject: Add script sql to Tools.
..

Add script sql to Tools.

The script allows users to just name the database they want to connect
to without having to look up the server it is stored on.

Bug: 48627
Change-Id: Ie111a5adad4c6378ed71825394548f47d4991eaf
---
A modules/toollabs/files/sql
M modules/toollabs/manifests/exec_environ.pp
2 files changed, 46 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/64847/1

diff --git a/modules/toollabs/files/sql b/modules/toollabs/files/sql
new file mode 100755
index 000..6dde329
--- /dev/null
+++ b/modules/toollabs/files/sql
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+function check_host () {
+for HOST_I in enwiki bgwiki bgwiktionary cswiki enwikiquote \
+  enwiktionary eowiki fiwiki idwiki itwiki nlwiki \
+  nowiki plwiki ptwiki svwiki thwiki trwiki zhwiki \
+  commonswiki dewiki wikidatawiki; do
+if [ "$1" = "$HOST_I" ]; then
+return 0
+fi
+done
+
+return 1
+}
+
+# No database name or extra parameters given?
+if [ $# -eq 0 ] || [ $# -gt 2 ]; then
+echo "Usage: $0 DATABASE [COMMAND]" >&2
+exit 1
+fi
+
+# Database name doesn't end up with "_p"?
+HOST="${1%_p}"
+if [ "$1" = "$HOST" ]; then
+echo "$0: Database name '$1' doesn't end with '_p'." >&2
+exit 1
+fi
+
+# Host in list of replicated databases?
+if ! check_host "$HOST"; then
+echo "$0: Database '$1' hasn't been replicated to Tools yet." >&2
+exit 1
+fi
+
+# Call mysql.
+if [ $# -eq 1 ]; then
+exec mysql -ch "$HOST.labsdb" "$1"
+else
+exec mysql -ch "$HOST.labsdb" "$1" -e "$2"
+fi
diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 75461dd..f2732cf 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -94,6 +94,12 @@
   sysctl { "vm.overcommit_memory": value => 2 }
   sysctl { "vm.overcommit_ratio": value => 95 }
 
+  file { "/usr/local/bin/sql":
+ensure => file,
+mode => "0555",
+source => "puppet:///files/toollabs/sql";
+  }
+
   # TODO: quotas
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/64847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie111a5adad4c6378ed71825394548f47d4991eaf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix jsub's dependence on $HOME's existence. - change (labs/toollabs)

2013-05-22 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/65007


Change subject: Fix jsub's dependence on $HOME's existence.
..

Fix jsub's dependence on $HOME's existence.

$HOME isn't set for CGIs so jsub's output files defaulted to the root
directory and thus caused the jobs to fail.  This fixes only bug
#48726; for submitting jobs from CGIs bug #48722 needs to be addressed
as well.

Bug: 48726
Change-Id: I7d03609b0c901527c0dcd492ba99af64e517a13e
---
M packages/jobutils/usr/local/bin/jsub
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/07/65007/1

diff --git a/packages/jobutils/usr/local/bin/jsub 
b/packages/jobutils/usr/local/bin/jsub
index 08f2cb8..bf37f21 100755
--- a/packages/jobutils/usr/local/bin/jsub
+++ b/packages/jobutils/usr/local/bin/jsub
@@ -125,8 +125,8 @@
 $jobname = $1 if $prog =~ m{([^/.]+)(\.[^/]*)?$};
 $jobname = $qsargs{'-N'} if defined $qsargs{'-N'};
 
-my $err = "$ENV{'HOME'}/$jobname.err";
-my $out = "$ENV{'HOME'}/$jobname.out";
+my $err = (getpwuid ($<)) [7] . '/' . $jobname . '.err';
+my $out = (getpwuid ($<)) [7] . '/' . $jobname . '.out';
 
 $err = $qsargs{'-e'} if defined $qsargs{'-e'};
 $out = $qsargs{'-o'} if defined $qsargs{'-o'};

-- 
To view, visit https://gerrit.wikimedia.org/r/65007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d03609b0c901527c0dcd492ba99af64e517a13e
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove debug output. - change (labs/toollabs)

2013-05-24 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/65322


Change subject: Remove debug output.
..

Remove debug output.

Change-Id: Ibf4aa8e98ebeb1cc3721a8f3505ed57918d5613c
---
M packages/jobutils/usr/local/bin/jsub
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/22/65322/1

diff --git a/packages/jobutils/usr/local/bin/jsub 
b/packages/jobutils/usr/local/bin/jsub
index 08f2cb8..45519ea 100755
--- a/packages/jobutils/usr/local/bin/jsub
+++ b/packages/jobutils/usr/local/bin/jsub
@@ -77,7 +77,6 @@
   $prog .= "/$symlink";
 }
 
-print "prog?: $prog\n";
 unless($prog =~ m{^/}) {
   my $cwd = `pwd`;
   chomp $cwd;

-- 
To view, visit https://gerrit.wikimedia.org/r/65322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf4aa8e98ebeb1cc3721a8f3505ed57918d5613c
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] planet: Remove obsolete comment. - change (operations/puppet[production])

2013-02-04 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

Change subject: planet: Remove obsolete comment.
..

planet: Remove obsolete comment.

Configurations now depend on the keys of the $planet_languages hash.

Change-Id: I8ca2d3a7cedc211c3f476255ebb01efc21400cd9
---
M manifests/role/planet.pp
1 file changed, 3 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/47518/1
--
To view, visit https://gerrit.wikimedia.org/r/47518
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ca2d3a7cedc211c3f476255ebb01efc21400cd9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ldaplist: Switch to new servicegroups structure - change (operations/puppet)

2014-03-06 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/117313

Change subject: ldaplist: Switch to new servicegroups structure
..

ldaplist: Switch to new servicegroups structure

This change amends "ldaplist -l servicegroups" to show the "new"
servicegroups structure ("${PROJECT}.${SERVICEGROUP}").  The old list
("local-${SERVICEGROUP}") is still available by "ldaplist -l
servicegroups.old".

Change-Id: I810f19299ed05d1e2062b7cad6e8b8696205fa47
---
M modules/ldap/files/scripts/ldaplist
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/13/117313/1

diff --git a/modules/ldap/files/scripts/ldaplist 
b/modules/ldap/files/scripts/ldaplist
index b80683a..42d7bb6 100755
--- a/modules/ldap/files/scripts/ldaplist
+++ b/modules/ldap/files/scripts/ldaplist
@@ -48,7 +48,8 @@
  "automount": base,
  "auto_*": "nisMapName=auto_AUTO," + base,
  "uids": "ou=uids," + base,
- "servicegroups": "ou=projects," + base}
+ "servicegroups.old": "ou=projects," + base,
+ "servicegroups": "ou=servicegroups," + base}
 objectdefaulttypes = {"base": "none",
   "passwd": "uid",
   "group": "cn",
@@ -57,6 +58,7 @@
   "automount": "nisMapName",
   "auto_*": "cn",
   "uids": "cn",
+  "servicegroups.old": "cn",
   "servicegroups": "cn"}
 objectobjectclasses = {"base": "none",
"passwd": "posixaccount",
@@ -66,6 +68,7 @@
"automount": "nisMap",
"auto_*": "nisObject",
"uids": "inetOrgPerson",
+   "servicegroups.old": "posixgroup",
"servicegroups": "posixgroup"}
 
 if options.showdatabase:

-- 
To view, visit https://gerrit.wikimedia.org/r/117313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I810f19299ed05d1e2062b7cad6e8b8696205fa47
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ldaplist: Fix typo - change (operations/puppet)

2014-03-06 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/117314

Change subject: ldaplist: Fix typo
..

ldaplist: Fix typo

Change-Id: Ie1d89f032e95e8ddadcb6353322d0192ff367e37
---
M modules/ldap/files/scripts/ldaplist
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/117314/1

diff --git a/modules/ldap/files/scripts/ldaplist 
b/modules/ldap/files/scripts/ldaplist
index 42d7bb6..e88aa0c 100755
--- a/modules/ldap/files/scripts/ldaplist
+++ b/modules/ldap/files/scripts/ldaplist
@@ -28,7 +28,7 @@
 ldapSupportLib.addParserOptions(parser)
 
 parser.add_option("-v", "--verbose", action="store_true", dest="verbose", 
help="Show the database and search filter used for this search")
-parser.add_option("-l", "--longlisting", action="store_true", 
dest="longlisting", help="List all the attributes for each  entry  matching  
the search  criteria.  By default, ldaplist lists only the Distiguished Name of 
the entries found.")
+parser.add_option("-l", "--longlisting", action="store_true", 
dest="longlisting", help="List all the attributes for each entry matching the 
search criteria.  By default, ldaplist lists only the Distinguished Name of the 
entries found.")
 parser.add_option("-h", action="store_true", dest="helpme", help="Show 
available databases to search")
 parser.add_option("-d", "--showdatabase", action="store_true", 
dest="showdatabase", help="Show the base dn being used for this database")
 parser.add_option("-a", "--showattributes", dest="showattributes", 
help="Show the given attributes")

-- 
To view, visit https://gerrit.wikimedia.org/r/117314
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1d89f032e95e8ddadcb6353322d0192ff367e37
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] puppet::self::master: Specify IP range for eqiad - change (operations/puppet)

2014-03-10 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/118030

Change subject: puppet::self::master: Specify IP range for eqiad
..

puppet::self::master: Specify IP range for eqiad

Change-Id: I4830c449f2d23b94faf623909ee3ede64354cf92
---
M modules/puppet/manifests/self/master.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/118030/1

diff --git a/modules/puppet/manifests/self/master.pp 
b/modules/puppet/manifests/self/master.pp
index 33451d8..9f446b8 100644
--- a/modules/puppet/manifests/self/master.pp
+++ b/modules/puppet/manifests/self/master.pp
@@ -32,7 +32,7 @@
 'localhost' => '127.0.0.1',
 default => $::site ? {
 'pmtpa' => '10.4.0.0/21',
-'eqiad' => undef,  # eqiad does not have labs yet.
+'eqiad' => '10.68.0.0/21',
 }
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/118030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4830c449f2d23b94faf623909ee3ede64354cf92
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Rename references to local-admin to tools.admin - change (operations/puppet)

2014-03-10 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/118036

Change subject: Tools: Rename references to local-admin to tools.admin
..

Tools: Rename references to local-admin to tools.admin

Change-Id: I10ad9645f8b26242331b9fa4ea869cc528e79463
---
M modules/toollabs/files/motd-tips.sh
M modules/toollabs/manifests/infrastructure.pp
M modules/toollabs/manifests/master.pp
3 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/118036/1

diff --git a/modules/toollabs/files/motd-tips.sh 
b/modules/toollabs/files/motd-tips.sh
index 4e45159..27be8ce 100644
--- a/modules/toollabs/files/motd-tips.sh
+++ b/modules/toollabs/files/motd-tips.sh
@@ -26,7 +26,7 @@
 fi
 
 # If user is sysadmin print the sysadmin motd instead.
-if groups | fgrep -qw local-admin; then
+if groups | fgrep -qw tools.admin; then
 if [ -f /etc/motd.sysadmin ]; then
 echo
 echo
diff --git a/modules/toollabs/manifests/infrastructure.pp 
b/modules/toollabs/manifests/infrastructure.pp
index 9ff9bc2..6147bb3 100644
--- a/modules/toollabs/manifests/infrastructure.pp
+++ b/modules/toollabs/manifests/infrastructure.pp
@@ -26,7 +26,7 @@
 # service group and root.
 
 File <| title == '/etc/security/access.conf' |> {
-content => "-:ALL EXCEPT (local-admin) root:ALL\n",
+content => "-:ALL EXCEPT (tools.admin) root:ALL\n",
 }
 }
 
diff --git a/modules/toollabs/manifests/master.pp 
b/modules/toollabs/manifests/master.pp
index 9f756bc..5d70a17 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -26,16 +26,16 @@
 
 file { $repo:
 ensure  => directory,
-owner   => 'local-admin',
-group   => 'local-admin',
+owner   => 'tools.admin',
+group   => 'tools.admin',
 mode=> '0755',
 require => File[$sysdir],
 }
 
 file { "${repo}/update-repo.sh":
 ensure  => file,
-owner   => 'local-admin',
-group   => 'local-admin',
+owner   => 'tools.admin',
+group   => 'tools.admin',
 mode=> '0550',
 require => File[$repo],
 source  => 'puppet:///modules/toollabs/update-repo.sh',

-- 
To view, visit https://gerrit.wikimedia.org/r/118036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10ad9645f8b26242331b9fa4ea869cc528e79463
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Allow access for administrators from bastions - change (operations/puppet)

2014-03-10 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/118039

Change subject: Tools: Allow access for administrators from bastions
..

Tools: Allow access for administrators from bastions

At the moment, to access execution nodes administrators need to log
into tools-login or tools-dev and then use HBA to access the hosts.
This makes it very cumbersome to use utilities like pdsh to execute
commands on all Tools instances.

This change allows standard, non-HBA ssh-via-bastion access for
members of the tools.admin group.

Change-Id: I6ac7cae1101c7687fa03a9c982e6e8f7f0de2d7a
---
M modules/toollabs/files/project-make-access
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/118039/1

diff --git a/modules/toollabs/files/project-make-access 
b/modules/toollabs/files/project-make-access
index ac74765..bee0189 100644
--- a/modules/toollabs/files/project-make-access
+++ b/modules/toollabs/files/project-make-access
@@ -10,4 +10,4 @@
 cat $host
   fi
 done)
-echo '-:ALL EXCEPT root:ALL'
+echo '-:ALL EXCEPT (tools.admin) root:ALL'

-- 
To view, visit https://gerrit.wikimedia.org/r/118039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ac7cae1101c7687fa03a9c982e6e8f7f0de2d7a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add exemption to the CVE linker for Ubuntu security links - change (wikimedia...modifications)

2014-02-13 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/113170

Change subject: Add exemption to the CVE linker for Ubuntu security links
..

Add exemption to the CVE linker for Ubuntu security links

In an ideal world, there would be a more general solution to this
problem.  Rather than imagining all possible good and bad patterns,
let's just fix the error at hand for now.

Bug: 61328
Change-Id: I2429484d2523048194e27ba95100bcac1c6edf4a
---
M extensions/Wikimedia/Extension.pm
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bugzilla/modifications 
refs/changes/70/113170/1

diff --git a/extensions/Wikimedia/Extension.pm 
b/extensions/Wikimedia/Extension.pm
index c75722d..2f1c306 100644
--- a/extensions/Wikimedia/Extension.pm
+++ b/extensions/Wikimedia/Extension.pm
@@ -68,8 +68,9 @@
replace => \&_createGitCommitLink
};
 
+   # Test case: https://bugzilla.wikimedia.org/60112#c8
my $replacerCVE = {
-   match => qr{\b(CVE-\d{4}-\d+)},
+   match => 
qr{(?http://people\.canonical\.com/~ubuntu-security/cve/2013/)\b(CVE-\d{4}-\d+)},
replace => \&_createCVELink
};
 

-- 
To view, visit https://gerrit.wikimedia.org/r/113170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2429484d2523048194e27ba95100bcac1c6edf4a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Revert "Add Apple Touch icon for Labs" - change (operations/mediawiki-config)

2014-02-13 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/113334

Change subject: Revert "Add Apple Touch icon for Labs"
..

Revert "Add Apple Touch icon for Labs"

We keep Labs's favicon.ico in the labs/toollabs repository, and that
is where Apple Touch icons for Labs should probably reside as well.

This reverts commit d007275f00a757cad9dd4dcc6f17bc7da68eb9de.

Change-Id: If18d4215b603f5461451c27ccb8e2a8165f2b0d0
---
D docroot/bits/apple-touch/labs.png
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/34/113334/1

diff --git a/docroot/bits/apple-touch/labs.png 
b/docroot/bits/apple-touch/labs.png
deleted file mode 100644
index 682732a..000
--- a/docroot/bits/apple-touch/labs.png
+++ /dev/null
Binary files differ

-- 
To view, visit https://gerrit.wikimedia.org/r/113334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If18d4215b603f5461451c27ccb8e2a8165f2b0d0
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add Apple Touch icon for Labs - change (labs/toollabs)

2014-02-13 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/113335

Change subject: Add Apple Touch icon for Labs
..

Add Apple Touch icon for Labs

This patch provides an Apple Touch icon for Wikimedia Labs.  It comes
as a 152x152 px square to satisfy the needs of iPad devices with the
new Retina display.  (iOS will scale the icon down if need be.)

Originally submitted as d007275f00a757cad9dd4dcc6f17bc7da68eb9de to
operations/mediawiki-config.

Bug: 52583
Change-Id: I12926f97857748317f21dfb061b644ec08984ad7
---
A www/apple-touch-icon.png
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/35/113335/1

diff --git a/www/apple-touch-icon.png b/www/apple-touch-icon.png
new file mode 100644
index 000..682732a
--- /dev/null
+++ b/www/apple-touch-icon.png
Binary files differ

-- 
To view, visit https://gerrit.wikimedia.org/r/113335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I12926f97857748317f21dfb061b644ec08984ad7
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Odder 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix indentation in role::labs::instance - change (operations/puppet)

2014-02-21 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/114734

Change subject: Fix indentation in role::labs::instance
..

Fix indentation in role::labs::instance

Change-Id: I5efc76f3014642e780aab62e85f23c9ae0f9a321
---
M manifests/role/labs.pp
1 file changed, 59 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/114734/1

diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 2568a73..3b1dd28 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -1,11 +1,12 @@
-
 class role::labs::instance {
 
 include ldap::role::client::labs,
-base::instance-upstarts
+  base::instance-upstarts
 
 # make common logs readable
-class {'base::syslogs': readable => true }
+class { 'base::syslogs':
+readable => true
+}
 
 # Directory for data mounts
 file { '/data':
@@ -29,72 +30,104 @@
 $nfs_server = 'labstore.svc.eqiad.wmnet'
 
 mount { '/home':
-ensure => mounted, atboot => true, fstype => 'nfs', options => 
"rw,${nfs_opts}",
-device => "${nfs_server}:/project/${instanceproject}/home",
+ensure  => mounted,
+atboot  => true,
+fstype  => 'nfs',
+options => "rw,${nfs_opts}",
+device  => "${nfs_server}:/project/${instanceproject}/home",
 }
 
 file { '/data/project':
-ensure => directory, owner => 'root', group => 'root', mode => 
'0755',
+ensure  => directory,
+owner   => 'root',
+group   => 'root',
+mode=> '0755',
 require => File['/data', '/etc/idmapd.conf'],
 }
 mount { '/data/project':
-ensure => mounted, atboot => true, fstype => 'nfs', options => 
"rw,${nfs_opts}",
-device => "${nfs_server}:/project/${instanceproject}/project",
+ensure  => mounted,
+atboot  => true,
+fstype  => 'nfs',
+options => "rw,${nfs_opts}",
+device  => "${nfs_server}:/project/${instanceproject}/project",
 require => File['/data/project'],
 }
 
 file { '/data/scratch':
-ensure => directory, owner => 'root', group => 'root', mode => 
'0755',
+ensure  => directory,
+owner   => 'root',
+group   => 'root',
+mode=> '0755',
 require => File['/data', '/etc/idmapd.conf'],
 }
 mount { '/data/scratch':
-ensure => mounted, atboot => true, fstype => 'nfs', options => 
"rw,${nfs_opts}",
-device => "${nfs_server}:/scratch",
+ensure  => mounted,
+atboot  => true,
+fstype  => 'nfs',
+options => "rw,${nfs_opts}",
+device  => "${nfs_server}:/scratch",
 require => File['/data/scratch'],
 }
 
 file { '/public/dumps':
-ensure => directory, owner => 'root', group => 'root', mode => 
'0755',
+ensure  => directory,
+owner   => 'root',
+group   => 'root',
+mode=> '0755',
 require => File['/public'],
 }
 mount { '/public/dumps':
-ensure => mounted, atboot => true, fstype => 'nfs', options => 
"ro,${nfs_opts}",
-device => "${nfs_server}:/dumps",
+ensure  => mounted,
+atboot  => true,
+fstype  => 'nfs',
+options => "ro,${nfs_opts}",
+device  => "${nfs_server}:/dumps",
 require => File['/public/dumps'],
 }
 
 file { '/public/backups':
-ensure => directory, owner => 'root', group => 'root', mode => 
'0755',
+ensure  => directory,
+owner   => 'root',
+group   => 'root',
+mode=> '0755',
 require => File['/public'],
 }
 mount { '/public/backups':
-ensure => mounted, atboot => true, fstype => 'nfs', options => 
"ro,${nfs_opts}",
-device => "${nfs_server}:/backups",
+ensure  => mounted,
+atboot  => true,
+fstype  => 'nfs',
+options => "ro,${nfs_opts}",
+device  => "${nfs_server}:/backups",
 require => File['/public/backups'],
 }
 
-
 file { '/public/keys':
-ensure => directory, owner => 'root', group => 'root', mode => 
'0755',
+ensure  => directory,
+owner   => 'root',
+group   => 'root',
+mode=> '0755',
 require => File['/public'],
 }
 mount { '/public/keys':
-ensure => mounted, atboot => true, fstype => 'nfs', options => 
"ro,${nfs_opts}",
-device => "${nfs_server}:/keys",
+ensure  => mounted,
+a

[MediaWiki-commits] [Gerrit] Fix paths in comments after modularization - change (operations/puppet)

2014-02-21 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/114736

Change subject: Fix paths in comments after modularization
..

Fix paths in comments after modularization

Change-Id: I0ab95cd45c79d08e3c770594f469c4789c5be880
---
M modules/beta/files/wmf-beta-autoupdate.py
M modules/contint/files/apache/doc.wikimedia.org
M modules/download/files/apache/download.mediawiki.org
M modules/download/files/rsync/rsync.default.downloadmirror
M modules/download/files/rsync/rsync.default.downloadprimary
M modules/download/files/rsync/rsyncd.conf.downloadmirror
M modules/download/files/rsync/rsyncd.conf.downloadprimary
M modules/eventlogging/files/logrotate
M modules/gitblit/files/gitblit.properties
M modules/gluster/files/glusterlogs
M modules/install-server/files/dhcpd/dhcpd.conf
M modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
M modules/install-server/files/dhcpd/linux-host-entries.ttyS0-9600
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
M modules/ldap/files/openjdk-6/java.security
M modules/ldap/files/scripts/add-labs-user
M modules/ldap/files/scripts/add-ldap-group
M modules/ldap/files/scripts/add-ldap-user
M modules/ldap/files/scripts/change-ldap-passwd
M modules/ldap/files/scripts/delete-ldap-group
M modules/ldap/files/scripts/delete-ldap-user
M modules/ldap/files/scripts/homedirectorymanager.py
M modules/ldap/files/scripts/ldaplist
M modules/ldap/files/scripts/ldapsupportlib.py
M modules/ldap/files/scripts/manage-exports
M modules/ldap/files/scripts/manage-keys
M modules/ldap/files/scripts/manage-keys-nfs
M modules/ldap/files/scripts/manage-nfs-volumes-daemon
M modules/ldap/files/scripts/manage-volumes-daemon
M modules/ldap/files/scripts/modify-ldap-group
M modules/ldap/files/scripts/modify-ldap-user
M modules/ldap/files/scripts/netgroup-mod
M modules/ldap/files/scripts/opendj-backup.sh
M modules/ldap/files/scripts/puppetsigner.py
M modules/ocg/files/logrotate
M modules/puppetmaster/files/logrotate-passenger
M modules/rsync/templates/rsync.default.erb
M modules/smokeping/files/config.d/Alerts
M modules/smokeping/files/config.d/General
M modules/smokeping/files/config.d/Probes
M modules/smokeping/files/config.d/Targets
M modules/subversion/files/docroot/robots.txt
M modules/url-downloader/files/copy-by-url-proxy.conf
M modules/wikidata_singlenode/files/StartProfiler.php
M modules/wikidata_singlenode/files/notitle.php
M modules/wikidata_singlenode/files/wikidata-replication.logrotate
M modules/wikidata_singlenode/files/wikidata-runJobs.logrotate
M modules/wikidata_singlenode/files/wikidata.cnf
49 files changed, 50 insertions(+), 50 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/114736/1

diff --git a/modules/beta/files/wmf-beta-autoupdate.py 
b/modules/beta/files/wmf-beta-autoupdate.py
index c1f8060..bc7796d 100755
--- a/modules/beta/files/wmf-beta-autoupdate.py
+++ b/modules/beta/files/wmf-beta-autoupdate.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 ###
 # WARNING: this file is managed by Puppet
-# puppet:///files/misc/beta/wmf-beta-autoupdate.py
+# puppet:///modules/beta/wmf-beta-autoupdate.py
 ###
 
 """
diff --git a/modules/contint/files/apache/doc.wikimedia.org 
b/modules/contint/files/apache/doc.wikimedia.org
index feeecc4..36d476b 100644
--- a/modules/contint/files/apache/doc.wikimedia.org
+++ b/modules/contint/files/apache/doc.wikimedia.org
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/apache/sites/doc.wikimedia.org
+### puppet:///modules/contint/apache/doc.wikimedia.org
 #
 # vim: filetype=apache
 
@@ -33,4 +33,4 @@
RewriteEngine On
RewriteRule ^/favicon\.ico$ /favicon.php [L]
 
-
\ No newline at end of file
+
diff --git a/modules/download/files/apache/download.mediawiki.org 
b/modules/download/files/apache/download.mediawiki.org
index e2d3a44..4a8b2ad 100644
--- a/modules/download/files/apache/download.mediawiki.org
+++ b/modules/download/files/apache/download.mediawiki.org
@@ -1,6 +1,6 @@
 #
 ### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/apache/sites/download.mediawiki.org
+### puppet:///modules/download/apache/download.mediawiki.org
 #
 # vim: filetype=apache
 
diff --git a/modules/download/files/rsync/rsync.default.downloadmirror 
b/modules/download/files/rsync/rsync.default.downloadmirror
index 024192d..cfdb5c1 100644
--- a/modules/download/files/rsync/rsync.default.downloadmirror
+++ b/module

[MediaWiki-commits] [Gerrit] Fix manage-keys-nfs misnomer in usage message - change (operations/puppet)

2014-02-21 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/114739

Change subject: Fix manage-keys-nfs misnomer in usage message
..

Fix manage-keys-nfs misnomer in usage message

Change-Id: Ie652a6b9141690e4ed7ddafdf15dfd6d7f20d788
---
M modules/ldap/files/scripts/manage-keys-nfs
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/114739/1

diff --git a/modules/ldap/files/scripts/manage-keys-nfs 
b/modules/ldap/files/scripts/manage-keys-nfs
index 9487c6b..ec8a8f7 100755
--- a/modules/ldap/files/scripts/manage-keys-nfs
+++ b/modules/ldap/files/scripts/manage-keys-nfs
@@ -35,7 +35,7 @@
 
 def run(self):
 parser = OptionParser(conflict_handler="resolve")
-parser.set_usage('manage-exports [options]')
+parser.set_usage('manage-keys-nfs [options]')
 
 ldapSupportLib = ldapsupportlib.LDAPSupportLib()
 ldapSupportLib.addParserOptions(parser)

-- 
To view, visit https://gerrit.wikimedia.org/r/114739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie652a6b9141690e4ed7ddafdf15dfd6d7f20d788
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ldap: Fix typo in usage messages - change (operations/puppet)

2014-02-21 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/114740

Change subject: ldap: Fix typo in usage messages
..

ldap: Fix typo in usage messages

Change-Id: Ifd8379ea315c13d2f22bed6cdb7d95763961e1bc
---
M modules/ldap/files/scripts/manage-exports
M modules/ldap/files/scripts/manage-keys
M modules/ldap/files/scripts/manage-keys-nfs
M modules/ldap/files/scripts/manage-nfs-volumes-daemon
M modules/ldap/files/scripts/manage-volumes-daemon
5 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/114740/1

diff --git a/modules/ldap/files/scripts/manage-exports 
b/modules/ldap/files/scripts/manage-exports
index eb54f87..ac8134b 100755
--- a/modules/ldap/files/scripts/manage-exports
+++ b/modules/ldap/files/scripts/manage-exports
@@ -40,7 +40,7 @@
 ldapSupportLib = ldapsupportlib.LDAPSupportLib()
 ldapSupportLib.addParserOptions(parser)
 
-parser.add_option("--logfile", dest="logfile", help="Write output to 
the specified log file. (default: stdin)")
+parser.add_option("--logfile", dest="logfile", help="Write output to 
the specified log file. (default: stdout)")
 parser.add_option("--loglevel", dest="loglevel", help="Change level of 
logging; NONE, INFO, DEBUG (default: INFO)")
 (options, args) = parser.parse_args()
 ldapSupportLib.setBindInfoByOptions(options, parser)
diff --git a/modules/ldap/files/scripts/manage-keys 
b/modules/ldap/files/scripts/manage-keys
index 8135133..96c8df3 100755
--- a/modules/ldap/files/scripts/manage-keys
+++ b/modules/ldap/files/scripts/manage-keys
@@ -40,7 +40,7 @@
 ldapSupportLib = ldapsupportlib.LDAPSupportLib()
 ldapSupportLib.addParserOptions(parser)
 
-parser.add_option("--logfile", dest="logfile", help="Write output to 
the specified log file. (default: stdin)")
+parser.add_option("--logfile", dest="logfile", help="Write output to 
the specified log file. (default: stdout)")
 parser.add_option("--loglevel", dest="loglevel", help="Change level of 
logging; NONE, INFO, DEBUG (default: INFO)")
 (options, args) = parser.parse_args()
 ldapSupportLib.setBindInfoByOptions(options, parser)
diff --git a/modules/ldap/files/scripts/manage-keys-nfs 
b/modules/ldap/files/scripts/manage-keys-nfs
index 9487c6b..c6bcbb1 100755
--- a/modules/ldap/files/scripts/manage-keys-nfs
+++ b/modules/ldap/files/scripts/manage-keys-nfs
@@ -40,7 +40,7 @@
 ldapSupportLib = ldapsupportlib.LDAPSupportLib()
 ldapSupportLib.addParserOptions(parser)
 
-parser.add_option("--logfile", dest="logfile", help="Write output to 
the specified log file. (default: stdin)")
+parser.add_option("--logfile", dest="logfile", help="Write output to 
the specified log file. (default: stdout)")
 parser.add_option("--loglevel", dest="loglevel", help="Change level of 
logging; NONE, INFO, DEBUG (default: INFO)")
 (options, args) = parser.parse_args()
 ldapSupportLib.setBindInfoByOptions(options, parser)
diff --git a/modules/ldap/files/scripts/manage-nfs-volumes-daemon 
b/modules/ldap/files/scripts/manage-nfs-volumes-daemon
index 6282aba..afb5f40 100755
--- a/modules/ldap/files/scripts/manage-nfs-volumes-daemon
+++ b/modules/ldap/files/scripts/manage-nfs-volumes-daemon
@@ -55,7 +55,7 @@
 self.ldapSupportLib = ldapsupportlib.LDAPSupportLib()
 self.ldapSupportLib.addParserOptions(parser)
 
-parser.add_option("--logfile", dest="logfile", help="Write output to 
the specified log file. (default: stdin)")
+parser.add_option("--logfile", dest="logfile", help="Write output to 
the specified log file. (default: stdout)")
 parser.add_option("--loglevel", dest="loglevel", help="Change level of 
logging; NONE, INFO, DEBUG (default: INFO)")
 (options, args) = parser.parse_args()
 self.ldapSupportLib.setBindInfoByOptions(options, parser)
diff --git a/modules/ldap/files/scripts/manage-volumes-daemon 
b/modules/ldap/files/scripts/manage-volumes-daemon
index 9d4b817..ec1ca70 100755
--- a/modules/ldap/files/scripts/manage-volumes-daemon
+++ b/modules/ldap/files/scripts/manage-volumes-daemon
@@ -53,7 +53,7 @@
 self.ldapSupportLib = ldapsupportlib.LDAPSupportLib()
 self.ldapSupportLib.addParserOptions(parser)
 
-parser.add_option("--logfile", dest="logfile", help="Write output to 
the specified log file. (default: stdin)")
+parser.add_option("--logfile", dest="logfile", help="Write output to 
the specified log file. (default: stdout)")
 parser.add_option("--loglevel", dest="loglevel", help="Change level of 
logging; NONE, INFO, DEBUG (default: INFO)")
 (options, args) = parser.parse_args()
 self.ldapSupportLib.setBindInfoByOptions(options, parser)

-- 
To view, visit https://gerrit.wikimedia.org/r/11474

[MediaWiki-commits] [Gerrit] Tools: Set group for $sysdir according to $::site - change (operations/puppet)

2014-02-26 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/115609

Change subject: Tools: Set group for $sysdir according to $::site
..

Tools: Set group for $sysdir according to $::site

This fixes a regression introduced by
I01592d50cc17a4acb25fd2d4b70881f450ad88cd.

Change-Id: Id7647830d3c925e73a1bc62b6ab4e9239e551090
---
M modules/toollabs/manifests/init.pp
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/115609/1

diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 302c17c..cdd1aee 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -30,7 +30,10 @@
 file { $sysdir:
 ensure  => directory,
 owner   => 'root',
-group   => 'tools.admin',
+group   => $::site ? {
+'eqiad' => 'tools.admin',
+default => 'local-admin',
+},
 mode=> '02775',
 require => $::site? {
 'eqiad' =>  Mount['/data/project'],

-- 
To view, visit https://gerrit.wikimedia.org/r/115609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7647830d3c925e73a1bc62b6ab4e9239e551090
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Restore local symlinks for jobutils - change (operations/puppet)

2014-02-26 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/115612

Change subject: Tools: Restore local symlinks for jobutils
..

Tools: Restore local symlinks for jobutils

This partially reverts I01592d50cc17a4acb25fd2d4b70881f450ad88cd.

Bug: 52258
Change-Id: Iee75364cfccb6290f50d8e70daad3a594c302648
---
M modules/gridengine/manifests/submit_host.pp
1 file changed, 20 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/115612/1

diff --git a/modules/gridengine/manifests/submit_host.pp 
b/modules/gridengine/manifests/submit_host.pp
index 0054ac1..437d816 100644
--- a/modules/gridengine/manifests/submit_host.pp
+++ b/modules/gridengine/manifests/submit_host.pp
@@ -1,6 +1,5 @@
 # gridengine.pp
 
-
 class gridengine::submit_host($gridmaster = $grid_master) {
 class { 'gridengine':
 gridmaster => $gridmaster,
@@ -11,7 +10,7 @@
 }
 
 package { 'gridengine-client':
-ensure => latest,
+ensure  => latest,
 require => Package['gridengine-common'],
 }
 
@@ -19,5 +18,23 @@
 ensure => link,
 target => '/data/project/.system/accounting',
 }
-}
 
+# Temporary hack to manage obsolete files in /usr/local/bin.
+# TODO: Remove when no longer needed.
+file { '/usr/local/bin/job':
+ensure => link,
+target => '/usr/bin/job',
+}
+file { '/usr/local/bin/jstart':
+ensure => link,
+target => '/usr/bin/jstart',
+}
+file { '/usr/local/bin/jstop':
+ensure => link,
+target => '/usr/bin/jstop',
+}
+file { '/usr/local/bin/jsub':
+ensure => link,
+target => '/usr/bin/jsub',
+}
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/115612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee75364cfccb6290f50d8e70daad3a594c302648
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix Lintian errors in misctools man pages - change (labs/toollabs)

2014-03-31 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/122628

Change subject: Fix Lintian errors in misctools man pages
..

Fix Lintian errors in misctools man pages

Change-Id: Iae743c93d43f8db46411fb33c358f070db203b4c
---
M debian/changelog
A debian/misctools.manpages
M misctools/Makefile.am
A misctools/become.1
A misctools/rmtool.8
A misctools/toolwatcher.8
M src/Makefile.am
A src/take.1
8 files changed, 86 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/28/122628/1

diff --git a/debian/changelog b/debian/changelog
index 68efd6d..86b6006 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@
   * Fix build and run-time dependencies
   * Work around pbuilder not properly setting $USER
   * Fix Lintian errors in jobutils man pages
+  * Fix Lintian errors in misctools man pages
 
- -- Tim Landscheidt   Sat, 29 Mar 2014 02:28:21 +
+ -- Tim Landscheidt   Tue, 01 Apr 2014 01:20:36 +
 
 toollabs (1.0.7) unstable; urgency=low
 
diff --git a/debian/misctools.manpages b/debian/misctools.manpages
new file mode 100644
index 000..8f9d8cc
--- /dev/null
+++ b/debian/misctools.manpages
@@ -0,0 +1,4 @@
+debian/tmp/usr/share/man/man1/become.1
+debian/tmp/usr/share/man/man8/rmtool.8
+debian/tmp/usr/share/man/man1/take.1
+debian/tmp/usr/share/man/man8/toolwatcher.8
diff --git a/misctools/Makefile.am b/misctools/Makefile.am
index 313da27..87b590d 100644
--- a/misctools/Makefile.am
+++ b/misctools/Makefile.am
@@ -1,2 +1,3 @@
+man_MANS = become.1 rmtool.8 toolwatcher.8
 bin_SCRIPTS = become webservice
 sbin_SCRIPTS = rmtool toolwatcher
diff --git a/misctools/become.1 b/misctools/become.1
new file mode 100644
index 000..785e774
--- /dev/null
+++ b/misctools/become.1
@@ -0,0 +1,21 @@
+.TH BECOME 1 2014-04-01 1.0.8dev "Wikimedia Labs Tools misctools"
+.SH NAME
+become \- switch to a tool account
+.SH SYNOPSIS
+.B become
+.I tool
+.RI [ sudo-args ]
+.SH DESCRIPTION
+.B become
+switches to a tool account by calling sudo.  Optional arguments are
+passed on to sudo.
+.SH EXIT STATUS
+If no tool account's name is provided or the tool account does not
+exist,
+.B become
+returns 1.  Otherwise, the exit status of the created sudo process is
+returned.
+.SH AUTHORS
+Marc-André Pelletier, Petr Bena
+.SH SEE ALSO
+.BR sudo (8)
diff --git a/misctools/rmtool.8 b/misctools/rmtool.8
new file mode 100644
index 000..bdab2e1
--- /dev/null
+++ b/misctools/rmtool.8
@@ -0,0 +1,19 @@
+.TH RMTOOL 8 2014-04-01 1.0.8dev "Wikimedia Labs Tools misctools"
+.SH NAME
+rmtool \- remove a tool account's data
+.SH SYNOPSIS
+.B rmtool
+.I tool
+.SH DESCRIPTION
+.B rmtool
+removes a tool account's data and backs it up under
+.IR /data/project/.system/removed_tools .
+.SH EXIT STATUS
+If the tool account's data was successfully removed and backed up,
+.B rmtool
+returns 0.  Otherwise, the exit status is greater than 0.
+.SH FILES
+.I /data/project/.system/removed_tools
+The directory where backups of removed tool account's data are stored.
+.SH AUTHORS
+Marc-André Pelletier, Petr Bena
diff --git a/misctools/toolwatcher.8 b/misctools/toolwatcher.8
new file mode 100644
index 000..380e72e
--- /dev/null
+++ b/misctools/toolwatcher.8
@@ -0,0 +1,19 @@
+.TH TOOLWATCHER 8 2014-04-01 1.0.8dev "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
+permissions for (new) tool accounts.  This encompasses the home
+directory and two subdirectories
+.I cgi-bin
+and
+.I public_html
+with the permissions u=rwx,g=rwsx,o=rx.
+.SH EXIT STATUS
+.B toolwatcher
+does not return.
+.SH AUTHORS
+Marc-André Pelletier, Petr Bena
diff --git a/src/Makefile.am b/src/Makefile.am
index 6541b6b..f00fc5c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+man_MANS = take.1
+
 bin_PROGRAMS = take
 
 take_SOURCES = take.cc
diff --git a/src/take.1 b/src/take.1
new file mode 100644
index 000..2ff3870
--- /dev/null
+++ b/src/take.1
@@ -0,0 +1,18 @@
+.TH TAKE 1 2014-04-01 1.0.8dev "Wikimedia Labs Tools misctools"
+.SH NAME
+take \- assume ownership of files and directories
+.SH SYNOPSIS
+.B take
+.RI [ files ]
+.SH DESCRIPTION
+.B take
+changes the ownership of files and directories to that of the calling
+user provided that the containing directory is owned by the calling
+user and the calling user shares a group with the file or directory.
+Directories are processed recursively.
+.SH EXIT STATUS
+.B take
+returns 0 in case of success.  Otherwise, the exit status is greater
+than 0.
+.SH AUTHORS
+Marc-André Pelletier

-- 
To view, visit https://gerrit.wikimedia.org/r/122628
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae743c93d43f8db46411fb33c358f070db2

[MediaWiki-commits] [Gerrit] Package webservice - change (labs/toollabs)

2014-04-01 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/122841

Change subject: Package webservice
..

Package webservice

Change-Id: I711c5330d9386584918ccb9da695275effc46c7b
---
M configure.ac
M debian/changelog
M debian/misctools.install
3 files changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/41/122841/1

diff --git a/configure.ac b/configure.ac
index 92d1b80..d2b4f81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([toollabs], [1.0.4dev], [mpellet...@wikimedia.org])
+AC_INIT([toollabs], [1.0.8dev], [mpellet...@wikimedia.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_TESTDIR([tests])
 
diff --git a/debian/changelog b/debian/changelog
index a3b166b..3232a0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+toollabs (1.0.8dev) unstable; urgency=low
+
+  * Package webservice
+
+ -- Tim Landscheidt   Tue, 01 Apr 2014 15:33:40 +
+
 toollabs (1.0.7) unstable; urgency=low
 
   * Marc-André Pelletier: fixes for eqiad
diff --git a/debian/misctools.install b/debian/misctools.install
index f383236..6df9429 100644
--- a/debian/misctools.install
+++ b/debian/misctools.install
@@ -1,4 +1,5 @@
 usr/bin/become
 usr/bin/take
+usr/bin/webservice
 usr/sbin/rmtool
 usr/sbin/toolwatcher

-- 
To view, visit https://gerrit.wikimedia.org/r/122841
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I711c5330d9386584918ccb9da695275effc46c7b
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Alias tools.wmflabs.org to internal webproxy - change (operations/puppet)

2014-04-01 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/123149

Change subject: Tools: Alias tools.wmflabs.org to internal webproxy
..

Tools: Alias tools.wmflabs.org to internal webproxy

The (external) IP for tools.wmflabs.org is not accessible from within
Labs.  To work around that, this change creates an alias that points
to tools-webproxy.

Change-Id: Iff526cccf1b5e887da02e32de15339c9c94215d1
---
M modules/toollabs/manifests/init.pp
1 file changed, 18 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/49/123149/1

diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 6fa1943..ee19829 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -136,4 +136,22 @@
 force  => true,
 target => "${store}/mail",
 }
+
+# The (external) IP for tools.wmflabs.org is not accessible from
+# within Labs.  To work around that, we create an alias that
+# points to tools-webproxy.  Note that dig is called on the
+# puppetmaster, not the individual instances.
+$projectdomain = $::instanceproject ? {
+'toolsbeta' => 'tools-beta.wmflabs.org',
+default => 'tools.wmflabs.org',
+}
+$webproxyip = chomp(generate('/usr/bin/dig',
+ '+short',
+ $projectdomain))
+host { "${::instanceproject}-webproxy":
+ensure   => present,
+host_aliases => ["${::instanceproject}-webproxy.eqiad.wmflabs",
+ $projectdomain],
+ip   => $webproxyip,
+}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/123149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff526cccf1b5e887da02e32de15339c9c94215d1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Use apt::repository instead of file resources - change (operations/puppet)

2014-04-04 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/123882

Change subject: Tools: Use apt::repository instead of file resources
..

Tools: Use apt::repository instead of file resources

Change-Id: I9214e039eac8b90c9d937a2932686fd65c9d3389
---
M modules/toollabs/manifests/init.pp
1 file changed, 7 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/123882/1

diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 6fa1943..f0a9c3b 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -110,19 +110,15 @@
 }
 
 # Trustworthy enough
-file { '/etc/apt/sources.list.d/mariadb.list':
-ensure  => file,
-content => "deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu 
precise main\n",
-mode=> '0444',
-owner   => 'root',
-group   => 'root',
+apt::repository { 'mariadb':
+uri=> 'http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu',
+dist   => 'precise',
+components => 'main',
+source => false,
+keyfile=> 'puppet:///modules/toollabs/mariadb.gpg',
 }
 file { '/etc/apt/trusted.gpg.d/mariadb.gpg':
-ensure => file,
-source => 'puppet:///modules/toollabs/mariadb.gpg',
-mode => '0444',
-owner => 'root',
-group => 'root',
+ensure => absent,
 }
 
 File <| title == '/etc/exim4/exim4.conf' |> {

-- 
To view, visit https://gerrit.wikimedia.org/r/123882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9214e039eac8b90c9d937a2932686fd65c9d3389
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Use apt::repository instead of file resources - change (operations/puppet)

2014-04-04 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/123903

Change subject: Use apt::repository instead of file resources
..

Use apt::repository instead of file resources

Change-Id: Ica0bf234c404dd7e32e9ca928da1b4766b966582
---
D modules/coredb_mysql/files/wikimedia-mariadb.list
M modules/coredb_mysql/manifests/packages.pp
M modules/mysql/manifests/server.pp
M modules/mysql_multi_instance/manifests/init.pp
M modules/mysql_wmf/manifests/packages.pp
5 files changed, 20 insertions(+), 48 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/123903/1

diff --git a/modules/coredb_mysql/files/wikimedia-mariadb.list 
b/modules/coredb_mysql/files/wikimedia-mariadb.list
deleted file mode 100644
index 305a67d..000
--- a/modules/coredb_mysql/files/wikimedia-mariadb.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://apt.wikimedia.org/wikimedia precise-wikimedia mariadb
-deb-src http://apt.wikimedia.org/wikimedia precise-wikimedia mariadb
diff --git a/modules/coredb_mysql/manifests/packages.pp 
b/modules/coredb_mysql/manifests/packages.pp
index 41a03ad..c4fe64e 100644
--- a/modules/coredb_mysql/manifests/packages.pp
+++ b/modules/coredb_mysql/manifests/packages.pp
@@ -2,17 +2,10 @@
 class coredb_mysql::packages {
 if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '12.04') >= 
0 {
 if $mariadb == true {
-file { '/etc/apt/sources.list.d/wikimedia-mariadb.list':
-group  => 'root',
-mode   => '0444',
-owner  => 'root',
-source => 
'puppet:///modules/coredb_mysql/wikimedia-mariadb.list',
-}
-
-exec { 'update_mysql_apt':
-subscribe   => 
File['/etc/apt/sources.list.d/wikimedia-mariadb.list'],
-command => '/usr/bin/apt-get update',
-refreshonly => true,
+apt::repository { 'wikimedia-mariadb':
+uri=> 'http://apt.wikimedia.org/wikimedia',
+dist   => 'precise-wikimedia',
+components => 'mariadb',
 }
 
 package { [
@@ -22,7 +15,7 @@
 'mariadb-server-core-5.5',
 ]:
 ensure  => present,
-require => 
File['/etc/apt/sources.list.d/wikimedia-mariadb.list'],
+require => Apt::Repository['wikimedia-mariadb'],
 }
 
 } else {
diff --git a/modules/mysql/manifests/server.pp 
b/modules/mysql/manifests/server.pp
index ecf3407..5e2b557 100644
--- a/modules/mysql/manifests/server.pp
+++ b/modules/mysql/manifests/server.pp
@@ -81,16 +81,10 @@
   $package_name = $mysql::params::server_package_name,
 ) {
   if $package_name =~ /mariadb/ {
-file { "/etc/apt/sources.list.d/wikimedia-mariadb.list":
-  owner => root,
-  group => root,
-  mode => 0444,
-  source => "puppet:///modules/coredb_mysql/wikimedia-mariadb.list"
-}
-exec { "update_mysql_apt":
-  subscribe => File['/etc/apt/sources.list.d/wikimedia-mariadb.list'],
-  command => "/usr/bin/apt-get update",
-  refreshonly => true;
+apt::repository { 'wikimedia-mariadb':
+  uri=> 'http://apt.wikimedia.org/wikimedia',
+  dist   => 'precise-wikimedia',
+  components => 'mariadb',
 }
   }
 
@@ -98,7 +92,7 @@
 ensure   => $package_ensure,
 name => $package_name,
 require  => $package_name ? {
-  "mariadb-server-5.5" => 
File["/etc/apt/sources.list.d/wikimedia-mariadb.list"],
+  "mariadb-server-5.5" => Apt::Repository['wikimedia-mariadb'],
   default => undef
 }
   }
diff --git a/modules/mysql_multi_instance/manifests/init.pp 
b/modules/mysql_multi_instance/manifests/init.pp
index 1f27e25..6f67e56 100644
--- a/modules/mysql_multi_instance/manifests/init.pp
+++ b/modules/mysql_multi_instance/manifests/init.pp
@@ -1,22 +1,16 @@
 
 class mysql_multi_instance {
 
-file { '/etc/apt/sources.list.d/wikimedia-mariadb.list':
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-source => 'puppet:///modules/coredb_mysql/wikimedia-mariadb.list',
-}
-exec { 'update_mysql_apt':
-subscribe   => File['/etc/apt/sources.list.d/wikimedia-mariadb.list'],
-command => '/usr/bin/apt-get update',
-refreshonly => true,
+apt::repository { 'wikimedia-mariadb':
+uri=> 'http://apt.wikimedia.org/wikimedia',
+dist   => 'precise-wikimedia',
+components => 'mariadb',
 }
 
 package { 'mysql-server':
 ensure   => present,
 name => 'mariadb-server-5.5',
-require  => File['/etc/apt/sources.list.d/wikimedia-mariadb.list'],
+require  => Apt::Repository['wikimedia-mariadb'],
 }
 
 package { ['percona-xtrabackup', 
diff --git a/modules/mysql_wmf/manifests/packages.pp 
b

[MediaWiki-commits] [Gerrit] Tools: Remove lint - change (operations/puppet)

2014-04-04 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/124001

Change subject: Tools: Remove lint
..

Tools: Remove lint

This leaves a few spots where puppet-lint complains about lines with
more than 80 characters, but changing those just for the sake of it
would be cumbersome and needs to be addressed by a proper refactoring.

Change-Id: Iac4fa7cedcb17a01fe99099c0305dc24c2c5017e
---
M modules/toollabs/manifests/bastion.pp
M modules/toollabs/manifests/execnode.pp
M modules/toollabs/manifests/gridnode.pp
M modules/toollabs/manifests/hba.pp
M modules/toollabs/manifests/infrastructure.pp
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/mailrelay.pp
M modules/toollabs/manifests/master.pp
M modules/toollabs/manifests/redis.pp
M modules/toollabs/manifests/shadow.pp
M modules/toollabs/manifests/submit.pp
M modules/toollabs/manifests/syslog.pp
M modules/toollabs/manifests/webnode.pp
M modules/toollabs/manifests/webproxy.pp
14 files changed, 59 insertions(+), 65 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/124001/1

diff --git a/modules/toollabs/manifests/bastion.pp 
b/modules/toollabs/manifests/bastion.pp
index fc828cc..26d1ae7 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -11,7 +11,7 @@
 #
 # Sample Usage:
 #
-class toollabs::bastion($gridmaster) inherits toollabs {
+class toollabs::bastion($gridmaster = undef) inherits toollabs {
 include toollabs::exec_environ,
 toollabs::dev_environ,
 toollabs::gridnode
@@ -33,15 +33,15 @@
 mode   => '0755',
 owner  => 'root',
 group  => 'root',
-source => 
"puppet:///modules/toollabs/40-${instanceproject}-bastion-banner",
+source => 
"puppet:///modules/toollabs/40-${::instanceproject}-bastion-banner",
 }
 
-file { "${store}/submithost-${::fqdn}":
+file { "${toollabs::store}/submithost-${::fqdn}":
 ensure  => file,
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
-require => File[$store],
+require => File[$toollabs::store],
 content => "${::ipaddress}\n",
 }
 
diff --git a/modules/toollabs/manifests/execnode.pp 
b/modules/toollabs/manifests/execnode.pp
index 14b03c4..34e9109 100644
--- a/modules/toollabs/manifests/execnode.pp
+++ b/modules/toollabs/manifests/execnode.pp
@@ -11,7 +11,7 @@
 #
 # Sample Usage:
 #
-class toollabs::execnode($gridmaster) inherits toollabs {
+class toollabs::execnode($gridmaster = undef) inherits toollabs {
 include toollabs::exec_environ,
 toollabs::gridnode
 
@@ -20,7 +20,7 @@
 }
 
 class { 'toollabs::hba':
-store => $store,
+store => $toollabs::store,
 }
 
 file { '/etc/update-motd.d/40-exechost-banner':
@@ -28,18 +28,17 @@
 mode   => '0755',
 owner  => 'root',
 group  => 'root',
-source => 
"puppet:///modules/toollabs/40-${instanceproject}-exechost-banner",
+source => 
"puppet:///modules/toollabs/40-${::instanceproject}-exechost-banner",
 }
 
-file { "${store}/execnode-${::fqdn}":
+file { "${toollabs::store}/execnode-${::fqdn}":
 ensure  => file,
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
-require => File[$store],
+require => File[$toollabs::store],
 content => "${::ipaddress}\n",
 }
 
 # TODO: grid node setup
 }
-
diff --git a/modules/toollabs/manifests/gridnode.pp 
b/modules/toollabs/manifests/gridnode.pp
index 4d09dac..0f4da43 100644
--- a/modules/toollabs/manifests/gridnode.pp
+++ b/modules/toollabs/manifests/gridnode.pp
@@ -10,9 +10,9 @@
 #
 class toollabs::gridnode inherits toollabs {
 
-file { "${sysdir}/gridengine":
+file { "${toollabs::sysdir}/gridengine":
 ensure  => directory,
-require => File[$sysdir],
+require => File[$toollabs::sysdir],
 }
 
 file { '/var/lib/gridengine':
@@ -22,12 +22,12 @@
 mount { '/var/lib/gridengine':
 ensure  => mounted,
 atboot  => False,
-device  => "${sysdir}/gridengine",
+device  => "${toollabs::sysdir}/gridengine",
 fstype  => none,
 options => 'rw,bind',
-require => File["${sysdir}/gridengine", '/var/lib/gridengine'],
+require => File["${toollabs::sysdir}/gridengine",
+'/var/lib/gridengine'],
 before  => Package['gridengine-common'],
 }
 
 }
-
diff --git a/modules/toollabs/manifests/hba.pp 
b/modules/toollabs/manifests/hba.pp
index a2ff805..2056fe7 100644
--- a/modules/toollabs/manifests/hba.pp
+++ b/modules/toollabs/manifests/hba.pp
@@ -10,7 +10,7 @@
 #
 # Sample Usage:
 #
-class toollabs::hba($store) {
+class toollabs::hba($store = undef) {
 
 file { '/usr/local/sbin/project-make-shosts':
 ensure => file,
@@ -54,4 +54,3

[MediaWiki-commits] [Gerrit] Tools: Remove already defined ttf-dejavu-core from exec_environ - change (operations/puppet)

2014-04-20 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/127476

Change subject: Tools: Remove already defined ttf-dejavu-core from exec_environ
..

Tools: Remove already defined ttf-dejavu-core from exec_environ

Change I04f3cad21579b5b35ddd6fbc1cc09f1e48bfc3a1 added ttf-dejavu-core
to imagescaler::packages::fonts, but it was also already defined in
exec_environ, so Puppet could not succeed on nodes using
role::labs::tools::execnode which includes both.

Bug: 64156
Change-Id: Ic937125db2c0276c30b2cbbc58bdc62908b33718
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/127476/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 29ee9b4..cd8dfb7 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -185,7 +185,6 @@
 # Fonts
 'fonts-ipafont-gothic',# for vCat tool (Japanese fonts)
 'fonts-unfonts-core',  # for vCat tool (Korean fonts)
-'ttf-dejavu-core', # for vCat tool (default font)
 'ttf-indic-fonts', # for vCat tool (fonts for many Indic 
languages)
 
 # tcl packages

-- 
To view, visit https://gerrit.wikimedia.org/r/127476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic937125db2c0276c30b2cbbc58bdc62908b33718
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Remove faulty exim configuration - change (operations/puppet)

2014-04-20 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/127481

Change subject: Tools: Remove faulty exim configuration
..

Tools: Remove faulty exim configuration

The present exim configuration seems to contain a typo
("relay_domains" vs. "relay_to_domains") which fills
/var/log/exim4/paniclog with lines like:

| 2014-04-16 21:07:26 unknown named domain list "+relay_domains"
| 2014-04-16 21:07:38 unknown named domain list "+relay_domains"
| 2014-04-16 21:16:34 unknown named domain list "+relay_domains"

ad nauseam.  As the configuration doesn't allow for any relaying at
all, this change removes the dead code altogether.

The error has appeared more often only recently.  This suggests that
only recently something has started to try sending mails to a
non-local domain.

Change-Id: I20afa5fb2be7d8b9cf5c3bf4018377d0e847daef
---
M modules/toollabs/templates/exim4.conf.erb
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/127481/1

diff --git a/modules/toollabs/templates/exim4.conf.erb 
b/modules/toollabs/templates/exim4.conf.erb
index eb2c660..bfad6a1 100644
--- a/modules/toollabs/templates/exim4.conf.erb
+++ b/modules/toollabs/templates/exim4.conf.erb
@@ -8,7 +8,6 @@
 qualify_domain = <%= @maildomain %>
 
 domainlist local_domains = <%= @maildomain %>
-domainlist relay_to_domains =
 hostlist relay_from_hosts = 10.0.0.0/8
 
 acl_smtp_rcpt = acl_check_rcpt
@@ -44,7 +43,7 @@
 control   = submission
 
 require message = relay not permitted
-domains = +local_domains : +relay_domains
+domains = +local_domains
 
 require verify = recipient
 

-- 
To view, visit https://gerrit.wikimedia.org/r/127481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I20afa5fb2be7d8b9cf5c3bf4018377d0e847daef
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Remove redundant package requirement - change (operations/puppet)

2014-04-23 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/129239

Change subject: Tools: Remove redundant package requirement
..

Tools: Remove redundant package requirement

The package jobutils that jsub is now part of requires
libstring-shellquote-perl itself, so we don't have to state that
dependency in Puppet as well any longer.

Change-Id: I52e66eaa6a397b3ffbb1ead693a06994efd7309b
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/129239/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index cd8dfb7..50421dd 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -100,7 +100,6 @@
 'libredis-perl',
 'libsocket-getaddrinfo-perl',
 'libstring-diff-perl',
-'libstring-shellquote-perl',   # For jsub.
 'libtask-weaken-perl',
 'libtest-exception-perl',  # For Checkwiki.
 'libtext-diff-perl',   # Bug 58744

-- 
To view, visit https://gerrit.wikimedia.org/r/129239
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52e66eaa6a397b3ffbb1ead693a06994efd7309b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Forward mail for root to the admin group - change (operations/puppet)

2014-03-27 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/121377

Change subject: Tools: Forward mail for root to the admin group
..

Tools: Forward mail for root to the admin group

Currently, mail for root is stuck as the account has no LDAP record.
This change effectively treats root as an alias for tools.admin, the
administrators' group.

Bug: 63165
Change-Id: Ia8208d0bc7bb1b8d5c0516f1cf532269689b8ce8
---
M modules/toollabs/files/localuser
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/121377/1

diff --git a/modules/toollabs/files/localuser b/modules/toollabs/files/localuser
index 1a8ba28..805308d 100755
--- a/modules/toollabs/files/localuser
+++ b/modules/toollabs/files/localuser
@@ -5,6 +5,12 @@
 # from:   toollabs::mailrelay
 #
 
+# Mail for root is handled by the maintainers of the admin service
+# group.
+if [ "x$1" = "xroot" ]; then
+exec maintainers tools.admin
+fi
+
 echo $(
   /usr/bin/ldapsearch -LLL -x -b "uid=$1,ou=people,dc=wikimedia,dc=org" mail |
/bin/sed -ne '/^mail: \(.*\)/{;s//\1,/;p;}'

-- 
To view, visit https://gerrit.wikimedia.org/r/121377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8208d0bc7bb1b8d5c0516f1cf532269689b8ce8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Work around problem with mail for nested service groups - change (operations/puppet)

2014-03-27 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/121398

Change subject: Tools: Work around problem with mail for nested service groups
..

Tools: Work around problem with mail for nested service groups

At the moment, mail for service groups that have other service groups
as members is stuck in the queue as the final recipients cannot be
determined.

This change filters out nested service groups, so mail to the
containing service group is only delivered to its "ordinary" members.

Bug: 63163
Change-Id: I8546cb6d8d91073fcfe96d9351fc28493781dd8b
---
M modules/toollabs/files/maintainers
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/121398/1

diff --git a/modules/toollabs/files/maintainers 
b/modules/toollabs/files/maintainers
index 3071039..2847104 100755
--- a/modules/toollabs/files/maintainers
+++ b/modules/toollabs/files/maintainers
@@ -5,8 +5,14 @@
 # from:   toollabs::mailrelay
 #
 
+# FIXME: For nested service groups, this returns only the addresses of
+# users who are direct members of the service group queried, but not
+# of those who are members of the related service groups.  This should
+# be replaced by a proper recursive query with protections against
+# circular loops, etc.
+
 echo $(
-  (/usr/bin/ldapsearch -LLL -x -b "cn=$1,ou=servicegroups,dc=wikimedia,dc=org" 
member|grep member:|while read x dn
+  (/usr/bin/ldapsearch -LLL -x -b "cn=$1,ou=servicegroups,dc=wikimedia,dc=org" 
member|grep member:|grep -v '^member: uid=\(local-\|tools\.\)'|while read x dn
   do
 /usr/bin/ldapsearch -LLL -x -b "$dn" mail
   done) |

-- 
To view, visit https://gerrit.wikimedia.org/r/121398
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8546cb6d8d91073fcfe96d9351fc28493781dd8b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add temporary PTR record for mail.tools.wmflabs.org - change (operations/dns)

2014-03-27 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/121416

Change subject: Add temporary PTR record for mail.tools.wmflabs.org
..

Add temporary PTR record for mail.tools.wmflabs.org

PTR records for public IPs should be handled dynamically by labs-ns0.
However, we need an interim solution for the Tools mail server as many
other mail servers reject mail from a server with no PTR record.

Bug: 51359
Bug: 62887
Change-Id: I16b7673e907550f7d9777f536706878183df4b7c
---
M templates/155.80.208.in-addr.arpa
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/16/121416/1

diff --git a/templates/155.80.208.in-addr.arpa 
b/templates/155.80.208.in-addr.arpa
index d4cbefd..05078b8 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -68,3 +68,10 @@
 
 
 ; 208.80.155.128/25 Eqiad Labs virtualization subnet
+
+; FIXME: These public IPs should be handled dynamically by labs-ns0
+; (cf. bug #62887).  However, we need an interim solution for the
+; Tools mail server as many other mail servers reject mail from a
+; server with no PTR record (cf. bug #51359).
+
+162 1H IN PTR   mail.tools.wmflabs.org.

-- 
To view, visit https://gerrit.wikimedia.org/r/121416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16b7673e907550f7d9777f536706878183df4b7c
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Simplify toolwatcher - change (labs/toollabs)

2014-03-29 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/122094

Change subject: Simplify toolwatcher
..

Simplify toolwatcher

At the moment, toolwatcher uses a cascade of grep, cut and two levels
of sed to extract a list of all tools.  This change simplifies that to
a single sed regular expression.

Also, permissions for the newly created directories are set by mkdir's
"-m" option instead of by a subsequent chmod call.  This removes a
(very theoretically exploitable) race condition as well.

Change-Id: I7a79c8fb6d1727e8d49febd964a4e1075e48a688
---
M configure.ac
M debian/changelog
M misctools/toolwatcher
3 files changed, 27 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/94/122094/1

diff --git a/configure.ac b/configure.ac
index 92d1b80..d2b4f81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([toollabs], [1.0.4dev], [mpellet...@wikimedia.org])
+AC_INIT([toollabs], [1.0.8dev], [mpellet...@wikimedia.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_TESTDIR([tests])
 
diff --git a/debian/changelog b/debian/changelog
index a3b166b..c154867 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+toollabs (1.0.8dev) unstable; urgency=low
+
+  * Simplify toolwatcher
+
+ -- Tim Landscheidt   Sun, 30 Mar 2014 05:03:51 +
+
 toollabs (1.0.7) unstable; urgency=low
 
   * Marc-André Pelletier: fixes for eqiad
diff --git a/misctools/toolwatcher b/misctools/toolwatcher
index 0b0d6d0..600ca0d 100755
--- a/misctools/toolwatcher
+++ b/misctools/toolwatcher
@@ -1,11 +1,11 @@
-#! /bin/bash
+#!/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
@@ -13,30 +13,26 @@
 # 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/
+cd /data/project
 export HOME=/root
-prefix=$(/bin/cat /etc/wmflabs-project)
+PREFIX=$(cat /etc/wmflabs-project)
 
-while true;do
+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"
 
-   getent passwd | grep "^$prefix\\." | cut -d : -f 1 | sed -n 
'/^[^.]*./{s///;p}' | while read tool; do
+mkdir -m u=rwx,g=rwsx,o=rx "$TOOL" "$TOOL/cgi-bin" 
"$TOOL/public_html"
+chown -R "$PREFIX.$TOOL:$PREFIX.$TOOL" "$TOOL"
+fi
+done
 
-   if [ ! -d "$tool" ]; then
-   logger -t toolwatcher "Creating tool $tool"
-
-   mkdir "$tool"
-   mkdir "$tool/public_html"
-   mkdir "$tool/cgi-bin"
-   chmod -R g+rw,o+r "$tool"
-   chown -R "$prefix.$tool:$prefix.$tool" "$tool"
-   find "$tool" -type d | xargs chmod g+sx,o+x
-   fi
-
-   done
-
-   sleep 120
-
+# Sleep for two minutes.
+sleep 120
 done
-

-- 
To view, visit https://gerrit.wikimedia.org/r/122094
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a79c8fb6d1727e8d49febd964a4e1075e48a688
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] WIP: Update rmtool - change (labs/toollabs)

2014-03-30 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/122274

Change subject: WIP: Update rmtool
..

WIP: Update rmtool

Change-Id: If40471197a8797386b89362016f5a3c6c0c86c48
---
M configure.ac
M debian/changelog
M misctools/rmtool
3 files changed, 50 insertions(+), 65 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/74/122274/1

diff --git a/configure.ac b/configure.ac
index 92d1b80..d2b4f81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([toollabs], [1.0.4dev], [mpellet...@wikimedia.org])
+AC_INIT([toollabs], [1.0.8dev], [mpellet...@wikimedia.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_TESTDIR([tests])
 
diff --git a/debian/changelog b/debian/changelog
index a3b166b..b743b50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+toollabs (1.0.8dev) unstable; urgency=low
+
+  * Update rmtool
+
+ -- Tim Landscheidt   Sun, 30 Mar 2014 20:06:52 +
+
 toollabs (1.0.7) unstable; urgency=low
 
   * Marc-André Pelletier: fixes for eqiad
diff --git a/misctools/rmtool b/misctools/rmtool
index 06a7696..2129d05 100755
--- a/misctools/rmtool
+++ b/misctools/rmtool
@@ -1,13 +1,18 @@
 #!/bin/bash
 
-if [ $UID -gt 0 ];then
-   echo "Error you must be root"
-   exit 2
+if [ $UID -gt 0 ]; then
+echo "Error you must be root"
+exit 2
 fi
 
-if [ $# -lt 1 ];then
-   echo "You need to provide a tool name"
-   exit 1
+if [ $# -lt 1 ]; then
+echo "You need to provide a tool name"
+exit 1
+fi
+
+if [ ! -d /data/project/.system/removed_tools ]; then
+echo "There is no folder to store removed tools!"
+exit 1
 fi
 
 tool=$1
@@ -18,9 +23,9 @@
 
 echo "There is $uc user accounts of name $dbuser in database"
 
-if [ "$uc" -gt 0 ];then
-   echo "Removing db access of $tool"
-   echo "drop user $dbuser;" | mysql mysql
+if [ "$uc" -gt 0 ]; then
+echo "Removing db access of $tool"
+echo "drop user $dbuser;" | mysql mysql
 fi
 
 # get the number of databases for this user
@@ -28,64 +33,38 @@
 
 echo "There is $db databases of name $tool in database"
 
-if [ "$db" -gt 0 ];then
-   echo "Creating a backup of database $tool"
-   if [ -f "/data/project/$tool/database_backup.sql" ];then
-   echo "Error there is already a backup file"
-   exit 1
-   fi
-   if [ ! -d "/data/project/$tool" ];then
-   echo "There is no folder to save backup of db to!"
-   exit 1
-   fi
-   mysqldump "$dbuser" > "/data/project/$tool/database_backup.sql"
-echo "Removing db access of $tool"
-echo "drop database $dbuser;" | mysql mysql
+if [ "$db" -gt 0 ]; then
+echo "Creating a backup of database $tool"
+if [ -f "/data/project/$tool/database_backup.sql" ]; then
+   echo "Error there is already a backup file"
+   exit 1
+fi
+if [ ! -d "/data/project/$tool" ]; then
+   echo "There is no folder to save backup of db to!"
+   exit 1
+fi
+mysqldump "$dbuser" > "/data/project/$tool/database_backup.sql"
+echo "Removing db access of $tool"
+echo "DROP DATABASE $dbuser;" | mysql mysql
 fi
 
-if [ ! -d /data/project/removed_tools ];then
-echo "There is no folder to store removed tools!"
-exit 1
-fi
-
-if [ -d "/data/project/$tool" ];then
-   echo "Removing data folder for $tool"
-   if [ -d "/data/project/removed_tools/$tool" ];then
-   echo "Unable to remove the folder, there is already backup 
folder with this name"
-   exit 1
+if [ -d "/data/project/$tool" ]; then
+echo "Removing data folder for $tool"
+if [ -d "/data/project/.system/removed_tools/$tool" ]; then
+   echo "Unable to remove the folder, there is already backup folder with 
this name"
+   exit 1
+fi
+mv -i "/data/project/$tool" "/data/project/.system/removed_tools/$tool/"
+if [ -f "/data/project/.system/removed_tools/$tool.tar.gz" ]; then
+   echo "Unable to tarball the folder because there is another tarball 
with same name"
+else
+   cd /data/project/.system/removed_tools
+   tar -zcvf "$tool.tar.gz" "$tool"
+   if [ -f "/data/project/.system/removed_tools/$tool.tar.gz" ]; then
+   echo Deleting project folder
+   rm -rf "/data/project/.system/removed_tools/$tool"
fi
-   mv "/data/project/$tool" "/data/project/removed_tools/$tool/"
-   if [ -f "/data/project/removed_tools/$tool.tar.gz" ];then
-   echo "Unable to tarball the folder because there is another 
tarball with same name"
-   else
-   cd /data/project/removed_tools
-   tar -zcvf "$tool.tar.gz" "$tool"
-   if [ -f "/data/project/removed_tools/$tool.tar.gz" ];then
-   echo Deleting project folder
-   rm -rf "/data/project/removed_tools/$tool"
-   fi
-   fi
+f

[MediaWiki-commits] [Gerrit] Tools: Install npm for users' use - change (operations/puppet)

2014-05-08 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/132238

Change subject: Tools: Install npm for users' use
..

Tools: Install npm for users' use

petan reported from the Zürich Hackathon that some people there want
to use npm to install Node.js packages in their tool's directory and
are blocked by npm not being available.

Change-Id: Ib29249c00a2840d9bedb100faab592ee9ea83458
---
M modules/toollabs/manifests/dev_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/132238/1

diff --git a/modules/toollabs/manifests/dev_environ.pp 
b/modules/toollabs/manifests/dev_environ.pp
index 87d830b..d82acf9 100644
--- a/modules/toollabs/manifests/dev_environ.pp
+++ b/modules/toollabs/manifests/dev_environ.pp
@@ -56,6 +56,7 @@
 'lynx',
 'mc', # Popular{{cn}} on Toolserver
 'mercurial',
+'npm',
 'openjdk-7-jdk',
 'pep8',# Bug 57863
 'pyflakes',# Bug 57863

-- 
To view, visit https://gerrit.wikimedia.org/r/132238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib29249c00a2840d9bedb100faab592ee9ea83458
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Install jq and pdftk - change (operations/puppet)

2014-05-08 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/132322

Change subject: Tools: Install jq and pdftk
..

Tools: Install jq and pdftk

Bug: 65048
Bug: 65049
Change-Id: Ic4a6bb3ad4e226922603de480a6b490c213074ef
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/132322/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index d2db619..5375382 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -212,6 +212,7 @@
 'graphicsmagick',  # Bug 56995
 'graphviz',
 'imagemagick', # Bug 63000
+'jq',  # Bug #65049.
 'ksh',
 'libav-tools', # Bug #53870.
 'libdmtx0a',   # Bug #53867.
@@ -242,6 +243,7 @@
 'socat',   # Bug 57005
 'supybot', # Bug 61088.
 'p7zip',
+'pdftk',   # Bug #65048.
 'phpunit',
 'poppler-utils',   # Bug #53869.
 'postgresql-client-9.1',

-- 
To view, visit https://gerrit.wikimedia.org/r/132322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4a6bb3ad4e226922603de480a6b490c213074ef
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ntp: Work around Labs network error - change (operations/puppet)

2014-03-12 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/118301

Change subject: ntp: Work around Labs network error
..

ntp: Work around Labs network error

On Labs the default "interface" configuration leads to ntpd
complaining that it can't create a IPv6 socket for eth0.  To work
around that, we let ntpd listen only on IPv4.

Bug: 60166
Change-Id: Ia88671965bb447bf306e97685ae35472cae721a9
---
M modules/ntp/templates/ntp-server.erb
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/118301/1

diff --git a/modules/ntp/templates/ntp-server.erb 
b/modules/ntp/templates/ntp-server.erb
index 3df250c..ba6bc56 100644
--- a/modules/ntp/templates/ntp-server.erb
+++ b/modules/ntp/templates/ntp-server.erb
@@ -62,3 +62,11 @@
 # next lines.  Please do this only if you trust everybody on the network!
 #disable auth
 #broadcastclient
+<% if @realm == "labs" then -%>
+
+# On Labs the default "interface" configuration leads to ntpd
+# complaining that it can't create a IPv6 socket for eth0
+# (cf. https://bugzilla.wikimedia.org/60166).  To work around that, we
+# let ntpd listen only on IPv4.
+interface listen ipv4
+<% end -%>

-- 
To view, visit https://gerrit.wikimedia.org/r/118301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia88671965bb447bf306e97685ae35472cae721a9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Install package joe - change (operations/puppet)

2014-03-13 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/118595

Change subject: Tools: Install package joe
..

Tools: Install package joe

Bug: 62236
Change-Id: I33dcde3dfd6d03ec17ee332eefe1880416a519f0
---
M modules/toollabs/manifests/dev_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/118595/1

diff --git a/modules/toollabs/manifests/dev_environ.pp 
b/modules/toollabs/manifests/dev_environ.pp
index 5bbc4ed..6243b3e 100644
--- a/modules/toollabs/manifests/dev_environ.pp
+++ b/modules/toollabs/manifests/dev_environ.pp
@@ -31,6 +31,7 @@
 'fakeroot', # for dpkg
 'gcj-jdk', # Bug 56995
 'ipython', # Bug 56995
+'joe', # Bug 62236.
 'libboost-python1.48-dev',
 'libdjvulibre-dev',# Bug 56972
 'libdmtx-dev', # Bug #53867.

-- 
To view, visit https://gerrit.wikimedia.org/r/118595
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33dcde3dfd6d03ec17ee332eefe1880416a519f0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] WIP: labsdeprepo: Allow more than one local repository - change (operations/puppet)

2014-03-14 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/118796

Change subject: WIP: labsdeprepo: Allow more than one local repository
..

WIP: labsdeprepo: Allow more than one local repository

Change-Id: I0a7d84579c6148a7249afa68f9b260adaf6a40ca
---
D files/misc/labsdebrepo.list
M manifests/misc/labsdebrepo.pp
A templates/misc/labsdebrepo.list
3 files changed, 13 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/118796/1

diff --git a/files/misc/labsdebrepo.list b/files/misc/labsdebrepo.list
deleted file mode 100644
index 08a816c..000
--- a/files/misc/labsdebrepo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# include the local per-project debian repo for labs
-deb [trusted=yes] file:///data/project/repo/ /
-
diff --git a/manifests/misc/labsdebrepo.pp b/manifests/misc/labsdebrepo.pp
index 1ffd56d..5f6841f 100644
--- a/manifests/misc/labsdebrepo.pp
+++ b/manifests/misc/labsdebrepo.pp
@@ -1,11 +1,12 @@
 # Puppet configs to create a local deb repo and add it to your sources.list
 
-class misc::labsdebrepo {
+class misc::labsdebrepo ($dir = '/data/project/repo', $handle = 'labsdebrepo') 
{
+
# manage /data/project/repo: make sure it's a directory and turn it 
into a deb repo
-   file { "/data/project/repo":
+   file { $dir:
ensure => directory;
}
-   file { "/data/project/repo/Packages.gz":
+   file { "${dir}/Packages.gz":
ensure => present;
}
# run dpkg-scanpackages . /dev/null | gzip -9c > binary/Packages.gz
@@ -13,19 +14,19 @@
package { "dpkg-dev":
ensure => present
}
-   exec { "Turn dir into deb repo":
-   cwd => "/data/project/repo",
+   exec { "Turn ${dir} into deb repo":
+   cwd => $dir,
command => "/usr/bin/dpkg-scanpackages . /dev/null | gzip -9c > 
Packages.gz",
# only run if Packages.gz is *not* the newest file in the 
directory
onlyif => "/usr/bin/test $(find . -newer Packages.gz | wc -l) 
-gt 0",
-   require => [Package["dpkg-dev"], File["/data/project/repo"]];
+   require => [Package["dpkg-dev"], File[$dir]];
}
# add the dir-turned-repo to sources.list
-   file { "/etc/apt/sources.list.d/labsdebrepo.list":
-   source => "puppet:///files/misc/labsdebrepo.list",
-   require => Exec["Turn dir into deb repo"];
+   file { "/etc/apt/sources.list.d/${handle}.list":
+   content => template('misc/labsdebrepo.list'),
+   require => Exec["Turn ${dir} into deb repo"];
}
-   file { "/etc/apt/preferences.d/labsdebrepo.pref":
+   file { "/etc/apt/preferences.d/${handle}.pref":
content => 'Explanation: Prefer local repo above others
 Package: *
 Pin: origin
@@ -33,4 +34,3 @@
 '
}
 }
-
diff --git a/templates/misc/labsdebrepo.list b/templates/misc/labsdebrepo.list
new file mode 100644
index 000..caf08c7
--- /dev/null
+++ b/templates/misc/labsdebrepo.list
@@ -0,0 +1,2 @@
+# Include a local per-project Debian repo for Labs.
+deb [trusted=yes] file://<%= @dir =>/ /

-- 
To view, visit https://gerrit.wikimedia.org/r/118796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a7d84579c6148a7249afa68f9b260adaf6a40ca
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] WIP: Tools: Use labsdeprepo - change (operations/puppet)

2014-03-18 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/119428

Change subject: WIP: Tools: Use labsdeprepo
..

WIP: Tools: Use labsdeprepo

Bug: 60925
Change-Id: I168565f61b2af26558becfbceb0dce29b4040ee5
---
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/master.pp
2 files changed, 3 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/28/119428/1

diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 6fa1943..7bbbda8 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -101,13 +101,8 @@
 # that are intended to be local to the project.  By keeping it on the
 # shared storage, we have no need to set up a server to use it.
 
-file { '/etc/apt/sources.list.d/local.list':
-ensure  => file,
-content => "deb [ arch=amd64 trusted=yes ] file:${repo}/ amd64/\ndeb 
[arch=all trusted=yes ] file:${repo}/ all/\n",
-mode=> '0444',
-owner   => 'root',
-group   => 'root',
-}
+misc::labsdebrepo { 'arch=amd64', 'trusted=yes', "$repo/amd64": }
+misc::labsdebrepo { 'arch=all', 'trusted=yes', "$repo/all": }
 
 # Trustworthy enough
 file { '/etc/apt/sources.list.d/mariadb.list':
diff --git a/modules/toollabs/manifests/master.pp 
b/modules/toollabs/manifests/master.pp
index ab61220..7dffe61 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -33,12 +33,7 @@
 }
 
 file { "${repo}/update-repo.sh":
-ensure  => file,
-owner   => 'local-admin',
-group   => 'local-admin',
-mode=> '0550',
-require => File[$repo],
-source  => 'puppet:///modules/toollabs/update-repo.sh',
+ensure  => absent,
 }
 
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/119428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I168565f61b2af26558becfbceb0dce29b4040ee5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Labs: Provide symbolic links to dumps for compatibility - change (operations/puppet)

2014-03-19 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/119438

Change subject: Labs: Provide symbolic links to dumps for compatibility
..

Labs: Provide symbolic links to dumps for compatibility

Bug: 62296
Change-Id: Ia0dd680b5693882f3990e0753a794e763533cde8
---
M manifests/role/labs.pp
1 file changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/119438/1

diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index de54e5d..ff1596e 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -63,6 +63,21 @@
 require => File['/public/dumps'],
 }
 
+# Symbolic links for pmtpa compatibility.
+file { '/public/datasets':
+ensure  => 'directory',
+owner   => 'root',
+group   => 'root',
+require => File['/public'],
+}
+file { '/public/datasets/public':
+ensure  => 'target',
+owner   => 'root',
+group   => 'root',
+target  => '/public/dumps/public',
+require => File['/public/datasets'],
+}
+
 file { '/public/backups':
 ensure => directory,
 require => File['/public'],

-- 
To view, visit https://gerrit.wikimedia.org/r/119438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0dd680b5693882f3990e0753a794e763533cde8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] become: Add --help option - change (labs/toollabs)

2014-03-20 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/119882

Change subject: become: Add --help option
..

become: Add --help option

Bug: 61832
Change-Id: Id0edbe43ea566a2570939014a3bd0db3814f5f3f
---
M configure.ac
M debian/changelog
M misctools/become
3 files changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/82/119882/1

diff --git a/configure.ac b/configure.ac
index 92d1b80..d2b4f81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([toollabs], [1.0.4dev], [mpellet...@wikimedia.org])
+AC_INIT([toollabs], [1.0.8dev], [mpellet...@wikimedia.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_TESTDIR([tests])
 
diff --git a/debian/changelog b/debian/changelog
index a3b166b..8d3502c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+toollabs (1.0.8dev) unstable; urgency=low
+
+  * become: Add --help option.
+
+ -- Tim Landscheidt   Thu, 20 Mar 2014 21:36:23 +
+
 toollabs (1.0.7) unstable; urgency=low
 
   * Marc-André Pelletier: fixes for eqiad
diff --git a/misctools/become b/misctools/become
index 2b6fbbc..51ccdb9 100755
--- a/misctools/become
+++ b/misctools/become
@@ -16,7 +16,7 @@
 #
 
 prefix=$(/bin/cat /etc/wmflabs-project)
-if [ $# -lt 1 ]; then
+if [ $# -lt 1 -o "$1" = "--help" ]; then
   echo "usage: $(basename $0)  [command [args...]]" >&2
   exit 1
 fi

-- 
To view, visit https://gerrit.wikimedia.org/r/119882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0edbe43ea566a2570939014a3bd0db3814f5f3f
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Purodha 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] WIP: Tools: Puppetize toolwatcher - change (operations/puppet)

2014-03-21 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/120186

Change subject: WIP: Tools: Puppetize toolwatcher
..

WIP: Tools: Puppetize toolwatcher

toolwatcher initializes home directories for tool accounts.
Previously, its setup was done manually.

Rather than hinging this on toollabs::master or some other not
directly causally related class that is likely to be used only once,
we define a new role role::labs::tools::toolwatcher.

Change-Id: Ia65b41795ab118be048a5b95536a5f75300d87d9
---
M manifests/role/labstools.pp
A modules/toollabs/files/toolwatcher.conf
A modules/toollabs/manifests/toolwatcher.pp
3 files changed, 40 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/120186/1

diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index db3eff6..2811341 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -83,5 +83,10 @@
 }
   }
 
+  class toolwatcher inherits role::labs::tools::config {
+system::role { "role::labs::tools::toolwatcher": description => "Server 
that runs toolwatcher" }
+include toollabs::toolwatcher
+  }
+
 } # class role::labs::tools
 
diff --git a/modules/toollabs/files/toolwatcher.conf 
b/modules/toollabs/files/toolwatcher.conf
new file mode 100644
index 000..97ad7d9
--- /dev/null
+++ b/modules/toollabs/files/toolwatcher.conf
@@ -0,0 +1,8 @@
+description "creates tool homes"
+
+start on runlevel [2345]
+stop on runlevel [06]
+
+respawn
+
+exec /usr/sbin/toolwatcher
diff --git a/modules/toollabs/manifests/toolwatcher.pp 
b/modules/toollabs/manifests/toolwatcher.pp
new file mode 100644
index 000..ef2349a
--- /dev/null
+++ b/modules/toollabs/manifests/toolwatcher.pp
@@ -0,0 +1,27 @@
+# toollabs::toolwatcher sets up a host with a service that scans every
+# two minutes for tool accounts whose home directory doesn't exist
+# yet.  For each such tool account, the toolwatcher creates the home
+# directory with the subdirectories cgi-bin and public_html owned by
+# the tool account and its group and sets the permissions to
+# g+srwx,o+rx.
+class toollabs::toolwatcher
+inherits toollabs {
+package { 'misctools':
+ensure => latest,
+}
+
+file { '/etc/init/toolwatcher.conf':
+ensure => file,
+source => 'puppet:///modules/toollabs/toolwatcher.conf',
+user   => 'root',
+group  => 'root',
+mode   => '0444',
+}
+
+service { 'toolwatcher':
+ensure=> running,
+provider  => 'upstart',
+require   => File['/etc/init/toolwatcher.conf'],
+subscribe => File['/etc/init/toolwatcher.conf'],
+}
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/120186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia65b41795ab118be048a5b95536a5f75300d87d9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Install package libxml2-utils for xmllint - change (operations/puppet)

2014-03-21 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/120187

Change subject: Tools: Install package libxml2-utils for xmllint
..

Tools: Install package libxml2-utils for xmllint

Bug: 62944
Change-Id: I68939699832b9e35e9e9d7b780b12101736bf4bd
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/120187/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 0a4a683..79317a1 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -232,6 +232,7 @@
 'libsvn1',
 'libvips-tools',
 'libvips15',
+'libxml2-utils',   # Bug 62944.
 'libzbar0',# Bug 56996
 'mariadb-client',  # For /usr/bin/mysql.
 'mdbtools',# Bug #48805.

-- 
To view, visit https://gerrit.wikimedia.org/r/120187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68939699832b9e35e9e9d7b780b12101736bf4bd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Rename references to local-admin to tools.admin - change (operations/puppet)

2014-03-22 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/120241

Change subject: Tools: Rename references to local-admin to tools.admin
..

Tools: Rename references to local-admin to tools.admin

Bug: 62961
Change-Id: I75c30a00f9e75626c1ae30accf40c4f8c145d66c
---
M modules/toollabs/files/motd-tips.sh
M modules/toollabs/manifests/infrastructure.pp
M modules/toollabs/manifests/master.pp
3 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/120241/1

diff --git a/modules/toollabs/files/motd-tips.sh 
b/modules/toollabs/files/motd-tips.sh
index 4e45159..27be8ce 100644
--- a/modules/toollabs/files/motd-tips.sh
+++ b/modules/toollabs/files/motd-tips.sh
@@ -26,7 +26,7 @@
 fi
 
 # If user is sysadmin print the sysadmin motd instead.
-if groups | fgrep -qw local-admin; then
+if groups | fgrep -qw tools.admin; then
 if [ -f /etc/motd.sysadmin ]; then
 echo
 echo
diff --git a/modules/toollabs/manifests/infrastructure.pp 
b/modules/toollabs/manifests/infrastructure.pp
index 9ff9bc2..6147bb3 100644
--- a/modules/toollabs/manifests/infrastructure.pp
+++ b/modules/toollabs/manifests/infrastructure.pp
@@ -26,7 +26,7 @@
 # service group and root.
 
 File <| title == '/etc/security/access.conf' |> {
-content => "-:ALL EXCEPT (local-admin) root:ALL\n",
+content => "-:ALL EXCEPT (tools.admin) root:ALL\n",
 }
 }
 
diff --git a/modules/toollabs/manifests/master.pp 
b/modules/toollabs/manifests/master.pp
index ab61220..584786c 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -26,16 +26,16 @@
 
 file { $repo:
 ensure  => directory,
-owner   => 'local-admin',
-group   => 'local-admin',
+owner   => 'tools.admin',
+group   => 'tools.admin',
 mode=> '0755',
 require => File[$sysdir],
 }
 
 file { "${repo}/update-repo.sh":
 ensure  => file,
-owner   => 'local-admin',
-group   => 'local-admin',
+owner   => 'tools.admin',
+group   => 'tools.admin',
 mode=> '0550',
 require => File[$repo],
 source  => 'puppet:///modules/toollabs/update-repo.sh',

-- 
To view, visit https://gerrit.wikimedia.org/r/120241
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I75c30a00f9e75626c1ae30accf40c4f8c145d66c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Rename reference to "local-" to "tools." - change (operations/puppet)

2014-03-22 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/120242

Change subject: Tools: Rename reference to "local-" to "tools."
..

Tools: Rename reference to "local-" to "tools."

Bug: 62961
Change-Id: Iaec05f4973f919d829c31d6acb447109efa0e08e
---
M modules/toollabs/files/motd-tips.sh
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/120242/1

diff --git a/modules/toollabs/files/motd-tips.sh 
b/modules/toollabs/files/motd-tips.sh
index 4e45159..c410c20 100644
--- a/modules/toollabs/files/motd-tips.sh
+++ b/modules/toollabs/files/motd-tips.sh
@@ -16,7 +16,7 @@
 fi
 
 # Don't display tips for root and tool accounts.
-if [ $UID -eq 0 ] || [ "${USER:0:6}" = "local-" ]; then
+if [ $UID -eq 0 ] || [ "${USER:0:6}" = "tools." ]; then
 return
 fi
 

-- 
To view, visit https://gerrit.wikimedia.org/r/120242
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaec05f4973f919d829c31d6acb447109efa0e08e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Adapt proxylistener to eqiad naming scheme - change (operations/puppet)

2014-03-22 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/120243

Change subject: Tools: Adapt proxylistener to eqiad naming scheme
..

Tools: Adapt proxylistener to eqiad naming scheme

In eqiad, tool accounts are now named "tools.TOOL", and there are
precautions in place that user accounts cannot be named in this way.

Bug: 62961
Change-Id: Iaa44f442a10ad1c65bf4e33255ce2093f98cb12a
---
M modules/toollabs/files/proxylistener.py
1 file changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/120243/1

diff --git a/modules/toollabs/files/proxylistener.py 
b/modules/toollabs/files/proxylistener.py
index 97c2e5b..5d13368 100644
--- a/modules/toollabs/files/proxylistener.py
+++ b/modules/toollabs/files/proxylistener.py
@@ -81,15 +81,12 @@
 return
 
 # Only tool accounts are allowed to ask for routes
-# Assume that *only* tool accounts will have local- prefix
-# Since user accounts need to be approved, and I doubt anything with 
local-
-# will make it.
-if not user.startswith('local-'):
+if not user.startswith('tools.'):
 self.request.send("This service available only to tool accounts")
 self.request.close()
 return
 
-toolname = user.replace("local-", "")
+toolname = user.replace("tools.", "")
 
 redis_key = "prefix:%s" % toolname
 

-- 
To view, visit https://gerrit.wikimedia.org/r/120243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa44f442a10ad1c65bf4e33255ce2093f98cb12a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Remove unused syslog role - change (operations/puppet)

2014-03-22 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/120347

Change subject: Tools: Remove unused syslog role
..

Tools: Remove unused syslog role

The development of a central logging server (classes
role::labs::tools::syslog and toollabs::syslog) never really got off
the ground.  To avoid confusion, this change removes them.

Change-Id: If218513849874b973da951b9a427a6ed1030c29b
---
M manifests/role/labsbeta.pp
M manifests/role/labstools.pp
D modules/toollabs/manifests/syslog.pp
3 files changed, 0 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/120347/1

diff --git a/manifests/role/labsbeta.pp b/manifests/role/labsbeta.pp
index 3d1b881..edac5f2 100644
--- a/manifests/role/labsbeta.pp
+++ b/manifests/role/labsbeta.pp
@@ -57,11 +57,6 @@
 }
   }
 
-  class syslog inherits role::labs::toolsbeta::config {
-system::role { "role::labs::toolsbeta::syslog": description => "Central 
logging server for tools and services" }
-class { 'toollabs::syslog': }
-  }
-
   class redis inherits role::labs::toolsbeta::config {
 system::role { "role::labs::toolsbeta::redis": description => "Server that 
hosts shared Redis instance" }
 class { 'toollabs::redis': }
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index db3eff6..8d25c67 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -71,11 +71,6 @@
 }
   }
 
-  class syslog inherits role::labs::tools::config {
-system::role { "role::labs::tools::syslog": description => "Central 
logging server for tools and services" }
-class { 'toollabs::syslog': }
-  }
-
   class redis inherits role::labs::tools::config {
 system::role { "role::labs::tools::redis": description => "Server that 
hosts shared Redis instance" }
 class { 'toollabs::redis':
diff --git a/modules/toollabs/manifests/syslog.pp 
b/modules/toollabs/manifests/syslog.pp
deleted file mode 100644
index 1d8b3ee..000
--- a/modules/toollabs/manifests/syslog.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# Class: toollabs::syslog
-#
-# This role sets up a central logging server in the Tool Labs model.
-#
-# Parameters:
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class toollabs::syslog inherits toollabs {
-include toollabs::infrastructure
-
-#TODO:  config
-}
-

-- 
To view, visit https://gerrit.wikimedia.org/r/120347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If218513849874b973da951b9a427a6ed1030c29b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Remove obsolete webserver class - change (operations/puppet)

2014-03-22 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/120348

Change subject: Tools: Remove obsolete webserver class
..

Tools: Remove obsolete webserver class

In eqiad there are no webservers, and thus toollabs::webserver is now
obsolete.

Also, for toollabs::proxy there are no longer servers to fall back on,
so remove their list in order to let the proxy handle non-existing
URLs itself.

Change-Id: I994d8671546debf1553e9cf93021abc9776b3d5d
---
M manifests/role/labsbeta.pp
M manifests/role/labstools.pp
M modules/toollabs/manifests/proxy.pp
D modules/toollabs/manifests/webserver.pp
4 files changed, 0 insertions(+), 67 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/120348/1

diff --git a/manifests/role/labsbeta.pp b/manifests/role/labsbeta.pp
index 3d1b881..70a5ba8 100644
--- a/manifests/role/labsbeta.pp
+++ b/manifests/role/labsbeta.pp
@@ -37,13 +37,6 @@
 }
   }
 
-  class webserver inherits role::labs::toolsbeta::config {
-system::role { "role::labs::toolsbeta::webserver": description => "Tool 
Labs webserver" }
-class { 'toollabs::webserver':
-  gridmaster => $grid_master,
-}
-  }
-
   class webproxy inherits role::labs::toolsbeta::config {
 system::role { "role::labs::toolsbeta::webproxy": description => "Tool 
Labs web proxy" }
 class { 'toollabs::webproxy': }
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index db3eff6..e3b18a1 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -46,13 +46,6 @@
 }
   }
 
-  class webserver inherits role::labs::tools::config {
-system::role { "role::labs::tools::webserver": description => "Tool Labs 
webserver" }
-class { 'toollabs::webserver':
-  gridmaster => $grid_master,
-}
-  }
-
   class webproxy inherits role::labs::tools::config {
 system::role { "role::labs::tools::webproxy": description => "Tool Labs 
web proxy" }
 include toollabs::webproxy
diff --git a/modules/toollabs/manifests/proxy.pp 
b/modules/toollabs/manifests/proxy.pp
index 1a35965..bf26821 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -1,12 +1,8 @@
 # A dynamic HTTP routing proxy, based on the dynamicproxy module.
-# When no route is found, passes on the request to one of the apaches.
 class toollabs::proxy inherits toollabs {
 include toollabs::infrastructure
 
-$apaches = [ 'tools-webserver-01.pmtpa.wmflabs', 
'tools-webserver-02.pmtpa.wmflabs', 'tools-webserver-03.pmtpa.wmflabs' ]
-
 class { '::dynamicproxy':
-notfound_servers => $apaches,
 luahandler   => 'urlproxy.lua'
 }
 }
diff --git a/modules/toollabs/manifests/webserver.pp 
b/modules/toollabs/manifests/webserver.pp
deleted file mode 100644
index b93fdbf..000
--- a/modules/toollabs/manifests/webserver.pp
+++ /dev/null
@@ -1,49 +0,0 @@
-# Class: toollabs::webserver
-#
-# This role sets up a webserver in the Tool Labs model.
-#
-# Parameters:
-#   gridmaster => FQDN of the gridengine master
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class toollabs::webserver($gridmaster) inherits toollabs {
-include toollabs::infrastructure,
-toollabs::exec_environ,
-toollabs::gridnode
-
-class { 'gridengine::submit_host':
-gridmaster => $gridmaster,
-}
-
-package { [
-'libapache2-mod-suphp',
-]:
-ensure => present
-}
-
-file { "${store}/submithost-${::fqdn}":
-ensure  => file,
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
-require => File[$store],
-content => "${::ipaddress}\n",
-}
-
-file { '/etc/ssh/ssh_config':
-ensure => file,
-mode   => '0444',
-owner  => 'root',
-group  => 'root',
-source => 'puppet:///modules/toollabs/submithost-ssh_config',
-}
-
-# TODO: Apache config
-# TODO: Local scripts
-}
-

-- 
To view, visit https://gerrit.wikimedia.org/r/120348
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I994d8671546debf1553e9cf93021abc9776b3d5d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Add Ukrainian locale and sort list - change (operations/puppet)

2014-02-01 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/110827

Change subject: Tools: Add Ukrainian locale and sort list
..

Tools: Add Ukrainian locale and sort list

Bug: 60730
Change-Id: Ica8158acf0fc3b172394299e5bf18b4b2ed8ea0e
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 14 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/110827/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index c12e89c..790c70f 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -23,21 +23,22 @@
 # Please keep all packages in each group sorted in alphabetical order
 
 # Locales (Bug 58500)
+'language-pack-ar',
+'language-pack-bn',
+'language-pack-de',
+'language-pack-en',
+'language-pack-es',
+'language-pack-fr',
+'language-pack-he',
+'language-pack-hi',
+'language-pack-ja',
+'language-pack-nl',
+'language-pack-pa',
+'language-pack-pt',
+'language-pack-ru',
+'language-pack-uk',# Bug 60730.
 'language-pack-zh-hans',
 'language-pack-zh-hant',
-'language-pack-es',
-'language-pack-en',
-'language-pack-hi',
-'language-pack-ar',
-'language-pack-pt',
-'language-pack-bn',
-'language-pack-ru',
-'language-pack-ja',
-'language-pack-pa',
-'language-pack-de',
-'language-pack-fr',
-'language-pack-nl',
-'language-pack-he',
 
 # Language Runtimes
 'gcj-jre', # Bug 56995
@@ -258,4 +259,3 @@
 
   # TODO: quotas
 }
-

-- 
To view, visit https://gerrit.wikimedia.org/r/110827
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica8158acf0fc3b172394299e5bf18b4b2ed8ea0e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Mirror font packages used in production - change (operations/puppet)

2014-02-04 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/111226

Change subject: Tools: Mirror font packages used in production
..

Tools: Mirror font packages used in production

Bug: 58740
Change-Id: I421685039b7ae9f73535ac92b3d8b6e5ecf1b1ac
---
M manifests/role/labs.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/111226/1

diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 418bc0f..5361eb5 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -23,6 +23,7 @@
 class { 'toollabs::execnode':
   gridmaster => $grid_master,
 }
+class { 'imagescaler::packages::fonts': }
   }
 
   class webnode inherits role::labs::tools::config {

-- 
To view, visit https://gerrit.wikimedia.org/r/111226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I421685039b7ae9f73535ac92b3d8b6e5ecf1b1ac
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Dynamic proxy: Serve SSL certificate chain - change (operations/puppet)

2014-02-04 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/111342

Change subject: Dynamic proxy: Serve SSL certificate chain
..

Dynamic proxy: Serve SSL certificate chain

Bug: 60833
Change-Id: Ie3b04461e75cda5acaa2428b768f50f335fad190
---
M modules/dynamicproxy/templates/proxy.conf
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/111342/1

diff --git a/modules/dynamicproxy/templates/proxy.conf 
b/modules/dynamicproxy/templates/proxy.conf
index 71465ba..475e137 100644
--- a/modules/dynamicproxy/templates/proxy.conf
+++ b/modules/dynamicproxy/templates/proxy.conf
@@ -36,7 +36,7 @@
 # Serve both HTTP and HTTPS
 listen 443 default_server ssl spdy;
 
-ssl_certificate /etc/ssl/certs/<%= @ssl_certificate_name %>.pem;
+ssl_certificate /etc/ssl/certs/<%= @ssl_certificate_name %>.chained.pem;
 ssl_certificate_key /etc/ssl/private/<%= @ssl_certificate_name %>.key;
 
 # Copied from templates/nginx/nginx.conf.erb. Eugh

-- 
To view, visit https://gerrit.wikimedia.org/r/111342
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3b04461e75cda5acaa2428b768f50f335fad190
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Revert "icinga: remove check_ram.sh doesn't seem to be used ... - change (operations/puppet)

2014-02-05 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/111457

Change subject: Revert "icinga: remove check_ram.sh doesn't seem to be used 
anywhere"
..

Revert "icinga: remove check_ram.sh doesn't seem to be used anywhere"

This reverts commit 95fdd0550466d0e307504cdbdddc0c0709a8f60c.  check_ram.sh is 
used by Icinga on Wikimedia Labs.

Change-Id: Ieca1ef96e88a2b62b19019865646fbf63d1e666c
---
A files/icinga/check_ram.sh
M manifests/misc/icinga.pp
M modules/nrpe/templates/nrpe_local.cfg.erb
3 files changed, 70 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/111457/1

diff --git a/files/icinga/check_ram.sh b/files/icinga/check_ram.sh
new file mode 100755
index 000..2341d10
--- /dev/null
+++ b/files/icinga/check_ram.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# Plugin to check free ram space
+# using check_by_ssh
+# by Markus Walther (voltsh...@gmx.de)
+# modified by Petr Bena (benap...@gmail.com)
+# The script needs a working check_by_ssh connection and needs to run on the 
client to check it
+#
+# Command-Line for check_by_ssh
+# command_line $USER1$/check_by_ssh -H $HOSTNAME$ -p $ARG1$ -C "$ARG2$ $ARG3$ 
$ARG4$ $ARG5$ $ARG6$"
+#
+# Command-Line for service (example)
+# check_by_ssh!82!/nagios/check_ram.sh!20!10
+#
+##
+
+case $1 in
+  --help | -h )
+echo "Usage: check_ram [warn] [crit]"
+echo " [warn] and [crit] as int"
+echo " Example: check_ram 20 10"
+exit 3
+ ;;
+  * )
+;;
+esac
+
+warn=$1
+crit=$2
+buffer=$3
+
+if [ ! "$1" -o ! "$2" ]; then
+echo "Usage: check_ram [warn] [crit]"
+echo " [warn] and [crit] as int"
+echo " Example: check_ram 20 10"
+echo "Unknown: Options missing: using default (warn=20, crit=10)"
+warn=`echo $((20))`
+crit=`echo $((10))`
+fi
+
+if [ "$buffer" != "b" ];then
+full=`free | grep Mem | sed -r 's/\ +/\ /g' | cut -d \  -f 3`
+free=`free | grep Mem | sed -r 's/\ +/\ /g' | cut -d \  -f 4`
+else
+full=`free | grep 'buffers\/cache' | sed 's/\-\/+\sbuffers\/cache\://' | 
sed -r 's/\ +/\ /g' | cut -d \  -f 2`
+free=`free | grep 'buffers\/cache' | sed 's/\-\/+\sbuffers\/cache\://' | 
sed -r 's/\ +/\ /g' | cut -d \  -f 3`
+fi
+
+if [ "$warn" -lt "$crit" -o "$warn" -eq "$crit" ]; then
+   echo "Unknown: [warn] must be larger than [crit]"
+exit 3
+fi
+
+use=`echo $(( ($free * 100) / ( $full + $free ) ))`
+
+if [ "$use" -gt "$warn" -o "$use" -eq "$warn" ]; then
+echo "OK: $use% free memory"
+exit 0
+ elif [ "$use" -lt "$warn" -a "$use" -gt "$crit" ]; then
+echo "Warning: $use% free memory"
+exit 1
+ elif [ "$use" -eq "$crit" -o "$use" -lt "$crit" ]; then
+echo "Critical: $use% free memory"
+exit 2
+ else
+echo "Unknown"
+exit 3
+fi
+
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index c84eb0d..3303855 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -587,9 +587,7 @@
   owner => 'root',
   group => 'root',
   mode => '0755';
-#after absent everywhere, remove entire resource as it is not used
 '/usr/lib/nagios/plugins/check_ram.sh':
-  ensure => 'absent',
   source => 'puppet:///files/icinga/check_ram.sh',
   owner => 'root',
   group => 'root',
diff --git a/modules/nrpe/templates/nrpe_local.cfg.erb 
b/modules/nrpe/templates/nrpe_local.cfg.erb
index cd30c25..0413dae 100644
--- a/modules/nrpe/templates/nrpe_local.cfg.erb
+++ b/modules/nrpe/templates/nrpe_local.cfg.erb
@@ -10,6 +10,7 @@
 command[check_disk_5_2]=/usr/lib/nagios/plugins/check_disk -w 5% -c 2% -l -e
 command[check_disk_6_3]=/usr/lib/nagios/plugins/check_disk -w 6% -c 3% -l -e
 command[check_disk_6_4]=/usr/lib/nagios/plugins/check_disk -w 6% -c 4% -l -e
+command[check_ram]=/usr/lib/nagios/plugins/check_ram.sh 20 5 b
 
 # process checks, we can't make this generic because we don't pass args via 
nrpe (security)
 command[check_mailman]=/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1:35 -a 
mailman

-- 
To view, visit https://gerrit.wikimedia.org/r/111457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieca1ef96e88a2b62b19019865646fbf63d1e666c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix sudo chown rule for service groups - change (mediawiki...OpenStackManager)

2014-02-06 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/111755

Change subject: Fix sudo chown rule for service groups
..

Fix sudo chown rule for service groups

The present rule was unapplicable as sudo requires fully qualified
command file names, i. e. "/bin/true" instead of "true".  Also, sudo
requires colons to be escaped with backslashes.

This change does not update the already created, wrong sudo rules for
existing service groups.  It might make sense to clean this up as part
of transitioning service groups to new globally unique names and UIDs
(bug 58997).

Bug: 48105
Change-Id: I834de96fe93452f22ee6e4eec283cf2e958917d0
---
M nova/OpenStackNovaServiceGroup.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager 
refs/changes/55/111755/1

diff --git a/nova/OpenStackNovaServiceGroup.php 
b/nova/OpenStackNovaServiceGroup.php
index 9c69912..916f1f4 100644
--- a/nova/OpenStackNovaServiceGroup.php
+++ b/nova/OpenStackNovaServiceGroup.php
@@ -542,7 +542,7 @@
array( $groupName ),
array( 'ALL' ),
array(),
-   array( 'chown -R ' . $groupName . ':' . 
$groupName . ' ' . $homeDir ),
+   array( '/bin/chown -R ' . $groupName . '\:' . 
$groupName . ' ' . $homeDir ),
array( '!authenticate' ) ) ) {
$wgAuth->printDebug( "Successfully created chmod sudo 
policy for $groupName",
NONSENSITIVE );
@@ -656,7 +656,7 @@
array( $groupName ),
array( 'ALL' ),
array(),
-   array( 'chown -R ' . $groupName . ':' . 
$groupName . ' ' . $homeDir ),
+   array( '/bin/chown -R ' . $groupName . '\:' . 
$groupName . ' ' . $homeDir ),
array( '!authenticate' ) ) ) {
$wgAuth->printDebug( "Successfully created chmod sudo 
policy for $groupName",
NONSENSITIVE );

-- 
To view, visit https://gerrit.wikimedia.org/r/111755
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I834de96fe93452f22ee6e4eec283cf2e958917d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Install package supybot - change (operations/puppet)

2014-02-08 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/112202

Change subject: Tools: Install package supybot
..

Tools: Install package supybot

Bug: 61088
Change-Id: Ib45ded670d4096bbe4103bc40a86d70a07d3362f
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/112202/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 790c70f..47576ca 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -235,6 +235,7 @@
 'mariadb-client',  # For /usr/bin/mysql.
 'mdbtools',# Bug #48805.
 'socat',   # Bug 57005
+'supybot', # Bug 61088.
 'p7zip',
 'phpunit',
 'poppler-utils',   # Bug #53869.

-- 
To view, visit https://gerrit.wikimedia.org/r/112202
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib45ded670d4096bbe4103bc40a86d70a07d3362f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix typo - change (operations/mediawiki-config)

2014-02-08 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/112239

Change subject: Fix typo
..

Fix typo

Change-Id: Ifb10bfeefc3b54048be49b3922e08b95e43c1a96
---
M multiversion/MWMultiVersion.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/39/112239/1

diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 991f986..3dc271b 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -33,7 +33,7 @@
private $versionLoaded = false;
 
/**
-* To get an inststance of this class, use the static helper methods.
+* To get an instance of this class, use the static helper methods.
 * @see getInstanceForWiki
 * @see getInstanceForUploadWiki
 */

-- 
To view, visit https://gerrit.wikimedia.org/r/112239
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb10bfeefc3b54048be49b3922e08b95e43c1a96
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Work around missing LDAP sudo rules - change (operations/puppet)

2014-02-11 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/112666

Change subject: Tools: Work around missing LDAP sudo rules
..

Tools: Work around missing LDAP sudo rules

Some service groups don't have sudo rules in LDAP.  To work around
this, we create them locally.

/etc/sudoers.d/tools-ldap-fix is a hot fix that is replaced by this
change.

Bug: 60937
Change-Id: Id5c13b3b50ba495724923f0a392616d04e1da0d5
---
M modules/toollabs/manifests/init.pp
1 file changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/112666/1

diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 244ce54..48bd167 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -125,4 +125,19 @@
 force  => true,
 target => "${store}/mail",
 }
+
+# FIXME: Some tools don't have sudo rules in LDAP at the moment.
+define tools_sudo_ldap_fix ($tool = $title, $ensure = 'present') {
+sudo_group { "local-${tool}":
+ensure => $ensure,
+group  => "local-${tool}",
+privileges => ["ALL=(local-${tool}) NOPASSWD: ALL"];
+}
+}
+tools_sudo_ldap_fix { ['afcbot', 'anagrimes', 'csbot', 'daahbot', 'ftl',
+   'legobot', 'matilda', 'wiktioutils']:
+}
+file { '/etc/sudoers.d/tools-ldap-fix':
+ensure => absent;
+}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/112666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5c13b3b50ba495724923f0a392616d04e1da0d5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Remove SGE shadow master - change (operations/puppet)

2014-02-11 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/112671

Change subject: Tools: Remove SGE shadow master
..

Tools: Remove SGE shadow master

We don't use tools-shadow in any meaningful way; it's apparently
neither set up to automatically take over nor, judging from past
experience, it's likely that we need some hot fail-over as most (all?)
SGE snafus so far were not related to a failure in tools-master, but
FS failures, a confused exec node, etc.

Bug: 61190
Change-Id: I85b272c90627f22d91590bb458ef4e50b4ea1c47
---
M manifests/role/labs.pp
M manifests/role/labsbeta.pp
D modules/gridengine/manifests/shadow_master.pp
M modules/toollabs/manifests/master.pp
D modules/toollabs/manifests/shadow.pp
5 files changed, 0 insertions(+), 60 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/112671/1

diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 5361eb5..0252005 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -38,13 +38,6 @@
 class { 'toollabs::master': }
   }
 
-  class shadow inherits role::labs::tools::config {
-system::role { "role::labs::tools::shadow": description => "Tool Labs 
gridengine shadow (backup) master" }
-class { 'toollabs::shadow':
-  gridmaster => $grid_master,
-}
-  }
-
   class webserver inherits role::labs::tools::config {
 system::role { "role::labs::tools::webserver": description => "Tool Labs 
webserver" }
 class { 'toollabs::webserver':
diff --git a/manifests/role/labsbeta.pp b/manifests/role/labsbeta.pp
index 290ba79..f9ae8ce 100644
--- a/manifests/role/labsbeta.pp
+++ b/manifests/role/labsbeta.pp
@@ -30,13 +30,6 @@
 class { 'toollabs::master': }
   }
 
-  class shadow inherits role::labs::toolsbeta::config {
-system::role { "role::labs::toolsbeta::shadow": description => "Tool Labs 
gridengine shadow (backup) master" }
-class { 'toollabs::shadow':
-  gridmaster => $grid_master,
-}
-  }
-
   class webserver inherits role::labs::toolsbeta::config {
 system::role { "role::labs::toolsbeta::webserver": description => "Tool 
Labs webserver" }
 class { 'toollabs::webserver':
diff --git a/modules/gridengine/manifests/shadow_master.pp 
b/modules/gridengine/manifests/shadow_master.pp
deleted file mode 100644
index 1a77edb..000
--- a/modules/gridengine/manifests/shadow_master.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# gridengine.pp
-
-
-class gridengine::shadow_master($gridmaster = $grid_master) {
-class { 'gridengine':
-gridmaster => $gridmaster,
-}
-
-package { 'gridengine-master':
-ensure => latest,
-}
-
-# Not actually possible in the labs
-#   @@sshkey { $fqdn:
-#   ensure => present,
-#   type => 'ssh-dss',
-#   key => $sshdsakey,
-#   tag => "sshkey-$grid_master",
-#   }
-}
diff --git a/modules/toollabs/manifests/master.pp 
b/modules/toollabs/manifests/master.pp
index 84c636c..6c7c416 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -16,7 +16,6 @@
 toollabs::exec_environ
 
 # TODO: Grid config
-# TODO: (conditional) shadow config
 # TODO: project-local NFS (job queue)
 
 
diff --git a/modules/toollabs/manifests/shadow.pp 
b/modules/toollabs/manifests/shadow.pp
deleted file mode 100644
index a0848d0..000
--- a/modules/toollabs/manifests/shadow.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-# Class: toollabs::shadow
-#
-# This role sets up a grid shadow master in the Tool Labs model.
-#
-# Parameters:
-#   gridmaster => FQDN of the gridengine master
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class toollabs::shadow($gridmaster) inherits toollabs {
-include toollabs::infrastructure,
-toollabs::exec_environ
-
-class { 'gridengine::shadow_master':
-gridmaster => $gridmaster,
-}
-
-# TODO: grid setup
-# TODO: project-local NFS (job queue)
-}
-

-- 
To view, visit https://gerrit.wikimedia.org/r/112671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85b272c90627f22d91590bb458ef4e50b4ea1c47
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Labs: Remove Bots project motd - change (operations/puppet)

2013-12-17 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/102335


Change subject: Labs: Remove Bots project motd
..

Labs: Remove Bots project motd

The Bots project is deprecated and there are no plans to create new
instances.  Existing instances will not be affected by this removal.

Change-Id: If375e7b200f5f704474adbdfc7c20cdc8c3d90d7
---
D files/labs/bots/motd.tail
D manifests/labs/bots/bots.pp
2 files changed, 0 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/102335/1

diff --git a/files/labs/bots/motd.tail b/files/labs/bots/motd.tail
deleted file mode 100644
index 4b9a6c2..000
--- a/files/labs/bots/motd.tail
+++ /dev/null
@@ -1,20 +0,0 @@
--
-   __
-  (  \_
-  |)  ) ___ _| |_  ___
-  |  __  ( / _ (_   _)/___)
-  | |__)  ) |_| || |_|___ |
-  |__/ \___/  \__|___/
-   project
--
-
-This is a server of the bots project, the collaborative
-environment to run and operate bots for wikimedia projects.
-
-In case you need a help, you can contact one of following sysadmins:
-
-Petrb (petan), Damian Zaremba (Damianz), Ryan Lane,
-Adam Shorland (addshore)
-
-Important:  don't forget to run command log  after every
-   system change
diff --git a/manifests/labs/bots/bots.pp b/manifests/labs/bots/bots.pp
deleted file mode 100644
index efeaeff..000
--- a/manifests/labs/bots/bots.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# bots.pp
-
-class bots::motd {
-
-   file { '/etc/motd.tail':
-   path   => '/etc/motd.tail',
-   owner  => 'root',
-   group  => 'root',
-   mode   => '0440',
-   source => 'puppet:///files/labs/bots/motd.tail',
-   ensure => 'present';
-   }
-}

-- 
To view, visit https://gerrit.wikimedia.org/r/102335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If375e7b200f5f704474adbdfc7c20cdc8c3d90d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Unify Tools and Toolsbeta configuration - change (operations/puppet)

2013-12-17 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/102385


Change subject: Tools: Unify Tools and Toolsbeta configuration
..

Tools: Unify Tools and Toolsbeta configuration

To properly test Tools puppetization in Toolsbeta, with the advent of
multi-instance self hosted puppetmasters in Labs, it is easier to use
a dedicated puppetmaster for Toolsbeta and assign "standard" Tools
roles to the instances.

Both has already been done; the only change with regard to Tools
itself is setting the maildomain conditionally.  This needs to be
verified after merging this change and a subsequent Puppet run on
tools-mail.

Change-Id: I45a27e02ed6616c20189964b2eade5b693b63ead
---
M manifests/role/labs.pp
D manifests/role/labsbeta.pp
2 files changed, 4 insertions(+), 71 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/102385/1

diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 58e1f8f..21f1763 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -64,7 +64,10 @@
   class mailrelay inherits role::labs::tools::config {
 system::role { "role::labs::tools::mailrelay": description => "Tool Labs 
mail relay" }
 class { 'toollabs::mailrelay':
-  maildomain => "tools.wmflabs.org",
+  maildomain => $::instanceproject ? {
+'toolsbeta' => "tools-beta.wmflabs.org",
+default => "tools.wmflabs.org",
+  }
 }
   }
 
diff --git a/manifests/role/labsbeta.pp b/manifests/role/labsbeta.pp
deleted file mode 100644
index 290ba79..000
--- a/manifests/role/labsbeta.pp
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# This is a nice generic place to make project-specific roles with a sane
-# naming scheme.
-#
-
-class role::labs::toolsbeta {
-
-  class config {
-include role::labsnfs::client # temporary measure
-
-$grid_master = "toolsbeta-master.pmtpa.wmflabs"
-  }
-
-  class bastion inherits role::labs::toolsbeta::config {
-system::role { "role::labs::toolsbeta::bastion": description => "Tool Labs 
bastion" }
-class { 'toollabs::bastion':
-  gridmaster => $grid_master,
-}
-  }
-
-  class execnode inherits role::labs::toolsbeta::config {
-system::role { "role::labs::toolsbeta::execnode": description => "Tool 
Labs execution host" }
-class { 'toollabs::execnode':
-  gridmaster => $grid_master,
-}
-  }
-
-  class master inherits role::labs::toolsbeta::config {
-system::role { "role::labs::toolsbeta::master": description => "Tool Labs 
gridengine master" }
-class { 'toollabs::master': }
-  }
-
-  class shadow inherits role::labs::toolsbeta::config {
-system::role { "role::labs::toolsbeta::shadow": description => "Tool Labs 
gridengine shadow (backup) master" }
-class { 'toollabs::shadow':
-  gridmaster => $grid_master,
-}
-  }
-
-  class webserver inherits role::labs::toolsbeta::config {
-system::role { "role::labs::toolsbeta::webserver": description => "Tool 
Labs webserver" }
-class { 'toollabs::webserver':
-  gridmaster => $grid_master,
-}
-  }
-
-  class webproxy inherits role::labs::toolsbeta::config {
-system::role { "role::labs::toolsbeta::webproxy": description => "Tool 
Labs web proxy" }
-class { 'toollabs::webproxy': }
-  }
-
-  class mailrelay inherits role::labs::toolsbeta::config {
-system::role { "role::labs::toolsbeta::mailrelay": description => "Tool 
Labs mail relay" }
-class { 'toollabs::mailrelay':
-  maildomain => "tools-beta.wmflabs.org",
-}
-  }
-
-  class syslog inherits role::labs::toolsbeta::config {
-system::role { "role::labs::toolsbeta::syslog": description => "Central 
logging server for tools and services" }
-class { 'toollabs::syslog': }
-  }
-
-  class redis inherits role::labs::toolsbeta::config {
-system::role { "role::labs::toolsbeta::redis": description => "Server that 
hosts shared Redis instance" }
-class { 'toollabs::redis': }
-  }
-
-} # class role::labs::tools
-

-- 
To view, visit https://gerrit.wikimedia.org/r/102385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45a27e02ed6616c20189964b2eade5b693b63ead
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Add key for MariaDB repository - change (operations/puppet)

2013-12-18 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/102585


Change subject: Tools: Add key for MariaDB repository
..

Tools: Add key for MariaDB repository

Packages from the MariaDB repository were not automatically installed
by Puppet because the signing key was missing in Tools.

The key was identified as 0xcbcb082a1bb943db per
https://mariadb.com/kb/en/installing-mariadb-deb-files/ and downloaded
by:

| gpg --no-default-keyring \
| --keyring modules/toollabs/files/mariadb.gpg \
| --keyserver keyserver.ubuntu.com \
| --recv-key 0xCBCB082A1BB943DB

The content of the keyring can be verified by:

| gpg --no-default-keyring \
| --keyring modules/toollabs/files/mariadb.gpg \
| --fingerprint

Change-Id: I59a32281da2b66779765f662b4a10e0a1594876e
---
A modules/toollabs/files/mariadb.gpg
M modules/toollabs/manifests/init.pp
2 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/102585/1

diff --git a/modules/toollabs/files/mariadb.gpg 
b/modules/toollabs/files/mariadb.gpg
new file mode 100644
index 000..64af3f6
--- /dev/null
+++ b/modules/toollabs/files/mariadb.gpg
Binary files differ
diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index d9d52b0..4f8ede9 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -106,6 +106,13 @@
 owner   => 'root',
 group   => 'root',
 }
+file { '/etc/apt/trusted.gpg.d/mariadb.gpg':
+ensure => file,
+source => 'puppet:///modules/toollabs/mariadb.gpg',
+mode => '0444',
+owner => 'root',
+group => 'root',
+}
 
 File <| title == '/etc/exim4/exim4.conf' |> {
 content => undef,

-- 
To view, visit https://gerrit.wikimedia.org/r/102585
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59a32281da2b66779765f662b4a10e0a1594876e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Work around broken WMF package libvips-dev - change (operations/puppet)

2013-12-18 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/102609


Change subject: Tools: Work around broken WMF package libvips-dev
..

Tools: Work around broken WMF package libvips-dev

The WMF repository has a custom, but broken package libvips-dev that
requires a package libtiff5-alt-dev, but does not provide it.  To work
around this, we pin it so that the vanilla Ubuntu version of
libvips-dev gets preferred.

Bug: 52717
Change-Id: I222736d4053815a3c1feb57f285ccf0f0afac2c2
---
A modules/toollabs/files/wikimedia-tools.pref
M modules/toollabs/manifests/init.pp
2 files changed, 16 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/102609/1

diff --git a/modules/toollabs/files/wikimedia-tools.pref 
b/modules/toollabs/files/wikimedia-tools.pref
new file mode 100644
index 000..1e1b6c7
--- /dev/null
+++ b/modules/toollabs/files/wikimedia-tools.pref
@@ -0,0 +1,4 @@
+Explanation: Work around broken libvips-dev package in WMF repository
+Package: libvips-dev
+Pin: release o=Ubuntu
+Pin-Priority: 2002
diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 4f8ede9..6263c34 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -114,6 +114,18 @@
 group => 'root',
 }
 
+# The WMF repository has a custom, but broken package libvips-dev
+# that requires a package libtiff5-alt-dev, but does not provide
+# it.  To work around this, we pin it so that the vanilla Ubuntu
+# version of libvips-dev gets preferred.
+file { '/etc/apt/preferences.d/wikimedia-tools.pref':
+ensure => file,
+source => 'puppet:///modules/toollabs/wikimedia-tools.pref',
+mode => '0444',
+owner => 'root',
+group => 'root',
+}
+
 File <| title == '/etc/exim4/exim4.conf' |> {
 content => undef,
 source  => [ "${store}/mail-relay", 
'puppet:///modules/toollabs/exim4-norelay.conf' ],
@@ -126,4 +138,3 @@
 target => "${store}/mail",
 }
 }
-

-- 
To view, visit https://gerrit.wikimedia.org/r/102609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I222736d4053815a3c1feb57f285ccf0f0afac2c2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Fix quoting error - change (operations/puppet)

2013-12-18 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/102613


Change subject: Tools: Fix quoting error
..

Tools: Fix quoting error

$store is a Puppet variable that needs to be substituted by its value
before the command is executed.  This change fixes a regression
introduced by change I748652a44071a98c74637c92f6b66f81213c5b9a.

Change-Id: I9061177e18dc277cb596bd9e0d7db3713314f0a0
---
M modules/toollabs/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/13/102613/1

diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index d9d52b0..95f3271 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -44,7 +44,7 @@
 }
 
 exec { 'make_known_hosts':
-command => '/bin/cat $store/hostkey-* >/etc/ssh/ssh_known_hosts~',
+command => "/bin/cat $store/hostkey-* >/etc/ssh/ssh_known_hosts~",
 require => File[$store],
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/102613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9061177e18dc277cb596bd9e0d7db3713314f0a0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tools: Resolve virtual package requirements - change (operations/puppet)

2013-12-18 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/102630


Change subject: Tools: Resolve virtual package requirements
..

Tools: Resolve virtual package requirements

At the moment, we require the virtual packages libpng3-dev and
libxslt-dev.  This leads to Puppet spamming on every run:

| notice: /Stage[main]/Toollabs::Dev_environ/Package[libxslt-dev]/ensure: 
ensure changed 'purged' to 'present'
| notice: /Stage[main]/Toollabs::Dev_environ/Package[libpng3-dev]/ensure: 
ensure changed 'purged' to 'present'

Also, it is not determinate which package is chosen to satisfy the
virtual requirement.  To solve this, we explicitly state which "real"
packages we require.

Change-Id: Ic0ce42aa96232e26a30b0c652e6ea1920d2e4322
---
M modules/toollabs/manifests/dev_environ.pp
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/102630/1

diff --git a/modules/toollabs/manifests/dev_environ.pp 
b/modules/toollabs/manifests/dev_environ.pp
index d80d717..500918b 100644
--- a/modules/toollabs/manifests/dev_environ.pp
+++ b/modules/toollabs/manifests/dev_environ.pp
@@ -37,7 +37,7 @@
 'libfreetype6-dev',
 'libgdal1-dev',# Bug 56995
 'libmariadbclient-dev',
-'libpng3-dev',
+'libpng12-dev',
 'libproj-dev', # Bug 56995
 'libprotobuf-dev', # Bug 56995
 'libsparsehash-dev',   # Bug 56995
@@ -45,8 +45,7 @@
 'libtool',
 'libvips-dev',
 'libxml2-dev',
-'libxslt-dev',
-'libxslt1-dev', # -- same
+'libxslt1-dev',
 'libzbar-dev', # Bug 56996
 'lintian',
 'links',

-- 
To view, visit https://gerrit.wikimedia.org/r/102630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0ce42aa96232e26a30b0c652e6ea1920d2e4322
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix quoting error in generic_vhost.erb - change (operations/puppet)

2013-12-19 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/102862


Change subject: Fix quoting error in generic_vhost.erb
..

Fix quoting error in generic_vhost.erb

This change fixes a regression introduced by change
I241aa0190e5407dd66bd30956004603f696df91d and adjusts the indentation.

Apparently there is currently only one use of this template in
manifests/misc/statistics.pp, and that does not utilize "ssl =>
'true'", so this change should not make any SSL webservers
unexpectedly appear from nowhere.

Change-Id: I550489752afa36e46e966ccfdc7ece9fded838db
---
M templates/apache/generic_vhost.erb
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/102862/1

diff --git a/templates/apache/generic_vhost.erb 
b/templates/apache/generic_vhost.erb
index 026b2c3..a8ea804 100644
--- a/templates/apache/generic_vhost.erb
+++ b/templates/apache/generic_vhost.erb
@@ -34,12 +34,12 @@
 
 <% end -%>
 
-<% if ["true", "only", "redirected"].include?("ssl") -%>
+<% if ["true", "only", "redirected"].include?(ssl) -%>
 
ServerName <%= title %>
-   <% if aliases.length > 0 -%>
+<% if aliases.length > 0 -%>
ServerAlias <%= aliases.join(" ") %>
-   <% end -%>
+<% end -%>
ServerAdmin r...@wikimedia.org
 
SSLEngine on

-- 
To view, visit https://gerrit.wikimedia.org/r/102862
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I550489752afa36e46e966ccfdc7ece9fded838db
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

1 2 3 4 5 6 7 >

1 - 100 of 698 matches

Mail list logo