Merge pull request #165 from saltstack-formulas/pillar-example

Updated pillar.example file with distro learnings

pillar.example

@@ -1,19 +1,19 @@
-nginx:
-  install_from_source: True
-  use_upstart: True
-  use_sysvinit: False
-  user_auth_enabled: True
-  with_luajit: False
-  with_openresty: True
-  repo_version: development  # Must be using ppa install by setting `repo_source = ppa`
-  set_real_ips: # NOTE: to use this, nginx must have http_realip module enabled
-    from_ips:
-      - 10.10.10.0/24
-    real_ip_header: X-Forwarded-For
-  modules:
-    headers-more:
-      source: http://github.com/agentzh/headers-more-nginx-module/tarball/v0.21
-      source_hash: sha1=dbf914cbf3f7b6cb7e033fa7b7c49e2f8879113b
+# nginx:
+   install_from_source: True
+   use_upstart: True
+   use_sysvinit: False
+   user_auth_enabled: True
+   with_luajit: False
+   with_openresty: True
+   repo_version: development  # Must be using ppa install by setting `repo_source = ppa`
+   set_real_ips: # NOTE: to use this, nginx must have http_realip module enabled
+     from_ips:
+       - 10.10.10.0/24
+     real_ip_header: X-Forwarded-For
+   modules:
+     headers-more:
+       source: http://github.com/agentzh/headers-more-nginx-module/tarball/v0.21
+       source_hash: sha1=dbf914cbf3f7b6cb7e033fa7b7c49e2f8879113b
 
 # ========
 # nginx.ng
@@ -42,6 +42,7 @@ nginx:
     source_hash: ''
     
     # These are usually set by grains in map.jinja
+    # Typically you can comment these out.
     lookup:
       package: nginx-custom
       service: nginx
@@ -54,6 +55,8 @@ nginx:
       rh_os_releasever: '6'
       # Currently it can be used on rhel/centos/suse when installing from repo
       gpg_check: True
+      pid_file: /var/run/nginx.pid   ### Prevent Rendering SLS error (map.jinja:149) if nginx.server.config.pid undefined (Ubuntu, etc) ###
+      
 
     # Source compilation is not currently a part of nginx.ng
     from_source: False
@@ -75,12 +78,13 @@ nginx:
       # dictionaries map to blocks {} and lists cause the same declaration to repeat with different values
       config: 
         worker_processes: 4
-        pid: /run/nginx.pid
+        pid: /var/run/nginx.pid		### Directory location must exist
         events:
           worker_connections: 768
         http:
           sendfile: 'on'
           include:
+            #### Note: Syntax issues in these files generate nginx [emerg] errors on startup.  ####
             - /etc/nginx/mime.types
             - /etc/nginx/conf.d/*.conf
             - /etc/nginx/sites-enabled/*
@@ -97,10 +101,13 @@ nginx:
       managed:
         mysite: # relative pathname of the server file
           # may be True, False, or None where True is enabled, False, disabled, and None indicates no action
-          available_dir: /tmp/sites-available # an alternate directory (not sites-available) where this server may be found
-          enabled_dir: /tmp/sites-enabled # an alternate directory (not sites-enabled) where this server may be found
-          disabled_name: mysite.aint_on # an alternative disabled name to be use when not symlinking
           enabled: True
+          ########### 
+          ## Modify  'available_dir' AND 'enabled_dir' '/etc/nginx' location to alternative value.
+          ###########
+          available_dir: /etc/nginx/sites-available # an alternate directory (not sites-available) where this server may be found
+          enabled_dir: /etc/nginx/sites-enabled # an alternate directory (not sites-enabled) where this server may be found
+          disabled_name: mysite.aint_on # an alternative disabled name to be use when not symlinking
           overwrite: True # overwrite an existing server file or not
           
           # May be a list of config options or None, if None, no server file will be managed/templated