jenkins-bot has submitted this change and it was merged.
Change subject: Add mwv-apt.wmflabs.org
......................................................................
Add mwv-apt.wmflabs.org
Add a new apt repo hosted at mwv-apt.wmflabs.org. This repo can be used
to host backports and other packages that are not available in
apt.wikimedia.org.
The first usage that is introduced is a backport of
libapache2-mod-wsgi-py3 from Debian Jessie to Trusty.
Bug: T125760
Change-Id: I9f995cd1a3736ee4431e2a753ae654857e63aae9
---
A puppet/modules/apache/manifests/mod/wsgi_py3.pp
M puppet/modules/apt/manifests/init.pp
A puppet/modules/apt/templates/mwv-apt.list.erb
3 files changed, 15 insertions(+), 0 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/apache/manifests/mod/wsgi_py3.pp
b/puppet/modules/apache/manifests/mod/wsgi_py3.pp
new file mode 100644
index 0000000..6b88a15
--- /dev/null
+++ b/puppet/modules/apache/manifests/mod/wsgi_py3.pp
@@ -0,0 +1,8 @@
+# == Class: apache::mod::wsgi_py3
+#
+class apache::mod::wsgi_py3 {
+ package { 'libapache2-mod-wsgi-py3': }
+ apache::mod_conf { 'wsgi':
+ require => Package['libapache2-mod-wsgi-py3'],
+ }
+}
diff --git a/puppet/modules/apt/manifests/init.pp
b/puppet/modules/apt/manifests/init.pp
index 8cdafb3..1735b97 100644
--- a/puppet/modules/apt/manifests/init.pp
+++ b/puppet/modules/apt/manifests/init.pp
@@ -32,6 +32,12 @@
before => Exec['apt-get update'],
}
+ # T125760 - mw-vagrant only apt repo
+ file { '/etc/apt/sources.list.d/mwv-apt.list':
+ content => template('apt/mwv-apt.list.erb'),
+ before => Exec['apt-get update'],
+ }
+
file { '/etc/apt/multiverse.list.puppet':
owner => 'root',
group => 'root',
diff --git a/puppet/modules/apt/templates/mwv-apt.list.erb
b/puppet/modules/apt/templates/mwv-apt.list.erb
new file mode 100644
index 0000000..1c8d863
--- /dev/null
+++ b/puppet/modules/apt/templates/mwv-apt.list.erb
@@ -0,0 +1 @@
+deb [trusted=yes] http://mwv-apt.wmflabs.org/repo <%=
scope['::lsbdistcodename'] %>-mwv-apt main
--
To view, visit https://gerrit.wikimedia.org/r/296804
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f995cd1a3736ee4431e2a753ae654857e63aae9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
