Tim Landscheidt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340058 )
Change subject: Tools: Unpuppetize sql ...................................................................... Tools: Unpuppetize sql sql is now deployed as part of misctools. Change-Id: I98ac8d4952a6cdbadfba8af42c91a41f585645be --- D modules/toollabs/files/sql M modules/toollabs/manifests/exec_environ.pp 2 files changed, 0 insertions(+), 128 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/58/340058/1 diff --git a/modules/toollabs/files/sql b/modules/toollabs/files/sql deleted file mode 100755 index 65f5314..0000000 --- a/modules/toollabs/files/sql +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash - -# this tool allow you to connect quickly to sql database -# it should work for all newbies - -verbose=0 - -function Log { -if [ $verbose -eq 1 ];then - echo "$1" -fi -} - -if [ $# -lt 1 ];then - echo "Usage: \"sql <database name|wiki name> [-vh]\" type sql --help for more help" - exit 0 -fi - -if [ "$1" = "-h" ] || [ "$1" == "--help" ];then - echo "Usage: sql <database>[_p] [-vh] [command(s)]" - 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 phabricator: https://phabricator.wikimedia.org" - exit 0 -fi - -for i -do - if [ "$i" = "-v" ] || [ "$i" = "--verbose" ] - then - verbose=1 - fi -done - -if [ ! -f ~/replica.my.cnf ] && [ ! -f ~/.my.cnf ] -then - Log "WARNING: There is no configuration file for mysql to use, you will probably be unable to access the database" -fi - -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" | "enwiki_p") - server="enwiki.labsdb" - db="enwiki_p" - ;; - "de" | "dewiki" | "dewiki_p") - server="dewiki.labsdb" - db="dewiki_p" - ;; - "fr" | "frwiki" | "frwiki_p") - server="frwiki.labsdb" - db="frwiki_p" - ;; - "cs" | "cswiki" | "cswiki_p") - server="cswiki.labsdb" - db="cswiki_p" - ;; - "commons" | "commonswiki" | "commonswiki_p") - server="commonswiki.labsdb" - db="commonswiki_p" - ;; - "wikidata" | "wikidatawiki" | "wikidatawiki_p") - server="wikidatawiki.labsdb" - db="wikidatawiki_p" - ;; - "meta" | "meta_p") - # Not to confuse with metawiki[_p] - # https://wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Help#Metadata_database - server="s7.labsdb" - db="meta_p" - ;; - "local") - server=tools-db - db="" - if [ -f ~/.my.cnf ];then - param="" - fi - ;; - *) - # we don't know what the database is so we check if it exist first - Log "This database name is not known by sql script, fallback to dblist resolution" - db="${1%_p}_p" - server="${db%_p}.labsdb" - if getent hosts -- "$server" > /dev/null - then - Log "Resolved to $server $db" - else - echo "Could not find requested database" - if [ "$db" != "$1" ]; then - echo 'Make sure to ask for a db in format of <wiki>_p' - fi - exit 1 - fi - ;; -esac - -shift -Log "Connecting to $server" -if [ $# -lt 1 ]; then - exec mysql $param -h $server $db "$@" -else - echo "$@" | mysql $param -h $server $db -fi diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index ebd3bfb..a4d68bf 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -429,14 +429,6 @@ ensure => latest, } - file { '/usr/bin/sql': - ensure => file, - owner => 'root', - group => 'root', - mode => '0755', - source => 'puppet:///modules/toollabs/sql', - } - sysctl::parameters { 'tool labs': values => { 'vm.overcommit_memory' => 2, -- To view, visit https://gerrit.wikimedia.org/r/340058 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98ac8d4952a6cdbadfba8af42c91a41f585645be Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits