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