Commit Graph

71 Commits

Author SHA1 Message Date
Ross Perkins
2c809fa402 Now restart nginx service instead of reload. Reload, while nice on config updates, doesn't have the required effect when you upgrade nginx. If we can reload on config update and restart on code upgrade, that would be great. For now we just always restart. 2014-10-31 09:23:54 -07:00
Ross Perkins
2cdd917550 Moved use_upstart and use_sysvinit default values into map.jinja. Source install now using default user/group names defined in map.jinja. Moved more default definitions from source.sls into map.jinja. 2014-10-31 09:22:16 -07:00
Ross Perkins
c7ede18d76 Added optional ability to disable creation of /etc/nginx/sites-(available|enabled) 2014-10-31 09:08:50 -07:00
Ross Perkins
12f9ffdc1f Removed duplicate service enabling code. "service -> enable: True" does this already, you don't need to explicitly call update-rc.d 2014-10-31 09:07:40 -07:00
Robert Fairburn
4e231126e2 nginx config default should use the error.fifo 2014-10-21 16:48:30 -05:00
Ajna Cackovic
a089cc2392 Force overwrite of /etc/init.d/nginx 2014-10-20 15:15:10 -07:00
Nitin Madhok
262070ab06 Merge pull request #58 from OneID/feature/repo-version
Allow ppa install using development/mainline etc
2014-10-20 17:23:49 -04:00
Ajna Cackovic
8043ffef73 Allow selection of repo_version 2014-10-20 13:51:56 -07:00
Robert Fairburn
6d3b1b6949 Use nginx_map.default_group for group in all places 2014-10-20 10:01:51 -05:00
Robert Fairburn
0a99a787c4 Fix support for os_family RedHat 2014-10-20 03:59:16 -05:00
Ross Perkins
746101c4e2 Source install now works. Paths now configurable. Added init.d. 2014-10-17 22:33:57 -07:00
Renoir Boulanger
e0365dca58 Using in top.sls state was failing because of missing map 2014-10-16 15:32:37 -04:00
Ajna Cackovic
f0f2f941a4 Wait until pkg:nginx is installed before adding /etc/nginx/nginx.conf 2014-10-15 21:30:39 -07:00
Ajna Cackovic
4bcb49826e Force symlink creation of /etc/init.d/nginx 2014-10-15 20:25:02 -07:00
Forrest
544eefd492 Merge pull request #50 from scout/sysvinit-support
support sysvinit scripts for the syslog forwarders
2014-10-08 15:41:09 -07:00
Travis J Parker
a3bc2d73bb support the official nginx.org apt repo for debian users (at least) 2014-10-08 14:48:12 -07:00
Travis J Parker
37fb389133 syslog support in the sysvinit paradigm
the debian package installs the nginx service just fine, but the extra
fifo->syslog functionality would be nice to have under debian as well.
2014-10-08 14:29:19 -07:00
Travis J Parker
0da43d9861 move upstart-related states to their own file 2014-10-08 10:17:06 -07:00
Wes Turner
1f5d6bb7ee BUG: Conditional pkgrepo.absent instead of enabled, pkgrepo:watch_in 2014-08-11 22:07:55 -05:00
Wes Turner
b2122db4f6 BUG: Fix pkgrepo.managed, from_source -> install_from_source (consistency) 2014-08-11 22:07:32 -05:00
Nitin Madhok
1c0e8d60ae Revert "ENH: Add install_from_ppa pillar setting and PPA pkgrepo" 2014-08-11 22:47:02 -04:00
Wes Turner
c696e87f34 ENH: Add install_from_ppa pillar setting and PPA pkgrepo 2014-08-09 02:37:30 -05:00
oboyle
07b7088b98 Synchronized upstart script with the one recommended by nginx.
http://wiki.nginx.org/Upstart
2014-07-31 10:52:04 -05:00
Seth House
7febd2deb6 Merge pull request #30 from the-control-group/feature/set-real-ip
Support http_realip module
2014-06-24 14:13:56 -06:00
Seth House
dc6757d2c9 Merge pull request #27 from ahmadsherif/patch-1
Create /var/log/nginx before running mkfifo
2014-06-24 13:44:38 -06:00
Seth House
e58a903584 Merge pull request #34 from fayetted/service_tab_completion
Add tab completion for upstart
2014-06-24 13:40:43 -06:00
Seth House
65b1594914 Merge pull request #31 from tfolio/users-optional
Optionally include nginx.users via a pillar value
2014-06-24 13:30:38 -06:00
Joseph Hall
ee22c1c8c8 Merge pull request #35 from spsoit/master
Fixes missing requisites in ng.init
2014-06-19 14:26:09 -06:00
Chad Heuschober
90a83d39a2 Fixes typo in last commit. 2014-06-19 11:25:40 -04:00
Chad Heuschober
6069abd50d Fixes missing requisite in ng.init 2014-06-19 11:21:39 -04:00
Dan Fayette
d7dcf75ed5 Add tab completion for upstart
If upstart is used, add symlink: /etc/init.d/nginx -> /lib/init/upstart-job
2014-06-19 10:43:00 -04:00
root
a03ece8de4 Added map file to resolve apache utils package name 2014-06-18 11:57:05 +02:00
Mark Lee
920ba9b1a4 Optionally include nginx.users via a pillar value 2014-06-15 22:01:14 -07:00
Kent Shultz
a978ac74fc change attribute name for better readability 2014-06-02 16:03:04 -07:00
Kent Shultz
c2b896ea52 remove nginx -V check; add pillar example 2014-06-02 16:00:09 -07:00
Joseph Hall
a0a272d819 Merge pull request #24 from the-control-group/feature/misc-config-items
Feature/misc config items
2014-05-31 01:10:09 -06:00
Kent Shultz
26f606e634 fix name of cmd call 2014-05-30 11:05:31 -07:00
Kent Shultz
def291d210 check for realip module 2014-05-30 11:02:46 -07:00
Kent Shultz
4f0aa05b6f whitespace cleanup 2014-05-30 10:30:08 -07:00
Kent Shultz
3616bcc9cf add support for realip 2014-05-30 10:28:54 -07:00
Kent Shultz
ed0879a42c Merge branch 'master' of https://github.com/saltstack-formulas/nginx-formula 2014-05-30 10:17:53 -07:00
Ahmad Sherif
aac18d2505 Correct requisite ID in source.sls 2014-05-30 19:31:00 +03:00
Ahmad Sherif
c28cac3483 Group source.sls include declarations into one 2014-05-30 19:28:59 +03:00
Ahmad Sherif
36b00e6332 Remove useless if statement in source.sls 2014-05-30 19:24:47 +03:00
Ahmad Sherif
6a9efa774d Create /var/log/nginx before running mkfifo 2014-05-30 18:55:26 +03:00
Kent Shultz
84d00fd56c more messing with suppress newline in jinja 2014-05-29 14:15:24 -07:00
Kent Shultz
8f894ea6e6 suppress newlines 2014-05-29 14:13:25 -07:00
Kent Shultz
c90a12d9f5 support error_log location and log level; fix gzip_disable syntax error 2014-05-29 14:05:14 -07:00
Kent Shultz
16ecfa1298 add support for gzip_disable 2014-05-29 13:44:31 -07:00
Kent Shultz
6fd6ee7b20 add support for setting default_type 2014-05-29 12:42:10 -07:00