puneet kandhari
25179778ed
Merge pull request #68 from msciciel/msciciel
RedHat fixes: change default vhostdir to redhat official
9 yıl önce
Krzysztof Pawłowski
b6fe515ed8
RedHat fixes: change default vhostdir to redhat official default /etc/httpd/vhosts.d, add state for ensuring that vhostdir exists, include vhosts.d/*.conf in httpd.conf
9 yıl önce
Nitin Madhok
954a39e0cd
Merge pull request #67 from msciciel/msciciel
Add mod_php5 pkg for RedHat in map.jinja. Remove welcome.conf on RedHat.
9 yıl önce
Krzysztof Pawłowski
0d7b149fd5
Add mod_php5 pkg for RedHat in map.jinja. Remove welcome.conf on RedHat.
9 yıl önce
puneet kandhari
9d72208524
Merge pull request #66 from madssj/fix-syntax-error
Fixed missing : and uppercased D in debian
9 yıl önce
Mads Sülau Jørgensen
4741f58a25
Fixed missing : and uppercased D in debian
9 yıl önce
Brian Jackson
26334430da
Merge pull request #65 from techhat/master
Initial commit of SPM FORMULA
9 yıl önce
Joseph Hall
e0ce473b81
Initial commit of SPM FORMULA
9 yıl önce
puneet kandhari
513bc04861
Merge pull request #62 from saltstack-formulas/revert-61-master
Revert "corrected the key to match the pillar.example"
9 yıl önce
Forrest
b839a7e30b
Revert "corrected the key to match the pillar.example"
9 yıl önce
Forrest
32c492dbae
Merge pull request #61 from papoyan/master
corrected the key to match the pillar.example
9 yıl önce
Papoyan, Nerses
023c2873b1
corrected the key to match the pillar.example
9 yıl önce
puneet kandhari
f34b239202
Merge pull request #60 from Thingks/master
Correct variable name
9 yıl önce
Rico Moorman
1a2d22b2e8
Correct variable name
9 yıl önce
puneet kandhari
114bb34fc4
Merge pull request #59 from aboe76/master
Improvements to the apache-formula
9 yıl önce
Niels Abspoel
53b995a680
Improved apache-formula
- Added more modules and configuration options
- Renamed sls files to reflect what they do.
- added mpm options for Debian
9 yıl önce
Niels Abspoel
f6a0c84544
Merge pull request #56 from thornycrackers/master
Create defaul vhost directories when DocumentRoot is not set
9 yıl önce
Forrest
e10003b077
Merge pull request #58 from multani/proxy-ssl
Add support for SSL certificates in the proxy template
9 yıl önce
Jonathan Ballet
a8f2d89995
ssl: also support the SSLCertificateChainFile required by some providers
9 yıl önce
Jonathan Ballet
c9d9d954de
proxy: support SSL certificate in the proxy template
9 yıl önce
Cody Hiar
45de7301a7
Updated README to note that directories are created when using
apache.vhosts.standard
9 yıl önce
Cody Hiar
07b2a9f9f5
Create defaul vhost directories when DocumentRoot is not set
9 yıl önce
puneet kandhari
fffb47518e
Merge pull request #55 from mosen/master
Fix SSL: incorrect syntax in pillar example and jinja template
9 yıl önce
Mosen
d4b1af0af4
Fix unnecessary comparison against boolean in vhosts/standard.tmpl
9 yıl önce
Mosen
f135e2e0d5
Fix incorrect syntax in pillar example for SSLCertificateFile, SSLCertificateKeyFile
Fix check for SSLCertificateFile, SSLCertificateKeyFile variables in vhosts/standard.tmpl, now using dict.get()
9 yıl önce
Wolodja Wentland
3ed48e04c6
Merge pull request #53 from eliasp/debian-confext
Set 'confext' for Debian systems.
9 yıl önce
Elias Probst
1a1104fe80
Set 'confext' for Debian systems.
9 yıl önce
Forrest
99ea682cfb
Merge pull request #52 from daschatten/master
Add basic SSL functionality.
9 yıl önce
Florian Bittner
dbb86f2bc4
Add basic SSL functionality.
9 yıl önce
Nitin Madhok
231000fd4b
Merge pull request #47 from bradthurber/modules.sls-redhat
make modules.sls compatible with RHEL/CentOS Apache 2.2
9 yıl önce
Brad Thurber
5afdcb819c
per @gravyboat suggestion, change separate if to elif
9 yıl önce
Forrest
39176444d1
Merge pull request #48 from multani/fix-jinja-reverse
Fix Jinja's reverse
9 yıl önce
Forrest
b190357ebf
Merge pull request #49 from multani/fix-missing-documentroot
Don't fail on missing DocumentRoot
9 yıl önce
Jonathan Ballet
42426f3f4a
Don't fail on missing DocumentRoot
If the DocumentRoot value wasn't set, applying the state would cause the
following error:
ID: site.example.com-documentroot
Function: file.directory
Name: None
Result: False
Comment: Specified file None is not an absolute path
Started: 15:07:05.596723
Duration: 4.929 ms
Changes:
This fixes the problem by not trying to check for the DocumentRoot directory is
the value is missing.
9 yıl önce
Jonathan Ballet
74e4c4d7d5
Make proxies order stable
9 yıl önce
Jonathan Ballet
3f4a7667f7
Jinja's `reverse` is a filter, use it accordingly
9 yıl önce
Brad Thurber
0f0d5318e5
make modules.sls compatible with RHEL/CentOS Apache 2.2
9 yıl önce
Nitin Madhok
0e2dd72e43
Merge pull request #46 from thornycrackers/master
Update standard.sls
9 yıl önce
Cody Hiar
f1b89abd3b
Update standard.sls
Make sure that you can makedirs incase parent folders are not created
9 yıl önce
Nitin Madhok
bb33e3856a
Merge pull request #45 from thornycrackers/master
Create vhost DocumentRoot directory
9 yıl önce
Cody Hiar
138a522f3f
Update standard.sls
Create the vhost DocumentRoot directory if it does not exist
9 yıl önce
Nitin Madhok
1949ff4f05
Update LICENSING year
9 yıl önce
Nitin Madhok
241f2be82e
Merge pull request #44 from RyPeck/feature/optional_template_register_sites
Add optional templating to register_site files
9 yıl önce
Ryan Peck
a83f74c18e
Add optional templating to register_site
Add optional templating for the register site aspect of a pillar.
User can specify keys to be included as defaults, otherwise it is
treated as a normal managed file.
9 yıl önce
Florian Bittner
77398445a9
Merge pull request #43 from artmoni/br_multiproxy
Issue#41 configure multi proxypass configuration in vhost
Thank you!
9 yıl önce
Raphaël Hertzog
5dc9d42ea6
Update map.ninja to rely on oscodename grain instead of lsb_distrib_release
This is more reliable than version numbers which might change with point
releases (in particular for Debian Jessie) and is more likely to not
conflict between multiple OS.
9 yıl önce
sebastien.fleury
fce8d72c12
Issue#41 configure multi proxypass configuration in vhost
9 yıl önce
Nitin Madhok
93745004ca
Merge pull request #42 from RyPeck/bugfix/a2dissite_from_pillar
Fix case where state != enabled causes error
9 yıl önce
Ryan Peck
993e836f60
Fix case where state != enabled caused error
When using the register_site state, if the `state` for the
site in the apache pillar did not equal "enabled" the error
```
Cannot extend ID 'a2ensite <name>' in 'base:apache.register_site'. It is not part of the high state.
```
If statements were there to build out the `a2ensite` or `a2dissite` ID
appropiately, but the next state for managing the config always
assumed that the `a2ensite` id would be there.
Addressed by making a Jinja variable that will be the appropiate ID,
probably could use a better name.
9 yıl önce
Nitin Madhok
bca9f619a3
Merge pull request #40 from aboe76/opensuse_support
Added basic opensuse support
9 yıl önce