[MediaWiki-commits] [Gerrit] Tools: add package python-hunspell to exec nodes - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/263229 Change subject: Tools: add package python-hunspell to exec nodes .. Tools: add package python-hunspell to exec nodes Requested on IRC by reza1615 for their tool Change-Id: I3347bb0eddee00ea70d8f1f0509c196488c3a472 --- 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/29/263229/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index e191d1a..2342f25 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -132,6 +132,7 @@ # Other python package requirements are added # using the genpp tool 'python-flask-oauth', + 'python-hunspell', 'python-mwparserfromhell', # T65539 'python-oursql', # For danilo et al. 'python-socketio-client', # T86015 -- To view, visit https://gerrit.wikimedia.org/r/263229 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3347bb0eddee00ea70d8f1f0509c196488c3a472 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Inserted a link to git repository - change (labs/toollabs)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/196227 Change subject: Inserted a link to git repository .. Inserted a link to git repository so that people can easily modify this web Change-Id: I01fc3c14b59b2efa7e9abfff0f9fbcae0e9fe53b --- M www/content/list.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/27/196227/1 diff --git a/www/content/list.php b/www/content/list.php index eae034a..7857af3 100644 --- a/www/content/list.php +++ b/www/content/list.php @@ -8,6 +8,7 @@ https://wikitech.wikimedia.org/wiki/Special:NovaKey";>Add a public SSH key (you’ll need this to access Labs servers using SSH) https://wikitech.wikimedia.org/wiki/Special:FormEdit/Tools_Access_Request";>Request access to the Tools project (Join us!) https://wikitech.wikimedia.org/w/index.php?title=Special:NovaServiceGroup&action=addservicegroup&projectname=tools";>Create New Tool +http://git.wikimedia.org/summary/labs%2Ftoollabs.git";>Source code repository of this web Hosted tools -- To view, visit https://gerrit.wikimedia.org/r/196227 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01fc3c14b59b2efa7e9abfff0f9fbcae0e9fe53b Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implemented a new XML format - change (mediawiki...Translate)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/186338 Change subject: Implemented a new XML format .. Implemented a new XML format which is actually just a pure XML - a copy of androidXML with no special android specific customizations Change-Id: I8345e61e79530cc570ec711c9ac6c14cb8bc51a0 --- M Autoload.php A ffs/SimpleXml.php 2 files changed, 209 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/38/186338/1 diff --git a/Autoload.php b/Autoload.php index d58f480..c1ca56a 100644 --- a/Autoload.php +++ b/Autoload.php @@ -184,6 +184,7 @@ $al['RubyYamlFFS'] = "$dir/ffs/RubyYamlFFS.php"; $al['ShapadoJsFFS'] = "$dir/ffs/JavaScriptFFS.php"; $al['SimpleFFS'] = "$dir/ffs/SimpleFFS.php"; +$al['SimpleXmlFFS'] = "$dir/ffs/SimpleXmlFFS.php"; $al['XliffFFS'] = "$dir/ffs/XliffFFS.php"; $al['YamlFFS'] = "$dir/ffs/YamlFFS.php"; /**@}*/ diff --git a/ffs/SimpleXml.php b/ffs/SimpleXml.php new file mode 100644 index 000..fd4e0a6 --- /dev/null +++ b/ffs/SimpleXml.php @@ -0,0 +1,208 @@ + + * + * English + * + * + * This format is similar to Android format and is almost compatible, but unlike + * that one, it uses standard Canonical XML Version 1.0, according to + * http://www.ietf.org/rfc/rfc3076.txt + * + * @file + * @author Petr Bena + * @license GPL-2.0+ + */ + +/** + * Support for XML translations + * @since 2015-01-23 + * @ingroup FFS + */ +class SimpleXmlFFS extends SimpleFFS { + protected static $pluralWords = array( + 'zero' => 1, + 'one' => 1, + 'two' => 1, + 'few' => 1, + 'many' => 1, + 'other' => 1, + ); + + public function supportsFuzzy() { + return 'yes'; + } + + public function getFileExtensions() { + return array( '.xml' ); + } + + /** +* @param string $data +* @return array Parsed data. +*/ + public function readFromVariable( $data ) { + $reader = new SimpleXMLElement( $data ); + + $messages = array(); + $mangler = $this->group->getMangler(); + + /** @var SimpleXMLElement $element */ + foreach ( $reader as $element ) { + $key = (string)$element['name']; + + if ( $element->getName() === 'string' ) { + $value = $this->readElementContents( $element ); + } elseif ( $element->getName() === 'plurals' ) { + $forms = array(); + foreach ( $element as $item ) { + $forms[(string)$item['quantity']] = $item; + } + $value = $this->flattenPlural( $forms ); + } else { + wfDebug( __METHOD__ . ': Unknown XML element name.' ); + continue; + } + + if ( isset( $element['fuzzy'] ) && (string)$element['fuzzy'] === 'true' ) { + $value = TRANSLATE_FUZZY . $value; + } + + $messages[$key] = $value; + } + + return array( + 'AUTHORS' => array(), // @todo + 'MESSAGES' => $mangler->mangle( $messages ), + ); + } + + protected function writeReal( MessageCollection $collection ) { + $template = << + +XML; + + $writer = new SimpleXMLElement( $template ); + $mangler = $this->group->getMangler(); + + $collection->filter( 'hastranslation', false ); + if ( count( $collection ) === 0 ) { + return ''; + } + + /** +* @var $m TMessage +*/ + foreach ( $collection as $key => $m ) { + $key = $mangler->unmangle( $key ); + + $value = $m->translation(); + $value = str_replace( TRANSLATE_FUZZY, '', $value ); + + // Handle plurals + if ( strpos( $value, '{{PLURAL' ) === false ) { + $element = $writer->addChild( 'string', $value ); +
[MediaWiki-commits] [Gerrit] created a new api to flag messages as read - change (mediawiki/core)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/156274 Change subject: created a new api to flag messages as read .. created a new api to flag messages as read this resolves bug 64238 New api is called "UnflagNewMessage" and does nothing but erase a new message flag from currently logged in user. This is useful for tools that can read the new messages using some api, or some other way (loading the text using different session, preload the text using a buffer where it's unrevealed later if user actually did read it, or closed the application before), so it can be useful in situations when you need to flag new messages as read in a different time than that when you actually read them. Change-Id: Ife575711c32bb8e3bcac789de4a6b37e1888d032 --- M includes/AutoLoader.php M includes/api/ApiMain.php A includes/api/ApiUnflagNewMessage.php 3 files changed, 74 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/74/156274/1 diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 2c71ce8..13b6f9d 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -313,6 +313,7 @@ 'ApiTokens' => 'includes/api/ApiTokens.php', 'ApiUnblock' => 'includes/api/ApiUnblock.php', 'ApiUndelete' => 'includes/api/ApiUndelete.php', +'ApiUnflagNewMessage' => 'includes/api/ApiUnflagNewMessage.php', 'ApiUpload' => 'includes/api/ApiUpload.php', 'ApiUserrights' => 'includes/api/ApiUserrights.php', 'ApiWatch' => 'includes/api/ApiWatch.php', diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index 3919c75..11095a4 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -81,6 +81,7 @@ 'watch' => 'ApiWatch', 'patrol' => 'ApiPatrol', 'import' => 'ApiImport', +'unflagnewmessage' => 'ApiUnflagNewMessage', 'userrights' => 'ApiUserrights', 'options' => 'ApiOptions', 'imagerotate' => 'ApiImageRotate', diff --git a/includes/api/ApiUnflagNewMessage.php b/includes/api/ApiUnflagNewMessage.php new file mode 100644 index 000..b209865 --- /dev/null +++ b/includes/api/ApiUnflagNewMessage.php @@ -0,0 +1,72 @@ +http://www.gnu.org/copyleft/gpl.html + * + * @file + */ + +/** + * API interface that allows user who is logged in to flag new messages as read + * + * This is useful for tools that can read the new messages using some api, or some + * other way (loading the text using different session, preload the text using + * a buffer where it's unrevealed later if user actually did read it, or closed + * the application before), so it's useful in situations when you need to flag + * new messages as read in a different time than that when you actually read them + * @ingroup API + */ +class ApiUnflagNewMessage extends ApiBase { + /** +* Sets new messages as read +*/ + public function execute() { +$user = $this->getUser(); +if ( $user->isAnon() ) { +$this->dieUsage( 'Anonymous users cannot use this api', 'notloggedin' ); +} +$user->setNewtalk(false); +$this->getResult()->addValue( null, $this->getModuleName(), 'success' ); + } + + public function isWriteMode() { + return true; + } + + public function mustBePosted() { + return false; + } + + public function getDescription() { + return array( 'Flags all new messages as read.', + 'This is useful for tools that are reading new messages using api or some unusual way and need to flag them as read.' + ); + } + + public function getExamples() { + return array( + 'api.php?action=unflagnewmessage' => 'Mark all messages for user who is currently logged in as read', + ); + } + + public function getHelpUrls() { + return 'https://www.mediawiki.org/wiki/API:UnflagNewMessage'; + } +} -- To view, visit https://gerrit.wikimedia.org/r/156274 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife575711c32bb8e3bcac789de4a6b37e1888d032 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cmake for tool labs - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/135318 Change subject: cmake for tool labs .. cmake for tool labs yes this thing is depending on previous commit I made, but as long as there is no decent guide how to submit patches to out gerrit I won't be able to fix that Change-Id: I52535174928fb4edc7eb1f37765ad96c51aab408 --- 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/18/135318/1 diff --git a/modules/toollabs/manifests/dev_environ.pp b/modules/toollabs/manifests/dev_environ.pp index 36ab4fa..23a3414 100644 --- a/modules/toollabs/manifests/dev_environ.pp +++ b/modules/toollabs/manifests/dev_environ.pp @@ -23,6 +23,7 @@ 'apt-file', 'autoconf', 'build-essential', # for dpkg +'cmake', 'cvs', 'cython', 'dh-make-perl', -- To view, visit https://gerrit.wikimedia.org/r/135318 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52535174928fb4edc7eb1f37765ad96c51aab408 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inserted iotop to toollabs - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/135185 Change subject: inserted iotop to toollabs .. inserted iotop to toollabs it's useful package for labs admins so that we can figure out which tools are using too much resources Change-Id: Ia5030f979c01194a3330d9a3f9b5d0cbd26cafbd --- 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/85/135185/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 18fff35..7076c6b 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -217,6 +217,7 @@ 'imagemagick', # Bug 63000 'jq', # Bug #65049. 'ksh', +'iotop', # useful for labs admins to monitor tools 'libav-tools', # Bug #53870. 'libdmtx0a', # Bug #53867. 'libfreetype6', -- To view, visit https://gerrit.wikimedia.org/r/135185 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5030f979c01194a3330d9a3f9b5d0cbd26cafbd Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed some names - change (labs/nagios-builder)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/62 Change subject: fixed some names .. fixed some names Change-Id: I5d0efb8f6e599f817c079edc0dbc6f01b6dc5b0d --- M labsnagiosbuilder/build.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/nagios-builder refs/changes/62/62/1 diff --git a/labsnagiosbuilder/build.py b/labsnagiosbuilder/build.py index 0338e7f..eb90c3e 100755 --- a/labsnagiosbuilder/build.py +++ b/labsnagiosbuilder/build.py @@ -28,7 +28,7 @@ debug_mode = False # Where we dump the generated configs -nagios_config_dir = "/etc/nagios3/conf.d" +nagios_config_dir = "/etc/icinga/objects" # Instances to ignore ''' @@ -350,7 +350,7 @@ return logger.info('Reloading nagios') -os.system('service nagios3 reload') +os.system('service icinga reload') return True -- To view, visit https://gerrit.wikimedia.org/r/62 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5d0efb8f6e599f817c079edc0dbc6f01b6dc5b0d Gerrit-PatchSet: 1 Gerrit-Project: labs/nagios-builder Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed lot of stuff in nagios builder - change (labs/nagios-builder)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/110968 Change subject: Fixed lot of stuff in nagios builder .. Fixed lot of stuff in nagios builder * The ignored hosts are now in separate file instead of being hardcoded, that makes it easier to maintain, the default template should be included (now is missing in git repo, but filename is ignored.host) * Implemented some default files that must not be removed from icinga objects like ido2db, if you remove them, icinga will not start * Don't create config files for empty groups, which makes faulty config Whole this commit is uggly and messy piece of shit but it's 6:40 pm, I am still sitting here in the office, despite I should have been home already, working on this python nightmare (the code is surely cute, but anything written in python gives me creeps) so I really need to commit it anyway, so that I can go home finally :-) If you don't like anything in this patch, fix it <3 Change-Id: Ib0a51c39a246855fc8240dddba500a5c751c4fa3 --- M labsnagiosbuilder/build.py 1 file changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/nagios-builder refs/changes/68/110968/1 diff --git a/labsnagiosbuilder/build.py b/labsnagiosbuilder/build.py index a0d6b07..0338e7f 100755 --- a/labsnagiosbuilder/build.py +++ b/labsnagiosbuilder/build.py @@ -31,6 +31,7 @@ nagios_config_dir = "/etc/nagios3/conf.d" # Instances to ignore +''' ignored_fqdns = [ # Suspended instances 'wikiversity-sandbox-frontend.pmtpa.wmflabs', @@ -57,6 +58,9 @@ 'nova-precise1.pmtpa.wmflabs', 'labs-nfs1.pmtpa.wmflabs', ] +''' + +ignored_fqdns = [line.strip() for line in open('ignored.host')] # How much to spam logging_level = logging.INFO @@ -280,6 +284,9 @@ template = jinja2_env.get_template('group.cfg') for group in groups.keys(): +if len(groups[group]['hosts']) == 0: + logger.info('Skipping group %s because it doesn\'t contain any hosts', group) + continue file_path = os.path.join(nagios_config_dir, 'group-%s.cfg' % group) with open(file_path, 'w') as fh: logger.debug('Writing out group %s to %s' % (group, file_path)) @@ -303,7 +310,14 @@ ''' Simple function to remove old instances ''' -ok_hosts = [] +ok_hosts = [ 'localhost_icinga', +'services_icinga', +'ido2db_check_proc', +'hostgroups_icinga', +'extinfo_icinga', +'contacts_icinga', +'timeperiods_icinga' ] + remove_files = [] for host in hosts: @@ -314,7 +328,7 @@ cfg = file_path[:-4] # Old instances -if not cfg.startswith('group-') and cfg not in ok_hosts: +if not cfg.startswith('group-') and not cfg.startswith('generic') and cfg not in ok_hosts: remove_files.append(file_path) # Old groups @@ -331,7 +345,7 @@ ''' Simple function to reload nagios ''' -if subprocess.call("nagios3 -v /etc/nagios3/nagios.cfg", shell=True) != 0: +if subprocess.call("icinga -v /etc/icinga/icinga.cfg", shell=True) != 0: logger.error('Nagios config validation failed') return -- To view, visit https://gerrit.wikimedia.org/r/110968 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0a51c39a246855fc8240dddba500a5c751c4fa3 Gerrit-PatchSet: 1 Gerrit-Project: labs/nagios-builder Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] updated IP address of icinga for labs - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/110944 Change subject: updated IP address of icinga for labs .. updated IP address of icinga for labs Change-Id: Ida5f935ed0f6e652166b8500fd9dfcaad46264cd --- M modules/nrpe/manifests/init.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/44/110944/1 diff --git a/modules/nrpe/manifests/init.pp b/modules/nrpe/manifests/init.pp index bec74a0..8265a05 100644 --- a/modules/nrpe/manifests/init.pp +++ b/modules/nrpe/manifests/init.pp @@ -29,7 +29,7 @@ if $allowed_hosts == undef { $nrpe_allowed_hosts = $::realm ? { 'production' => '127.0.0.1,208.80.152.185,208.80.152.161,208.80.154.14', -'labs' => '10.4.0.120', +'labs' => '10.4.1.88', default => '127.0.0.1', } } else { -- To view, visit https://gerrit.wikimedia.org/r/110944 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida5f935ed0f6e652166b8500fd9dfcaad46264cd Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inserted lynx and links to fix !b 56997 - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/96491 Change subject: inserted lynx and links to fix !b 56997 .. inserted lynx and links to fix !b 56997 Change-Id: I06cd40cde6533c0596dfa908073efcc156d75525 --- M modules/toollabs/manifests/dev_environ.pp 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/91/96491/1 diff --git a/modules/toollabs/manifests/dev_environ.pp b/modules/toollabs/manifests/dev_environ.pp index b183c85..cb6eeff 100644 --- a/modules/toollabs/manifests/dev_environ.pp +++ b/modules/toollabs/manifests/dev_environ.pp @@ -48,6 +48,8 @@ 'libxslt1-dev', # -- same 'libzbar-dev', # Bug 56996 'lintian', + 'links', + 'lynx', 'mc', # Popular{{cn}} on Toolserver 'mercurial', 'openjdk-7-jdk', -- To view, visit https://gerrit.wikimedia.org/r/96491 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06cd40cde6533c0596dfa908073efcc156d75525 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] installing package to fix !b 57004 - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/96487 Change subject: installing package to fix !b 57004 .. installing package to fix !b 57004 Change-Id: Icf5c2be75d6442aed81bfadea72be27d583cc86c --- 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/96487/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 3c0465a..a12b370 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -195,6 +195,7 @@ 'p7zip', 'phpunit', 'poppler-utils', # Bug #53869. + 'rrdtool', # Bug 57004 'texinfo', # Bug #56994 'tree',# Bug #48862. 'zbar-tools', # Bug 56996 -- To view, visit https://gerrit.wikimedia.org/r/96487 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf5c2be75d6442aed81bfadea72be27d583cc86c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ufraw-batch to fix !b 57008 - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/96486 Change subject: ufraw-batch to fix !b 57008 .. ufraw-batch to fix !b 57008 Change-Id: I42fe9168eece31545423a9757e5daf86e31e94fd --- 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/86/96486/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 3c0465a..455144f 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -195,6 +195,7 @@ 'p7zip', 'phpunit', 'poppler-utils', # Bug #53869. + 'ufraw-batch', # Bug 57008 'texinfo', # Bug #56994 'tree',# Bug #48862. 'zbar-tools', # Bug 56996 -- To view, visit https://gerrit.wikimedia.org/r/96486 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I42fe9168eece31545423a9757e5daf86e31e94fd Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] installed socat to resolve !b 57005 - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/96484 Change subject: installed socat to resolve !b 57005 .. installed socat to resolve !b 57005 Change-Id: I0f8c1e7040bae41f9176581cf79750c14a209a71 --- 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/84/96484/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 3c0465a..c1e7417 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -192,6 +192,7 @@ 'libzbar0',# Bug 56996 'mariadb-client', # For /usr/bin/mysql. 'mdbtools',# Bug #48805. + 'socat', # Bug 57005 'p7zip', 'phpunit', 'poppler-utils', # Bug #53869. -- To view, visit https://gerrit.wikimedia.org/r/96484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f8c1e7040bae41f9176581cf79750c14a209a71 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inserted QT libraries to resolve b57241 - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/96478 Change subject: inserted QT libraries to resolve b57241 .. inserted QT libraries to resolve b57241 Change-Id: Ie7e4ef8dd54f46b7001a1459f5720365329f06e3 --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/78/96478/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 3c0465a..96df070 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -160,6 +160,29 @@ 'tclthread', 'tdom',# Bug 56995 + # C++ packages + 'qt5-default', # Bug 57241 + 'qdbus-qt5', # Bug 57241 + 'libqwt5-qt4', # Bug 57241 + 'qtcore4-l10n',# Bug 57241 + 'qt4-linguist-tools', # Bug 57241 + 'qdbus', # Bug 57241 + 'libqt4-core', # Bug 57241 + 'libqt4-dbus', # Bug 57241 + 'libqt4-declarative', # Bug 57241 + 'libqt4-designer', # Bug 57241 + 'libqt4-gui', # Bug 57241 + 'libqt4-network', # Bug 57241 + 'libqt4-opengl', # Bug 57241 + 'libqt4-script', # Bug 57241 + 'libqt4-sql', # Bug 57241 + 'libqt4-sql-mysql',# Bug 57241 + 'libqt4-svg', # Bug 57241 + 'libqt4-test', # Bug 57241 + 'libqt4-webkit', # Bug 57241 + 'libqt4-xml', # Bug 57241 + 'libqt4-xmlpatterns', # Bug 57241 + # Other packages 'adminbot', 'csh',# common user request -- To view, visit https://gerrit.wikimedia.org/r/96478 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie7e4ef8dd54f46b7001a1459f5720365329f06e3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix of oracle installation sql - change (mediawiki/core)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/80538 Change subject: Fix of oracle installation sql .. Fix of oracle installation sql This fix is courtesy of $wgBusyBunny who was too busy to insert it, see !bug 38411 and !bug 52094 Change-Id: Ic9a17b92d6052fbdc24dd431726e4d82dbf48034 --- M maintenance/oracle/tables.sql 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/38/80538/1 diff --git a/maintenance/oracle/tables.sql b/maintenance/oracle/tables.sql index 74fb1b1..3aab55d 100644 --- a/maintenance/oracle/tables.sql +++ b/maintenance/oracle/tables.sql @@ -2,7 +2,7 @@ define mw_prefix='{$wgDBprefix}'; -CREATE SEQUENCE user_user_id_seq MINVALUE 0 START WITH 0; +CREATE SEQUENCE user_user_id_seq; CREATE TABLE &mw_prefix.mwuser ( -- replace reserved word 'user' user_id NUMBER NOT NULL, user_name VARCHAR2(255) NOT NULL, @@ -27,7 +27,7 @@ -- Create a dummy user to satisfy fk contraints especially with revisions INSERT INTO &mw_prefix.mwuser - VALUES (user_user_id_seq.nextval,'Anonymous',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, '', current_timestamp, current_timestamp, 0); + VALUES (0,'Anonymous',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, '', current_timestamp, current_timestamp, 0); CREATE TABLE &mw_prefix.user_groups ( ug_user NUMBER DEFAULT 0 NOT NULL, -- To view, visit https://gerrit.wikimedia.org/r/80538 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9a17b92d6052fbdc24dd431726e4d82dbf48034 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] implemented check for free v_mem - change (labs/toollabs)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/70603 Change subject: implemented check for free v_mem .. implemented check for free v_mem Change-Id: Ibf180515461ee8c3fb8dd4a9ef4a96f89a3d1e4f --- M www/content/status.php 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/03/70603/1 diff --git a/www/content/status.php b/www/content/status.php index 4e9987c..6a9747f 100644 --- a/www/content/status.php +++ b/www/content/status.php @@ -50,6 +50,15 @@ $rawjobs = toarray(simplexml_load_string(`PATH=/bin:/usr/bin /usr/bin/qstat -u '*' -r -xml`)); $rawhosts = toarray(simplexml_load_string(`PATH=/bin:/usr/bin /usr/bin/qhost -F h_vmem -xml`)); + $vmem = toarray(simplexml_load_string(`PATH=/bin:/usr/bin /usr/bin/qstat -F h_vmem -xml`)); + foreach ($vmem['queue_info'] as $vm) { + $server = $vm['name']; + $server = substr($server, strpos($server, "@") + 1); + $server = substr($server, 0, strpos($server, ".")); + if ( $server !== false ) { + $h_vmem[$server] = $vm['resource']; + } + } ?> Wikimedia Tool Labs This is the web server for the Tool Labs project, the home of community-maintained external tools supporting Wikimedia projects and their users. @@ -117,6 +126,7 @@ Load: % Memory: % + Free vmem: $j): -- To view, visit https://gerrit.wikimedia.org/r/70603 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf180515461ee8c3fb8dd4a9ef4a96f89a3d1e4f Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] changed colors for root prompt, red on production, green on ... - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/70188 Change subject: changed colors for root prompt, red on production, green on beta .. changed colors for root prompt, red on production, green on beta Change-Id: Id18fa71317f4570b7544526cc77ecba179494c2b --- A modules/toollabs/files/rootrc M modules/toollabs/manifests/init.pp 2 files changed, 111 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/88/70188/1 diff --git a/modules/toollabs/files/rootrc b/modules/toollabs/files/rootrc new file mode 100644 index 000..5080223 --- /dev/null +++ b/modules/toollabs/files/rootrc @@ -0,0 +1,103 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# If not running interactively, don't do anything +[ -z "$PS1" ] && return + +# don't put duplicate lines in the history. See bash(1) for more options +# ... or force ignoredups and ignorespace +HISTCONTROL=ignoredups:ignorespace + +# append to the history file, don't overwrite it +shopt -s histappend + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTSIZE=1000 +HISTFILESIZE=2000 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# make less more friendly for non-text input files, see lesspipe(1) +[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then +debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +case "$TERM" in +xterm-color) color_prompt=yes;; +esac + +# uncomment for a colored prompt, if the terminal has the capability; turned +# off by default to not distract the user: the focus in a terminal window +# should be on the output of commands, not on the prompt +force_color_prompt=yes + +if [ -n "$force_color_prompt" ]; then +if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes +else + color_prompt= +fi +fi + +if [ "$color_prompt" = yes ]; then +if [ "$INSTANCEPROJECT" = "tools" ];then + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;31m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' +else + PS1='${debian_chroot:+($debian_chroot)}\[\032[01;31m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' +fi +else +PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' +fi +unset color_prompt force_color_prompt + +# If this is an xterm set the title to user@host:dir +case "$TERM" in +xterm*|rxvt*) +PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" +;; +*) +;; +esac + +# enable color support of ls and also add handy aliases +if [ -x /usr/bin/dircolors ]; then +test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" +alias ls='ls --color=auto' +#alias dir='dir --color=auto' +#alias vdir='vdir --color=auto' + +alias grep='grep --color=auto' +alias fgrep='fgrep --color=auto' +alias egrep='egrep --color=auto' +fi + +# some more ls aliases +alias ll='ls -alF' +alias la='ls -A' +alias l='ls -CF' + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then +. ~/.bash_aliases +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +#if [ -f /etc/bash_completion ] && ! shopt -oq posix; then +#. /etc/bash_completion +#fi diff --git a/modules/toollabs/manifests/init.pp b/modules/toollabs/manifests/init.pp index 1f7e89d..841d5dc 100644 --- a/modules/toollabs/manifests/init.pp +++ b/modules/toollabs/manifests/init.pp @@ -74,6 +74,14 @@ group => "root", } + file { "/root/.bashrc": +ensure => file, +source => "puppet:///modules/toollabs/rootrc", +mode => "0750", +owner => "root", +group => "ro
[MediaWiki-commits] [Gerrit] inserted missing motd - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/70175 Change subject: inserted missing motd .. inserted missing motd Change-Id: I269c642f63962669646b6ce88353445965043fca --- A modules/toollabs/files/40-toolsbeta-bastion-banner A modules/toollabs/files/40-toolsbeta-exechost-banner 2 files changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/75/70175/1 diff --git a/modules/toollabs/files/40-toolsbeta-bastion-banner b/modules/toollabs/files/40-toolsbeta-bastion-banner new file mode 100755 index 000..f2cf11c --- /dev/null +++ b/modules/toollabs/files/40-toolsbeta-bastion-banner @@ -0,0 +1,24 @@ +#! /bin/sh + +# +# This script is managed by puppet +# + +cat <#[0;31m #[0mWikimedia projects and their users. +[34;1m #. [32;1m( \ [34;1m .# [0m +[34;1m ## [32;1m#) #[34;1m ## [0m +[34;1m ## [32;1m' """###[34;1m ## [0m +[34;1m ## [32;1m### # ### #<<###[34;1m ## [0mUse of this system is subject to the Tool Labs +[34;1m ## [32;1m### ### ,# #[34;1m ## [0mTerms of Use and Privacy Policies: +[34;1m ### [32;1m[34;1m ###[0m- [4mhttp://tools.wmflabs.org/?Rules[0m +[34;1m [32;1m##[34;1m [0m +[34;1m # [34;1m# [0mGeneral guidance and help can be found at: +[34;1m [34;1m [0m- [4mhttp://tools.wmflabs.org/?Help[0m + +EOF diff --git a/modules/toollabs/files/40-toolsbeta-exechost-banner b/modules/toollabs/files/40-toolsbeta-exechost-banner new file mode 100644 index 000..27e8e5f --- /dev/null +++ b/modules/toollabs/files/40-toolsbeta-exechost-banner @@ -0,0 +1,17 @@ +#! /bin/sh + +# +# This script is managed by puppet +# + +cat <https://gerrit.wikimedia.org/r/70175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I269c642f63962669646b6ce88353445965043fca Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] new class for toolsbeta project - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/69864 Change subject: new class for toolsbeta project .. new class for toolsbeta project Change-Id: I436e644e41f65107a5e1349b4f9aa28b17083ee1 --- A manifests/role/labsbeta.pp 1 file changed, 66 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/64/69864/1 diff --git a/manifests/role/labsbeta.pp b/manifests/role/labsbeta.pp new file mode 100644 index 000..aa5461a --- /dev/null +++ b/manifests/role/labsbeta.pp @@ -0,0 +1,66 @@ +# +# 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::tools::config { +system_role { "role::labs::toolsbeta::bastion": description => "Tool Labs bastion" } +class { 'toollabs::bastion': + gridmaster => $grid_master, +} + } + + class execnode inherits role::labs::tools::config { +system_role { "role::labs::toolsbeta::execnode": description => "Tool Labs execution host" } +class { 'toollabs::execnode': + gridmaster => $grid_master, +} + } + + class master inherits role::labs::tools::config { +system_role { "role::labs::toolsbeta::master": description => "Tool Labs gridengine master" } +class { 'toollabs::master': } + } + + class shadow inherits role::labs::tools::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::tools::config { +system_role { "role::labs::toolsbeta::webserver": description => "Tool Labs webserver" } +class { 'toollabs::webserver': + gridmaster => $grid_master, +} + } + + class webproxy inherits role::labs::tools::config { +system_role { "role::labs::toolsbeta::webproxy": description => "Tool Labs web proxy" } +class { 'toollabs::webproxy': } + } + + class mailrelay inherits role::labs::tools::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::tools::config { +system_role { "role::labs::toolsbeta::syslog": description => "Central logging server for tools and services" } +class { 'toollabs::syslog': } + } + + +} # class role::labs::tools + -- To view, visit https://gerrit.wikimedia.org/r/69864 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I436e644e41f65107a5e1349b4f9aa28b17083ee1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] missing motd file - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/69860 Change subject: missing motd file .. missing motd file Change-Id: Ib377110beb325ee0614d2edbe121d1448de28ec8 --- A modules/toollabs/files/40-toolsbeta-infrastructure-banner 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/60/69860/1 diff --git a/modules/toollabs/files/40-toolsbeta-infrastructure-banner b/modules/toollabs/files/40-toolsbeta-infrastructure-banner new file mode 100755 index 000..d26e9a5 --- /dev/null +++ b/modules/toollabs/files/40-toolsbeta-infrastructure-banner @@ -0,0 +1,31 @@ +#! /bin/sh + +# +# This script is managed by puppet +# + +if [ -f /data/project/.system/.testing ];then +cat <https://gerrit.wikimedia.org/r/69860 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib377110beb325ee0614d2edbe121d1448de28ec8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] updating motd to make it clear which server is which - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/69133 Change subject: updating motd to make it clear which server is which .. updating motd to make it clear which server is which Change-Id: I135dea142ef26912d4c4b8be1563f6c2fda3f230 --- M modules/toollabs/files/40-tools-infrastructure-banner 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/33/69133/1 diff --git a/modules/toollabs/files/40-tools-infrastructure-banner b/modules/toollabs/files/40-tools-infrastructure-banner old mode 100644 new mode 100755 index 5a67afb..d26e9a5 --- a/modules/toollabs/files/40-tools-infrastructure-banner +++ b/modules/toollabs/files/40-tools-infrastructure-banner @@ -4,10 +4,28 @@ # This script is managed by puppet # +if [ -f /data/project/.system/.testing ];then cat <https://gerrit.wikimedia.org/r/69133 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I135dea142ef26912d4c4b8be1563f6c2fda3f230 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] improved sql script - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/67826 Change subject: improved sql script .. improved sql script * added wikidata and commons so that you can just type sql commons instead of sql commonswiki * some typo Change-Id: Ibd833a57148499e48e43e50c72aa6a895f696ddd --- M modules/toollabs/files/sql 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/26/67826/1 diff --git a/modules/toollabs/files/sql b/modules/toollabs/files/sql index 6485f64..de5884c 100755 --- a/modules/toollabs/files/sql +++ b/modules/toollabs/files/sql @@ -74,6 +74,14 @@ server="cswiki.labsdb" db="cswiki_p" ;; +"commons") +server="commonswiki.labsdb" +db="commonswiki_p" +;; +"wikidata") +server="wikidatawiki.labsdb" +db="wikidatawiki_p" +;; "local") server=tools-db db="" @@ -103,7 +111,7 @@ then Log "Resolved to $server $db" else - echo "This is unknown db to me, if you don't like, blame petan on freenode" + echo "This is unknown db to me, if you don't like that, blame petan on freenode" exit 1 fi ;; -- To view, visit https://gerrit.wikimedia.org/r/67826 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd833a57148499e48e43e50c72aa6a895f696ddd Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] libcache-memcached-fast-perl on tools - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/67597 Change subject: libcache-memcached-fast-perl on tools .. libcache-memcached-fast-perl on tools Change-Id: If1b5dbaaaf02ed35ee500c2ca30aa6a915057adb --- 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/97/67597/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index ca4b558..8112407 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -29,6 +29,7 @@ 'mono-runtime', 'php5-cli', 'php5-mysql', + 'libcache-memcached-fast-perl', 'libhtml-parser-perl', 'libwww-perl', 'liburi-perl', -- To view, visit https://gerrit.wikimedia.org/r/67597 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1b5dbaaaf02ed35ee500c2ca30aa6a915057adb Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inserted syslog to manifest - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/67440 Change subject: inserted syslog to manifest .. inserted syslog to manifest Change-Id: Ibd89c667742922faa136d246f614b55dac5cb845 --- M manifests/role/labs.pp 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/40/67440/1 diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp index ca71010..97e6864 100644 --- a/manifests/role/labs.pp +++ b/manifests/role/labs.pp @@ -56,5 +56,11 @@ } } + 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 role::labs::tools -- To view, visit https://gerrit.wikimedia.org/r/67440 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd89c667742922faa136d246f614b55dac5cb845 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] created a manifest for syslog - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/67434 Change subject: created a manifest for syslog .. created a manifest for syslog Change-Id: Ie6c9472fec32c5ec92f98d67ed3a053fc4789f99 --- A modules/toollabs/manifests/syslog.pp 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/34/67434/1 diff --git a/modules/toollabs/manifests/syslog.pp b/modules/toollabs/manifests/syslog.pp new file mode 100644 index 000..36d1f89 --- /dev/null +++ b/modules/toollabs/manifests/syslog.pp @@ -0,0 +1,18 @@ +# 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/67434 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6c9472fec32c5ec92f98d67ed3a053fc4789f99 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inserted several missing packages - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/67055 Change subject: inserted several missing packages .. inserted several missing packages Change-Id: Ibb2a4689d61faddacf18a6dead7735cd50f3971d --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/67055/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 5a9ad82..109c225 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -95,7 +95,16 @@ 'dc', 'p7zip', 'phpunit', - 'r-base' ]: + 'r-base', + 'csh', + 'bash-completion', #useful when you need to do maintenance there + 'ed', #shell scripts need this + 'ftp', #shell scripts may need this (some jobs may download stuff using ftp periodically + 'ksh', + 'lsof', #shell scripts may use this + 'subversion', #some automatic jobs use svn to sync repo + 'telnet', #some jobs may need this + 'time']: ensure => present } -- To view, visit https://gerrit.wikimedia.org/r/67055 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb2a4689d61faddacf18a6dead7735cd50f3971d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] created a stub for memcache - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/66328 Change subject: created a stub for memcache .. created a stub for memcache Change-Id: Iee1d8361801d89ca4035114dc3b83764d2604505 --- A modules/toollabs/manifests/memcachesasl.pp 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/28/66328/1 diff --git a/modules/toollabs/manifests/memcachesasl.pp b/modules/toollabs/manifests/memcachesasl.pp new file mode 100644 index 000..c203f36 --- /dev/null +++ b/modules/toollabs/manifests/memcachesasl.pp @@ -0,0 +1,18 @@ +# Class: toollabs::memcachesasl +# +# This role sets up a memcache with sasl +# +# Parameters: +# +# Actions: +# +# Requires: +# +# Sample Usage: +# +class toollabs::memcachesasl inherits toollabs { + include toollabs::infrastructure + + #TODO: memcache config +} + -- To view, visit https://gerrit.wikimedia.org/r/66328 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee1d8361801d89ca4035114dc3b83764d2604505 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inserted rmtool to new folder - change (labs/toollabs)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/66294 Change subject: inserted rmtool to new folder .. inserted rmtool to new folder Change-Id: Ib4fb2f8ba1531e934084691e98f4e358c74c69c6 --- A utilities/rmtool 1 file changed, 145 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/94/66294/1 diff --git a/utilities/rmtool b/utilities/rmtool new file mode 100755 index 000..e6849a1 --- /dev/null +++ b/utilities/rmtool @@ -0,0 +1,145 @@ +#!/bin/bash + +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 +fi + +echo "Don't forget to remove the entry in ldap first!! Once the record is removed, continue" +read p + +tool=$1 +toolpath=/data/project/$tool +dbuser=`echo $1 | sed 's/-//'` +original_dbuser=$dbuser +dbuser2=null +if [ -f "$toolpath/replica.my.cnf" ];then +dbuser2="$(sed -n -e "/user='\(.*\)'/{;s//\1/;p;}" $toolpath/replica.my.cnf)" +fi +using_replica_only=0 + +if [ ! -f "$toolpath/.my.cnf" ] && [ -f "$toolpath/replica.my.cnf" ];then + echo "Warning: user replica user only!" + using_replica_only=1 + dbuser=$dbuser2 +fi + +# get a number of users of this name in mysql +uc=`echo "select user from user;" | mysql mysql | grep -cE ^$dbuser'$'` + +echo "There is $uc user accounts of name $dbuser in database" + +if [ "$uc" -gt 0 ];then +echo I will now remove the db access, this can\'t be reverted, hit enter to continue +read p + echo "Removing db access of $tool" + echo "drop user $dbuser;" | mysql mysql +fi + +if [ -f /var/spool/cron/crontabs/local-$tool ];then + echo "Attempting to clear the cron" + rm /var/spool/cron/crontabs/local-$tool +fi + +# get the number of databases for this user +db=`echo "show databases;" | mysql mysql | grep -cE ^$tool'$'` + + db2=`echo "show databases;" | mysql mysql | grep -cE ^"$dbuser"__` +echo "There is $db databases of name $tool in database" +echo "There is $db2 databases prefixed with $dbuser in database" + +if [ $db2 -gt 0 ];then + # backup all databases + list=`echo "show databases;" | mysql mysql | grep -E ^"$dbuser"__` + for database in `echo $list` + do + echo "Backing up database $database" + if [ -f "$toolpath/$database"_backup.sql ];then + echo "Error, there is already a backup file for this db, process with manual backup and hit enter" + read p + else + mysqldump "$database" > "$toolpath/$database"_backup.sql +echo "Removing the database $database" + echo "drop database $database;" | mysql mysql + fi + done +fi + + +if [ $db -gt 1 ];then + echo "Warning there are more than 1 databases for this user, please proceed with manual backup and hit enter to continue" + read p +else + + 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 +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 + 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" +
[MediaWiki-commits] [Gerrit] updated rmtool to latest version - change (labs/toollabs)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/66293 Change subject: updated rmtool to latest version .. updated rmtool to latest version Change-Id: I9e752512bc319b5ee8b5a8fd9c79a04112b8b10d --- M bin/rmtool 1 file changed, 60 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/93/66293/1 diff --git a/bin/rmtool b/bin/rmtool index 7dada4a..e6849a1 100755 --- a/bin/rmtool +++ b/bin/rmtool @@ -10,8 +10,24 @@ exit 1 fi +echo "Don't forget to remove the entry in ldap first!! Once the record is removed, continue" +read p + tool=$1 +toolpath=/data/project/$tool dbuser=`echo $1 | sed 's/-//'` +original_dbuser=$dbuser +dbuser2=null +if [ -f "$toolpath/replica.my.cnf" ];then +dbuser2="$(sed -n -e "/user='\(.*\)'/{;s//\1/;p;}" $toolpath/replica.my.cnf)" +fi +using_replica_only=0 + +if [ ! -f "$toolpath/.my.cnf" ] && [ -f "$toolpath/replica.my.cnf" ];then + echo "Warning: user replica user only!" + using_replica_only=1 + dbuser=$dbuser2 +fi # get a number of users of this name in mysql uc=`echo "select user from user;" | mysql mysql | grep -cE ^$dbuser'$'` @@ -19,16 +35,48 @@ echo "There is $uc user accounts of name $dbuser in database" if [ "$uc" -gt 0 ];then +echo I will now remove the db access, this can\'t be reverted, hit enter to continue +read p echo "Removing db access of $tool" echo "drop user $dbuser;" | mysql mysql fi +if [ -f /var/spool/cron/crontabs/local-$tool ];then + echo "Attempting to clear the cron" + rm /var/spool/cron/crontabs/local-$tool +fi + # get the number of databases for this user -db=`echo "show databases;" | mysql mysql | grep -cE ^$dbuser'$'` +db=`echo "show databases;" | mysql mysql | grep -cE ^$tool'$'` + db2=`echo "show databases;" | mysql mysql | grep -cE ^"$dbuser"__` echo "There is $db databases of name $tool in database" +echo "There is $db2 databases prefixed with $dbuser in database" -if [ "$db" -gt 0 ];then +if [ $db2 -gt 0 ];then + # backup all databases + list=`echo "show databases;" | mysql mysql | grep -E ^"$dbuser"__` + for database in `echo $list` + do + echo "Backing up database $database" + if [ -f "$toolpath/$database"_backup.sql ];then + echo "Error, there is already a backup file for this db, process with manual backup and hit enter" + read p + else + mysqldump "$database" > "$toolpath/$database"_backup.sql +echo "Removing the database $database" + echo "drop database $database;" | mysql mysql + fi + done +fi + + +if [ $db -gt 1 ];then + echo "Warning there are more than 1 databases for this user, please proceed with manual backup and hit enter to continue" + read p +else + + 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" @@ -41,6 +89,7 @@ mysqldump "$dbuser" > "/data/project/$tool/database_backup.sql" echo "Removing db access of $tool" echo "drop database $dbuser;" | mysql mysql + fi fi if [ ! -d /data/project/removed_tools ];then @@ -60,6 +109,11 @@ else cd /data/project/removed_tools tar -zcvf "$tool.tar.gz" "$tool" + chmod 600 "$tool.tar.gz" + if [ -f "/data/project/removed_tools/$tool.tar.gz" ];then + echo Deleting project folder + rm -rf "/data/project/removed_tools/$tool" + fi fi fi @@ -84,6 +138,8 @@ rm /data/project/.system/webservers.lock -echo "All data for $tool were cleaned" -exit 0 +if [ -f /data/project/.system/cache/localdb-$tool ];then + rm /data/project/.system/cache/localdb-$tool +fi +echo "All data for $tool were cleaned" -- To view, visit https://gerrit.wikimedia.org/r/66293 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9e752512bc319b5ee8b5a8fd9c79a04112b8b10d Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inserted sql tool - change (labs/toollabs)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/66292 Change subject: inserted sql tool .. inserted sql tool Change-Id: I24101234ab09693e66348ac6f29413ac9b1d4532 --- A bin/sql 1 file changed, 91 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/92/66292/1 diff --git a/bin/sql b/bin/sql new file mode 100755 index 000..3c6b7be --- /dev/null +++ b/bin/sql @@ -0,0 +1,91 @@ +#!/bin/bash + +# this tool allow you to connect quickly to sql database +# it should work for all newbies + + +if [ $# -lt 1 ];then +echo "Usage: sql " +exit 0 +fi + +if [ "$1" = "-h" ] || [ "$1" == "--help" ];then + echo "This tool allows you to easily open a connection to sql database without having to provide the credentials or a database host server" + echo "Example: sql frwiki_p" + exit 0 +fi + +if [ ! -f ~/replica.my.cnf ] && [ ! -f ~/.my.cnf ] +then + echo "WARNING: There is no configuration file for mysql to use, you will probably be unable to access the database" +fi + +list=/usr/share/dblist + +param="" +# check if the user has a replica file +if [ -f ~/replica.my.cnf ];then +param=" --defaults-file=~/replica.my.cnf" +else +if [ ! -f ~/.my.cnf ];then +param=" -p" +fi +fi + +server="enwiki.labsdb" +db="enwiki_p" + +case "$1" in +"en" | "enwiki_p") +server="enwiki.labsdb" +db="enwiki_p" +;; +"de" | "dewiki_p") +server="dewiki.labsdb" +db="dewiki_p" +;; +"fr" | "frwiki_p") +server="frwiki.labsdb" +db="frwiki_p" +;; +"cs" | "cswiki_p") +server="cswiki.labsdb" +db="cswiki_p" +;; +"local") +server=tools-db +db="mysql" +if [ -f ~/.my.cnf ];then + param="" +fi + ;; + "commonswiki_p" | "commons") + server=commonswiki.labsdb + db="commonswiki_p" + ;; + *) + # we don't know what the database is so we check if it exist first + echo "This database name is not known by sql script, fallback to dblist resolution" + # lookup from hosts + if [ `echo "$1" | grep -cE '_p$'` -lt 1 ];then +echo "Invalid database name, recursive attempt suffixing _p..." +if (sql $1_p ${*:2});then +exit 0 +fi + echo "Make sure to ask for a db in format of _p" +exit 1 + fi + db=$1 + server=`echo "$1" | sed 's/_p//' | sed 's/$/.labsdb/'` + if [ `cat /etc/hosts | grep -cE "\s$server"` -gt 0 ] + then + echo "Resolved to $server $db" + else + echo "This is unknown db to me, if you don't like, blame petan on freenode" + exit 1 + fi + ;; +esac + +echo "Connecting to $server" +mysql $param -h $server $db ${*:2} -- To view, visit https://gerrit.wikimedia.org/r/66292 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24101234ab09693e66348ac6f29413ac9b1d4532 Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] subversion to all exec nodes - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/66273 Change subject: subversion to all exec nodes .. subversion to all exec nodes legoktm has some script which checks the pywikibot commits Change-Id: I8efa9a9d2ffc31bd817b94051b982ee5b9f8d499 --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/73/66273/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 47d9c2d..5639ddb 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -94,7 +94,8 @@ 'dc', 'p7zip', 'phpunit', - 'r-base' ]: + 'r-base', + 'subversion' ]: ensure => present } -- To view, visit https://gerrit.wikimedia.org/r/66273 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8efa9a9d2ffc31bd817b94051b982ee5b9f8d499 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inserted sql tool to execnodes - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/66266 Change subject: inserted sql tool to execnodes .. inserted sql tool to execnodes some scripts might want to use it and execute on grid instead of -login or -dev Change-Id: I9edf4f8a1610337c9ea1403c01f15095aca4252c --- M modules/toollabs/manifests/execnode.pp 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/66/66266/1 diff --git a/modules/toollabs/manifests/execnode.pp b/modules/toollabs/manifests/execnode.pp index 1e5c785..f127017 100644 --- a/modules/toollabs/manifests/execnode.pp +++ b/modules/toollabs/manifests/execnode.pp @@ -49,6 +49,15 @@ source => "puppet:///modules/toollabs/project-make-shosts", } + file { "/usr/bin/sql": +ensure => file, +mode => "0755", +owner => "root", +group => "root", +source => "puppet://modules/toollabs/sql", + } + + exec { "make-shosts": command => "/usr/local/sbin/project-make-shosts >/etc/ssh/shosts.equiv~", require => File['/usr/local/sbin/project-make-shosts', $store], -- To view, visit https://gerrit.wikimedia.org/r/66266 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9edf4f8a1610337c9ea1403c01f15095aca4252c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inserted ksh and mysql client to exec nodes - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/66264 Change subject: inserted ksh and mysql client to exec nodes .. inserted ksh and mysql client to exec nodes Both could be used by some low level bots or tools written in shell script Change-Id: I467ed522d6919963524cccf42c78d0ed3fcfe38b --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/64/66264/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 47d9c2d..562d669 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -94,7 +94,9 @@ 'dc', 'p7zip', 'phpunit', - 'r-base' ]: + 'r-base', + 'ksh', + 'mysql-client' ]: ensure => present } -- To view, visit https://gerrit.wikimedia.org/r/66264 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I467ed522d6919963524cccf42c78d0ed3fcfe38b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] improved a help of sql command a bit - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/66262 Change subject: improved a help of sql command a bit .. improved a help of sql command a bit Change-Id: Idb74f2161647a7afcdc4e07f833f277c7d302542 --- M modules/toollabs/files/sql 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/62/66262/1 diff --git a/modules/toollabs/files/sql b/modules/toollabs/files/sql index 79a2d03..99b9875 100755 --- a/modules/toollabs/files/sql +++ b/modules/toollabs/files/sql @@ -12,15 +12,20 @@ } if [ $# -lt 1 ];then -echo "Usage: sql [-v]" +echo "Usage: sql [-vh] type sql --help for more help" exit 0 fi if [ "$1" = "-h" ] || [ "$1" == "--help" ];then + echo "Usage: sql [_p] [-vh]" + echo echo "This tool allows you to easily open a connection to sql database without having to provide the credentials or a database host server" echo "Example: sql frwiki_p" + echo echo "Parameters:" echo " -v: verbose - produce various information about the resolution of db" + echo + echo "Report bugs to bugzilla" exit 0 fi -- To view, visit https://gerrit.wikimedia.org/r/66262 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb74f2161647a7afcdc4e07f833f277c7d302542 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] r-base on tools project - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/65942 Change subject: r-base on tools project .. r-base on tools project Change-Id: Ie724197dd39b58408d4f19d5621381bc7653b055 --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/42/65942/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index b0de2a9..fc620fb 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -89,7 +89,8 @@ 'libthreads-perl', 'dc', 'p7zip', - 'phpunit' ]: + 'phpunit', + 'r-base' ]: ensure => present } -- To view, visit https://gerrit.wikimedia.org/r/65942 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie724197dd39b58408d4f19d5621381bc7653b055 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inserted 7z to list of packages on dev - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/65876 Change subject: inserted 7z to list of packages on dev .. inserted 7z to list of packages on dev Change-Id: Idb1d11659788805370f0cfa39b302b63d579b2dd --- 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/76/65876/1 diff --git a/modules/toollabs/manifests/dev_environ.pp b/modules/toollabs/manifests/dev_environ.pp index 4aef728..ff6188f 100644 --- a/modules/toollabs/manifests/dev_environ.pp +++ b/modules/toollabs/manifests/dev_environ.pp @@ -40,6 +40,7 @@ 'build-essential', # for dpkg 'mc', # midnight commander is favorite on toolserver, let's not make labs worse than toolserver 'libxslt1-dev', # -- same + 'p7zip-full', # requested by Betacommand to extract files using 7zip 'subversion', 'cython' ]: ensure => present -- To view, visit https://gerrit.wikimedia.org/r/65876 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb1d11659788805370f0cfa39b302b63d579b2dd Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] new tool for easy sql replica access - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/65634 Change subject: new tool for easy sql replica access .. new tool for easy sql replica access Change-Id: Ic28729d34129735a452698e2cdc81cb4fdd8859f --- A modules/toollabs/files/sql M modules/toollabs/manifests/bastion.pp 2 files changed, 91 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/34/65634/1 diff --git a/modules/toollabs/files/sql b/modules/toollabs/files/sql new file mode 100755 index 000..1ff1992 --- /dev/null +++ b/modules/toollabs/files/sql @@ -0,0 +1,82 @@ +#!/bin/bash + +# this tool allow you to connect quickly to sql database +# it should work for all newbies + + +if [ $# -lt 1 ];then +echo "Usage: sql " +exit 0 +fi + +if [ "$1" = "-h" ] || [ "$1" == "--help" ];then + echo "This tool allows you to easily open a connection to sql database without having to provide the credentials or a database host server" + echo "Example: sql frwiki_p" + exit 0 +fi + +list=/usr/share/dblist + +param="" +# check if the user has a replica file +if [ -f ~/replica.my.cnf ];then +param=" --defaults-file=~/replica.my.cnf" +else +if [ ! -f ~/.my.cnf ];then +param=" -p" +fi +fi + +server="enwiki.labsdb" +db="enwiki_p" + +case "$1" in +"en" | "enwiki_p") +server="enwiki.labsdb" +db="enwiki_p" +;; +"de" | "dewiki_p") +server="dewiki.labsdb" +db="dewiki_p" +;; +"fr" | "frwiki_p") +server="frwiki.labsdb" +db="frwiki_p" +;; +"cs" | "cswiki_p") +server="cswiki.labsdb" +db="cswiki_p" +;; +"local") +server=tools-db +db="mysql" +if [ -f ~/.my.cnf ];then + param="" +fi + ;; + "commonswiki_p" | "commons") + server=commonswiki.labsdb + db="commonswiki_p" + ;; + *) + # we don't know what the database is so we check if it exist first + echo "This database name is not known by sql script, fallback to dblist resolution" + # lookup from hosts + if [ `echo "$1" | grep -cE '_p$'` -lt 1 ];then + echo "Make sure to ask for a db in format of _p" +exit 1 + fi + db=$1 + server=`echo "$1" | sed 's/_p//' | sed 's/$/.labsdb/'` + if [ `cat /etc/hosts | grep -cE "\s$server"` -gt 0 ] + then + echo "Resolved to $server $db" + else + echo "This is unknown db to me, if you don't like, blame petan on freenode" + exit 1 + fi + ;; +esac + +echo "Connecting to $server" +mysql $param -h $server $db ${*:2} diff --git a/modules/toollabs/manifests/bastion.pp b/modules/toollabs/manifests/bastion.pp index d96a1a3..21e90c3 100644 --- a/modules/toollabs/manifests/bastion.pp +++ b/modules/toollabs/manifests/bastion.pp @@ -37,6 +37,15 @@ content => "$ipaddress\n", } + file { "/usr/bin/sql": +ensure => file, +mode => "0755", +owner => "root", +group => "root", +source => "puppet://modules/toollabs/sql", + } + + # TODO: local scripts # TODO: j* tools # TODO: cron setup -- To view, visit https://gerrit.wikimedia.org/r/65634 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic28729d34129735a452698e2cdc81cb4fdd8859f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inserted phpunit on exec nodes because they are needed for d... - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/65341 Change subject: inserted phpunit on exec nodes because they are needed for development tests .. inserted phpunit on exec nodes because they are needed for development tests Change-Id: I6b84e7e7dd693b35873223a21d55e307919907f7 --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/41/65341/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index f0b9b88..b0de2a9 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -88,7 +88,8 @@ 'libthreads-shared-perl', 'libthreads-perl', 'dc', - 'p7zip' ]: + 'p7zip', + 'phpunit' ]: ensure => present } -- To view, visit https://gerrit.wikimedia.org/r/65341 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b84e7e7dd693b35873223a21d55e307919907f7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] motd is now project wide - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/64285 Change subject: motd is now project wide .. motd is now project wide Change-Id: I6f3d49efa97fe39617ad98df4eb2d565a2100b41 --- A modules/toollabs/files/profile-tool-labs.sh M modules/toollabs/manifests/init.pp 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/85/64285/1 diff --git a/modules/toollabs/files/profile-tool-labs.sh b/modules/toollabs/files/profile-tool-labs.sh new file mode 100644 index 000..d5e540f --- /dev/null +++ b/modules/toollabs/files/profile-tool-labs.sh @@ -0,0 +1,2 @@ +#!/bin/sh +[ -f /data/project/.system/tips.sh ] && /data/project/.system/tips.sh diff --git a/modules/toollabs/manifests/init.pp b/modules/toollabs/manifests/init.pp index 995eca7..1f7e89d 100644 --- a/modules/toollabs/manifests/init.pp +++ b/modules/toollabs/manifests/init.pp @@ -57,11 +57,23 @@ group => "root", } + # this is a link to shared folder file { "/shared": ensure => link, target => "/data/project/.shared"; } + # this file contains the motd tips and also the admin motd script + # in fact it just check if the shared script exist and if so + # it executes it + file { "/etc/profile.d/tips.sh": +ensure => file, +source => "puppet:///modules/toollabs/profile-tool-labs.sh", +mode => "0555", +owner => "root", +group => "root", + } + # Tool Labs is enduser-facing, so we want to control the motd # properly (most things make no sense for community users: they -- To view, visit https://gerrit.wikimedia.org/r/64285 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f3d49efa97fe39617ad98df4eb2d565a2100b41 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] removed the libxml because it breaks puppet - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/63279 Change subject: removed the libxml because it breaks puppet .. removed the libxml because it breaks puppet Change-Id: I7fd1791457a6e1a8bd60fae2b544e9e1ca0f8aa4 --- M modules/toollabs/manifests/dev_environ.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/79/63279/1 diff --git a/modules/toollabs/manifests/dev_environ.pp b/modules/toollabs/manifests/dev_environ.pp index 87a2843..f1d4ea6 100644 --- a/modules/toollabs/manifests/dev_environ.pp +++ b/modules/toollabs/manifests/dev_environ.pp @@ -38,7 +38,7 @@ 'fakeroot', # for dpkg 'build-essential', # for dpkg 'mc', # midnight commander is favorite on toolserver, let's not make labs worse than toolserver - 'libxml2-dev', # needed to compile some bots + #'libxml2-dev', # needed to compile some bots # removed - is already contained in some other file 'libxslt1-dev', # -- same 'subversion', 'cython' ]: -- To view, visit https://gerrit.wikimedia.org/r/63279 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7fd1791457a6e1a8bd60fae2b544e9e1ca0f8aa4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] create a link to shared folder - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/63271 Change subject: create a link to shared folder .. create a link to shared folder Change-Id: I83eaca918cc1ed0388a957dee97d42b6b7b445ef --- M modules/toollabs/manifests/init.pp 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/71/63271/1 diff --git a/modules/toollabs/manifests/init.pp b/modules/toollabs/manifests/init.pp index 6f3868c..d75018d 100644 --- a/modules/toollabs/manifests/init.pp +++ b/modules/toollabs/manifests/init.pp @@ -34,6 +34,11 @@ content => "[$fqdn]:* ssh-dss $sshdsakey\n[$ipaddress]:* ssh-dss $sshdsakey\n", } + file { "/shared": +ensure => link, +target => "/data/project/.shared"; + } + exec { "make_known_hosts": command => "/bin/cat /data/project/.system/store/hostkey-* >/etc/ssh/ssh_known_hosts~", require => File[$store], -- To view, visit https://gerrit.wikimedia.org/r/63271 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83eaca918cc1ed0388a957dee97d42b6b7b445ef Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inserted 2 more packages needed to compile - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/63065 Change subject: inserted 2 more packages needed to compile .. inserted 2 more packages needed to compile Change-Id: I94cb4a100a862502ffda9fcb5723022ac242ca16 --- M modules/toollabs/manifests/dev_environ.pp 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/65/63065/1 diff --git a/modules/toollabs/manifests/dev_environ.pp b/modules/toollabs/manifests/dev_environ.pp index c1a95ad..35ee395 100644 --- a/modules/toollabs/manifests/dev_environ.pp +++ b/modules/toollabs/manifests/dev_environ.pp @@ -34,6 +34,8 @@ 'fakeroot', # for dpkg 'build-essential', # for dpkg 'mc', # midnight commander is favorite on toolserver, let's not make labs worse than toolserver + 'libxml2-dev', # needed to compile some bots + 'libxslt1-dev', # -- same 'subversion', 'cython' ]: ensure => present -- To view, visit https://gerrit.wikimedia.org/r/63065 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I94cb4a100a862502ffda9fcb5723022ac242ca16 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Inserted some more packages to development set - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/62913 Change subject: Inserted some more packages to development set .. Inserted some more packages to development set Change-Id: I9fec629ffb131852f539be8c510734f3b5c38653 --- M modules/toollabs/manifests/dev_environ.pp 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/13/62913/1 diff --git a/modules/toollabs/manifests/dev_environ.pp b/modules/toollabs/manifests/dev_environ.pp index a7dcb51..1fdecdc 100644 --- a/modules/toollabs/manifests/dev_environ.pp +++ b/modules/toollabs/manifests/dev_environ.pp @@ -31,6 +31,11 @@ 'emacs', 'elinks', 'mercurial', + 'mono-complete', # contains a lot of developer stuff + 'gdb', # debugger is useful on dev + 'fakeroot', # for dpkg + 'build-essential', # for dpkg + 'mc', # midnight commander is favorite on toolserver, let's not make labs worse than toolserver 'subversion', 'cython' ]: ensure => present -- To view, visit https://gerrit.wikimedia.org/r/62913 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9fec629ffb131852f539be8c510734f3b5c38653 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] latest version of rmtool - change (labs/toollabs)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/62350 Change subject: latest version of rmtool .. latest version of rmtool Change-Id: I83a7e7046ad991d3e29c59aece92d1daf4501767 --- A usr/local/sbin/rmtool 1 file changed, 91 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/50/62350/1 diff --git a/usr/local/sbin/rmtool b/usr/local/sbin/rmtool new file mode 100755 index 000..06a7696 --- /dev/null +++ b/usr/local/sbin/rmtool @@ -0,0 +1,91 @@ +#!/bin/bash + +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 +fi + +tool=$1 +dbuser=`echo $1 | sed 's/-//'` + +# get a number of users of this name in mysql +uc=`echo "select user from user;" | mysql mysql | grep -cE ^$dbuser'$'` + +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 +fi + +# get the number of databases for this user +db=`echo "show databases;" | mysql mysql | grep -cE ^$dbuser'$'` + +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 +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 + 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 +fi + +# get a number of records in /data/project/.system/webservers + +while [ -f /data/project/.system/webservers.lock ] +do + echo "There is a lockfile, sleeping for 10 seconds" + sleep 10 +done + +touch /data/project/.system/webservers.lock +wc=`cat /data/project/.system/webservers | grep -Ec "^$tool\s.*"` + +if [ "$wc" -gt 0 ];then + # create a backup file so that if stuff get fucked up we can recover it + cp /data/project/.system/webservers /tmp/webservers.backup.`date +%H:%M:%S` + echo "Removing webserver" + cat /data/project/.system/webservers | grep -vE "^$tool\s.*" > /tmp/webservers + mv /tmp/webservers /data/project/.system/webservers +fi + +rm /data/project/.system/webservers.lock + +echo "All data for $tool were cleaned" -- To view, visit https://gerrit.wikimedia.org/r/62350 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83a7e7046ad991d3e29c59aece92d1daf4501767 Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] some more tools to git - change (labs/toollabs)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/62349 Change subject: some more tools to git .. some more tools to git Change-Id: Icc0094d8aba34c571d930eafd79904f748e10ad7 --- A usr/local/bin/become 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/49/62349/1 diff --git a/usr/local/bin/become b/usr/local/bin/become new file mode 100755 index 000..eab5657 --- /dev/null +++ b/usr/local/bin/become @@ -0,0 +1,21 @@ +#! /bin/bash + + +if [ $# -lt 1 ]; then + echo "usage: $(basename $0) [command [args...]]" >&2 + exit 1 +fi +if ! id "local-$1" >/dev/null 2>&1 +then + echo "$(basename $0): no such tool '$1'" >&2 + exit 1 +fi +if ! [ -d "/data/project/$1" ] +then + echo "$(basename $0): no such tool '$1'" >&2 + exit 1 +fi +user="$1" +shift +exec /usr/bin/sudo -niu "local-$user" "$@" + -- To view, visit https://gerrit.wikimedia.org/r/62349 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icc0094d8aba34c571d930eafd79904f748e10ad7 Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inserted toolwatcher to git - change (labs/toollabs)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/62348 Change subject: inserted toolwatcher to git .. inserted toolwatcher to git Change-Id: I4d7462baf8ca03c5cdcf31feaca2ba60226828a7 --- A usr/local/sbin/toolwatcher 1 file changed, 46 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/48/62348/1 diff --git a/usr/local/sbin/toolwatcher b/usr/local/sbin/toolwatcher new file mode 100755 index 000..81f2574 --- /dev/null +++ b/usr/local/sbin/toolwatcher @@ -0,0 +1,46 @@ +#! /bin/bash + +export HOME=/root +while true;do + cd /data/project/ + for tool in $(getent passwd | cut -d : -f 1 | sed -n '/^local-/{s///;p}'); do + if [ ! -d "/data/project/$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 "local-$tool:local-$tool" "$tool" + find "$tool" -type d | xargs chmod g+sx,o+x + fi + + if [ ! -f "$tool/.my.cnf" ]; then + dbname=$(echo "$tool"|tr -d -c '[:alnum:]') + pwd=$(pwgen -nc 16) + /usr/bin/mysql -h tools-db -u root <<-END + create database $dbname; + grant usage on *.* to '$dbname'@'%' identified by '$pwd'; + grant all privileges on $dbname.* to '$dbname'@'%' with grant option; + END + touch tmp.$$ + chmod u=r,go= tmp.$$ + chown "local-$tool:local-$tool" tmp.$$ + cat >>tmp.$$ <<-END + [client] + host=tools-db + user=$dbname + database=$dbname + password='$pwd' + END + mv tmp.$$ "$tool/.my.cnf" + fi + + if ! greq -q "^$tool " /data/project/.system/webservers >/dev/null; then + echo "$tool tools-webserver-01" >>/data/project/.system/webservers + fi + done + cd /tmp + sleep 120 +done + -- To view, visit https://gerrit.wikimedia.org/r/62348 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d7462baf8ca03c5cdcf31feaca2ba60226828a7 Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed some bug - change (labs/toollabs)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/62239 Change subject: fixed some bug .. fixed some bug Change-Id: I51bfe57e5619ddfc6307d01ff2ab0119e10b35c4 --- M bin/rmtool 1 file changed, 11 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/39/62239/1 diff --git a/bin/rmtool b/bin/rmtool index d0a5d6d..7dada4a 100755 --- a/bin/rmtool +++ b/bin/rmtool @@ -43,6 +43,11 @@ 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 @@ -50,6 +55,12 @@ exit 1 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" + fi fi # get a number of records in /data/project/.system/webservers @@ -60,11 +71,6 @@ sleep 10 done -if [ ! -d /data/project/removed_tools ];then -echo "There is no folder to store removed tools!" -exit 1 -fi - touch /data/project/.system/webservers.lock wc=`cat /data/project/.system/webservers | grep -Ec "^$tool\s.*"` @@ -74,8 +80,6 @@ echo "Removing webserver" cat /data/project/.system/webservers | grep -vE "^$tool\s.*" > /tmp/webservers mv /tmp/webservers /data/project/.system/webservers - cd /data/project/removed_tools - tar -zcvf "$tool.tar.gz" "$tool" fi rm /data/project/.system/webservers.lock -- To view, visit https://gerrit.wikimedia.org/r/62239 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51bfe57e5619ddfc6307d01ff2ab0119e10b35c4 Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tarballing the produced folder so that we save some space - change (labs/toollabs)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/62238 Change subject: tarballing the produced folder so that we save some space .. tarballing the produced folder so that we save some space Change-Id: I25056770407610c6f6ca1ea3bd1585a1e5809ad4 --- M bin/rmtool 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/38/62238/1 diff --git a/bin/rmtool b/bin/rmtool index 317c12a..d0a5d6d 100755 --- a/bin/rmtool +++ b/bin/rmtool @@ -33,7 +33,7 @@ if [ -f "/data/project/$tool/database_backup.sql" ];then echo "Error there is already a backup file" exit 1 - fi + fi if [ ! -d "/data/project/$tool" ];then echo "There is no folder to save backup of db to!" exit 1 @@ -60,14 +60,22 @@ sleep 10 done +if [ ! -d /data/project/removed_tools ];then +echo "There is no folder to store removed tools!" +exit 1 +fi + touch /data/project/.system/webservers.lock wc=`cat /data/project/.system/webservers | grep -Ec "^$tool\s.*"` + if [ "$wc" -gt 0 ];then # create a backup file so that if stuff get fucked up we can recover it cp /data/project/.system/webservers /tmp/webservers.backup.`date +%H:%M:%S` echo "Removing webserver" cat /data/project/.system/webservers | grep -vE "^$tool\s.*" > /tmp/webservers mv /tmp/webservers /data/project/.system/webservers + cd /data/project/removed_tools + tar -zcvf "$tool.tar.gz" "$tool" fi rm /data/project/.system/webservers.lock -- To view, visit https://gerrit.wikimedia.org/r/62238 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25056770407610c6f6ca1ea3bd1585a1e5809ad4 Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tool for removing of existing projects - change (labs/toollabs)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/62236 Change subject: tool for removing of existing projects .. tool for removing of existing projects Change-Id: I6d46145ba184b5ec07aa8fa49913c2fb51b36b68 --- A bin/rmtool 1 file changed, 77 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/36/62236/1 diff --git a/bin/rmtool b/bin/rmtool new file mode 100755 index 000..317c12a --- /dev/null +++ b/bin/rmtool @@ -0,0 +1,77 @@ +#!/bin/bash + +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 +fi + +tool=$1 +dbuser=`echo $1 | sed 's/-//'` + +# get a number of users of this name in mysql +uc=`echo "select user from user;" | mysql mysql | grep -cE ^$dbuser'$'` + +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 +fi + +# get the number of databases for this user +db=`echo "show databases;" | mysql mysql | grep -cE ^$dbuser'$'` + +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 +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 + fi + mv "/data/project/$tool" "/data/project/removed_tools/$tool/" +fi + +# get a number of records in /data/project/.system/webservers + +while [ -f /data/project/.system/webservers.lock ] +do + echo "There is a lockfile, sleeping for 10 seconds" + sleep 10 +done + +touch /data/project/.system/webservers.lock +wc=`cat /data/project/.system/webservers | grep -Ec "^$tool\s.*"` +if [ "$wc" -gt 0 ];then + # create a backup file so that if stuff get fucked up we can recover it + cp /data/project/.system/webservers /tmp/webservers.backup.`date +%H:%M:%S` + echo "Removing webserver" + cat /data/project/.system/webservers | grep -vE "^$tool\s.*" > /tmp/webservers + mv /tmp/webservers /data/project/.system/webservers +fi + +rm /data/project/.system/webservers.lock + +echo "All data for $tool were cleaned" +exit 0 + -- To view, visit https://gerrit.wikimedia.org/r/62236 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d46145ba184b5ec07aa8fa49913c2fb51b36b68 Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ok, and these manual pages of course should be in usr as well - change (labs/toollabs)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/57743 Change subject: ok, and these manual pages of course should be in usr as well .. ok, and these manual pages of course should be in usr as well Change-Id: Iedae79846cca35f1da339c2a186d275d709515bd --- R packages/jobutils/usr/share/man/man1/jstart.1 R packages/jobutils/usr/share/man/man1/jstop.1 R packages/jobutils/usr/share/man/man1/jsub.1 3 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/43/57743/1 diff --git a/packages/jobutils/share/man/man1/jstart.1 b/packages/jobutils/usr/share/man/man1/jstart.1 similarity index 100% rename from packages/jobutils/share/man/man1/jstart.1 rename to packages/jobutils/usr/share/man/man1/jstart.1 diff --git a/packages/jobutils/share/man/man1/jstop.1 b/packages/jobutils/usr/share/man/man1/jstop.1 similarity index 100% rename from packages/jobutils/share/man/man1/jstop.1 rename to packages/jobutils/usr/share/man/man1/jstop.1 diff --git a/packages/jobutils/share/man/man1/jsub.1 b/packages/jobutils/usr/share/man/man1/jsub.1 similarity index 100% rename from packages/jobutils/share/man/man1/jsub.1 rename to packages/jobutils/usr/share/man/man1/jsub.1 -- To view, visit https://gerrit.wikimedia.org/r/57743 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iedae79846cca35f1da339c2a186d275d709515bd Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mark > marc + comma - change (labs/toollabs)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/57742 Change subject: mark > marc + comma .. mark > marc + comma Change-Id: I7310e23c2335c1f82063ab40ecf3283da7c0e4cc --- M packages/jobutils/DEBIAN/control M packages/jobutils/share/man/man1/jstart.1 M packages/jobutils/share/man/man1/jstop.1 M packages/jobutils/share/man/man1/jsub.1 4 files changed, 8 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/42/57742/1 diff --git a/packages/jobutils/DEBIAN/control b/packages/jobutils/DEBIAN/control index 829ff91..c2ac5e9 100644 --- a/packages/jobutils/DEBIAN/control +++ b/packages/jobutils/DEBIAN/control @@ -4,8 +4,8 @@ Priority: optional Architecture: all Essential: no -Depends: perl gridengine-common +Depends: perl, gridengine-common Installed-Size: 9 -Maintainer: Mark Pelletier , Petr Bena +Maintainer: Marc-André Pelletier , Petr Bena Description: Set of utilities to use on wikimedia bots and tools cluster This package will install jstart (jsub) and jstop, which can be used with GE diff --git a/packages/jobutils/share/man/man1/jstart.1 b/packages/jobutils/share/man/man1/jstart.1 index cc47739..33cd924 100644 --- a/packages/jobutils/share/man/man1/jstart.1 +++ b/packages/jobutils/share/man/man1/jstart.1 @@ -1,6 +1,6 @@ .\" Man page for jstart .\" Licensed under BSD-like License. -.\" Created by Marc Pelletier +.\" Created by Marc-André Pelletier .\" .TH Jobutils "jstart" "User Manual" .SH NAME @@ -27,7 +27,5 @@ jobutils will insert extra commands to grid engine, these tools were created for wikimedia tools project .PP .SH "AUTHOR" -Marc Pelletier, Petr Bena +Marc-André Pelletier, Petr Bena .br - - diff --git a/packages/jobutils/share/man/man1/jstop.1 b/packages/jobutils/share/man/man1/jstop.1 index 0d596cb..50bea5e 100644 --- a/packages/jobutils/share/man/man1/jstop.1 +++ b/packages/jobutils/share/man/man1/jstop.1 @@ -1,6 +1,6 @@ .\" Man page for jstart .\" Licensed under CC-BY-SA -.\" Created by Marc Pelletier +.\" Created by Marc-André Pelletier .\" .TH Jobutils "jstop" "User Manual" .SH NAME @@ -12,7 +12,5 @@ jobutils will insert extra commands to grid engine, these tools were created for wikimedia tools project .PP .SH "AUTHOR" -Marc Pelletier, Petr Bena +Marc-André Pelletier, Petr Bena .br - - diff --git a/packages/jobutils/share/man/man1/jsub.1 b/packages/jobutils/share/man/man1/jsub.1 index ee56f2d..a3ae4d9 100644 --- a/packages/jobutils/share/man/man1/jsub.1 +++ b/packages/jobutils/share/man/man1/jsub.1 @@ -1,6 +1,6 @@ .\" Man page for jstart .\" Licensed under CC-BY-SA -.\" Created by Marc Pelletier +.\" Created by Marc-André Pelletier .\" .TH Jobutils "jsub" "User Manual" .SH NAME @@ -27,7 +27,5 @@ jobutils will insert extra commands to grid engine, these tools were created for wikimedia tools project .PP .SH "AUTHOR" -Marc Pelletier, Petr Bena +Marc-André Pelletier, Petr Bena .br - - -- To view, visit https://gerrit.wikimedia.org/r/57742 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7310e23c2335c1f82063ab40ecf3283da7c0e4cc Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inserted a package structure for jobutils - change (labs/toollabs)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/57740 Change subject: inserted a package structure for jobutils .. inserted a package structure for jobutils Change-Id: I4c92ba0cede54616caf037a99ca79247b2c189cf --- A packages/jobutils/DEBIAN/control A packages/jobutils/share/man/man1/jstart.1 A packages/jobutils/share/man/man1/jstop.1 A packages/jobutils/share/man/man1/jsub.1 A packages/jobutils/usr/local/bin/jstart A packages/jobutils/usr/local/bin/jstop A packages/jobutils/usr/local/bin/jsub 7 files changed, 356 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/40/57740/1 diff --git a/packages/jobutils/DEBIAN/control b/packages/jobutils/DEBIAN/control new file mode 100644 index 000..829ff91 --- /dev/null +++ b/packages/jobutils/DEBIAN/control @@ -0,0 +1,11 @@ +Package: Jobutils +Version: 1.0.0 +Section: universe/utils +Priority: optional +Architecture: all +Essential: no +Depends: perl gridengine-common +Installed-Size: 9 +Maintainer: Mark Pelletier , Petr Bena +Description: Set of utilities to use on wikimedia bots and tools cluster + This package will install jstart (jsub) and jstop, which can be used with GE diff --git a/packages/jobutils/share/man/man1/jstart.1 b/packages/jobutils/share/man/man1/jstart.1 new file mode 100644 index 000..cc47739 --- /dev/null +++ b/packages/jobutils/share/man/man1/jstart.1 @@ -0,0 +1,33 @@ +.\" Man page for jstart +.\" Licensed under BSD-like License. +.\" Created by Marc Pelletier +.\" +.TH Jobutils "jstart" "User Manual" +.SH NAME +usage: jstart [options...] program [arg...] + +Options include many (but not all) qsub options, along with: + \-stderr Send errors to stderr rather than the error + output file. + \-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. + \-continuous Start a self-restarting job on the continuous + queue (default if invoked as 'jstart') + +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 +(without job numbers), including errors from starting the job itself. + +Additionally, you need to provide an executable on the command line, +jstart will not read a script from standard input. + +.SH DESCRIPTION +jobutils will insert extra commands to grid engine, these tools were created for wikimedia tools project +.PP +.SH "AUTHOR" +Marc Pelletier, Petr Bena +.br + + diff --git a/packages/jobutils/share/man/man1/jstop.1 b/packages/jobutils/share/man/man1/jstop.1 new file mode 100644 index 000..0d596cb --- /dev/null +++ b/packages/jobutils/share/man/man1/jstop.1 @@ -0,0 +1,18 @@ +.\" Man page for jstart +.\" Licensed under CC-BY-SA +.\" Created by Marc Pelletier +.\" +.TH Jobutils "jstop" "User Manual" +.SH NAME +usage: jstop [jobname] + +Delete a job + +.SH DESCRIPTION +jobutils will insert extra commands to grid engine, these tools were created for wikimedia tools project +.PP +.SH "AUTHOR" +Marc Pelletier, Petr Bena +.br + + diff --git a/packages/jobutils/share/man/man1/jsub.1 b/packages/jobutils/share/man/man1/jsub.1 new file mode 100644 index 000..ee56f2d --- /dev/null +++ b/packages/jobutils/share/man/man1/jsub.1 @@ -0,0 +1,33 @@ +.\" Man page for jstart +.\" Licensed under CC-BY-SA +.\" Created by Marc Pelletier +.\" +.TH Jobutils "jsub" "User Manual" +.SH NAME +usage: jsub [options...] program [arg...] + +Options include many (but not all) qsub options, along with: + \-stderr Send errors to stderr rather than the error + output file. + \-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. + \-continuous Start a self-restarting job on the continuous + queue (default if invoked as 'jstart') + +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 +(without job numbers), including errors from starting the job itself. + +Additionally, you need to provide an executable on the command line, +jstart will not read a script from standard input. + +.SH DESCRIPTION +jobutils will insert extra commands to grid engine, these tools were created for wikimedia tools project +.PP +.SH "AUTHOR" +Marc Pelletier, Petr Bena +.br + + diff --g
[MediaWiki-commits] [Gerrit] puppetized motd of bots project of labs - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/53145 Change subject: puppetized motd of bots project of labs .. puppetized motd of bots project of labs Change-Id: I6862c2b33500f05be1eff749eb29aa8a02d682df --- A files/labs/bots/motd.tail A manifests/labs/bots/bots.pp 2 files changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/45/53145/1 diff --git a/files/labs/bots/motd.tail b/files/labs/bots/motd.tail new file mode 100644 index 000..4bc263c --- /dev/null +++ b/files/labs/bots/motd.tail @@ -0,0 +1,19 @@ +- + __ + ( \_ + |) ) ___ _| |_ ___ + | __ ( / _ (_ _)/___) + | |__) ) |_| || |_|___ | + |__/ \___/ \__|___/ + project +- + +This is a server of bots project, the collaborative environment +to run and operate bots for wikimedia project. 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 new file mode 100644 index 000..325cb03 --- /dev/null +++ b/manifests/labs/bots/bots.pp @@ -0,0 +1,13 @@ +# 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/53145 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6862c2b33500f05be1eff749eb29aa8a02d682df Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] nrpe changed the IP of master server for labs - change (operations/puppet)
Petrb has uploaded a new change for review. https://gerrit.wikimedia.org/r/52779 Change subject: nrpe changed the IP of master server for labs .. nrpe changed the IP of master server for labs Change-Id: I66781173cffc616ff63b08f6b17c7346d6ac3464 --- M manifests/nrpe.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/79/52779/1 diff --git a/manifests/nrpe.pp b/manifests/nrpe.pp index 388c15a..af55223 100644 --- a/manifests/nrpe.pp +++ b/manifests/nrpe.pp @@ -70,7 +70,7 @@ class nrpe::packages { $nrpe_allowed_hosts = $::realm ? { "production" => "127.0.0.1,208.80.152.185,208.80.152.161,208.80.154.14", - "labs" => "10.4.0.34" + "labs" => "10.4.0.120" } package { [ "nagios-nrpe-server", "nagios-plugins", "nagios-plugins-basic", "nagios-plugins-extra", "nagios-plugins-standard", "libssl0.9.8" ]: -- To view, visit https://gerrit.wikimedia.org/r/52779 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I66781173cffc616ff63b08f6b17c7346d6ac3464 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed ram check in nagios - change (operations/puppet[production])
Petrb has uploaded a new change for review. Change subject: fixed ram check in nagios .. fixed ram check in nagios Change-Id: I732b2954d7fb24186af7b12e4a0acee940f033e1 --- M files/nagios/check_ram.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/43/43843/1 -- To view, visit https://gerrit.wikimedia.org/r/43843 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I732b2954d7fb24186af7b12e4a0acee940f033e1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] SVN: [115777] trunk/tools/wmib/README
https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115777 Revision: 115777 Author: petrb Date: 2012-10-30 11:55:44 + (Tue, 30 Oct 2012) Log Message: --- This repository was moved to https://github.com/benapetr/wikimedia-bot Added Paths: --- trunk/tools/wmib/README Added: trunk/tools/wmib/README === --- trunk/tools/wmib/README (rev 0) +++ trunk/tools/wmib/README 2012-10-30 11:55:44 UTC (rev 115777) @@ -0,0 +1 @@ +this repository was moved to https://github.com/benapetr/wikimedia-bot don't commit into this one, please ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Deploying OSB to beta - change (operations/mediawiki-config[master])
Petrb has uploaded a new change for review. Change subject: Deploying OSB to beta .. Deploying OSB to beta Deploying extension as a part of review. This extension is scheduled for deployment on enwiki. Change-Id: I93f6d44e84cc3e7bd57623cb3ebce133c270965f --- M wmf-config/ext-wmflabs.php 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/72/22172/1 -- To view, visit https://gerrit.wikimedia.org/r/22172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I93f6d44e84cc3e7bd57623cb3ebce133c270965f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Petrb ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits