Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/145526
Change subject: Puppet and README cleanups ...................................................................... Puppet and README cleanups * Quiet annoying puppet warning * Update steps for php extensions (can be dropped once we switch to hhvm) * Fix incorrect documentation for /etc/webauth Change-Id: I592ed7c20accd33ebf80fa04e640d88bedffda09 --- M puppet/README M puppet/modules/base/manifests/init.pp 2 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/26/145526/1 diff --git a/puppet/README b/puppet/README index faa9143..0c6087c 100644 --- a/puppet/README +++ b/puppet/README @@ -20,36 +20,31 @@ ------------------ Reboot the machine enabled the IP configuration. ------------------ -mkdir /etc/webauth +Add accounts for stats.translatewiki.net to /etc/webauth ------------------ for module in 'YAML::Syck' 'PHP::Serialization' 'File::Slurp'; do cpanp -i $module; done ------------------ -Install phpunit +Install wikidiff and FastStringSearch for php -Go to mediawiki/tests/phpunit - sudo sh install-phpunit.sh +sudo aptitude install php5-dev ------------------- - -Install wikidiff and FastStringSearch - -cd /www/translatewiki.net/w/extensions/wikidiff2 -b phpize -b ./configure -b make +git clone https://gerrit.wikimedia.org/r/mediawiki/php/wikidiff2 +cd wikidiff2 +phpize +./configure +make sudo make install -Create /etc/php5/conf.d/20-wikidiff2.ini: +Create /etc/php5/fpm/conf.d/wikidiff2.ini: extension=wikidiff2.so Adapt the same for FastStringSearch which is located at https://gerrit.wikimedia.org/r/mediawiki/php/FastStringSearch -And restart php5-fpm if needed. +And restart php5-fpm. ----------------------- Put backup keys in /root/.ssh/ ----------------------- TODO: -* puppet: Warning: Config file /etc/puppet/hiera.yaml not found, using Hiera defaults * puppet: Install nginx before lists diff --git a/puppet/modules/base/manifests/init.pp b/puppet/modules/base/manifests/init.pp index a1d2bc1..13e70d6 100644 --- a/puppet/modules/base/manifests/init.pp +++ b/puppet/modules/base/manifests/init.pp @@ -61,6 +61,11 @@ content => 'translatewiki.net', } + # Puppet, please stfu + file { '/etc/puppet/hiera.yaml': + content => '', + } + file { '/etc/network/interfaces': source => 'puppet:///modules/base/interfaces' } -- To view, visit https://gerrit.wikimedia.org/r/145526 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I592ed7c20accd33ebf80fa04e640d88bedffda09 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
