Unified Diff: modules/adblockplus/manifests/web/fileserver.pp
Issue 29795567:
#11371 - Password protection for fileserver repositories (Closed)
Patch Set: For comment 7
Created June 5, 2018, 6:47 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/adblockplus/files/nginx/fileserver.conf ('k')
|
modules/adblockplus/manifests/web/fileserver/repository.pp » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/adblockplus/manifests/web/fileserver.pp |
| =================================================================== |
| --- a/modules/adblockplus/manifests/web/fileserver.pp |
| +++ b/modules/adblockplus/manifests/web/fileserver.pp |
| @@ -16,9 +16,6 @@ |
| # 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). |
| -# |
| # [*repositories*] |
| # A collection (hash) of repositories to serve. |
| # The contents of a repository is served on a subdomain of the fileserver. |
| @@ -41,16 +38,12 @@ |
| ensure => directory, |
| } |
| + file {"${::adblockplus::directory}/htpasswd": |
| + ensure => directory, |
| + } |
| + |
| ensure_resources('adblockplus::web::fileserver::repository', $repositories, { |
| ensure => 'present', |
| }) |
| - |
| - nginx::hostconfig{ "$domain": |
| - source => 'puppet:///modules/adblockplus/nginx/fileserver.conf', |
| - is_default => true, |
| - certificate => $certificate, |
| - private_key => $private_key, |
| - log => 'access_log_fileserver', |
| - } |
| } |
« no previous file with comments
|
« modules/adblockplus/files/nginx/fileserver.conf ('k')
|
modules/adblockplus/manifests/web/fileserver/repository.pp » ('j')
|
no next file with comments »
