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

modules/web/manifests/server.pp

Index: modules/web/manifests/server.pp
===================================================================
--- a/modules/web/manifests/server.pp
+++ b/modules/web/manifests/server.pp
@@ -10,8 +10,6 @@
     $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, '.+')
@@ -41,25 +39,7 @@
     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'),
@@ -70,14 +50,14 @@
     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',
@@ -86,7 +66,7 @@
       user => 'nginx',
       children => 1,
       require => [
-        Class["sitescripts"],
+        Exec["fetch_sitescripts"],
         Package["python-flup"],
       ],
     }
@@ -172,8 +152,7 @@
   cron {'generate_docs':
     ensure => present,
     require => [
-      Class['sitescripts'],
-      Exec['install_jsdoc'],
+      Exec['fetch_sitescripts', 'install_jsdoc'],
       Package['make', 'doxygen'],
       File['/var/www/docs'],
     ],