aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-01-18 17:49:20 +0000
committerNicolas Vigier <boklm@mageia.org>2011-01-18 17:49:20 +0000
commit03c727fa39f4a0228c5ca6c79f9dde3d7859d8bc (patch)
tree698d86546c5fc5e5ff1172000a27a244ddfd0be9 /modules
parenta90eca78b3a4d2e299cbec8c9cedd09004b9e710 (diff)
downloadpuppet-03c727fa39f4a0228c5ca6c79f9dde3d7859d8bc.tar
puppet-03c727fa39f4a0228c5ca6c79f9dde3d7859d8bc.tar.gz
puppet-03c727fa39f4a0228c5ca6c79f9dde3d7859d8bc.tar.bz2
puppet-03c727fa39f4a0228c5ca6c79f9dde3d7859d8bc.tar.xz
puppet-03c727fa39f4a0228c5ca6c79f9dde3d7859d8bc.zip
use blog-test.mageia.org as vhost
Diffstat (limited to 'modules')
-rw-r--r--modules/blog/manifests/init.pp2
-rw-r--r--modules/blog/templates/01_blogs_vhosts.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp
index e502e978..cb932dd2 100644
--- a/modules/blog/manifests/init.pp
+++ b/modules/blog/manifests/init.pp
@@ -17,7 +17,7 @@ class blog {
content => template("blog/check_new-blog-post.sh")
}
- apache::vhost_other_app { "blog.$domain":
+ apache::vhost_other_app { "blog-test.$domain":
vhost_file => "blog/01_blogs_vhosts.conf",
}
diff --git a/modules/blog/templates/01_blogs_vhosts.conf b/modules/blog/templates/01_blogs_vhosts.conf
index 9c90bf40..1b3cf4fe 100644
--- a/modules/blog/templates/01_blogs_vhosts.conf
+++ b/modules/blog/templates/01_blogs_vhosts.conf
@@ -1,5 +1,5 @@
<VirtualHost *:80>
-ServerName champagne.mageia.org
+ServerName blog-test.mageia.org
Alias /blog-test /blog.mageia.org/test
DocumentRoot /var/www/html/blog.mageia.org/
<Directory /var/www/html/blog.mageia.org/test>