[MediaWiki-commits] [Gerrit] Remove sandbox wiki - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Remove sandbox wiki .. Remove sandbox wiki Change-Id: I8283f7b4508e1709c24f5f1fc2e4da133b9df38e --- D bin/sandbox-update-all M puppet/modules/nginx/files/offline M puppet/modules/wiki/templates/wikimaintenance.erb 3 files changed, 1 insertion(+), 18 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/bin/sandbox-update-all b/bin/sandbox-update-all deleted file mode 100755 index 065f957..000 --- a/bin/sandbox-update-all +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -e - -BASEDIR=$(dirname $0) -WIKINAME="sandbox.translatewiki.net" -WIKI=/www/$WIKINAME/docroot/w - -cd $WIKI -REV=`git log --pretty='%h %ci (%cr)' -n 1` -"$BASEDIR/udpcast" "updating $WIKINAME from $REV..." - -sudo -H -u betawiki "$BASEDIR/wikiupdate" "$WIKI" - -REV=`git log --pretty='%h %ci (%cr)' -n 1` -"$BASEDIR/udpcast" "updated $WIKINAME to $REV" diff --git a/puppet/modules/nginx/files/offline b/puppet/modules/nginx/files/offline index 44136d1..92218bc 100644 --- a/puppet/modules/nginx/files/offline +++ b/puppet/modules/nginx/files/offline @@ -18,7 +18,7 @@ spdy_headers_comp 7; - server_name translatewiki.net dev.translatewiki.net sandbox.translatewiki.net; + server_name translatewiki.net dev.translatewiki.net; root /www/offline; location /index.php { diff --git a/puppet/modules/wiki/templates/wikimaintenance.erb b/puppet/modules/wiki/templates/wikimaintenance.erb index fe481a9..bf26bbe 100644 --- a/puppet/modules/wiki/templates/wikimaintenance.erb +++ b/puppet/modules/wiki/templates/wikimaintenance.erb @@ -1,5 +1,4 @@ # file managed by puppet * * * * * <%= @user %> nice php /srv/mediawiki/targets/production/maintenance/runJobs.php --maxtime=50 --procs=1 --memory-limit=250M >> /www/translatewiki.net/logs/jobqueue 2> /dev/null -*/5 * * * * <%= @user %> nice php /www/sandbox.translatewiki.net/docroot/w/maintenance/runJobs.php --maxtime=50 --procs=1 --memory-limit=250M >> /www/sandbox.translatewiki.net/logs/jobqueue 2> /dev/null @weekly www-data find /www/translatewiki.net/docroot/images/thumb/ -name "*.png" -type f -print0 | nice xargs -0 -P4 -I{} optipng -o7 {} 1> /dev/null @weekly <%= @user %> nice php /srv/mediawiki/targets/production/maintenance/generateSitemap.php --fspath /www/translatewiki.net/docroot/sitemap/ --skip-redirects --urlpath https://translatewiki.net/sitemap/ -- To view, visit https://gerrit.wikimedia.org/r/224854 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8283f7b4508e1709c24f5f1fc2e4da133b9df38e Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove sandbox wiki - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/224854 Change subject: Remove sandbox wiki .. Remove sandbox wiki Change-Id: I8283f7b4508e1709c24f5f1fc2e4da133b9df38e --- D bin/sandbox-update-all M puppet/modules/nginx/files/offline M puppet/modules/wiki/templates/wikimaintenance.erb 3 files changed, 1 insertion(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/54/224854/1 diff --git a/bin/sandbox-update-all b/bin/sandbox-update-all deleted file mode 100755 index 065f957..000 --- a/bin/sandbox-update-all +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -e - -BASEDIR=$(dirname $0) -WIKINAME="sandbox.translatewiki.net" -WIKI=/www/$WIKINAME/docroot/w - -cd $WIKI -REV=`git log --pretty='%h %ci (%cr)' -n 1` -"$BASEDIR/udpcast" "updating $WIKINAME from $REV..." - -sudo -H -u betawiki "$BASEDIR/wikiupdate" "$WIKI" - -REV=`git log --pretty='%h %ci (%cr)' -n 1` -"$BASEDIR/udpcast" "updated $WIKINAME to $REV" diff --git a/puppet/modules/nginx/files/offline b/puppet/modules/nginx/files/offline index 44136d1..92218bc 100644 --- a/puppet/modules/nginx/files/offline +++ b/puppet/modules/nginx/files/offline @@ -18,7 +18,7 @@ spdy_headers_comp 7; - server_name translatewiki.net dev.translatewiki.net sandbox.translatewiki.net; + server_name translatewiki.net dev.translatewiki.net; root /www/offline; location /index.php { diff --git a/puppet/modules/wiki/templates/wikimaintenance.erb b/puppet/modules/wiki/templates/wikimaintenance.erb index fe481a9..bf26bbe 100644 --- a/puppet/modules/wiki/templates/wikimaintenance.erb +++ b/puppet/modules/wiki/templates/wikimaintenance.erb @@ -1,5 +1,4 @@ # file managed by puppet * * * * * <%= @user %> nice php /srv/mediawiki/targets/production/maintenance/runJobs.php --maxtime=50 --procs=1 --memory-limit=250M >> /www/translatewiki.net/logs/jobqueue 2> /dev/null -*/5 * * * * <%= @user %> nice php /www/sandbox.translatewiki.net/docroot/w/maintenance/runJobs.php --maxtime=50 --procs=1 --memory-limit=250M >> /www/sandbox.translatewiki.net/logs/jobqueue 2> /dev/null @weekly www-data find /www/translatewiki.net/docroot/images/thumb/ -name "*.png" -type f -print0 | nice xargs -0 -P4 -I{} optipng -o7 {} 1> /dev/null @weekly <%= @user %> nice php /srv/mediawiki/targets/production/maintenance/generateSitemap.php --fspath /www/translatewiki.net/docroot/sitemap/ --skip-redirects --urlpath https://translatewiki.net/sitemap/ -- To view, visit https://gerrit.wikimedia.org/r/224854 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8283f7b4508e1709c24f5f1fc2e4da133b9df38e Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits