#1980 - Introduce puppet class adblockplus_web in updateserver module

modules/updateserver/manifests/init.pp

 class updateserver(
     $domain,
     $certificate,
     $private_key,
     $is_default=false
   ) {
+
+  include adblockplus::web
+
   class {'nginx':
     worker_connections => 4000,
     ssl_session_cache => off,
   }
 
   File {
     owner => root,
     group => root
-  }
-
-  class {'adblockplus::web':

[mathias, 2017/07/06 14:26:31]

This should be a simple include.

-    directory => {
-      require => Package['nginx'],
-    },
   }
 
   $update_dir = '/var/www/update'
 
   file {$update_dir:
     ensure => directory,
     mode => '0755',
   }
 
   $sitescripts_var_dir = '/var/lib/sitescripts'
@@ skipping 112 matching lines @@
     fcgi_app => '/opt/sitescripts/multiplexer.fcgi',
     socket => '/tmp/multiplexer-fastcgi.sock',
     mode => '0666',
     user => 'nginx',
     children => 1,
     require => [
       Class["sitescripts"],
     ],
   }
 }