Index: modules/web/manifests/server.pp |
=================================================================== |
--- a/modules/web/manifests/server.pp |
+++ b/modules/web/manifests/server.pp |
@@ -12,6 +12,8 @@ |
include sitescripts |
+ $PYTHONPATH = 'PYTHONPATH=/opt/cms:/opt/sitescripts' |
+ |
# Ensure there is at least one character in the respective strings; |
# see https://codereview.adblockplus.org/29329028/#msg3 |
validate_re($vhost, '.+') |
@@ -25,7 +27,7 @@ |
Cron { |
environment => concat(hiera('cron::environment', []), [ |
- 'PYTHONPATH=/opt/cms:/opt/sitescripts', |
+ $PYTHONPATH, |
]), |
} |
@@ -114,6 +116,21 @@ |
creates => "/home/www/${repository}/.hg/hgrc", |
} |
+ $initialize_content_exec = [ |
+ 'python', '-m', 'cms.bin.generate_static_pages', |
+ "/home/www/${repository}", "/var/www/${vhost}", |
+ ] |
+ |
+ if $::environment == 'development' { |
+ exec {"initialize_content": |
+ command => shellquote($initialize_content_exec), |
+ path => ["/usr/bin/", "/bin/"], |
+ user => www, |
+ require => [Exec["fetch_repo"], Exec["fetch_cms"]], |
+ environment => $PYTHONPATH, |
+ } |
+ } |
+ |
file {'/var/www': |
ensure => directory, |
mode => 755, |