#2317 - provide role fileserver for eyeofiles.com

modules/adblockplus/manifests/web/fileserver.pp

 # == Class: adblockplus::web::fileserver
 #
-# Serves files for different repositories over https.
+# A fileserver serves multiple file repositories.
 #
 # === Parameters:
 #
 # [*domain*]
-#   A string for the domain serving traffic.
+#   A string which is the name of the fileserver domain, under which
+#   each repository has a subdomain.
 #
 # [*certificate*]
 #   The name of the SSL certificate file within modules/private/files, if any.
 #   Requires a private_key as well.
 #
 # [*private_key*]
 #   The name of the private key file within modules/private/files, if any.
 #   Requires a certificate as well.
 #
 # [*is_default*]
 #  Passed on to nginx (whether or not the site config should be default).
 #
-# [*repository*]
-#   A string that is the name of the repository to serve. A repository
-#   is a collection of files uploaded by a group of users.
-#
-#   TODO Convert this into a collection of *repositories*
+# [*repositories*]
+#   A collection (hash) of repositories to serve.
+#   The contents of a repository is served on a subdomain of the fileserver.
 #
 class adblockplus::web::fileserver(
+  $ensure = 'present',
   $domain,
-  $certificate,
-  $private_key,
-  $is_default=false,
-  $repository='v8',
+  $certificate = undef,
+  $private_key = undef,
+  $repositories={},
 ){
 
   include nginx
   include adblockplus
   include adblockplus::web
 
-  nginx::hostconfig{$domain:
-    source => 'puppet:///modules/adblockplus/nginx/fileserver.conf',
-    is_default => $is_default,
-    certificate => $certificate,
-    private_key => $private_key,
-    log => 'access_log_files'
-  }
-
-  # Root directory for serving repositories
   realize(File[$adblockplus::directory])
 
-
-  file {[
-    "$adblockplus::directory/fileserver",
-    "$adblockplus::directory/fileserver/repositories"
-  ]:
+  file {"$adblockplus::directory/fileserver":
     ensure => directory,
   }
 
-  $repositories_directory = "$adblockplus::directory/fileserver/repositories"
+  ensure_resources('adblockplus::web::fileserver::repository', $repositories, {
+    ensure => 'present',
+  })
 
-  # TODO Base these entries on a map of directories and members: $repositories
-  # For each entry in repositories, (1) create the group , (2) folder and (3) symlink into /var/www/
-  # as is done below for the example 'v8':
-
-  # (1) Create the group
-  group {"www-$repository":
-    ensure => present,
-    # TODO Members are handled manually on the target server for now. Should go into configuration.
+  nginx::hostconfig{ "$domain":
+    source => 'puppet:///modules/adblockplus/nginx/fileserver.conf',
+    is_default => true,
+    certificate => $certificate,
+    private_key => $private_key,
+    log => 'access_log_fileserver',
   }
-
-  # (2) create the repository folder
-  file {"$repositories_directory/$repository":
-    ensure => directory,
-    group => "www-$repository",
-    mode => '0775',
-    require => [
-      File["$repositories_directory"],
-      Group["www-$repository"],
-    ],
-  }
-
-  # (3) symlink the repository into www:
-  file {"/var/www/$repository":
-    ensure => link,
-    target => "$repositories_directory/$repository",
-    require => [
-      File["$repositories_directory/$repository"],
-      Package['nginx'],
-    ],
-  }
-
 }