summaryrefslogtreecommitdiff
path: root/tests/auto
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>2014-12-15 13:09:09 +0100
committerTor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>2015-11-02 11:49:52 +0100
commit0aeabaa78b02a62bd44ab01338cf6c8c4ce00a4f (patch)
treec96b0549db7aa7c9a47c4073d61fb4073bd8d094 /tests/auto
parenta4d0a12fd09707ed44d5fcf5349216a6a73403de (diff)
downloadqtbase-0aeabaa78b02a62bd44ab01338cf6c8c4ce00a4f.tar.gz
network test server: install Apache mod_spdy module.
Cherry-picked from sysadmin repository 4ec100051665fe97bc0083296b8ff07146fda02c Change-Id: I323705acd6099f0f61b4974667c69af503d784fc Author: Peter Hartmann <phartmann@blackberry.com> Signed-off-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/network/support/modules/network_test_server/manifests/apache2.pp19
1 files changed, 18 insertions, 1 deletions
diff --git a/tests/auto/network/support/modules/network_test_server/manifests/apache2.pp b/tests/auto/network/support/modules/network_test_server/manifests/apache2.pp
index e30ffc2d38..46db5cd1b3 100644
--- a/tests/auto/network/support/modules/network_test_server/manifests/apache2.pp
+++ b/tests/auto/network/support/modules/network_test_server/manifests/apache2.pp
@@ -3,10 +3,27 @@ class network_test_server::apache2 {
"apache2": ensure => present;
}
+ exec {
+ "download SPDY module":
+ command => "/usr/bin/wget https://dl-ssl.google.com/dl/linux/direct/mod-spdy-beta_current_i386.deb --directory-prefix=/tmp",
+ creates => "/tmp/mod-spdy-beta_current_i386.deb",
+ notify => Service["apache2"]
+ ;
+ }
+
+ package {
+ "mod_spdy":
+ ensure => installed,
+ provider => dpkg,
+ source => "/tmp/mod-spdy-beta_current_i386.deb",
+ notify => Service["apache2"],
+ require => [ Package["apache2"], Exec["download SPDY module"] ]
+ }
+
service { "apache2":
enable => true,
ensure => running,
- require => Package["apache2"],
+ require => Package["apache2", "mod_spdy"],
}
apache2_module {