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

modules/adblockplus/manifests/init.pp

Index: modules/adblockplus/manifests/init.pp
===================================================================
--- a/modules/adblockplus/manifests/init.pp
+++ b/modules/adblockplus/manifests/init.pp
@@ -10,10 +10,6 @@
 #   The authorative domain or zone associated with the current environment,
 #   similar to the deprecated and soon to be removed $base::zone.
 #
-# [*hosts*]
-#   A hash of adblockplus::host $name => $parameter items to set up in this
-#   context, i.e. via Hiera.
-#
 # [*users*]
 #   A hash of adblockplus::user $name => $parameter items to set up in this
 #   context, i.e. via Hiera.
@@ -21,11 +17,6 @@
 # === Examples:
 #
 #   class {'adblockplus':
-#     hosts => {
-#       'node1' => {
-#         # see adblockplus::host
-#       },
-#     },
 #     users => {
 #       'pinocchio' => {
 #         # see adblockplus::user
@@ -35,30 +26,14 @@
 #
 class adblockplus (
   $authority = hiera('adblockplus::authority', 'adblockplus.org'),
-  $hosts = hiera_hash('adblockplus::hosts', {}),
-  $packages = hiera_array('adblockplus::packages', []),
   $users = hiera_hash('adblockplus::users', {}),
 ) {
 
-  include postfix
-  include ssh
-  include stdlib
-
   # See https://issues.adblockplus.org/ticket/3574#comment:8
   class {'base':
     zone => $authority,
   }
 
-  # See https://issues.adblockplus.org/ticket/3575#comment:2
-  class {'logrotate':
-    stage => 'runtime',
-  }
-
-  # Class['apt'] cannot yet be configured to update on-demand
-  class {'apt':
-    always_apt_update => ($environment != 'development'),
-  }
-
   # Used as internal constant within adblockplus::* resources
   $directory = '/var/adblockplus'
 
@@ -70,58 +45,6 @@
     owner => 'root',
   }
 
-  # A common time-zone shared by all hosts provisioned eases synchronization
-  # and debugging, i.e. log-file review and similar tasks, significantly
-  file {
-    '/etc/timezone':
-      content => 'UTC',
-      ensure => 'present',
-      group => 'root',
-      mode => 0644,
-      notify => Service['cron'],
-      owner => 'root';
-    '/etc/localtime':
-      ensure => 'link',
-      target => '/usr/share/zoneinfo/UTC',
-      notify => Service['cron'];
-  }
-
-  # Explicit resource required only to ensure cron(8) is running;
-  # there is no real requirement for a rationship with another resource
-  service {'cron':
-    ensure => 'running',
-    enable => true,
-  }
-
-  # Work around https://issues.adblockplus.org/ticket/3479
-  if $::environment == 'development' {
-
-    file {
-      '/etc/ssh/ssh_host_rsa_key':
-        source => 'puppet:///modules/adblockplus/development_host_rsa_key',
-        mode => 600,
-        notify => Service['ssh'];
-      '/etc/ssh/ssh_host_rsa_key.pub':
-        source => 'puppet:///modules/adblockplus/development_host_rsa_key.pub',
-        mode => 644;
-    }
-  }
-
-  # Fix implicit package dependency Class['apt'] does not properly handle
-  Exec['apt_update'] -> Package<|title != 'python-software-properties'|>
-
-  # https://issues.adblockplus.org/ticket/3574#comment:19
-  ensure_packages($packages)
-
-  # https://projects.puppetlabs.com/issues/4145
-  ensure_resource('file', '/etc/ssh/ssh_known_hosts', {
-    ensure => 'present',
-    mode => 0644,
-  })
-
-  # See modules/adblockplus/manifests/host.pp
-  create_resources('adblockplus::host', $hosts)
-
   # See modules/adblockplus/manifests/user.pp
   create_resources('adblockplus::user', $users)
 }