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

174 Commits

Author SHA1 Message Date
Christian McHugh
f8d90931f8 Cleanup whitespace in generated vhosts 
Correct handling of allow encoded slashes
 2016-01-31 16:35:29 -06:00
David Douard
f01c72c637 Allow to configure several interfaces for a vhost. 
This is done by split the interface pillar value instead of using a proper
list so it behaves exactly the same as before for simple 1 interface cases
(no need to refactor one's pillar files).

The resulting is something like:

  Listen 1.2.3.4:80
  Listen [2001🔤def💯:3]:80

  <VirtualHost 1.2.3.4:80 [2001🔤def💯:3]:80>
  ...
 2016-01-25 12:25:29 +01:00
Rowcliffe Browne
4987f3d556 allow AllowEncodedSlashes directive in vhosts. 
Apache2 docs state this is global, but vhost overrides it even when not specified.

additionally, this directive is defaulted differently across distributions (eg. CentOS is default 'On')

this change allows control of the directive.
 2016-01-20 12:17:41 +08:00
Rowcliffe Browne
2557d3d1c8 Allow global directives to be added to apache config 2016-01-19 17:02:31 +08:00
Bogdan Radulescu
ee1208d5c7 Improove the logrotate state with the map 2016-01-07 19:02:00 +00:00
Bogdan Radulescu
d7b28dd4fb Added state for configuring logrotate 2016-01-07 20:03:10 +02:00
Forrest
9ade6b3de8 Merge pull request #104 from genuss/mod_dav_svn 
Add mod_dav_svn support
 2015-12-24 13:12:43 -08:00
a.genus
5d03deb3b5 Remove ports.conf inclusion 2015-12-24 16:09:18 +03:00
a.genus
cac7545070 Add listen directive to vhosts templates and remove ports.conf 2015-12-24 16:01:32 +03:00
a.genus
8ca121bed2 Add mod_dav_svn 2015-12-23 17:02:24 +03:00
Alexander Kozlov
3e650f5c48 Added ability to configure KeepAlive option 
Sometimes it's necessary optimization in nginx+apache2 environment
 2015-12-17 02:40:48 +03:00
Alexander Kozlov
03d97659d0 Added newlines to recent files 2015-12-16 16:43:16 +03:00
Alexander Kozlov
8f2308b985 Added ability to configure mod_remoteip 2015-12-16 02:54:14 +03:00
Forrest
8df779fe12 Merge pull request #98 from michaelforge/feature_manage-security 
Added ability to manage security settings
 2015-12-14 11:33:06 -08:00
Alexander Kozlov
f7940ecdc1 Added ability to replace default vhost with own version 
Added example shows 503 code instead of "It works!" page.
 2015-12-14 17:44:59 +03:00
Alexander Kozlov
8584dbf2a1 Added ability to manage security settings 
By reassigning options with `blockreplace` at `/etc/apache2/conf-available/security.conf`, which is linked as conf-enabled by default on Debian packages
 2015-12-14 17:12:20 +03:00
Forrest
00d0785886 Merge pull request #95 from nigelsim/versioned-config 
Added support for different config templates based on Apache version
 2015-12-09 13:20:38 -08:00
root
3742b40f86 Added support for Alias and Locations, as well as enabling Dav 2015-12-10 06:59:32 +10:00
root
dc7970955a Added support for different templates for the config file based on version 2015-12-10 06:54:50 +10:00
Nitin Madhok
c3393a4910 Fixing minor typo 2015-11-23 13:39:28 -05:00
abednarik
b28b61205a Update mod proxy id to avoid conflict when using modules te enable this mod 2015-11-23 15:31:45 -03:00
abednarik
384a3c56c2 Replace deprecated iteritems() with items() 2015-11-22 18:57:56 -03:00
Adrien Bréfort
9e9d6ba4ba Add support for Ubuntu 15.04 and 15.10 in map.jinja. 2015-11-22 12:11:14 +01:00
Carlo Vollebregt
2d39798fbb Added installation support for mod_pagespeed on RedHat: cache and log dir are already created after installation of the mod_pagespeed RPM 2015-11-20 12:33:16 +01:00
Carlo Vollebregt
a3885e6d69 Added installation support for mod_pagespeed on RedHat 2015-11-19 22:04:03 +01:00
Rowcliffe Browne
fd49c2c385 fix for symlink docroot failure 2015-11-17 11:16:24 +08:00
abednarik
a093f8debb CentOS osfingermap update 2015-11-16 17:07:23 -03:00
Dominik Menzi
ea065e3413 Set vhost sites as enabled by default 2015-11-16 11:43:44 +01:00
Brad Thurber
fb2f41afe4 debugging - the \s gets turned into \\s for some reason - so using [[:space:]] instead. This seems to be the grep-favored approach http://stackoverflow.com/questions/4233159/grep-regex-whitespace-behavior 2015-10-20 14:37:22 -04:00
Brad Thurber
9020f8d82a sed needs to allow spaces before LoadModule 2015-10-20 14:03:33 -04:00
Brad Thurber
24698575f1 add space before grep module check 2015-10-20 13:41:51 -04:00
Elias Probst
293b68b939 Add missing context 2015-10-08 12:31:47 +02:00
Konrad Mosoń
f07f672ed1 Added CentOS and Oracle Linux versions mapping 2015-10-03 15:44:45 +02:00
Elias Probst
ff2dd397c3 Don't execute a2dissite on each state run 
Add `onlyif` check to execute `a2dissite` only when needed.
 2015-09-25 09:34:28 +02:00
Julien Cristau
9be8ade5aa allow absence of DocumentRoot 
DocumentRoot is useless for a plain redirect or proxy vhost, no need to
force creating the directory.

Signed-off-by: Julien Cristau <julien.cristau@logilab.fr>
 2015-09-21 15:47:46 +02:00
Elias Probst
0ed941bd4e a2(en|dis)site requires the full name incl. the confext. 2015-08-28 16:01:38 +02:00
Elias Probst
873d86cadb Use 'apache.confext' instead of hardcoding '.conf' 2015-08-28 13:25:21 +02:00
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)
 2015-08-26 08:49:43 -04:00
Forrest
b6437b15e0 Merge pull request #74 from Wenzel/disable_site 
add a boolean to a site configuration to enable or disable it
 2015-08-25 11:02:29 -07:00
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
 2015-08-25 05:09:49 -05:00
Mathieu Tarral
a7fb2f89fc add missing {% endif %} 2015-08-25 01:58:22 -04:00
Mathieu Tarral
c195dce07c add an 'enabled' attribute for a site in pillar 2015-08-25 01:50:58 -04:00
Mathieu Tarral
a88611c1d0 fix apache-restart ID in apache/mod_mpm according to apache/init.sls 2015-08-25 01:42:08 -04:00
Wido den Hollander
def448db2f Files in sites-available should end with .conf under Ubuntu 2015-08-21 17:11:45 +02:00
Brad Thurber
0ced6e4cf0 quote wildcard paths 2015-08-19 10:41:53 -04:00
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 2015-07-22 14:36:25 +02:00
Krzysztof Pawłowski
0d7b149fd5 Add mod_php5 pkg for RedHat in map.jinja. Remove welcome.conf on RedHat. 2015-07-22 10:13:38 +02:00
Mads Sülau Jørgensen
4741f58a25 Fixed missing : and uppercased D in debian 2015-07-08 15:33:19 +02:00
Forrest
b839a7e30b Revert "corrected the key to match the pillar.example" 2015-06-23 10:30:16 -07:00
Papoyan, Nerses
023c2873b1 corrected the key to match the pillar.example 2015-06-23 11:35:55 -04:00
Rico Moorman
1a2d22b2e8 Correct variable name 2015-06-19 22:55:30 +02:00
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
 2015-06-19 20:44:53 +02:00
Niels Abspoel
f6a0c84544 Merge pull request #56 from thornycrackers/master 
Create defaul vhost directories when DocumentRoot is not set
 2015-06-17 16:11:29 +02:00
Jonathan Ballet
a8f2d89995 ssl: also support the SSLCertificateChainFile required by some providers 2015-06-09 11:54:07 +02:00
Jonathan Ballet
c9d9d954de proxy: support SSL certificate in the proxy template 2015-06-09 11:48:35 +02:00
Cody Hiar
07b2a9f9f5 Create defaul vhost directories when DocumentRoot is not set 2015-05-31 12:17:25 -06: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
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
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
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
Cody Hiar
138a522f3f Update standard.sls 
Create the vhost DocumentRoot directory if it does not exist
 2015-03-23 15:22:08 -06: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
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
Niels Abspoel
9cd070302f Added basic opensuse support 2015-03-08 22:12:36 +01:00
Cory Wright
eb15c0753a Update map.jinja 
Fix typo: `user_require` -> `use_require`
 2015-03-04 17:39:15 -05: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
Niels Abspoel
3ab160bad2 updated map.jinja debian 8.0 settings 2015-01-10 16:18:59 +01:00
Ben Dougherty
ff9fc14eaf Fix mod-php5 dependency when setting php.ini 2014-12-29 10:25:08 +08:00
Skyler Berg
11d66cfda7 Add ability to specify modules in pillar 2014-11-20 15:46:31 -08: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
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
Vincent Fretin
541360a0ce use test -f instead of ls in register_site.sls too 2014-08-01 15:39:32 +02:00
Vincent Fretin
0aec048eaf use test -f instead of ls 2014-08-01 15:32:40 +02:00
vincentfretin
18d8c0c0fb Don't execute a2ensite if the vhost is already enabled 2014-08-01 10:43:04 +02:00
Seth House
2db91119af Combined multiple extend statements 
Fixes #22
 2014-03-10 11:53:34 -06:00
Seth House
6457ae9e86 Use long-form state declaration 2014-03-04 11:13:26 -08:00
Adam Herzog
be1aa5629e Use confext parameter when naming vhost config files. 2014-02-09 09:12:31 -05:00
Adam Herzog
1888584b94 Add config file extension (confext) to parameter map. 2014-02-09 09:11:55 -05:00
Christer Edwards
36051f4353 removed unneeded wsgi_path 2014-01-29 19:14:50 -07:00
Christer Edwards
001f2a9d9c added initial FreeBSD support 2014-01-29 19:12:47 -07:00
Forrest Alvarez
3535ecae9a Removed apt from items where it is not required, also modified fcgid to include apache as it requires the apache package. 2014-01-20 20:47:04 +00:00
Seth House
ad541eb5bf Merge pull request #15 from bechtoldt/add_proxy_module_support 
Adding mod_proxy and mod_proxy_http states
 2014-01-08 07:30:39 -08:00
Arnold Bechtoldt
d60aca39cb setting the correct parameter values for watch_in 2014-01-04 23:54:45 +01:00
Arnold Bechtoldt
1fce705bc0 setting the remaining changes caused by the change of cmd.wait to .module.wait in init.sls 2014-01-04 23:46:47 +01:00