Niels Abspoel
4a976bf1ab
added test for value None, to be an absent value
...
this is needed on archlinux where the pid file is set by systemd
not the nginx.conf file.
In the pillar file you just add
pid:
an value of 'None' and no pid entry in nginx.conf.
this now works with every None value set in the pillar file
2015-02-11 23:03:10 +01:00
Juan Manuel
c91377897a
Added option to use 'development' ppa
2015-02-10 17:55:36 -03:00
Juan Manuel
9de2a2631c
Added nginx repo key for mainline
2015-02-10 17:20:52 -03:00
Juan Manuel
88dfd0835c
Minor bugfix and updated pillar.example
2015-02-10 17:14:00 -03:00
Juan Manuel
afc723802d
Choose mainline/stable from ppa at will
2015-02-10 16:59:49 -03:00
Seth House
137482d175
Change states to use short-dec style
2014-12-13 00:19:59 -07:00
CorwinTanner
51844f2820
Fixed "no service named nginx" chkconfig error.
...
chkconfig was attempting to remove /etc/init.d/nginx when it did not exist.
2014-11-21 17:10:01 -06:00
Nitin Madhok
59cdfb79c2
Merge pull request #65 from gravyboat/master
...
Update the map file for ng to use the proper redhat user.
2014-11-08 02:40:53 -05:00
Ross Perkins
da9498bb45
Fixed is-nginx-source-modified in the case where you're using a Github tarball as the URL, and it unzips to some freaky directory name instead of a nice name like we expected.
2014-11-07 23:24:42 -08:00
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
Forrest Alvarez
e511042ac7
Update the map file for ng to use nginx as the redhat user instead of httpd.
2014-11-07 15:29:50 -08:00
Ari Aosved
7a3c370f35
allow the url to the source tarball to be overridden
2014-11-06 18:18:27 -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
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
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
