Nikerabbit has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339607 )
Change subject: Fixes for distro upgrade
......................................................................
Fixes for distro upgrade
Change-Id: Id8631e85fb4fe346637c660a5efc0bf85f65a5ef
---
M puppet/modules/base/manifests/web1.pp
M puppet/modules/hhvm/manifests/init.pp
2 files changed, 2 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/07/339607/1
diff --git a/puppet/modules/base/manifests/web1.pp
b/puppet/modules/base/manifests/web1.pp
index af28136..8907647 100644
--- a/puppet/modules/base/manifests/web1.pp
+++ b/puppet/modules/base/manifests/web1.pp
@@ -3,10 +3,6 @@
# Provides base configuration for server web1.
#
class base::web1 {
- file { '/etc/hostname':
- content => 'translatewiki.net',
- }
-
file { '/etc/network/interfaces':
source => 'puppet:///modules/base/interfaces-web1'
}
diff --git a/puppet/modules/hhvm/manifests/init.pp
b/puppet/modules/hhvm/manifests/init.pp
index 6507b59..b72f8ee 100644
--- a/puppet/modules/hhvm/manifests/init.pp
+++ b/puppet/modules/hhvm/manifests/init.pp
@@ -3,28 +3,9 @@
# Configures hhvm for MediaWiki to run in fastcgi mode.
#
class hhvm {
- include apt
-
- file { '/tmp/wikimedia.key':
- source => 'puppet:///modules/hhvm/wikimedia.key',
- }
-
- exec { 'apt-key-wikimedia':
- command => '/usr/bin/apt-key add /tmp/wikimedia.key',
- require => File['/tmp/wikimedia.key'],
- }
-
- apt::source { 'wikimedia':
- location => 'http://apt.wikimedia.org/wikimedia',
- release => "${::lsbdistcodename}-wikimedia",
- repos => 'main universe',
- require => Exec['apt-key-wikimedia'],
- }
-
- package { [ 'hhvm', 'hhvm-dev' ]:
- ensure => latest,
+ package { [ 'hhvm' ]:
+ ensure => present,
before => Service['hhvm'],
- require => Apt::Source['wikimedia'],
}
file { '/etc/hhvm':
--
To view, visit https://gerrit.wikimedia.org/r/339607
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8631e85fb4fe346637c660a5efc0bf85f65a5ef
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
