#1980 - Introduce puppet class adblockplus_web in webserver module

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
+  include adblockplus::web
 
   $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',
@@ skipping 113 matching lines @@
   ]
 
   exec {"initialize_content":
     command => shellquote($initialize_content_exec),
     user => www,
     subscribe => [Exec["fetch_repo"], Exec["fetch_cms"]],
     refreshonly => true,
     environment => $pythonpath,
   }
 
-  file {'/var/www':
-    ensure => directory,
-    mode => '0755',
-  }
-
   file {[
     "/var/cache/$repository",
     "/var/www/$vhost",
     "/var/www/docs",
   ]:
     ensure => directory,
     owner => www,
     mode => '0755',
   }
 
@@ skipping 25 matching lines @@
   )
 
   cron {'update_repo':
     ensure => present,
     command => $update_webpage_cmd,
     user => www,
     minute  => '5-59/20',
   }
 
 }