saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
336 Commits 6 Branches 31 Tags 1.8 MiB
ffac9b2381
Commit Graph

336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cody Hiar
07b2a9f9f5 Create defaul vhost directories when DocumentRoot is not set 2015-05-31 12:17:25 -06:00
puneet kandhari
fffb47518e Merge pull request #55 from mosen/master 
Fix SSL: incorrect syntax in pillar example and jinja template
 2015-05-14 00:00:39 -07:00
Mosen
d4b1af0af4 Fix unnecessary comparison against boolean in vhosts/standard.tmpl 2015-05-14 16:55:11 +10:00
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()
 2015-05-14 12:38:27 +10:00
Wolodja Wentland
3ed48e04c6 Merge pull request #53 from eliasp/debian-confext 
Set 'confext' for Debian systems.
 2015-04-17 14:17:09 +01:00
Elias Probst
1a1104fe80 Set 'confext' for Debian systems. 2015-04-17 14:39:57 +02:00
Forrest
99ea682cfb Merge pull request #52 from daschatten/master 
Add basic SSL functionality.
 2015-04-02 08:52:42 -07:00
Florian Bittner
dbb86f2bc4 Add basic SSL functionality. 2015-04-02 14:23:21 +02:00
Nitin Madhok
231000fd4b Merge pull request #47 from bradthurber/modules.sls-redhat 
make modules.sls compatible with RHEL/CentOS Apache 2.2
 2015-03-26 13:07:08 -04:00
Brad Thurber
5afdcb819c per @gravyboat suggestion, change separate if to elif 2015-03-26 08:00:11 -04:00
Forrest
39176444d1 Merge pull request #48 from multani/fix-jinja-reverse 
Fix Jinja's reverse
 2015-03-25 19:25:38 -07:00
Forrest
b190357ebf Merge pull request #49 from multani/fix-missing-documentroot 
Don't fail on missing DocumentRoot
 2015-03-25 19:25:11 -07:00
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.
 2015-03-25 15:06:18 +01:00
Jonathan Ballet
74e4c4d7d5 Make proxies order stable 2015-03-25 14:48:13 +01:00
Jonathan Ballet
3f4a7667f7 Jinja's reverse is a filter, use it accordingly 2015-03-25 14:47:55 +01:00
Brad Thurber
0f0d5318e5 make modules.sls compatible with RHEL/CentOS Apache 2.2 2015-03-24 15:41:08 -04:00
Nitin Madhok
0e2dd72e43 Merge pull request #46 from thornycrackers/master 
Update standard.sls
 2015-03-23 19:17:02 -04:00
Cody Hiar
f1b89abd3b Update standard.sls 
Make sure that you can makedirs incase parent folders are not created
 2015-03-23 16:53:45 -06:00
Nitin Madhok
bb33e3856a Merge pull request #45 from thornycrackers/master 
Create vhost DocumentRoot directory
 2015-03-23 18:43:48 -04:00
Cody Hiar
138a522f3f Update standard.sls 
Create the vhost DocumentRoot directory if it does not exist
 2015-03-23 15:22:08 -06:00
Nitin Madhok
1949ff4f05 Update LICENSING year 2015-03-20 20:10:44 -04:00
Nitin Madhok
241f2be82e Merge pull request #44 from RyPeck/feature/optional_template_register_sites 
Add optional templating to register_site files
 2015-03-18 13:48:13 -04:00
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.
 2015-03-18 13:36:19 -04:00
Florian Bittner
77398445a9 Merge pull request #43 from artmoni/br_multiproxy 
Issue#41 configure multi proxypass configuration in vhost
Thank you!
 2015-03-11 23:15:49 +01:00
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.
 2015-03-11 20:43:18 +01:00
sebastien.fleury
fce8d72c12 Issue#41 configure multi proxypass configuration in vhost 2015-03-11 18:35:41 +01:00
Nitin Madhok
93745004ca Merge pull request #42 from RyPeck/bugfix/a2dissite_from_pillar 
Fix case where state != enabled causes error
 2015-03-10 17:13:06 -04:00
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.
 2015-03-10 16:52:24 -04:00
Nitin Madhok
bca9f619a3 Merge pull request #40 from aboe76/opensuse_support 
Added basic opensuse support
 2015-03-08 18:59:57 -04:00
Niels Abspoel
9cd070302f Added basic opensuse support 2015-03-08 22:12:36 +01:00
Nitin Madhok
143c3242f2 Merge pull request #39 from corywright/patch-1 
Update map.jinja
 2015-03-04 21:53:06 -07:00
Cory Wright
eb15c0753a Update map.jinja 
Fix typo: `user_require` -> `use_require`
 2015-03-04 17:39:15 -05:00
Raphaël Hertzog
23e3280a7d Drop references to unused apt and php formulas 
They no longer are dependencies of this formula.
 2015-03-02 23:38:20 +01:00
Nitin Madhok
56629310ca Merge pull request #37 from daschatten/master 
Add templates 'redirect.tmpl' and 'proxy.tmpl'.
 2015-02-16 16:11:36 +05:30
root
8d1b8f7f36 Add example code for new templates 'redirect.tmpl' and 'proxy.tmpl'. 2015-02-15 00:12:13 +01:00
root
2ba72e613d Add new templates 'proxy.tmpl' and 'redirect.tmpl'. Add comment pointing to new templates to pillar.example. 2015-02-15 00:06:44 +01:00
Seth House
1a596bcb48 Merge pull request #36 from aboe76/improve_debian 
updated map.jinja debian 8.0 settings
 2015-01-12 17:07:55 -08:00
Niels Abspoel
3ab160bad2 updated map.jinja debian 8.0 settings 2015-01-10 16:18:59 +01:00
Nitin Madhok
c58a650b69 Merge pull request #35 from benjy14/master 
Fix mod-php5 dependency when setting php.ini
 2014-12-28 21:32:17 -05:00
Ben Dougherty
ff9fc14eaf Fix mod-php5 dependency when setting php.ini 2014-12-29 10:25:08 +08:00
Nitin Madhok
aa0d6fdfc4 Merge pull request #32 from openenvi-formulas/modules 
Add ability to specify modules in pillar
 2014-11-20 18:49:24 -05:00
Skyler Berg
11d66cfda7 Add ability to specify modules in pillar 2014-11-20 15:46:31 -08:00
Nitin Madhok
82c120586a Merge pull request #31 from abrefort/master 
Fix Apache 2.4 and add support for Ubuntu 14.10
 2014-10-28 14:15:59 -04:00
Adrien Bréfort
3612927174 Fix default Options. 2014-10-28 18:50:04 +01:00
Adrien Bréfort
67e12a8bc2 Fixed Apache 2.4 support and added support for Ubuntu 14.10. 
Replace require_all with use_require in map.jinja, we want to be able
to use custom Require values.

Remove uneeded Directory in standard.tmpl and add conditional and
default value for Require.

Fix bad filenames in standard.sls
 2014-10-28 15:13:13 +01:00
Nitin Madhok
5432b18a7c Merge pull request #29 from berry-langerak/feature/adding-support-for-apache-2.4 
Adding support for Apache 2.4 on Ubuntu 14.04
 2014-10-01 07:38:22 -04:00
Berry Langerak
b8fe242d35 Adding support for Apache 2.4 on Ubuntu 14.04 
- Adding confext to virtualhost names.
- Renaming the default config file for Ubuntu (000-default.conf).
- Adding ability to use "Require all granted".
 2014-10-01 10:35:53 +02:00
Nitin Madhok
13fef9e9ac Merge pull request #27 from KennethWilke/master 
fixed things seth mentioned in class
 2014-09-25 12:47:12 -04:00
KennethWilke
964b653692 fixed things seth mentioned in class 2014-09-25 11:48:36 -05:00
Seth House
67b8518e47 Added explanatory comment to the apache restart/reload module.wait states 2014-08-06 17:08:14 -04:00