Noissue - Generate content on provision

modules/web/manifests/server.pp

 class web::server(
     $vhost,
     $repository,
     $certificate = hiera('web::server::certificate', 'undef'),
     $private_key = hiera('web::server::private_key', 'undef'),
     $is_default = false,
     $aliases = undef,
     $custom_config = undef,
     $multiplexer_locations = undef,
     $geoip = false,
 ) {
 
   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, '.+')
   validate_re($repository, '.+')
 
   File {
     owner  => 'root',
     group  => 'root',
     mode   => 0644,
   }
 
   Cron {
     environment => concat(hiera('cron::environment', []), [
-      'PYTHONPATH=/opt/cms:/opt/sitescripts',
+      $PYTHONPATH,
     ]),
   }
 
   class {'nginx':
     geoip_country => $geoip ? {
       false => undef,
       default => '/usr/share/GeoIP/GeoIPv6.dat',
     },
   }
 
@@ skipping 68 matching lines @@
 
   exec {"fetch_repo":
     command => "hg clone -U https://hg.adblockplus.org/${repository} /home/www/${repository}",
     path => ["/usr/bin/", "/bin/"],
     require => Package['mercurial'],
     user => www,
     timeout => 0,
     creates => "/home/www/${repository}/.hg/hgrc",
   }
 
-  exec {"generate_static_pages":
-    command => "python -m cms.bin.generate_static_pages /home/www/${repository} /var/www/${vhost}",

[mathias, 2017/05/10 17:56:00]

Please export the bits shared with the cronjob command to variables, and use
shellquote() to combine them into the respective resource's command parameter.

+  $initialize_content_exec = [
+    'python', '-m', 'cms.bin.generate_static_pages',
+    "/home/www/${repository}", "/var/www/${vhost}",
+  ]
+
+  exec {"initialize_content":
+    command => shellquote($initialize_content_exec),
     path => ["/usr/bin/", "/bin/"],
     user => www,
-    require => [Exec["fetch_repo"], Exec["fetch_cms"]],
-    environment => 'PYTHONPATH=/opt/cms:/opt/sitescripts',
+    subscribe => [Exec["fetch_repo"], Exec["fetch_cms"]],
+    refreshonly => true,
+    environment => $PYTHONPATH,
   }
 
   file {'/var/www':
     ensure => directory,
     mode => 755,
   }
 
   file {[
     "/var/cache/$repository",
     "/var/www/$vhost",
     "/var/www/docs",
   ]:
     ensure => directory,
     owner => www,
     mode => 755,
   }
 
   cron {'update_cms':
     ensure => present,
     command => "hg pull -q -u -R /opt/cms",
     minute  => '4-59/20',
   }
 
+  $update_repo_cmd = [
+    "hg", "pull", "-q", "-R", "/home/www/${repository}",
+  ]
+
+  $update_webpage_cmd = join(
+    [
+      shellquote($update_repo_cmd),
+      shellquote($initialize_content_exec)
+    ],
+    "&&"
+  )
+
   cron {'update_repo':
     ensure => present,
-    command => "hg pull -q -R /home/www/${repository} && python -m cms.bin.generate_static_pages /home/www/${repository} /var/www/${vhost}",
+    command => $update_webpage_cmd,
     user => www,
     minute  => '5-59/20',
   }
 
 }