Commit Graph

  • *
  • *
  • *
  • *
  • |\
  • | *
  • | *
  • | *
  • |/
  • *
  • |\
  • | *
  • * |
  • |\|
  • | *
  • * |
  • |\ \
  • * \ \
  • |\ \ \
  • * \ \ \
  • |\ \ \ \
  • | * | | |
  • |/ / / /
  • | * / /
  • |/ / /
  • | * |
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • |/ /
  • * |
  • |\ \
  • | |/
  • |/|
  • | *
  • |/
  • *
  • |\
  • * \
  • |\ \
  • * \ \
  • |\ \ \
  • | * | |
  • | * | |
  • |/ / /
  • * | |
  • |\ \ \
  • * \ \ \
  • |\ \ \ \
  • | | * | |
  • | * | | |
  • |/ / / /
  • * | | |
  • |\| | |
  • | * | |
  • | * | |
  • | * | |
  • | * | |
  • |/ / /
  • * | |
  • |\ \ \
  • | * | |
  • | * | |
  • |/ / /
  • * | |
  • |\ \ \
  • | * | |
  • |/ / /
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • * | |
  • |\ \ \
  • | * | |
  • |/ / /
  • * | |
  • |\ \ \
  • * \ \ \
  • |\ \ \ \
  • | * | | |
  • |/ / / /
  • | * / /
  • |/ / /
  • * | |
  • |\ \ \
  • | * | |
  • |/ / /
  • * | |
  • |\ \ \
  • | * | |
  • |/ / /
  • | * |
  • * | |
  • |\ \ \
  • | |/ /
  • |/| |
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • * | |
  • |\| |
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • | * |
  • * | |
  • |\| |
  • | * |
  • | * |
  • | * |
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • |/ /
  • * |
  • |\ \
  • * \ \
  • |\ \ \
  • b29ebe9 (HEAD -> master) Removing if statement around nginx.ng.certificates by Nate Bohman 2019-09-16 10:46:41 -0600
  • 203532c Changing Nginx NG to Check for Certificates by Nate Bohman 2019-09-16 10:41:14 -0600
  • 9d85e68 Adding config test before reload by Nate Bohman 2018-09-06 16:27:37 -0600
  • a562462 Merge pull request #192 from morsik/patch-1 by Niels Abspoel 2018-06-29 12:59:01 +0200
  • c75ad64 Example for load_module: comment how it works by Konrad Mosoń 2018-06-29 12:55:17 +0200
  • 9c4634d Example for load_module by Konrad Mosoń 2018-06-29 12:46:12 +0200
  • f16d800 Allow to use load_module without including external files by Konrad Mosoń 2018-05-08 19:07:20 +0200
  • 4b3d5bf Merge pull request #190 from arthurlogilab/nginx-users-makedirs by Niels Abspoel 2018-04-24 12:26:58 +0200
  • 4da13b9 [nginx/users] convert file.present into file.managed with no content by Arthur Lutz 2018-04-24 11:20:08 +0200
  • 5a7e113 Merge pull request #189 from arthurlogilab/nginx-users-makedirs by Niels Abspoel 2018-04-24 11:02:25 +0200
  • 28d1069 [nginx/users] add makedirs to htpasswd deploy by Arthur Lutz 2018-04-24 11:01:29 +0200
  • d0800e9 Merge pull request #183 from arthurlogilab/patch-4 by Niels Abspoel 2018-03-18 21:13:08 +0100
  • eeb118b Merge pull request #184 from arthurlogilab/patch-5 by Niels Abspoel 2018-03-18 21:12:03 +0100
  • 85a51a4 Merge pull request #185 from netmanagers/master by Niels Abspoel 2018-02-26 11:32:18 +0100
  • c5c1047 Allow to specify a different passenger config file in nginx.ng by Javier Bértoli 2018-02-13 21:27:15 -0300
  • 159f4da [README] include nginx.ng.certifcates by Arthur Lutz 2018-01-26 15:37:34 +0100
  • 78ddf90 [users] use {{ htauth }} variable by Arthur Lutz 2018-01-24 16:56:43 +0100
  • f3ef626 [users.sls] touch /etc/nginx/.htpasswd by Arthur Lutz 2018-01-24 16:44:51 +0100
  • 896fdee Merge pull request #176 from Perceptyx/fix_pr_172 by Niels Abspoel 2017-12-22 16:47:28 +0100
  • ac90a9f Fix for saltstack-formulas/nginx-formula/#172 by Andres Montalban 2017-12-21 16:48:00 -0300
  • dc292fb Merge pull request #175 from 9numbernine9/fix-dhparam-default by Niels Abspoel 2017-12-21 09:02:20 +0100
  • 19d0102 Ensure that pillar.get on nginx:ng:dhparam has a sane default value if dhparam isn't defined in the pillar. by Matt M 2017-12-20 22:31:49 -0500
  • 1db6dde Merge pull request #82 from devaos/master by Niels Abspoel 2017-12-16 09:27:26 +0100
  • 4204505 Merge pull request #153 from EvaSDK/add_dhparam_creation by Niels Abspoel 2017-12-16 09:26:20 +0100
  • 1b616bf Merge pull request #171 from Perceptyx/master by Niels Abspoel 2017-12-16 09:25:25 +0100
  • 7389917 Remove trailing spaces by Andres Montalban 2017-12-12 17:10:51 -0300
  • 7e259eb Add support for FreeBSD by Andres Montalban 2017-12-12 17:08:06 -0300
  • 69e9b47 Merge pull request #168 from dseira/master by David Seira 2017-09-01 17:41:28 +0200
  • 6090ce0 Merge pull request #167 from jamesp9/master by David Seira 2017-09-01 11:46:27 +0200
  • f50c7e2 New Feature - Added deleted option to be able to remove site files (clean up sites folder) Improvement - Disable reload of nginx when enabled=False (previously the nginx was always reloaded if settings.config != None; even with enabled=False) by David Seira 2017-09-01 11:23:15 +0200
  • f7fb8e3 update README, closes #121 by james pinkster 2017-09-01 15:43:42 +1000
  • 5613762 Merge pull request #166 from dseira/master by David Seira 2017-08-31 13:36:28 +0200
  • 60b5c73 Fix in config.sls with the new naming for source_path by David Seira 2017-08-31 13:36:10 +0200
  • 8c0259c Replace source for source_path variable name in nginx.conf file by David Seira 2017-08-31 13:22:55 +0200
  • bc7f8f4 Replace source for source_path variable name by David Seira 2017-08-31 13:19:46 +0200
  • 1f697b9 New feature - Enable the uploading of the config file (nginx.conf and sites) instead of templating those file by David Seira 2017-08-30 19:48:44 +0200
  • bc71df5 Merge pull request #165 from saltstack-formulas/pillar-example by myoung34 2017-08-29 10:38:59 -0500
  • 433bda5 Additional explanatory comments for pillar.example by Noel McLoughlin 2017-08-29 14:34:25 +0100
  • 2e03d4c Updated pillar.example file with installation learnings (OpenSUSE, Ubuntu, Fedora) by Noel McLoughlin 2017-08-28 16:20:58 +0100
  • ec561b2 Merge pull request #164 from saltstack-formulas/susefix by Niels Abspoel 2017-08-24 21:48:46 +0200
  • 6b09358 (susefix) Fix for OpenSuse leap, salt 2016.3.4-84.13 by Noel McLoughlin 2017-08-24 10:52:59 +0100
  • 43c4eca Add missing dependency on nginx_service by Gilles Dartiguelongue 2017-07-11 11:44:40 +0200
  • d2bc1e6 Add support for specifying dh_param file name by Gilles Dartiguelongue 2017-07-11 12:19:47 +0200
  • db2db31 Handle installation of openssl to generate DH param by Gilles Dartiguelongue 2017-07-11 11:31:17 +0200
  • 19ab90e Add example for DH management by Gilles Dartiguelongue 2017-05-04 18:34:22 +0200
  • 9ab4e3f Added dhparam file creation by Tobias Macey 2016-09-19 11:35:30 -0400
  • 07d0607 Merge pull request #163 from Perceptyx/cert_path_configurable by Niels Abspoel 2017-07-31 23:01:16 +0200
  • 57011ba Make certificates path configurable. by abednarik 2017-07-31 15:51:58 -0300
  • d938725 Merge pull request #160 from netmanagers/master by Niels Abspoel 2017-06-26 21:38:03 +0200
  • 0be21df Fix missing defaults when no `install_from_*` is set by Javier Bértoli 2017-06-26 13:10:44 -0300
  • 9f5f966 Merge pull request #158 from netmanagers/master by Niels Abspoel 2017-06-26 13:19:49 +0200
  • a656014 Update the README by Javier Bértoli 2017-06-24 10:48:17 -0300
  • 79ddb49 Add support to install and configure passenger by Javier Bértoli 2017-06-24 10:43:25 -0300
  • 240bd83 Merge pull request #157 from SuperTux88/nginx-conf-include by Javier Bértoli 2017-06-23 17:17:25 -0300
  • 5d67b09 Move includes to the top of nginx.conf by Benjamin Neff 2017-06-18 21:09:05 +0200
  • 15a1291 Merge pull request #152 from jeduardo/pkg_install_fix by Javier Bértoli 2017-04-21 18:55:36 -0300
  • fb818fc Fixed reference to pkg state when installing from official Debian repo by J. Eduardo 2017-04-21 23:29:14 +0200
  • c6f230f Merge pull request #146 from myoung34/bugfix/upstart_runlevel by Niels Abspoel 2017-01-25 20:20:14 +0100
  • 2509f0d Fixed runlevel on nginx upstart file by Marcus Young 2017-01-20 13:33:06 -0600
  • 6512516 Merge pull request #141 from chris-sanders/chris by Niels Abspoel 2017-01-17 21:59:57 +0100
  • ce2e8ea Cleaned up comment by Chris Sanders 2017-01-17 15:11:33 +0000
  • a59ca4c Merge pull request #140 from scub/nginx_old_init_onlyif_exists by Forrest 2016-12-01 14:12:02 -0800
  • 571eb29 nginx/package: add onlyif requisite to nginx-old-init by Skoobie 2016-12-01 16:52:43 -0500
  • 545944c Merge pull request #137 from arthurlogilab/patch-2 by Forrest 2016-11-16 09:41:07 -0800
  • 99b6ee9 Merge pull request #138 from arthurlogilab/patch-3 by Forrest 2016-11-16 09:40:49 -0800
  • 7cf3af2 touch htpasswd file if it doesn't exist by Arthur Lutz 2016-11-16 11:18:15 +0100
  • cd2276b add depenency to salt-contrib's basicauth by Arthur Lutz 2016-11-16 11:10:51 +0100
  • 3c6f0e3 Merge pull request #135 from aboe76/nginx_ng_listen by Forrest 2016-10-29 15:05:41 -0700
  • ce2024d change service watch to listen so it will only trigger a refresh of nginx service and the end of the state run by Niels Abspoel 2016-10-29 09:34:28 +0200
  • 26183bc Merge pull request #134 from renich/vhost_to_server by Forrest 2016-10-24 17:02:26 -0700
  • 92a8461 replace the term vhost for server everywhere by Renich Bon Ciric 2016-10-19 16:35:38 -0500
  • 4900d96 Use oscodename grain instead of hard coded trusty by Chris Sanders 2016-10-17 11:36:29 -0500
  • 9e47729 Merge pull request #131 from arthurlogilab/patch-1 by Forrest 2016-10-12 09:32:09 -0700
  • 727826d avoid crash if private_key is not shipped in pillar by Arthur Lutz 2016-10-12 10:52:17 +0200
  • ef8fb87 Merge pull request #125 from fedusia/master by Niels Abspoel 2016-06-29 17:04:10 +0200
  • 36f4f59 Add newline to blocks like location, server, httpd and etc by Dmitry S. Fedorov 2016-06-29 17:55:54 +0300
  • 5e4575d Merge pull request #124 from grobinson-blockchain/master by Forrest 2016-06-22 10:23:00 -0700
  • 38c7c8a Fix overwrite check testing the name of the vhost rather than settings dict by George Robinson 2016-06-22 18:22:01 +0100
  • 06fb1d6 Merge pull request #123 from grobinson-blockchain/master by Forrest 2016-06-22 09:49:54 -0700
  • f4bd172 Fix state fail when NGINX is already installed by George Robinson 2016-06-22 11:09:05 +0100
  • a35b606 Merge pull request #119 from grobinson-blockchain/master by Forrest 2016-06-05 12:20:00 -0700
  • 0dcd4fe Use NGINX lookup conf path or fallback by George Robinson 2016-06-05 19:35:35 +0100
  • 241d868 Overwrite existing vhost files on a per vhost granularity by George Robinson 2016-06-05 19:34:53 +0100
  • 49e085d Use static conf path in compile time options by George Robinson 2016-05-25 18:24:34 +0100
  • 9ff1a8f vhost_overwrite option for nginx.ng state by George Robinson 2016-05-25 16:53:52 +0100
  • 6cab663 Use conf_file pillar when building from source by George Robinson 2016-05-25 12:04:27 +0100
  • c6ed2e6 NGINX zero downtime reloads by George Robinson 2016-05-25 12:02:43 +0100
  • 6d41a59 Auto-restart NGINX on failure by George Robinson 2016-05-25 11:57:25 +0100
  • d9002d3 Merge pull request #118 from grobinson-blockchain/master by Forrest 2016-05-10 09:50:58 -0700
  • 7f5d366 Set /var/log/nginx writable by NGINX worker processes by George Robinson 2016-05-10 12:06:42 +0100
  • 5c68f12 Separate NGINX install from source and package states by George Robinson 2016-05-10 12:00:18 +0100
  • 874719e Fix absent /var/log/nginx by George Robinson 2016-05-09 17:59:55 +0100
  • f24b066 Build from source with nginx.ng by George Robinson 2016-05-09 16:31:29 +0100
  • 89d07fe Merge pull request #115 from grobinson-blockchain/master by Forrest 2016-04-20 09:33:50 -0700
  • 59bb5ab Use trusty packages by George Robinson 2016-04-20 12:53:48 +0100
  • 6d84de2 Fix ppa install for Debian by George Robinson 2016-04-20 12:36:46 +0100
  • 01c713a Merge pull request #114 from M2Mobi/centos by Forrest 2016-04-06 11:49:25 -0700
  • dba53b8 Add lookup index for CentOS by Heinz Wiesinger 2015-10-26 16:36:25 +0100
  • dc1e102 Merge pull request #112 from bogdanr/master by Forrest 2016-04-04 10:43:10 -0700
  • a739158 Merge pull request #113 from johnnyrun/master by Forrest 2016-04-04 10:41:02 -0700