Nitin Madhok
|
f057d70190
|
Merge pull request #64 from devaos/master
Facilitate active nginx development
|
10 years ago |
Ari Aosved
|
7a3c370f35
|
allow the url to the source tarball to be overridden
|
10 years ago |
Ross Perkins
|
29c1fdbea1
|
Merge pull request #1 from devaos/master
Rebuild nginx if the source files, or module source files, are newer than the nginx binary
|
10 years ago |
Ari Aosved
|
bc51ffbd2b
|
Rebuild nginx if the source files, or module source files, are newer than the nginx binary
|
10 years ago |
Nitin Madhok
|
b820500e2b
|
Merge pull request #62 from ross-p/feature-source-improvements
Source state improvements
|
10 years ago |
Ross Perkins
|
b48f6cf98f
|
Added 'silence_compiler' option which will cause all stdout from source build/install to be suppressed (logged to a file, in case you want to see it later). stderr is also logged to file, but if there is an error then stderr is copied to Salt so it comes back with the highstate payload.
|
10 years ago |
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.
|
10 years ago |
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.
|
10 years ago |
Ross Perkins
|
c7ede18d76
|
Added optional ability to disable creation of /etc/nginx/sites-(available|enabled)
|
10 years ago |
Ross Perkins
|
12f9ffdc1f
|
Removed duplicate service enabling code. "service -> enable: True" does this already, you don't need to explicitly call update-rc.d
|
10 years ago |
Nitin Madhok
|
4f64967da3
|
Merge pull request #61 from rfairburn/master
nginx config default should use the error.fifo
|
10 years ago |
Robert Fairburn
|
4e231126e2
|
nginx config default should use the error.fifo
|
10 years ago |
Nitin Madhok
|
296eecd7b9
|
Merge pull request #59 from OneID/feature/upstart-symlink-checking
Force overwrite of /etc/init.d/nginx
|
10 years ago |
Ajna Cackovic
|
a089cc2392
|
Force overwrite of /etc/init.d/nginx
|
10 years ago |
Nitin Madhok
|
262070ab06
|
Merge pull request #58 from OneID/feature/repo-version
Allow ppa install using development/mainline etc
|
10 years ago |
Ajna Cackovic
|
29b3aa6462
|
Update pillar.example
|
10 years ago |
Ajna Cackovic
|
8043ffef73
|
Allow selection of repo_version
|
10 years ago |
Nitin Madhok
|
c87186ff87
|
Merge pull request #57 from rfairburn/master
Use nginx_map.default_group for group in all places
|
10 years ago |
Robert Fairburn
|
6d3b1b6949
|
Use nginx_map.default_group for group in all places
|
10 years ago |
Nitin Madhok
|
7f4f973f37
|
Merge pull request #56 from rfairburn/master
Fix support for os_family RedHat
|
10 years ago |
Robert Fairburn
|
0a99a787c4
|
Fix support for os_family RedHat
|
10 years ago |
Nitin Madhok
|
b76b2346b4
|
Merge pull request #55 from ross-p/master
Source install now works. Paths now configurable. Added init.d.
|
10 years ago |
Ross Perkins
|
746101c4e2
|
Source install now works. Paths now configurable. Added init.d.
|
10 years ago |
Nitin Madhok
|
37a048ceb0
|
Merge pull request #54 from webplatform/master
Installing nginx on Ubuntu/Debian fails, missing map property
|
10 years ago |
Renoir Boulanger
|
e0365dca58
|
Using in top.sls state was failing because of missing map
|
10 years ago |
Nitin Madhok
|
205d37b028
|
Merge pull request #52 from OneID/master
Force symlink creation of /etc/init.d/nginx
|
10 years ago |
Ajna Cackovic
|
f0f2f941a4
|
Wait until pkg:nginx is installed before adding /etc/nginx/nginx.conf
|
10 years ago |
Ajna Cackovic
|
4bcb49826e
|
Force symlink creation of /etc/init.d/nginx
|
10 years ago |
Forrest
|
544eefd492
|
Merge pull request #50 from scout/sysvinit-support
support sysvinit scripts for the syslog forwarders
|
10 years ago |
Nitin Madhok
|
fa3222fd3e
|
Merge pull request #51 from scout/nginx.org-apt
support the official nginx.org apt repo for debian users (at least)
|
10 years ago |
Travis J Parker
|
a3bc2d73bb
|
support the official nginx.org apt repo for debian users (at least)
|
10 years ago |
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.
|
10 years ago |
Travis J Parker
|
02faa5c88a
|
ignore vim droppings please
|
10 years ago |
Travis J Parker
|
0da43d9861
|
move upstart-related states to their own file
|
10 years ago |
Forrest
|
90c539de8c
|
Merge pull request #44 from westurner/add_install_from_ppa
BUG: pkgrepo.absent, pkgrepo:watch_in(pkg), install_from_ppa
|
10 years ago |
Wes Turner
|
1f5d6bb7ee
|
BUG: Conditional pkgrepo.absent instead of enabled, pkgrepo:watch_in
|
10 years ago |
Wes Turner
|
b2122db4f6
|
BUG: Fix pkgrepo.managed, from_source -> install_from_source (consistency)
|
10 years ago |
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"
|
10 years ago |
Nitin Madhok
|
1c0e8d60ae
|
Revert "ENH: Add install_from_ppa pillar setting and PPA pkgrepo"
|
10 years ago |
Nitin Madhok
|
c449e5fb4f
|
Merge pull request #42 from westurner/add_install_from_ppa
ENH: Add install_from_ppa pillar setting and PPA pkgrepo
|
10 years ago |
Wes Turner
|
c696e87f34
|
ENH: Add install_from_ppa pillar setting and PPA pkgrepo
|
10 years ago |
Seth House
|
0810b94c55
|
Merge pull request #41 from percipient/sync-nginx-upstart
Synchronized upstart script with the one recommended by nginx.
|
10 years ago |
oboyle
|
07b7088b98
|
Synchronized upstart script with the one recommended by nginx.
http://wiki.nginx.org/Upstart
|
10 years ago |
Erik Johnson
|
eaf88dd5de
|
Quote "on" to keep it from being loaded as bool
Fixes #39.
|
10 years ago |
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
|
10 years ago |
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.
|
10 years ago |
Seth House
|
7febd2deb6
|
Merge pull request #30 from the-control-group/feature/set-real-ip
Support http_realip module
|
10 years ago |
Seth House
|
dc6757d2c9
|
Merge pull request #27 from ahmadsherif/patch-1
Create /var/log/nginx before running mkfifo
|
10 years ago |
Seth House
|
e58a903584
|
Merge pull request #34 from fayetted/service_tab_completion
Add tab completion for upstart
|
10 years ago |
Seth House
|
65b1594914
|
Merge pull request #31 from tfolio/users-optional
Optionally include nginx.users via a pillar value
|
10 years ago |