From 68a5094f7fc50964d1783cf1ac1827adebe9b409 Mon Sep 17 00:00:00 2001 From: James Fryman Date: Sat, 8 Nov 2014 17:22:55 +0100 Subject: [PATCH] cleanup puppet-module-data cruft --- data/common.yaml | 77 ------------------------------- data/hiera.yaml | 5 -- data/operatingsystem/SmartOS.yaml | 3 -- data/osfamily/Archlinux.yaml | 3 -- data/osfamily/Debian.yaml | 2 - data/osfamily/FreeBSD.yaml | 4 -- data/osfamily/Solaris.yaml | 2 - 7 files changed, 96 deletions(-) delete mode 100644 data/common.yaml delete mode 100644 data/hiera.yaml delete mode 100644 data/operatingsystem/SmartOS.yaml delete mode 100644 data/osfamily/Archlinux.yaml delete mode 100644 data/osfamily/Debian.yaml delete mode 100644 data/osfamily/FreeBSD.yaml delete mode 100644 data/osfamily/Solaris.yaml diff --git a/data/common.yaml b/data/common.yaml deleted file mode 100644 index 5d6ae3b..0000000 --- a/data/common.yaml +++ /dev/null @@ -1,77 +0,0 @@ ---- -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 - -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 - -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 diff --git a/data/hiera.yaml b/data/hiera.yaml deleted file mode 100644 index 8926e47..0000000 --- a/data/hiera.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -:hierarchy: -- operatingsystem/%{::operatingsystem} -- osfamily/%{::osfamily} -- common diff --git a/data/operatingsystem/SmartOS.yaml b/data/operatingsystem/SmartOS.yaml deleted file mode 100644 index bafc7e6..0000000 --- a/data/operatingsystem/SmartOS.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -nginx::config::conf_dir: /opt/local/etc/nginx -nginx::config::daemon_user: www \ No newline at end of file diff --git a/data/osfamily/Archlinux.yaml b/data/osfamily/Archlinux.yaml deleted file mode 100644 index 071c50e..0000000 --- a/data/osfamily/Archlinux.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -nginx::config::pid: false -nginx::config::daemon_user: http \ No newline at end of file diff --git a/data/osfamily/Debian.yaml b/data/osfamily/Debian.yaml deleted file mode 100644 index 565ea96..0000000 --- a/data/osfamily/Debian.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -nginx::config::daemon_user: www-data \ No newline at end of file diff --git a/data/osfamily/FreeBSD.yaml b/data/osfamily/FreeBSD.yaml deleted file mode 100644 index fb601d5..0000000 --- a/data/osfamily/FreeBSD.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -nginx::config::conf_dir: /usr/local/etc/nginx -nginx::config::daemon_user: www -nginx::config::root_group: wheel \ No newline at end of file diff --git a/data/osfamily/Solaris.yaml b/data/osfamily/Solaris.yaml deleted file mode 100644 index 27ca557..0000000 --- a/data/osfamily/Solaris.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -nginx::config::daemon_user: webservd \ No newline at end of file