Issue 4019 - Added "Edge" to platform choices in Issues tracker at issues1.

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
-
   # 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',
     ]),
   }
 
   class {'nginx':
     geoip_country => $geoip ? {
       false => undef,
       default => '/usr/share/GeoIP/GeoIPv6.dat',
     },
   }
 
   class {'geoip':
     cron => {hour => 0, minute => 8, monthday => 15},
     ensure => $geoip ? {false => 'absent', default => 'present'},
   }
 
-  ensure_packages(['python-pip'])
-
-  # Make sure that apt packages corresponding to the pip-installed modules below
-  # won't be installed unintentionally, these will take precedence otherwise.
-  package {['python-jinja2', 'python-markdown']:
-    ensure => 'held',
-  }
-
-  package {'Jinja2':
-    ensure => '2.8',
-    provider => 'pip',
-    require => [Package['python-pip'], Package['python-jinja2']],
-  }
-
-  package {'markdown':
-    ensure => '2.6.6',
-    provider => 'pip',
-    require => [Package['python-pip'], Package['python-markdown']],
-  }
+  package {['python-jinja2', 'python-markdown']:}
 
   nginx::hostconfig {$vhost:
     content => template('web/site.conf.erb'),
     global_config => template('web/global.conf.erb'),
     is_default => $is_default,
     certificate => $certificate ? {'undef' => undef, default => $certificate},
     private_key => $private_key ? {'undef' => undef, default => $private_key},
     log => "access_log_$vhost"
   }
 
-  sitescripts::configfragment {$title:
-    source => 'puppet:///modules/web/sitescripts',
-  }
-
   if $multiplexer_locations != undef {
     include spawn-fcgi
     package {'python-flup':}
 
+    class {'sitescripts':
+      sitescriptsini_source => 'puppet:///modules/web/sitescripts',
+    }
+
     spawn-fcgi::pool {"multiplexer":
       ensure => present,
       fcgi_app => '/opt/sitescripts/multiplexer.fcgi',
       socket => '/tmp/multiplexer-fastcgi.sock',
       mode => '0666',
       user => 'nginx',
       children => 1,
       require => [
-        Class["sitescripts"],
+        Exec["fetch_sitescripts"],
         Package["python-flup"],
       ],
     }
   }
 
   user {'www':
     ensure => present,
     comment => 'Web content owner',
     home => '/home/www',
     managehome => true,
@@ skipping 65 matching lines @@
     path => ['/usr/bin/'],
     require => Package['nodejs'],
     onlyif => 'test ! -x /usr/bin/jsdoc',
   }
 
   package {['make', 'doxygen']:}
 
   cron {'generate_docs':
     ensure => present,
     require => [
-      Class['sitescripts'],
-      Exec['install_jsdoc'],
+      Exec['fetch_sitescripts', 'install_jsdoc'],
       Package['make', 'doxygen'],
       File['/var/www/docs'],
     ],
     command => 'python -m sitescripts.docs.bin.generate_docs',
     user => www,
     minute => '5-55/10',
   }
 }