Niels Abspoel
ce2024df4b
change service watch to listen so it will only trigger a refresh of nginx service and the end of the state run
2016-10-29 09:34:28 +02:00
Forrest
26183bc14b
Merge pull request #134 from renich/vhost_to_server
...
Replace the term vhost for server everywhere and solve issue #105
2016-10-24 17:02:26 -07:00
Renich Bon Ciric
92a8461ab3
replace the term vhost for server everywhere
2016-10-19 16:35:38 -05:00
Chris Sanders
4900d96a29
Use oscodename grain instead of hard coded trusty
2016-10-17 11:36:29 -05:00
Forrest
9e47729230
Merge pull request #131 from arthurlogilab/patch-1
...
avoid crash if private_key is not shipped in pillar
2016-10-12 09:32:09 -07:00
Arthur Lutz
727826d272
avoid crash if private_key is not shipped in pillar
2016-10-12 10:52:17 +02:00
George Robinson
e4759f559b
Fix build deps for NGINX NG build from source
2016-08-10 22:51:36 +01:00
Niels Abspoel
ef8fb87105
Merge pull request #125 from fedusia/master
...
Add newline to blocks like location, server, httpd and etc
2016-06-29 17:04:10 +02:00
Dmitry S. Fedorov
36f4f59624
Add newline to blocks like location, server, httpd and etc
2016-06-29 17:55:54 +03:00
Forrest
5e4575d702
Merge pull request #124 from grobinson-blockchain/master
...
Fix overwrite check testing the name of the vhost rather than setting…
2016-06-22 10:23:00 -07:00
George Robinson
38c7c8a772
Fix overwrite check testing the name of the vhost rather than settings dict
2016-06-22 18:22:01 +01:00
Forrest
06fb1d666f
Merge pull request #123 from grobinson-blockchain/master
...
Fix state fail when NGINX is already installed
2016-06-22 09:49:54 -07:00
George Robinson
f4bd172adc
Fix state fail when NGINX is already installed
2016-06-22 11:09:05 +01:00
Forrest
a35b606d9c
Merge pull request #119 from grobinson-blockchain/master
...
Auto-restart NGINX and use pillars to set conf path when building from source
2016-06-05 12:20:00 -07:00
George Robinson
0dcd4feb28
Use NGINX lookup conf path or fallback
2016-06-05 19:35:35 +01:00
George Robinson
241d8683ed
Overwrite existing vhost files on a per vhost granularity
2016-06-05 19:34:53 +01:00
George Robinson
49e085da11
Use static conf path in compile time options
2016-05-25 18:24:34 +01:00
George Robinson
9ff1a8f22d
vhost_overwrite option for nginx.ng state
2016-05-25 16:53:52 +01:00
George Robinson
6cab66306b
Use conf_file pillar when building from source
2016-05-25 12:05:18 +01:00
George Robinson
c6ed2e6bcb
NGINX zero downtime reloads
2016-05-25 12:02:43 +01:00
George Robinson
6d41a590f8
Auto-restart NGINX on failure
2016-05-25 11:57:25 +01:00
Forrest
d9002d397f
Merge pull request #118 from grobinson-blockchain/master
...
Build from source with nginx.ng
2016-05-10 09:50:58 -07:00
George Robinson
7f5d36603d
Set /var/log/nginx writable by NGINX worker processes
2016-05-10 12:06:42 +01:00
George Robinson
5c68f12801
Separate NGINX install from source and package states
2016-05-10 12:00:18 +01:00
George Robinson
874719e49e
Fix absent /var/log/nginx
2016-05-09 17:59:55 +01:00
George Robinson
f24b066c43
Build from source with nginx.ng
...
Build NGINX from source with nginx.ng state with support for passing
compile time flags necessary for installing modules such as more headers
by the openresty project.
2016-05-09 16:39:24 +01:00
Forrest
89d07fed8b
Merge pull request #115 from grobinson-blockchain/master
...
Fix ppa install for Debian
2016-04-20 09:33:50 -07:00
George Robinson
59bb5abb00
Use trusty packages
2016-04-20 12:53:48 +01:00
George Robinson
6d84de272f
Fix ppa install for Debian
...
On Ubuntu, you can take advantage of Personal Package Archives on Launchpad simply by specifying the user and archive name. On other apt-based systems this must be the complete entry as it would be seen in the sources.list file.
2016-04-20 12:36:46 +01:00
Forrest
01c713a2da
Merge pull request #114 from M2Mobi/centos
...
Add lookup index for CentOS
2016-04-06 11:49:25 -07:00
Heinz Wiesinger
dba53b833f
Add lookup index for CentOS
2016-04-06 13:04:00 +02:00
Forrest
dc1e102d57
Merge pull request #112 from bogdanr/master
...
Support installing the packages from the official repo on Debian
2016-04-04 10:43:10 -07:00
Forrest
a73915879d
Merge pull request #113 from johnnyrun/master
...
enabled
2016-04-04 10:41:02 -07:00
Gianni Carabelli
91f92164be
enabled
2016-04-04 15:30:26 +02:00
Bogdan Radulescu
3e6b236348
Support installing the packages from the official repo on Debian
2016-04-04 13:09:31 +00:00
puneet kandhari
cf00b46bc8
Merge pull request #108 from enver/master
...
Added support to control gpgcheck and gpgkey via pillar
2016-02-24 07:01:00 -06:00
Enver
46785b79aa
Added support to control gpgcheck and gpgkey via pillar
2016-02-24 11:11:42 +01:00
Forrest
5fc76853b3
Merge pull request #103 from percipient/fix-nginx-kill
...
Fix the command that was killing nginx process.
2016-01-21 20:19:23 -08:00
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