Commit Graph

229 Commits

Author SHA1 Message Date
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
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