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.

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

The Road to 1.0: Cleanup part 1 #423

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ fixtures:
apt: "puppetlabs/apt"
concat: "puppetlabs/concat"
stdlib: "puppetlabs/stdlib"
module_data: "ripienaar/module_data"
1 change: 0 additions & 1 deletion .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
--fail-on-warnings
--relative
--no-80chars-check
--no-class_inherits_from_params_class-check
9 changes: 5 additions & 4 deletions Modulefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
name 'jfryman-nginx'
version '0.0.10'
version '0.1.0'
source 'http://github.com/jfryman/puppet-nginx'
author 'James Fryman'
license 'Apache License Version 2.0'
summary 'Puppet NGINX management module'
description 'This module can be used for basic NGINX Management'
project_page 'http://github.com/jfryman/puppet-nginx'

dependency 'puppetlabs/stdlib', '>= 3.0.0'
dependency 'puppetlabs/apt', '>= 1.0.0'
dependency 'puppetlabs/concat', '>= 1.1.0'
dependency 'puppetlabs/stdlib', '>= 3.0.0'
dependency 'puppetlabs/apt', '>= 1.0.0'
dependency 'puppetlabs/concat', '>= 1.1.0'
dependency 'ripienaar/module_data', '>= 0.0.3'
3 changes: 3 additions & 0 deletions data/Archlinux.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
nginx::config::pid: false
nginx::config::daemon_user: 'http'
2 changes: 2 additions & 0 deletions data/Debian.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
nginx::config::daemon_user: 'www-data'
3 changes: 3 additions & 0 deletions data/FreeBSD.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
nginx::config::conf_dir: '/usr/local/etc/nginx'
nginx::config::daemon_user: 'www'
3 changes: 3 additions & 0 deletions data/Joyent.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
nginx::config::conf_dir: '/opt/local/etc/nginx'
nginx::config::daemon_user: 'www'
2 changes: 2 additions & 0 deletions data/Solaris.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
nginx::config::daemon_user: 'webservd'
91 changes: 91 additions & 0 deletions data/common.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
---
nginx::config::temp_dir: '/tmp'
nginx::config::run_dir: '/var/nginx'
nginx::config::conf_template: 'nginx/conf.d/nginx.conf.erb'
nginx::config::proxy_conf_template: 'nginx/conf.d/proxy.conf.erb'
nginx::config::confd_purge: false
nginx::config::vhost_purge: false
nginx::config::worker_processes: 1
nginx::config::worker_connections: 1024
nginx::config::worker_rlimit_nofile: 1024
nginx::config::types_hash_max_size: 1024
nginx::config::types_hash_bucket_size: 512
nginx::config::names_hash_bucket_size: 64
nginx::config::names_hash_max_size: 512
nginx::config::multi_accept: 'off'
nginx::config::events_use: false
nginx::config::sendfile: 'on'
nginx::config::keepalive_timeout: 65
nginx::config::http_tcp_nodelay: 'on'
nginx::config::http_tcp_nopush: 'off'
nginx::config::gzip: 'on'
nginx::config::server_tokens: 'on'
nginx::config::spdy: 'off'
nginx::config::ssl_stapling: 'off'
nginx::config::proxy_redirect: 'off'
nginx::config::proxy_set_header:
- 'Host $host'
- 'X-Real-IP $remote_addr'
- 'X-Forwarded-For $proxy_add_x_forwarded_for'
nginx::config::proxy_cache_path: false
nginx::config::proxy_cache_levels: 1
nginx::config::proxy_cache_keys_zone: 'd2:100m'
nginx::config::proxy_cache_max_size: '500m'
nginx::config::proxy_cache_inactive: '20m'
nginx::config::fastcgi_cache_path: false
nginx::config::fastcgi_cache_levels: 1
nginx::config::fastcgi_cache_keys_zone: 'd3:100m'
nginx::config::fastcgi_cache_max_size: '500m'
nginx::config::fastcgi_cache_inactive: '20m'
nginx::config::fastcgi_cache_key: false
nginx::config::fastcgi_cache_use_stale: false
nginx::config::client_body_temp_path: "/var/nginx/client_body_temp"
nginx::config::client_body_buffer_size: '128k'
nginx::config::client_max_body_size: '10m'
nginx::config::proxy_temp_path: "/var/nginx/proxy_temp"
nginx::config::proxy_connect_timeout: '90'
nginx::config::proxy_send_timeout: '90'
nginx::config::proxy_read_timeout: '90'
nginx::config::proxy_buffers: '32 4k'
nginx::config::proxy_http_version: '1.0'
nginx::config::proxy_buffer_size: '8k'
nginx::config::proxy_headers_hash_bucket_size: '64'
nginx::config::logdir: '/var/log/nginx'

# Service restart after Nginx 0.7.53 could also be just
# "/path/to/nginx/bin -s HUP" Some init scripts do a configtest, some don't.
# If configtest_enable it's true then service restart will take
# $nx_service_restart value, forcing configtest.
nginx::config::configtest_enable: false
nginx::config::service_restart: '/etc/init.d/nginx configtest && /etc/init.d/nginx restart'
nginx::config::service_ensure: 'running'

nginx::config::mail: false

nginx::config::http_cfg_append: false
nginx::config::nginx_error_log: "/var/log/nginx/error.log"
nginx::config::http_access_log: "/var/log/nginx/access.log"

# package name depends on distribution, e.g. for Debian nginx-full | nginx-light
nginx::config::package_name: 'nginx'
nginx::config::package_ensure: 'present'
nginx::config::package_source: 'nginx'
nginx::config::manage_repo: true

nginx::config::root_group: root
# Specific owner for sites-available directory
nginx::config::sites_available_owner: 'root'
nginx::config::sites_available_group: 'root'
nginx::config::sites_available_mode: '0644'

# Owner for all other files
nginx::config::global_owner: 'root'
nginx::config::global_group: 'root'
nginx::config::global_mode: '0644'

nginx::config::pid: '/var/run/nginx.pid'

nginx::config::conf_dir: '/etc/nginx'

nginx::config::super_user: true
nginx::config::daemon_user: 'nginx'
6 changes: 6 additions & 0 deletions data/hiera.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
:hierarchy:
- "%{::osfamily}"
- "%{::kernelversion}"
- "%{::kernel}"
- common
Loading