Forrest
32c492dbae
Merge pull request #61 from papoyan/master
corrected the key to match the pillar.example
9 лет назад
Papoyan, Nerses
023c2873b1
corrected the key to match the pillar.example
9 лет назад
puneet kandhari
f34b239202
Merge pull request #60 from Thingks/master
Correct variable name
9 лет назад
Rico Moorman
1a2d22b2e8
Correct variable name
9 лет назад
puneet kandhari
114bb34fc4
Merge pull request #59 from aboe76/master
Improvements to the apache-formula
9 лет назад
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 лет назад
Niels Abspoel
f6a0c84544
Merge pull request #56 from thornycrackers/master
Create defaul vhost directories when DocumentRoot is not set
9 лет назад
Forrest
e10003b077
Merge pull request #58 from multani/proxy-ssl
Add support for SSL certificates in the proxy template
9 лет назад
Jonathan Ballet
a8f2d89995
ssl: also support the SSLCertificateChainFile required by some providers
9 лет назад
Jonathan Ballet
c9d9d954de
proxy: support SSL certificate in the proxy template
9 лет назад
Cody Hiar
45de7301a7
Updated README to note that directories are created when using
apache.vhosts.standard
9 лет назад
Cody Hiar
07b2a9f9f5
Create defaul vhost directories when DocumentRoot is not set
9 лет назад
puneet kandhari
fffb47518e
Merge pull request #55 from mosen/master
Fix SSL: incorrect syntax in pillar example and jinja template
9 лет назад
Mosen
d4b1af0af4
Fix unnecessary comparison against boolean in vhosts/standard.tmpl
9 лет назад
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 лет назад
Wolodja Wentland
3ed48e04c6
Merge pull request #53 from eliasp/debian-confext
Set 'confext' for Debian systems.
9 лет назад
Elias Probst
1a1104fe80
Set 'confext' for Debian systems.
9 лет назад
Forrest
99ea682cfb
Merge pull request #52 from daschatten/master
Add basic SSL functionality.
9 лет назад
Florian Bittner
dbb86f2bc4
Add basic SSL functionality.
9 лет назад
Nitin Madhok
231000fd4b
Merge pull request #47 from bradthurber/modules.sls-redhat
make modules.sls compatible with RHEL/CentOS Apache 2.2
9 лет назад
Brad Thurber
5afdcb819c
per @gravyboat suggestion, change separate if to elif
9 лет назад
Forrest
39176444d1
Merge pull request #48 from multani/fix-jinja-reverse
Fix Jinja's reverse
9 лет назад
Forrest
b190357ebf
Merge pull request #49 from multani/fix-missing-documentroot
Don't fail on missing DocumentRoot
9 лет назад
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 лет назад
Jonathan Ballet
74e4c4d7d5
Make proxies order stable
9 лет назад
Jonathan Ballet
3f4a7667f7
Jinja's `reverse` is a filter, use it accordingly
9 лет назад
Brad Thurber
0f0d5318e5
make modules.sls compatible with RHEL/CentOS Apache 2.2
9 лет назад
Nitin Madhok
0e2dd72e43
Merge pull request #46 from thornycrackers/master
Update standard.sls
9 лет назад
Cody Hiar
f1b89abd3b
Update standard.sls
Make sure that you can makedirs incase parent folders are not created
9 лет назад
Nitin Madhok
bb33e3856a
Merge pull request #45 from thornycrackers/master
Create vhost DocumentRoot directory
9 лет назад
Cody Hiar
138a522f3f
Update standard.sls
Create the vhost DocumentRoot directory if it does not exist
9 лет назад
Nitin Madhok
1949ff4f05
Update LICENSING year
9 лет назад
Nitin Madhok
241f2be82e
Merge pull request #44 from RyPeck/feature/optional_template_register_sites
Add optional templating to register_site files
9 лет назад
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 лет назад
Florian Bittner
77398445a9
Merge pull request #43 from artmoni/br_multiproxy
Issue#41 configure multi proxypass configuration in vhost
Thank you!
9 лет назад
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 лет назад
sebastien.fleury
fce8d72c12
Issue#41 configure multi proxypass configuration in vhost
9 лет назад
Nitin Madhok
93745004ca
Merge pull request #42 from RyPeck/bugfix/a2dissite_from_pillar
Fix case where state != enabled causes error
9 лет назад
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 лет назад
Nitin Madhok
bca9f619a3
Merge pull request #40 from aboe76/opensuse_support
Added basic opensuse support
9 лет назад
Niels Abspoel
9cd070302f
Added basic opensuse support
9 лет назад
Nitin Madhok
143c3242f2
Merge pull request #39 from corywright/patch-1
Update map.jinja
9 лет назад
Cory Wright
eb15c0753a
Update map.jinja
Fix typo: `user_require` -> `use_require`
9 лет назад
Raphaël Hertzog
23e3280a7d
Drop references to unused apt and php formulas
They no longer are dependencies of this formula.
9 лет назад
Nitin Madhok
56629310ca
Merge pull request #37 from daschatten/master
Add templates 'redirect.tmpl' and 'proxy.tmpl'.
10 лет назад
root
8d1b8f7f36
Add example code for new templates 'redirect.tmpl' and 'proxy.tmpl'.
10 лет назад
root
2ba72e613d
Add new templates 'proxy.tmpl' and 'redirect.tmpl'. Add comment pointing to new templates to pillar.example.
10 лет назад
Seth House
1a596bcb48
Merge pull request #36 from aboe76/improve_debian
updated map.jinja debian 8.0 settings
10 лет назад
Niels Abspoel
3ab160bad2
updated map.jinja debian 8.0 settings
10 лет назад
Nitin Madhok
c58a650b69
Merge pull request #35 from benjy14/master
Fix mod-php5 dependency when setting php.ini
10 лет назад