[MediaWiki-commits] [Gerrit] fix sync-apache for use in eqiad - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/130610 Change subject: fix sync-apache for use in eqiad .. fix sync-apache for use in eqiad so that it can be used on in eqiad on tin the original file on fenari stays untouched. Change-Id: Ie1f623e85709b422e8012c463771b144f06cc495 --- M modules/apachesync/files/sync-apache 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/10/130610/1 diff --git a/modules/apachesync/files/sync-apache b/modules/apachesync/files/sync-apache index b3aa737..c01feca 100755 --- a/modules/apachesync/files/sync-apache +++ b/modules/apachesync/files/sync-apache @@ -1,6 +1,6 @@ #!/bin/bash -echo "Synchronizing /home/wikipedia/conf/httpd to /usr/local/apache/conf..." +echo "Synchronizing /srv/httpd to /usr/local/apache/conf..." # Options to pass to the rsync command RSYNC_OPTIONS="-a" @@ -14,18 +14,18 @@ #This sync works with both puppet and non-puppet hosts dsh -cM -g apaches -o-lroot -o-oSetupTimeout=30 -F30 -- " - rsync $RSYNC_OPTIONS 10.0.5.8::httpdconf/ /usr/local/apache/conf + rsync $RSYNC_OPTIONS 10.64.0.196::httpdconf /usr/local/apache/conf " -# dont forget the image rending cluster +# dont forget the image rendering cluster dsh -cM -g image_scalers -o-lroot -o-oSetupTimeout=30 -F30 -- " - rsync $RSYNC_OPTIONS 10.0.5.8::httpdconf/ /usr/local/apache/conf + rsync $RSYNC_OPTIONS 10.64.0.196::httpdconf /usr/local/apache/conf " # while we are at it, might as well do the snapshot boxen dsh -cM -g snapshot -o-lroot -o-oSetupTimeout=30 -F30 -- " - rsync $RSYNC_OPTIONS 10.0.5.8::httpdconf/ /usr/local/apache/conf + rsync $RSYNC_OPTIONS 10.64.0.196::httpdconf /usr/local/apache/conf " # decided we want search indexers too dsh -cM -g searchidx -o-lroot -o-oSetupTimeout=30 -F30 -- " - rsync $RSYNC_OPTIONS 10.0.5.8::httpdconf/ /usr/local/apache/conf + rsync $RSYNC_OPTIONS 10.64.0.196::httpdconf /usr/local/apache/conf " -- To view, visit https://gerrit.wikimedia.org/r/130610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1f623e85709b422e8012c463771b144f06cc495 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix sync-apache for use in eqiad - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: fix sync-apache for use in eqiad .. fix sync-apache for use in eqiad so that it can be used in eqiad on tin the original file on fenari stays untouched RT #6145 Change-Id: Ie1f623e85709b422e8012c463771b144f06cc495 --- M modules/apachesync/files/sync-apache 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/apachesync/files/sync-apache b/modules/apachesync/files/sync-apache index b3aa737..97100c8 100755 --- a/modules/apachesync/files/sync-apache +++ b/modules/apachesync/files/sync-apache @@ -1,6 +1,6 @@ #!/bin/bash -echo "Synchronizing /home/wikipedia/conf/httpd to /usr/local/apache/conf..." +echo "Synchronizing /srv/httpdconf/apache-config to /usr/local/apache/conf..." # Options to pass to the rsync command RSYNC_OPTIONS="-a" @@ -14,18 +14,18 @@ #This sync works with both puppet and non-puppet hosts dsh -cM -g apaches -o-lroot -o-oSetupTimeout=30 -F30 -- " - rsync $RSYNC_OPTIONS 10.0.5.8::httpdconf/ /usr/local/apache/conf + rsync $RSYNC_OPTIONS 10.64.0.196::httpdconf/ /usr/local/apache/conf " -# dont forget the image rending cluster +# dont forget the image rendering cluster dsh -cM -g image_scalers -o-lroot -o-oSetupTimeout=30 -F30 -- " - rsync $RSYNC_OPTIONS 10.0.5.8::httpdconf/ /usr/local/apache/conf + rsync $RSYNC_OPTIONS 10.64.0.196::httpdconf/ /usr/local/apache/conf " # while we are at it, might as well do the snapshot boxen dsh -cM -g snapshot -o-lroot -o-oSetupTimeout=30 -F30 -- " - rsync $RSYNC_OPTIONS 10.0.5.8::httpdconf/ /usr/local/apache/conf + rsync $RSYNC_OPTIONS 10.64.0.196::httpdconf/ /usr/local/apache/conf " # decided we want search indexers too dsh -cM -g searchidx -o-lroot -o-oSetupTimeout=30 -F30 -- " - rsync $RSYNC_OPTIONS 10.0.5.8::httpdconf/ /usr/local/apache/conf + rsync $RSYNC_OPTIONS 10.64.0.196::httpdconf/ /usr/local/apache/conf " -- To view, visit https://gerrit.wikimedia.org/r/130610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie1f623e85709b422e8012c463771b144f06cc495 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: ArielGlenn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
