puneet kandhari
75304c160c
Merge pull request #76 from bradthurber/add-lookup-to-pillar
add lookup section to pillar.example
9 anni fa
Brad Thurber
13fb82c470
add lookup section to pillar.example
9 anni fa
Forrest
b6437b15e0
Merge pull request #74 from Wenzel/disable_site
add a boolean to a site configuration to enable or disable it
9 anni fa
puneet kandhari
3dafac2627
Merge pull request #73 from Wenzel/fix_mod_mpm
fix apache-restart ID in apache/mod_mpm according to apache/init.sls
9 anni fa
Mathieu Tarral
a7fb2f89fc
add missing {% endif %}
9 anni fa
Mathieu Tarral
c195dce07c
add an 'enabled' attribute for a site in pillar
9 anni fa
Mathieu Tarral
a88611c1d0
fix apache-restart ID in apache/mod_mpm according to apache/init.sls
9 anni fa
puneet kandhari
b59ef46304
Merge pull request #72 from wido/fix_register_site
Files in sites-available should end with .conf under Ubuntu
9 anni fa
Wido den Hollander
def448db2f
Files in sites-available should end with .conf under Ubuntu
9 anni fa
puneet kandhari
e84b76ab01
Merge pull request #71 from bradthurber/find_wildcard_paths_should_be_quoted
quote wildcard paths
9 anni fa
Brad Thurber
0ced6e4cf0
quote wildcard paths
9 anni fa
puneet kandhari
25179778ed
Merge pull request #68 from msciciel/msciciel
RedHat fixes: change default vhostdir to redhat official
9 anni fa
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 anni fa
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 anni fa
Krzysztof Pawłowski
0d7b149fd5
Add mod_php5 pkg for RedHat in map.jinja. Remove welcome.conf on RedHat.
9 anni fa
puneet kandhari
9d72208524
Merge pull request #66 from madssj/fix-syntax-error
Fixed missing : and uppercased D in debian
9 anni fa
Mads Sülau Jørgensen
4741f58a25
Fixed missing : and uppercased D in debian
9 anni fa
Brian Jackson
26334430da
Merge pull request #65 from techhat/master
Initial commit of SPM FORMULA
9 anni fa
Joseph Hall
e0ce473b81
Initial commit of SPM FORMULA
9 anni fa
puneet kandhari
513bc04861
Merge pull request #62 from saltstack-formulas/revert-61-master
Revert "corrected the key to match the pillar.example"
9 anni fa
Forrest
b839a7e30b
Revert "corrected the key to match the pillar.example"
9 anni fa
Forrest
32c492dbae
Merge pull request #61 from papoyan/master
corrected the key to match the pillar.example
9 anni fa
Papoyan, Nerses
023c2873b1
corrected the key to match the pillar.example
9 anni fa
puneet kandhari
f34b239202
Merge pull request #60 from Thingks/master
Correct variable name
9 anni fa
Rico Moorman
1a2d22b2e8
Correct variable name
9 anni fa
puneet kandhari
114bb34fc4
Merge pull request #59 from aboe76/master
Improvements to the apache-formula
9 anni fa
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 anni fa
Niels Abspoel
f6a0c84544
Merge pull request #56 from thornycrackers/master
Create defaul vhost directories when DocumentRoot is not set
9 anni fa
Forrest
e10003b077
Merge pull request #58 from multani/proxy-ssl
Add support for SSL certificates in the proxy template
9 anni fa
Jonathan Ballet
a8f2d89995
ssl: also support the SSLCertificateChainFile required by some providers
9 anni fa
Jonathan Ballet
c9d9d954de
proxy: support SSL certificate in the proxy template
9 anni fa
Cody Hiar
45de7301a7
Updated README to note that directories are created when using
apache.vhosts.standard
9 anni fa
Cody Hiar
07b2a9f9f5
Create defaul vhost directories when DocumentRoot is not set
9 anni fa
puneet kandhari
fffb47518e
Merge pull request #55 from mosen/master
Fix SSL: incorrect syntax in pillar example and jinja template
9 anni fa
Mosen
d4b1af0af4
Fix unnecessary comparison against boolean in vhosts/standard.tmpl
9 anni fa
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 anni fa
Wolodja Wentland
3ed48e04c6
Merge pull request #53 from eliasp/debian-confext
Set 'confext' for Debian systems.
9 anni fa
Elias Probst
1a1104fe80
Set 'confext' for Debian systems.
9 anni fa
Forrest
99ea682cfb
Merge pull request #52 from daschatten/master
Add basic SSL functionality.
9 anni fa
Florian Bittner
dbb86f2bc4
Add basic SSL functionality.
9 anni fa
Nitin Madhok
231000fd4b
Merge pull request #47 from bradthurber/modules.sls-redhat
make modules.sls compatible with RHEL/CentOS Apache 2.2
10 anni fa
Brad Thurber
5afdcb819c
per @gravyboat suggestion, change separate if to elif
10 anni fa
Forrest
39176444d1
Merge pull request #48 from multani/fix-jinja-reverse
Fix Jinja's reverse
10 anni fa
Forrest
b190357ebf
Merge pull request #49 from multani/fix-missing-documentroot
Don't fail on missing DocumentRoot
10 anni fa
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.
10 anni fa
Jonathan Ballet
74e4c4d7d5
Make proxies order stable
10 anni fa
Jonathan Ballet
3f4a7667f7
Jinja's `reverse` is a filter, use it accordingly
10 anni fa
Brad Thurber
0f0d5318e5
make modules.sls compatible with RHEL/CentOS Apache 2.2
10 anni fa
Nitin Madhok
0e2dd72e43
Merge pull request #46 from thornycrackers/master
Update standard.sls
10 anni fa
Cody Hiar
f1b89abd3b
Update standard.sls
Make sure that you can makedirs incase parent folders are not created
10 anni fa