#7320 - Introduce helpcenter role

modules/adblockplus/manifests/web/static/hook.pp

 # == Type: adblockplus::web::static::hook
 #
 # Manage custom hooks to be triggered via ssh commands
 #
 # === Parameters:
 #
 # [*file*]
-#   Overwrite the default configuration for the hook.
+#   Overwrite group and the source of the content of the file.
 #
 # === Examples:
 #
 #  adblockplus::web::static::hook {'deploy':
-#    'file' => {
+#    file => {
 #      source => 'puppet:///modules/adblockplus/web/deploy.py',
 #      path => '/usr/local/bin/deploy.py',
 #    },
-#    'own-uname' => {

[mathias, 2018/03/27 14:46:51]

This seems like a fragment that doesn't belong here.

[f.lopez, 2018/03/27 19:29:50]

Oh, I didn't delete the other example, I'll fix it

+#   }
+#
+#  adblockplus::web::static::hook {'uname':
+#    file => {
 #      content => 'uname -a',
 #    },
 #  }
 #
+#  adblockplus::web::static::hook {'uptime':
+#    file => {
+#      target => '/usr/bin/uptime',
+#      ensure => 'link',
+#    },
+#  }
+#
 define adblockplus::web::static::hook (
-  $file = {},
+  $file,
 ) {
 
-  File {
+  $hook_path = "/home/${adblockplus::web::static::deploy_user}/bin/${name}"
+
+  ensure_resource('file', "web-deploy-hook#${title}", merge({
+    group => $adblockplus::web::static::deploy_user,
+    ensure => ensure_file_state($adblockplus::web::static::ensure),
+  }, $file, {
     mode => '0755',
     owner => $adblockplus::web::static::deploy_user,
-    group => $adblockplus::web::static::deploy_user,
-  }
-
-  ensure_resource('file', "/usr/local/bin/commands", {

[mathias, 2018/03/27 14:46:51]

You shall not create a global command called "commands". Use a more distinct
(i.e. specific) name. Also, as long as adblockplus::web::static is a class, this
resource is better placed there.

[f.lopez, 2018/03/27 19:29:50]

Acknowledged.

-    ensure => ensure_file_state($adblockplus::web::static::ensure),
-    content => template('adblockplus/web/commands.sh.erb'),
-  })
-
-  ensure_resource('file', "/home/$adblockplus::web::static::deploy_user/bin", {

[mathias, 2018/03/27 14:46:51]

As long as adblockplus::web::static is a class this resource is better placed
there.

[f.lopez, 2018/03/27 19:29:50]

Acknowledged.

-    ensure => ensure_directory_state($adblockplus::web::static::ensure),
-  })
-
-  ensure_resource('file',

[mathias, 2018/03/27 14:46:51]

Now which convention was the base for the kind of indentation that follows below
this line?

[f.lopez, 2018/03/27 19:29:50]

The line would be 80+ if I didn't split it up, so I decided to put it that way.

-  "script#${name}",

[mathias, 2018/03/27 14:46:51]

Using "script#" as a local context prefix for file/script/whatever resources is
pretty much pointless. Unless the surrounding class or define is called
"script", of course.

[f.lopez, 2018/03/27 19:29:50]

Acknowledged.

-  merge({
-    ensure => ensure_file_state($adblockplus::web::static::ensure),
-    path => "/home/$adblockplus::web::static::deploy_user/bin/${name}",
-  }, $file))

[mathias, 2018/03/27 14:46:51]

The "path" should be merged after $file (maybe "ensure" as well).

[f.lopez, 2018/03/27 19:29:50]

Acknowledged.

-
+    path => $hook_path,
+  }))
 }