#2317 - provide role fileserver for eyeofiles.com

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

 # == Type: adblockplus::web::fileserver::repository
 #
-# Manage a repository in a filterserver.
+# Manage a repository on a fileserver.
 #
-# A repository is a directory where a group of people can place files.
-# The directory is linked into /var/www so that the files can be downloaded.
+# A repository is a site where a group of people can upload and artifacts.
 #
-# The directory and the group have the same name.
+# 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.
+#   Whether to set up the repository or not. Removing repositories is not
+#   supported.
+#
+# Members are handled manually on the target server for now.
+#      Figure out how to provision them some day.
 #
 define adblockplus::web::fileserver::repository (

[mathias, 2017/09/22 07:00:15]

Why ::repository? This is rather misleading. Or do you plan to actually migrate
this to a repository-based approach (exclusively) some day? IMHO this should be
::directory (as it was in your suggestions in the ticket) or ::subdomain or
something.

[f.nicolaisen, 2017/09/22 07:57:44]

Since I don't know where this is going to end up, I went for the more abstract
term.

I can change it to directory, calling a spade a spade.

   $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)$/ {
-    group {"www-$name":
-      ensure => present,
-      # TODO Members are handled manually on the target server for now. Should go into configuration.
-    }
+  group {"www-$name":
+    ensure => $ensure,
+  }
 
-    # (2) create the repository folder
-    file {"$repositories_directory/$name":
-      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"],
+    ],
+  }
 
-    # (3) symlink the repository into www:
-    file {"/var/www/$name":
-      ensure => link,
-      target => "$repositories_directory/$name",
-      require => [
-        File["$repositories_directory/$name"],
-        Package['nginx'],
-      ],
-    }
+  realize(File[$adblockplus::directory])
+
+  file {"/var/www/$repository_host":
+    ensure => ensure_symlink_state($ensure),
+    target => "$repository_directory",
+    require => File["$repository_directory"],
   }
 }
+