diff options
| -rw-r--r-- | deployment/dns/templates/mageia.org.zone | 5 | ||||
| -rw-r--r-- | modules/blog/manifests/init.pp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index af3c9296..c29ebf11 100644 --- a/deployment/dns/templates/mageia.org.zone +++ b/deployment/dns/templates/mageia.org.zone @@ -3,7 +3,7 @@ ; $Id$ $TTL 1D @ IN SOA ns0.mageia.org. root.mageia.org. ( - 2011030301 ; Serial + 2011030701 ; Serial 21600 ; Refresh 3600 ; Retry 2419200 ; Expire @@ -61,8 +61,7 @@ www IN CNAME www-zarb www-test IN CNAME champagne static IN CNAME champagne start IN CNAME champagne -blog IN CNAME www-zarb -blog-test IN CNAME champagne +blog IN CNAME champagne planet IN CNAME champagne rsync IN CNAME valstar diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp index 647b868e..d3640638 100644 --- a/modules/blog/manifests/init.pp +++ b/modules/blog/manifests/init.pp @@ -34,7 +34,7 @@ class blog { include apache::mod_php $blog_location = "/var/www/html/blog.$domain" - $blog_domain = "blog-test.$domain" + $blog_domain = "blog.$domain" apache::vhost_base { "$blog_domain": location => $blog_location, @@ -50,7 +50,7 @@ class blog { file { "$blog_location": ensure => directory, - owner => blog, + owner => apache, group => apache, mode => 644, } |