Ross Perkins
|
746101c4e2
|
Source install now works. Paths now configurable. Added init.d.
|
2014-10-17 22:33:57 -07:00 |
|
Nitin Madhok
|
37a048ceb0
|
Merge pull request #54 from webplatform/master
Installing nginx on Ubuntu/Debian fails, missing map property
|
2014-10-16 15:33:51 -04:00 |
|
Renoir Boulanger
|
e0365dca58
|
Using in top.sls state was failing because of missing map
|
2014-10-16 15:32:37 -04:00 |
|
Nitin Madhok
|
205d37b028
|
Merge pull request #52 from OneID/master
Force symlink creation of /etc/init.d/nginx
|
2014-10-16 00:56:46 -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 |
|
Nitin Madhok
|
fa3222fd3e
|
Merge pull request #51 from scout/nginx.org-apt
support the official nginx.org apt repo for debian users (at least)
|
2014-10-08 18:25:19 -04: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
|
02faa5c88a
|
ignore vim droppings please
|
2014-10-08 11:06:56 -07:00 |
|
Travis J Parker
|
0da43d9861
|
move upstart-related states to their own file
|
2014-10-08 10:17:06 -07:00 |
|
Forrest
|
90c539de8c
|
Merge pull request #44 from westurner/add_install_from_ppa
BUG: pkgrepo.absent, pkgrepo:watch_in(pkg), install_from_ppa
|
2014-08-11 20:49:38 -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
|
c3c5d9777d
|
Merge pull request #43 from saltstack-formulas/revert-42-add_install_from_ppa
Revert "ENH: Add install_from_ppa pillar setting and PPA pkgrepo"
|
2014-08-11 22:47:11 -04:00 |
|
Nitin Madhok
|
1c0e8d60ae
|
Revert "ENH: Add install_from_ppa pillar setting and PPA pkgrepo"
|
2014-08-11 22:47:02 -04:00 |
|
Nitin Madhok
|
c449e5fb4f
|
Merge pull request #42 from westurner/add_install_from_ppa
ENH: Add install_from_ppa pillar setting and PPA pkgrepo
|
2014-08-09 20:55:13 -04:00 |
|
Wes Turner
|
c696e87f34
|
ENH: Add install_from_ppa pillar setting and PPA pkgrepo
|
2014-08-09 02:37:30 -05:00 |
|
Seth House
|
0810b94c55
|
Merge pull request #41 from percipient/sync-nginx-upstart
Synchronized upstart script with the one recommended by nginx.
|
2014-08-01 11:18:50 -06: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 |
|
Erik Johnson
|
eaf88dd5de
|
Quote "on" to keep it from being loaded as bool
Fixes #39.
|
2014-07-04 22:35:23 -05:00 |
|
Erik Johnson
|
01cb1f9576
|
Revert "Remove merge argument from pillar.get"
This reverts commit f6ba9ddb59 .
the nginx.ng formula is only compatible with the upcoming feature
release, as noted here:
https://github.com/saltstack-formulas/nginx-formula#nginxng
|
2014-07-03 15:40:15 -05:00 |
|
Erik Johnson
|
f6ba9ddb59
|
Remove merge argument from pillar.get
This argument is only currently available in develop, and thus does not
belong in this formula at this time.
|
2014-07-03 12:53:13 -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 |
|
Joseph Hall
|
3a63a8c2bd
|
Merge pull request #32 from jaanush/master
Added map file to resolve apache utils package name
|
2014-06-18 07:50:51 -06: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 |
|
Joseph Hall
|
c8413788b0
|
Merge pull request #23 from the-control-group/master
set 'daemon on;' by default
|
2014-05-31 01:09:29 -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 |
|
Forrest
|
bd5b3b8ce8
|
Merge pull request #29 from ahmadsherif/patch-3
Fix errors in source.sls
|
2014-05-30 09:41:19 -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 |
|
Joseph Hall
|
5164152de7
|
Merge pull request #26 from fly/fix-doclink
fix link to formula usage instructions
|
2014-05-30 00:11:46 -06:00 |
|