Ross Perkins
|
2a679f9597
|
Update init.d script to allow custom service name
|
2014-11-07 21:55:54 -08:00 |
|
Ross Perkins
|
3a158a278c
|
Added optional ability to NOT start nginx after compiling and installing
|
2014-11-07 18:57:24 -08:00 |
|
Ross Perkins
|
5cad1002fc
|
Fixed some dependencies
|
2014-11-07 18:56:28 -08:00 |
|
Ross Perkins
|
ce0e3384eb
|
Added optional 'service_name' pillar config, to change the name of the service from 'nginx' to whatever you want it to be.
|
2014-11-07 18:56:07 -08:00 |
|
Ross Perkins
|
5531662527
|
No longer implicitly delete files ending in ".default", if you want to delete those, name them in the pillar.
|
2014-11-07 18:55:13 -08:00 |
|
Nitin Madhok
|
f057d70190
|
Merge pull request #64 from devaos/master
Facilitate active nginx development
|
2014-11-07 15:03:55 -05:00 |
|
Ari Aosved
|
7a3c370f35
|
allow the url to the source tarball to be overridden
|
2014-11-06 18:18:27 -08:00 |
|
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
|
2014-11-04 19:00:38 -08:00 |
|
Ari Aosved
|
bc51ffbd2b
|
Rebuild nginx if the source files, or module source files, are newer than the nginx binary
|
2014-11-04 18:45:53 -08:00 |
|
Nitin Madhok
|
b820500e2b
|
Merge pull request #62 from ross-p/feature-source-improvements
Source state improvements
|
2014-10-31 13:03:58 -04:00 |
|
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.
|
2014-10-31 09:54:15 -07:00 |
|
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 |
|
Nitin Madhok
|
4f64967da3
|
Merge pull request #61 from rfairburn/master
nginx config default should use the error.fifo
|
2014-10-21 14:53:51 -07:00 |
|
Robert Fairburn
|
4e231126e2
|
nginx config default should use the error.fifo
|
2014-10-21 16:48:30 -05:00 |
|
Nitin Madhok
|
296eecd7b9
|
Merge pull request #59 from OneID/feature/upstart-symlink-checking
Force overwrite of /etc/init.d/nginx
|
2014-10-20 18:38:15 -04: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
|
29b3aa6462
|
Update pillar.example
|
2014-10-20 14:17:27 -07:00 |
|
Ajna Cackovic
|
8043ffef73
|
Allow selection of repo_version
|
2014-10-20 13:51:56 -07:00 |
|
Nitin Madhok
|
c87186ff87
|
Merge pull request #57 from rfairburn/master
Use nginx_map.default_group for group in all places
|
2014-10-20 11:09:12 -04:00 |
|
Robert Fairburn
|
6d3b1b6949
|
Use nginx_map.default_group for group in all places
|
2014-10-20 10:01:51 -05:00 |
|
Nitin Madhok
|
7f4f973f37
|
Merge pull request #56 from rfairburn/master
Fix support for os_family RedHat
|
2014-10-20 05:46:34 -04:00 |
|
Robert Fairburn
|
0a99a787c4
|
Fix support for os_family RedHat
|
2014-10-20 03:59:16 -05:00 |
|
Nitin Madhok
|
b76b2346b4
|
Merge pull request #55 from ross-p/master
Source install now works. Paths now configurable. Added init.d.
|
2014-10-18 12:27:54 -04:00 |
|
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 |
|