Issue 1094 - Generate update manifests on the update server

modules/updateserver/manifests/init.pp

Index: modules/updateserver/manifests/init.pp
===================================================================
--- a/modules/updateserver/manifests/init.pp
+++ b/modules/updateserver/manifests/init.pp
@@ -26,6 +26,15 @@
     mode => 0755
   }
 
+  $update_manifest_dirs = ['/var/www/update/adblockplus',

[mathias, 2014/07/25 07:04:28]

Now that /var/www/update is used over and over, I'd prefer using a variable for
this prefix, much like $base_dir below.

[Felix Dahlke, 2014/07/25 07:17:45]

Done.

+                           '/var/www/update/adblockplusandroid',
+                           '/var/www/update/adblockplussafari']
+
+  file {$update_manifest_dirs:
+    ensure => directory,
+    mode => 0755
+  }
+
   file {'/var/www/update/adblockplusie':

[mathias, 2014/07/25 07:04:28]

I assume it's intentional that adblockplusie is not included in the
$update_manifest_dirs? (I don't know these parts of our infrastructure, software
and requirements well enough yet to answer that myself..)

[Felix Dahlke, 2014/07/25 07:17:45]

Yup, we can't generate that one yet with how things currently are in
sitescripts. Working on that in parallel, will be a separate patch.

     ensure => directory,
     mode => 0755
@@ -44,4 +53,67 @@
     private_key => $private_key,
     log => 'access_log_update'
   }
+
+  class {'sitescripts':
+    sitescriptsini_source => 'puppet:///modules/updateserver/sitescripts'
+  }
+
+  $base_dir = '/var/lib/adblockplus'
+
+  file {$base_dir:
+    ensure => directory,
+    mode => 0755
+  }
+
+  $safari_certificate_path = "${base_dir}/adblockplussafari.pem"
+
+  file {$safari_certificate_path:
+    source => 'puppet:///modules/private/adblockplussafari.pem'
+  }
+
+  $repositories_to_sync = ['downloads', 'adblockplus', 'adblockplusandroid',
+                           'adblockpluschrome', 'elemhidehelper', 'abpwatcher',
+                           'abpcustomization', 'urlfixer']
+
+  define fetch_repository() {
+    $repository_path = "${updateserver::base_dir}/${title}"
+    exec {"fetch_repository_${title}":
+      command => "hg clone https://hg.adblockplus.org/${title} ${repository_path}",
+      path => '/usr/bin',

[mathias, 2014/07/25 07:04:28]

Are you sure that hg(1) is available in /usr/bin?

[Felix Dahlke, 2014/07/25 07:17:45]

Yes.

[Wladimir Palant, 2014/07/25 09:54:39]

Thinking a bit more about it - this does look like a bad assumption. What if we
at some point decide to install Mercurial via pip? I'd rather go with a standard
search path like '/bin:/usr/bin:/usr/sbin:/usr/local/bin'.

[Felix Dahlke, 2014/07/25 10:31:15]

Done. Left sbin out since I really wouldn't expect hg there.

+      timeout => 0,
+      onlyif => "test ! -d ${repository_path}",
+      require => [Package['mercurial'], File[$updateserver::base_dir]]
+    }
+  }
+
+  fetch_repository {$repositories_to_sync: }
+
+  $update_update_manifests_script = '/usr/local/bin/update_update_manifests'

[mathias, 2014/07/25 07:04:28]

Is the update_update prefix intentional?

[Felix Dahlke, 2014/07/25 07:17:45]

Yes, we're updating update manifests here.

+
+  file {$update_update_manifests_script:
+    mode => '0755',
+    content => template('updateserver/update_update_manifests.erb')
+  }
+
+  $update_update_manifests_dependencies = ['python-m2crypto', 'python-jinja2']

[mathias, 2014/07/25 07:04:28]

Is the update_update prefix intentional?

[Felix Dahlke, 2014/07/25 07:17:45]

Yes.

+
+  package {$update_update_manifests_dependencies:}
+
+  exec {'update_update_manifests':
+    command => $update_update_manifests_script,
+    timeout => 0,
+    require => [Exec['fetch_sitescripts'],
+                Fetch_repository[$repositories_to_sync],
+                File[$update_update_manifests_script],
+                File[$update_manifest_dirs], File[$safari_certificate_path],
+                Package[$update_update_manifests_dependencies]]
+  }
+
+  cron {'update_update_manifests':
+    ensure => present,
+    environment => ['MAILTO=admins@adblockplus.org'],
+    command => $update_update_manifests_script,
+    minute => '*/10',
+    require => Exec['update_update_manifests']
+  }
 }