saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
498 Commits 7 Branches 34 Tags 1.2 MiB
123d13e2f4
Commit Graph

220 Commits

Author SHA1 Message Date
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
Heinz Wiesinger
dba53b833f Add lookup index for CentOS 2016-04-06 13:04:00 +02:00
Bogdan Radulescu
3e6b236348 Support installing the packages from the official repo on Debian 2016-04-04 13:09:31 +00: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
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
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
Brandon Bradley
874274b559 add LSB header to logger sysv init script 2015-08-27 12:12:17 -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
Gilles Dartiguelongue
586a7c80c3 Add support for Gentoo to nginx.ng 2015-08-15 12:26:42 +02: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
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
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
Andrew Vant
51b612002b Added nginx.ng.certificates state. 2015-06-23 15:17:52 -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
Zijad Purkovic
7f95a5a9db Add nginx repo for RedHat family 2015-04-21 12:16:19 +02:00
Ari Aosved
5ce9ff0c11 Allow debug symbols to be included when compiling from source- http://wiki.nginx.org/Debugging#Core_dump 2015-04-08 10:51:12 -07:00
Étienne BERSAC
03f73add16 Fix nginx config on systemd 2015-03-13 16:49:33 +01: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
Juan Manuel
a303c8cc0c Moved entirely to ubuntu's ppa 2015-02-23 18:16:41 -03: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
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
Mark Lee
920ba9b1a4 Optionally include nginx.users via a pillar value 2014-06-15 22:01:14 -07:00
Kent Shultz
a978ac74fc change attribute name for better readability 2014-06-02 16:03:04 -07:00
Kent Shultz
c2b896ea52 remove nginx -V check; add pillar example 2014-06-02 16:00:09 -07:00
Joseph Hall
a0a272d819 Merge pull request #24 from the-control-group/feature/misc-config-items 
Feature/misc config items
 2014-05-31 01:10:09 -06:00
Kent Shultz
26f606e634 fix name of cmd call 2014-05-30 11:05:31 -07:00
Kent Shultz
def291d210 check for realip module 2014-05-30 11:02:46 -07:00
Kent Shultz
4f0aa05b6f whitespace cleanup 2014-05-30 10:30:08 -07:00
Kent Shultz
3616bcc9cf add support for realip 2014-05-30 10:28:54 -07:00
Kent Shultz
ed0879a42c Merge branch 'master' of https://github.com/saltstack-formulas/nginx-formula 2014-05-30 10:17:53 -07:00
Ahmad Sherif
aac18d2505 Correct requisite ID in source.sls 2014-05-30 19:31:00 +03:00
Ahmad Sherif
c28cac3483 Group source.sls include declarations into one 2014-05-30 19:28:59 +03:00
Ahmad Sherif
36b00e6332 Remove useless if statement in source.sls 2014-05-30 19:24:47 +03:00
Ahmad Sherif
6a9efa774d Create /var/log/nginx before running mkfifo 2014-05-30 18:55:26 +03:00
Kent Shultz
84d00fd56c more messing with suppress newline in jinja 2014-05-29 14:15:24 -07:00
Kent Shultz
8f894ea6e6 suppress newlines 2014-05-29 14:13:25 -07:00
Kent Shultz
c90a12d9f5 support error_log location and log level; fix gzip_disable syntax error 2014-05-29 14:05:14 -07:00
Kent Shultz
16ecfa1298 add support for gzip_disable 2014-05-29 13:44:31 -07:00
Kent Shultz
6fd6ee7b20 add support for setting default_type 2014-05-29 12:42:10 -07:00
Kent Shultz
7f6b7841c3 set 'daemon on;' by default 2014-05-29 11:30:29 -07:00
Kent Shultz
af46708a56 set 'daemon on;' by default 2014-05-29 09:58:02 -07:00
Kent Shultz
b2a7b3fe1b remove extra curly 2014-05-28 17:06:45 -07:00
Kent Shultz
8d4f4b6d6f suppress newlines 2014-05-28 17:03:55 -07:00
Kent Shultz
b4ae528df5 add support for events { use <epoll,etc>} 2014-05-28 16:57:48 -07:00
Kent Shultz
928882e401 add support for worker_rlimit_nofile 2014-05-28 16:33:29 -07:00
Juan Manuel
1b935c1190 Fixed minor typo in nginx.ng.config.sls 2014-05-27 20:55:49 -03:00
Chad Heuschober
88c39caa52 Adjusts the parameters passed to context to be passed as json and hopefully avoid double quoting. Also brings indentation in-line with salt doc 23.14.1.2.1 2014-05-21 15:13:13 -04:00
Chad Heuschober
9f8dc59973 Tightened up some requirements. 2014-05-21 01:01:43 -04:00
Chad Heuschober
ffafd1e0d7 More documentation touches. 2014-05-19 13:22:51 -04:00
Chad Heuschober
825bd7950e Finishes vhost config template 2014-05-19 13:04:43 -04:00
Chad Heuschober
81de880fe0 Adds basic ng state functionality. 2014-05-15 18:06:48 -04:00
Mark Lee
59c2f8b21f Add pillar item to disable using upstart-based services 
Fixes GH saltstack-formulas/nginx-formula#14.
 2014-05-04 11:15:04 -07:00
Erik
a2c9d686ed fixing bug with common.sls that causes it to fail 2014-01-13 13:12:37 -05:00
Jeff Strunk
068de6fada move templates to the right place 2013-10-18 21:41:05 -03:00
Jeff Strunk
4542bd5142 remove extraneous nrpe include 2013-10-18 20:44:58 -03:00
David Czarnecki
6a1becff4a Fix source module iteration 
* Fixing iteration for building nginx by source with respect
  to modules
* Adding `CHANGELOG.rst` and `VERSION` per https://groups.google.com/forum/#!topic/salt-users/zHguqsk-mds
 2013-09-27 14:59:01 -04:00
David Czarnecki
14310ff263 Fix a filename and pillar key issue 
* Ensure `common.sls` references correct template filename
* Use `pillar.get(...)` for message_do_not_modify with default
 2013-09-25 16:53:32 -04:00
David Czarnecki
b470a1b496 Re-organize nginx formula files 
* Re-organize according to http://docs.saltstack.com/topics/conventions/formulas.html#writing-formulas
 2013-09-25 15:50:25 -04:00
Ari Lerner
0d192b3928 Moving package to be on the top-level, instead of one level down 2013-08-21 12:01:37 -07:00
Ari Lerner
efe26afba0 Added basic nginx template and config file 2013-06-18 00:26:23 -07:00