Gilles has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362939 )
Change subject: Clone Varnish repos in paths that survive reboot
......................................................................
Clone Varnish repos in paths that survive reboot
Otherwise after every VM reboot it will git clone
again, which is wasteful.
Change-Id: I46b1d8535b268ca307a50c739e89b682b01fb89c
---
M puppet/modules/varnish/files/build-tbf.sh
M puppet/modules/varnish/files/build-varnish-modules.sh
M puppet/modules/varnish/files/build-varnish.sh
M puppet/modules/varnish/manifests/init.pp
4 files changed, 23 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/39/362939/1
diff --git a/puppet/modules/varnish/files/build-tbf.sh
b/puppet/modules/varnish/files/build-tbf.sh
index 01071c1..7403bcb 100644
--- a/puppet/modules/varnish/files/build-tbf.sh
+++ b/puppet/modules/varnish/files/build-tbf.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-cd /tmp/libvmod-tbf
+cd /srv/varnish-build/libvmod-tbf
./bootstrap
-./configure VARNISHSRC=/tmp/Varnish-Cache VMODDIR=/usr/local/lib/varnish/vmods
+./configure VARNISHSRC=/srv/varnish-build/Varnish-Cache
VMODDIR=/usr/local/lib/varnish/vmods
make
make install
\ No newline at end of file
diff --git a/puppet/modules/varnish/files/build-varnish-modules.sh
b/puppet/modules/varnish/files/build-varnish-modules.sh
index 0af7770..fa3bd17 100644
--- a/puppet/modules/varnish/files/build-varnish-modules.sh
+++ b/puppet/modules/varnish/files/build-varnish-modules.sh
@@ -2,7 +2,7 @@
PREFIX=/usr/local
export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
export ACLOCAL_PATH=$PREFIX/share/aclocal
-cd /tmp/varnish-modules
+cd /srv/varnish-build/varnish-modules
./bootstrap
./configure
make check
diff --git a/puppet/modules/varnish/files/build-varnish.sh
b/puppet/modules/varnish/files/build-varnish.sh
index 430a02b..fd66dae 100644
--- a/puppet/modules/varnish/files/build-varnish.sh
+++ b/puppet/modules/varnish/files/build-varnish.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-cd /tmp/Varnish-Cache
+cd /srv/varnish-build/Varnish-Cache
./autogen.sh
./configure
make
diff --git a/puppet/modules/varnish/manifests/init.pp
b/puppet/modules/varnish/manifests/init.pp
index 0e73965..f84aaf7 100644
--- a/puppet/modules/varnish/manifests/init.pp
+++ b/puppet/modules/varnish/manifests/init.pp
@@ -29,6 +29,13 @@
mode => '0755',
}
+ file { '/srv/varnish-build':
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ }
+
# Dependencies to build varnish
require_package('pkg-config')
require_package('libncurses-dev')
@@ -39,11 +46,11 @@
# built source, can't rely only on the headers
git::clone { 'Varnish-Cache':
branch => 'varnish-4.1.3',
- directory => '/tmp/Varnish-Cache',
+ directory => '/srv/varnish-build/Varnish-Cache',
remote => 'https://github.com/varnishcache/varnish-cache',
}
- file { '/tmp/build-varnish.sh':
+ file { '/srv/varnish-build/build-varnish.sh':
source => 'puppet:///modules/varnish/build-varnish.sh',
owner => 'root',
group => 'root',
@@ -51,10 +58,10 @@
}
exec { 'build_varnish':
- command => '/tmp/build-varnish.sh',
+ command => '/srv/varnish-build/build-varnish.sh',
creates => '/usr/local/sbin/varnishd',
require => [
- File['/tmp/build-varnish.sh'],
+ File['/srv/varnish-build/build-varnish.sh'],
Git::Clone['Varnish-Cache'],
Package['pkg-config'],
Package['libncurses-dev'],
@@ -132,11 +139,11 @@
git::clone { 'libvmod-tbf':
branch => 'varnish-4.1',
- directory => '/tmp/libvmod-tbf',
+ directory => '/srv/varnish-build/libvmod-tbf',
remote => 'git://git.gnu.org.ua/vmod-tbf.git',
}
- file { '/tmp/build-tbf.sh':
+ file { '/srv/varnish-build/build-tbf.sh':
source => 'puppet:///modules/varnish/build-tbf.sh',
owner => 'root',
group => 'root',
@@ -144,12 +151,12 @@
}
exec { 'build_tbf':
- command => '/tmp/build-tbf.sh',
+ command => '/srv/varnish-build/build-tbf.sh',
creates => '/usr/local/lib/varnish/vmods/libvmod_tbf.so',
require => [
Exec['build_varnish'],
Package['libdb-dev'],
- File['/tmp/build-tbf.sh'],
+ File['/srv/varnish-build/build-tbf.sh'],
Git::Clone['libvmod-tbf'],
],
user => 'root',
@@ -196,11 +203,11 @@
# Build and install vmods (which include xkey)
git::clone { 'varnish-modules':
branch => 'varnish-modules-0.9.1',
- directory => '/tmp/varnish-modules',
+ directory => '/srv/varnish-build/varnish-modules',
remote => 'https://github.com/varnish/varnish-modules',
}
- file { '/tmp/build-varnish-modules.sh':
+ file { '/srv/varnish-build/build-varnish-modules.sh':
source => 'puppet:///modules/varnish/build-varnish-modules.sh',
owner => 'root',
group => 'root',
@@ -208,11 +215,11 @@
}
exec { 'build_varnish_modules':
- command => '/tmp/build-varnish-modules.sh',
+ command => '/srv/varnish-build/build-varnish-modules.sh',
creates => '/usr/local/lib/varnish/vmods/libvmod_xkey.so',
require => [
Exec['build_varnish'],
- File['/tmp/build-varnish-modules.sh'],
+ File['/srv/varnish-build/build-varnish-modules.sh'],
Git::Clone['varnish-modules'],
],
user => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/362939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I46b1d8535b268ca307a50c739e89b682b01fb89c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
