Elliot Murphy
3ef1cf5265
Fix the command that was killing nginx process.
2016-01-21 21:08:42 -05:00
Forrest
3320a5f8bc
Merge pull request #101 from EvaSDK/master
...
Workaround for include being defined too early
2015-11-12 16:58:56 -08:00
Gilles Dartiguelongue
294a775b98
Workaround for include being defined too early
...
This is crap but configuration for http scope cannot be both ordered and
merged from map.jinja it seems, see issue #40 .
2015-11-13 00:18:57 +01:00
puneet kandhari
7647f3cec2
Merge pull request #98 from outime/patch-1
...
Adding default include for 'sites-enabled' dir
2015-10-06 05:26:11 -05:00
Rubén Díaz
ad62dac2b0
Adding default include for 'sites-enabled' dir
2015-10-06 10:18:48 +00:00
Wolodja Wentland
5dd0d3efbc
Merge pull request #97 from unicalabs/master
...
Resolve missing dependency for nginx home dir.
2015-09-28 16:29:10 +02:00
Benjamin Mosior
a73097aa19
Resolve missing dependency for nginx home dir.
...
To resolve the occurrence of the below error, a dependency has been added to require the nginx user first be created, either by nginx package installation or explicitly with salt (when installing nginx from source).
```
----------
ID: /var/www
Function: file.directory
Result: False
Comment: User nginx is not available Group nginx is not available
Started: 15:50:02.070799
Duration: 0.531 ms
Changes:
----------
```
2015-09-27 13:09:57 -04:00
Forrest
e93fce1a2f
Merge pull request #95 from blbradley/logger-init-lsb-header
...
add LSB header to logger sysv init script
2015-08-27 10:25:22 -07:00
Brandon Bradley
874274b559
add LSB header to logger sysv init script
2015-08-27 12:12:17 -05:00
puneet kandhari
92ac29b872
Merge pull request #94 from msciciel/msciciel
...
subscribe to repo only if install_from_repo variable is set to true
2015-08-20 05:28:37 -05:00
Krzysztof Pawłowski
dc5600d19e
ng.install: follow style recommendation
2015-08-20 09:17:55 +02:00
Krzysztof Pawłowski
445012023b
Merge branch 'itg' into msciciel
2015-08-19 17:02:45 +02:00
Krzysztof Pawłowski
1c1d338359
ng.install: subscribe to repo only if install_from_repo variable is set to true
2015-08-19 16:59:04 +02:00
puneet kandhari
b3113d53ff
Merge pull request #93 from EvaSDK/gentoo-support
...
Add support for Gentoo to nginx.ng
2015-08-15 06:51:53 -05:00
Gilles Dartiguelongue
586a7c80c3
Add support for Gentoo to nginx.ng
2015-08-15 12:26:42 +02:00
Forrest
2fe6f5846b
Merge pull request #92 from alinefr/pull_upstream
...
Add support for building from source with os_family=RedHat
2015-08-13 23:13:30 -07:00
Aline Freitas
aa0314e90d
Get salt version from grains + fix state function name for groupinstall
2015-08-14 02:17:07 -03:00
Aline Freitas
7684d6b0a9
It should be just <, not <= when comparing salt version.
2015-08-14 00:36:33 -03:00
Aline Freitas
da1405c5e7
Add support for building from source with os_family=RedHat
2015-08-13 23:40:55 -03:00
puneet kandhari
b068bc6a9d
Merge pull request #90 from techhat/master
...
Initial commit of SPM FORMULA
2015-07-07 11:59:26 -05:00
Joseph Hall
45957e2836
Initial commit of SPM FORMULA
2015-07-07 09:48:14 -06:00
Forrest
dcc47700da
Merge pull request #84 from rbang1/master
...
Fix for incorrect pkg repo base url on Amazon Linux on EC2
2015-06-30 20:24:38 -07:00
Roshan Bangera
afea3d245e
* fixed previous commit
2015-06-30 20:02:15 -07:00
Roshan Bangera
62ab6a9502
* added pillar variable to specify os release version for nginx package repo base url for RedHat family os hosts
...
* added comment for pillar example
* removed override releasever variable use for CentOS
2015-06-30 20:00:46 -07:00
Roshan Bangera
03c4902b9e
* added comment for pillar example
...
* removed override releasever variable use for CentOS
2015-06-30 19:59:47 -07:00
Roshan Bangera
997ef47905
* added pillar variable to specify os release version for nginx package repo base url for RedHat family os hosts
2015-06-30 19:59:47 -07:00
puneet kandhari
8db7bf7b4d
Merge pull request #89 from andrew-vant/certificates
...
Added nginx.ng.certificates state.
2015-06-29 11:33:39 -05:00
puneet kandhari
be35b6dd52
Merge pull request #86 from stromnet/master
...
RedHat uses /var/run, not /run
2015-06-29 10:22:47 -05:00
Johan Ström
f0d2281525
RedHat uses /var/run, not /run
2015-06-29 17:21:08 +02:00
Forrest
126169fea1
Merge pull request #88 from imran1008/separate-dir
...
Separate 'dir' into 'available_dir' and 'enabled_dir'
2015-06-28 22:28:28 -07:00
Imran Haider
36368cae5d
Added enabled_dir to pillar.example
2015-06-23 20:04:02 -04:00
Andrew Vant
51b612002b
Added nginx.ng.certificates state.
2015-06-23 15:17:52 -04:00
Nitin Madhok
8ab38a5b18
Merge pull request #87 from imran1008/arch-support
...
Add support for Arch Linux
2015-06-20 20:52:53 -04:00
Imran Haider
481c3d6aa4
Separate 'dir' into 'available_dir' and 'enabled_dir'
2015-06-20 14:18:29 -04:00
Imran Haider
f720e52158
Add support for Arch Linux
2015-06-20 14:13:02 -04:00
Nitin Madhok
5db89309ed
Merge pull request #83 from zajk/master
...
Add nginx repo for RedHat family
2015-05-13 08:04:08 -04:00
Zijad Purkovic
7f95a5a9db
Add nginx repo for RedHat family
2015-04-21 12:16:19 +02:00
Nitin Madhok
313185674c
Update LICENSING year
2015-03-20 20:06:14 -04:00
Nitin Madhok
013a0e8406
Merge pull request #79 from bersace/systemd
...
Fix nginx config on systemd
2015-03-15 02:09:41 -04:00
É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