Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added owner group and mode parameter. For all users, per sites-available... #373

Merged
merged 1 commit into from
Jul 7, 2014
Merged

Added owner group and mode parameter. For all users, per sites-available... #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,19 @@
$vhost_purge = $nginx::params::nx_vhost_purge,
$worker_connections = $nginx::params::nx_worker_connections,
$worker_processes = $nginx::params::nx_worker_processes,
$worker_rlimit_nofile = $nginx::params::nx_worker_rlimit_nofile
$worker_rlimit_nofile = $nginx::params::nx_worker_rlimit_nofile,
$global_owner = $nginx::params::global_owner,
$global_group = $nginx::params::global_group,
$global_mode = $nginx::params::global_mode,
$sites_available_owner = $nginx::params::sites_available_owner,
$sites_available_group = $nginx::params::sites_available_group,
$sites_available_mode = $nginx::params::sites_available_mode,
) inherits nginx::params {

File {
owner => 'root',
group => 'root',
mode => '0644',
owner => $global_owner,
group => $global_group,
mode => $global_mode,
}

file { $conf_dir:
Expand Down Expand Up @@ -125,6 +131,9 @@
}

file { "${conf_dir}/sites-available":
owner => $sites_available_owner,
group => $sites_available_group,
mode => $sites_available_mode,
ensure => directory,
}

Expand Down
12 changes: 12 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@
$worker_connections = $nginx::params::nx_worker_connections,
$worker_processes = $nginx::params::nx_worker_processes,
$worker_rlimit_nofile = $nginx::params::nx_worker_rlimit_nofile,
$global_owner = $nginx::params::nx_global_owner,
$global_group = $nginx::params::nx_global_group,
$global_mode = $nginx::params::nx_global_mode,
$sites_available_owner = $nginx::params::nx_sites_available_owner,
$sites_available_group = $nginx::params::nx_sites_available_group,
$sites_available_mode = $nginx::params::nx_sites_available_mode,
$geo_mappings = {},
$string_mappings = {},
) inherits nginx::params {
Expand Down Expand Up @@ -245,6 +251,12 @@
worker_connections => $worker_connections,
worker_processes => $worker_processes,
worker_rlimit_nofile => $worker_rlimit_nofile,
global_owner => $global_owner,
global_group => $global_group,
global_mode => $global_mode,
sites_available_owner => $sites_available_owner,
sites_available_group => $sites_available_group,
sites_available_mode => $sites_available_mode,
require => Class['nginx::package'],
notify => Class['nginx::service'],
}
Expand Down
10 changes: 10 additions & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,14 @@
$package_ensure = 'present'
$package_source = 'nginx'
$manage_repo = true

# Specific owner for sites-available directory
$sites_available_owner = 'root'
$sites_available_group = 'root'
$sites_available_mode = '0644'

# Owner for all other files
$global_owner = 'root'
$global_group = 'root'
$global_mode = '0644'
}
23 changes: 17 additions & 6 deletions manifests/resource/vhost.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@
# specified by <path-to-lua-script-file> contains the Lua code, or, as from
# the v0.5.0rc32 release, the Lua/LuaJIT bytecode to be executed.
# [*gzip_types*] - Defines gzip_types, nginx default is text/html
# [*owner*] - Defines owner of the .conf file
# [*group*] - Defines group of the .conf file
# [*mode*] - Defines mode of the .conf file
# Actions:
#
# Requires:
Expand Down Expand Up @@ -222,6 +225,9 @@
$string_mappings = {},
$geo_mappings = {},
$gzip_types = undef,
$owner = $nginx::config::global_owner,
$group = $nginx::config::global_group,
$mode = $nginx::config::global_mode,
) {

validate_re($ensure, '^(present|absent)$',
Expand Down Expand Up @@ -401,6 +407,11 @@
validate_hash($string_mappings)
validate_hash($geo_mappings)

validate_string($owner)
validate_string($group)
validate_re($mode, '^\d{4}$',
"${mode} is not valid. It should be 4 digits (0644 by default).")

# Variables
$vhost_dir = "${nginx::config::conf_dir}/sites-available"
$vhost_enable_dir = "${nginx::config::conf_dir}/sites-enabled"
Expand All @@ -418,9 +429,9 @@
default => 'file',
},
notify => Class['nginx::service'],
owner => 'root',
group => 'root',
mode => '0644',
owner => $owner,
group => $group,
mode => $mode,
}

# Add IPv6 Logic Check - Nginx service will not start if ipv6 is enabled
Expand Down Expand Up @@ -456,9 +467,9 @@
}

concat { $config_file:
owner => 'root',
group => 'root',
mode => '0644',
owner => $owner,
group => $group,
mode => $mode,
notify => Class['nginx::service'],
}

Expand Down