Étienne BERSAC
03f73add16
Fix nginx config on systemd
2015-03-13 16:49:33 +01:00
Nitin Madhok
3cdf007cec
Merge pull request #78 from aboe76/opensuse_support
...
Added opensuse support
2015-03-08 19:01:36 -04:00
Niels Abspoel
a275ee2451
Added opensuse support
...
Needed to add repo management because opensuse doesn't have nginx
in default repo
2015-03-08 21:23:26 +01:00
Forrest
92b0b8d9c9
Merge pull request #76 from TaiSHiNet/master
...
Moved entirely to ubuntu's ppa
2015-02-23 14:18:44 -08:00
Juan Manuel
a303c8cc0c
Moved entirely to ubuntu's ppa
2015-02-23 18:16:41 -03:00
Forrest
eed147836d
Merge pull request #75 from aboe76/enable_values_absent
...
added test for value None, to be an absent value
2015-02-11 21:49:27 -08:00
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
Forrest
7ae1602745
Merge pull request #74 from TaiSHiNet/master
...
Minor bugfix and updated pillar.example
2015-02-10 13:01:47 -08: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
Nitin Madhok
698172f89a
Merge pull request #73 from TaiSHiNet/master
...
Choose mainline/stable from ppa at will
2015-02-11 01:43:42 +05:30
Juan Manuel
afc723802d
Choose mainline/stable from ppa at will
2015-02-10 16:59:49 -03:00
Nitin Madhok
f2091b464f
Merge pull request #69 from saltstack-formulas/style-short-dec
...
Change states to use short-dec style
2014-12-13 06:43:01 -05:00
Seth House
137482d175
Change states to use short-dec style
2014-12-13 00:19:59 -07:00
Nitin Madhok
5cad45126e
Merge pull request #67 from CorwinTanner/patch-1
...
Fixed "no service named nginx" chkconfig error.
2014-11-21 18:46:25 -05: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
Nitin Madhok
89a30e31de
Merge pull request #66 from xclusv/feature-customize-service-name-and-status
...
Source install: Customize service name and status
2014-11-08 02:36:56 -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
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
