#5944 - Introduce Puppet namespace adblockplus::sitescripts

modules/sitescripts/manifests/init.pp

Index: modules/sitescripts/manifests/init.pp
diff --git a/modules/sitescripts/manifests/init.pp b/modules/sitescripts/manifests/init.pp
index de53e68a29750654c30a40d13e99f5cf1377bf00..5c75b9b987406b6ab8be3308079fe2ef5d6b2ac7 100644
--- a/modules/sitescripts/manifests/init.pp
+++ b/modules/sitescripts/manifests/init.pp
@@ -3,6 +3,8 @@ class sitescripts (
     $sitescriptsini_content = '',
   ){
 
+  ensure_resource('adblockplus::sitescripts::repository', 'sitescripts')
+
   @concat {'/etc/sitescripts.ini':
     mode => '644',
     owner => root,
@@ -23,8 +25,6 @@ class sitescripts (
     }
   }
 
-  ensure_packages(['python-flup'])
-
   if ($sitescriptsini_source != '') or ($sitescriptsini_content != '') {
 
     $content = $sitescriptsini_content
@@ -43,20 +43,4 @@ class sitescripts (
 
   $configfragments = hiera('sitescripts::configfragments', {})
   create_resources('sitescripts::configfragment', $configfragments)
-
-  exec { "fetch_sitescripts":
-    command => "hg clone https://hg.adblockplus.org/sitescripts /opt/sitescripts",
-    path => ["/usr/bin/", "/bin/"],
-    require => Package['mercurial'],
-    onlyif => "test ! -d /opt/sitescripts"
-  }
-
-  cron {"update_sitescripts":
-    ensure => present,
-    command => "hg pull -q -u -R /opt/sitescripts && /opt/sitescripts/ensure_dependencies.py -q",
-    environment => hiera('cron::environment', []),
-    user => root,
-    require => Exec["fetch_sitescripts"],
-    minute => [15],
-  }
 }