#2317 - provide role fileserver for eyeofiles.com

modules/adblockplus/manifests/web/fileserver/repository.pp

 # == Type: adblockplus::web::fileserver::repository
 #
 # Manage a repository on a fileserver.
 #
 # A repository is a site where a group of people can upload and artifacts.
 #
 # In its current form, a repository is simply a directory exposed on a web
 # server. This may evolve to make use of more advanced repositories in the
 # future (proxy to repository manager, or 3rd-party service, etc).
 #
 # === parameters:
 #
 # [*ensure*]
 #   Whether to set up the repository or not. Removing repositories is not
 #   supported.
 #
-# TODO Members are handled manually on the target server for now.
-#      Figure out how to provision them.
+# Members are handled manually on the target server for now.
+#      Figure out how to provision them some day.
 #
 define adblockplus::web::fileserver::repository (
   $ensure = 'present',
 ){
 
-  $repositories_directory = "$adblockplus::directory/fileserver/repositories"
+  $repositories_directory = "$adblockplus::directory/fileserver"
   $repository_directory = "$repositories_directory/$name"
   $repository_host = "$name.$adblockplus::web::fileserver::domain"
 
-  if $ensure !~ /^(absent|purged)$/ {

[mathias, 2017/09/25 17:06:04]

Can't you avoid the conditional and base parameter $ensure of the contained
resources on values computed by the ensure_*_state() functions?

[f.nicolaisen, 2017/09/25 20:21:18]

I can try!

-    group {"www-$name":
-      ensure => present,
-    }
+  group {"www-$name":
+    ensure => $ensure,
+  }
 
-    file {"$repository_directory":
-      ensure => directory,
-      group => "www-$name",
-      mode => '0775',
-      require => [
-        File["$repositories_directory"],
-        Group["www-$name"],
-      ],
-    }
+  file {"$repository_directory":
+    ensure => ensure_directory_state($ensure),
+    group => "www-$name",
+    mode => '0775',
+    require => [
+      File["$repositories_directory"],
+      Group["www-$name"],
+    ],
+  }
 
-    realize(File[$adblockplus::directory])
+  realize(File[$adblockplus::directory])
 
-    # TODO Figure out how to use $adblockplus::web::directory insetad of hardcoded path

[mathias, 2017/09/25 17:06:04]

?

[f.nicolaisen, 2017/09/25 20:21:18]

I discussed this with Paco, and he said it would not be trivial to fix. So I
decided to just remove the TODO and stick with the /var/www/ path as it is.

[mathias, 2017/09/25 21:08:50]

The '/var/www' path is not configurable for that directory, see class
adblockplus::web. Hence you can hard-code those bits.

[f.nicolaisen, 2017/09/25 21:19:47]

Acknowledged.

-    #file {"$adblockplus::web::directory/$name":
-    file {"/var/www/$repository_host":
-      ensure => link,
-      target => "$repository_directory",
-      require => File["$repository_directory"],
-    }
+  file {"/var/www/$repository_host":
+    ensure => ensure_symlink_state($ensure),
+    target => "$repository_directory",
+    require => File["$repository_directory"],
   }
 }