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

305 Commits

Author SHA1 Message Date
Javier Bértoli
a7f66b6344 Move vhostdir to config.sls 2017-04-24 15:33:44 -03:00
Javier Bértoli
ffac9b2381 Added minimal template (fixes #34) 2017-04-23 14:38:17 -03:00
Javier Bértoli
9c9050595d Remove duplicated ID (fixes #179) 2017-04-23 14:37:26 -03:00
Mike Shade
9bf72e5d0a Correct CentOS 6 osfinger map 
CentOS 6 reports as CentOS-6 rather than CentOS Linux-6 from osfinger grain
 2017-04-13 12:41:53 -04:00
Gary Waters
4da54dd8de in RH, vhosts.d doesnt exisit, this makes it 2017-04-12 14:45:00 -07:00
Oleksandr Porunov
ee6b910302 Format mod_wsgi state 2017-04-06 15:11:32 +03:00
Oleksandr Porunov
7ac28f42f9 Clear uncomment state of mod_wsgi config 2017-04-06 15:03:37 +03:00
Oleksandr Porunov
c28a1097e3 Fix wsgi.conf uncomment for RedHat based OS 2017-04-05 10:42:06 +02:00
Oleksandr Porunov
0b37a14035 Fix: wsgi.conf file not found 2017-04-05 00:34:49 +02:00
Javier Bértoli
475fb8347e Add default user/group attributes as required by some states 2017-03-29 07:42:27 -03:00
alxwr
7d5e588b6e Merge pull request #168 from bmwiedemann/suse 
fixes in SUSE support
 2017-03-28 17:01:46 +02:00
alxwr
0e670f47df Merge pull request #170 from bmwiedemann/fix2 
fix standard.tmpl
 2017-03-28 16:36:14 +02:00
alxwr
7f6179365e Merge pull request #171 from porunov/master 
Add uninstall state
 2017-03-28 16:28:01 +02:00
alxwr
b003b82249 Merge pull request #169 from bmwiedemann/fix1 
drop %O from default LogFormat
 2017-03-28 16:24:06 +02:00
alxwr
8540ce92f6 Merge pull request #167 from isntall/mod_remoteip_conf 
[+] debian apache2 needs to have conf enabled when making this change
 2017-03-28 16:17:28 +02:00
Oleksandr Porunov
aba648965f Add a new line into uninstall state 2017-03-28 16:26:52 +03:00
Oleksandr Porunov
58e968916e Add uninstall state 2017-03-28 16:15:44 +03:00
Bernhard M. Wiedemann
f25d7707cf fix standard.tmpl 
with salt-ssh-2016.11.3 it errored out with
TemplateNotFound: apache/map.jinja

and we were already passing in the 'apache' data as 'map'
from standard.sls
 2017-03-20 17:10:22 +01:00
Bernhard M. Wiedemann
81a25d9467 drop %O from default LogFormat 
because it requires mod_logio to be enabled
 2017-03-20 17:09:58 +01:00
Archie Brentano
f80a06260b [+] debian apache2 needs to have conf enabled when making this change 2017-03-17 09:03:26 -07:00
Bernhard M. Wiedemann
55eac38881 SUSE: fix conf.d location 2017-03-17 13:49:55 +01:00
Bernhard M. Wiedemann
cc95c7579e SUSE: typo fixes 2017-03-17 13:16:07 +01:00
Bernhard M. Wiedemann
57690acd77 SUSE: use different global.conf 
sysconfig.d/global.conf is re-written by sysconfig on openSUSE
 2017-03-17 13:16:01 +01:00
Patrick Chevalley
780bf3158d Add Reverse Proxy directives, GeoIP, Certificates management, mostly for RedHat 2017-03-09 12:44:32 +01:00
Alexander Weidinger
3f3e734cd7 mod_proxy_http: include mod_proxy in all OSs 2017-02-20 20:09:25 +01:00
Niels Abspoel
68ca8eb9de Merge pull request #164 from fcrozat/suse 
ensure php5 module is enabled on openSUSE / SLE
 2017-02-06 16:54:10 +01:00
Alexander Weidinger
6e880d0827 FreeBSD: mod_cgi 2017-02-01 23:50:03 +01:00
Alexander Weidinger
e1c55b9475 FreeBSD: apache.mod_proxy_http 2017-02-01 23:50:03 +01:00
Alexander Weidinger
0590e43973 FreeBSD: apache.manage_security 2017-02-01 23:50:03 +01:00
Alexander Weidinger
9f796f0b6a apache.global for Debian and FreeBSD 2017-02-01 23:50:03 +01:00
Alexander Weidinger
f03df6e2fb FreeBSD: mod_rewrite 2017-02-01 23:50:03 +01:00
Alexander Weidinger
5dbe687cda FreeBSD: mod_perl2 2017-02-01 23:50:03 +01:00
Alexander Weidinger
4e12b404a4 FreeBSD: mod_suexec 2017-02-01 23:50:03 +01:00
Alexander Weidinger
bc81c6ab43 FreeBSD: mod_proxy 2017-02-01 23:50:03 +01:00
Alexander Weidinger
9e3645c53c FreeBSD: made default SSL key configurable 2017-02-01 23:50:03 +01:00
Alexander Weidinger
4d94109534 FreeBSD: set correct env vars 2017-02-01 23:50:03 +01:00
Alexander Weidinger
327f86db91 FreeBSD: confdir: extra/ 2017-02-01 23:50:03 +01:00
Alexander Weidinger
385a120590 FreeBSD: envvars 2017-02-01 23:50:03 +01:00
Alexander Weidinger
9a1fb054d6 mod_php5: FreeBSD 2017-02-01 23:50:03 +01:00
Alexander Weidinger
5d27226001 FreeBSD: global DocumentRoot 2017-02-01 23:50:03 +01:00
Alexander Weidinger
c7e533d7e5 mod_ssl: FreeBSD support 2017-02-01 23:50:03 +01:00
Alexander Weidinger
a64ee209cb FreeBSD support 2017-02-01 23:48:25 +01:00
alxwr
6d2ebe27db Merge pull request #157 from webscale-formulas/mod_security_rules 
add modsecurity rules state
 2017-02-01 23:47:14 +01:00
Alexander Weidinger
cc9d81c3b1 Made Timeout optional 2017-02-01 23:39:29 +01:00
alxwr
217b6caa64 Merge pull request #118 from opdude/feature/add-fields 
Added Timeout and LimitRequestsFields to vhosts
 2017-02-01 23:12:13 +01:00
Frederic Crozat
af0c009f7b ensure php5 module is enabled on openSUSE / SLE 2017-01-22 22:50:33 +01:00
nigelsim
936f20b559 added Amazon Linux 2016 (#162) 2016-11-12 15:29:50 -08:00
dexbleeker
bf66e749d1 Append slash to RedirectTarget (#161) 2016-10-18 12:48:59 -07:00
Niels Abspoel
1c20ce5f70 add modsecurity rules state 2016-09-23 11:12:37 +02:00
Niels Abspoel
ffec46e8d5 Merge pull request #149 from dexbleeker/master 
Add user-defined envvars
 2016-09-15 17:11:10 +02:00
srse
45c1e98dff Added gentoo defaults to map.jinja (#155) 2016-08-25 09:08:26 -07:00
John Kristensen
10ae336f12 Correct ProxyPassTarget default for ProxyPassReverseTarget (#154) 
According to the pillar.example file there is no site.ProxyPassTarget,
so ProxyPassReverseTarget should default to proxyargs.ProxyPassTarget
(ie. site.ProxyRoute.ProxyPassTarget)
 2016-08-02 21:29:53 -07:00
Jeremy T. Bouse
be3215f0cd Update Debian mpm_prefork.conf to include ServerLimit (#152) 
If MaxRequestWorkers is greater than 256 than you also need to set the
ServerLimit value which is defaulted to 256 but has a 20000 hard maximum
 2016-07-29 10:19:46 -07:00
Rob Ruma
d5337836b2 Adding exclude_listen_directive option (#151) 
* Adding exclude_listen_directive option

* Updating Debian config
 2016-07-20 19:19:39 -07:00
Dex Bleeker
7b7deaeb5b Add user-defined envvars 2016-07-16 17:21:46 +02:00
Nitin Madhok
adc80edd39 Merge pull request #146 from rhertzog/fix-vhost 
Do not force usage of apache.config in apache.vhosts.standard
 2016-06-30 18:13:31 +02:00
abehling
9aca4c35b7 RedHat: Made AddDefaultCharset Directive configurable (#147) 
* RedHat: Made AddDefaultCharset Directive configurable

* Added description of apache:lookup:default_charset to pillar.example, sane default equals former hardcoded UTF-8
 2016-06-29 09:18:30 -07:00
Kenneth Østrup
61439a60a8 Set use_require on Ubuntu 16.04 (Xenial Xerus) with Apache 2.4 (#148) 2016-06-28 09:36:33 -07:00
Raphaël Hertzog
4fa9d57d2b Do not force usage of apache.config in apache.vhosts.standard 
In 4d04d95b02 (#113)
apache/vhosts/standard.sls has been modified by @genuss to include
apache.config on the basis that apache.config was now able to retrieve the
interfaces/ports from pillar data in apache:sites.

I use apache:sites to register virtual hosts with non-standard
"template_file" (they contain the desired configuration directly)
and the "interface/port" keys are thus not meaningful.

apache:
  sites:
    example.com:
      template_file: salt://vm/example/apache-vhost.conf
      DocumentRoot: False

The generated ports.conf ends up containing only "*:80" while
my virtual host configuration files need ports 80 and 443. The
situation was perfectly fine up to now because the default configuration
file handles both of those ports if you have mod_ssl installed.

People who want to use apache.config should just explicitly include
that state, we should not force its usage to all apache.vhosts.standard
users.
 2016-06-21 17:39:35 +02:00
Martin Jackson
6382785cc9 Add proxyrequests directive (#144) 
* Add ProxyRequests directive

This allows or prevents Apache httpd from functioning as a forward proxy server.
[See](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyrequests).
The default action is off so I've set this a the default for this formula so it does not change the default behaviour.

* Add example pillar usage
 2016-05-24 10:10:01 -07:00
mschiff
33170b1dce Add '-f' option to a2dismod to fix hanging minions for some modules (#143) 2016-05-23 23:49:03 -07:00
Martin Jackson
b1640f4f3d [#141] Support additional options for Proxypass (#142) 
* Add support for proxy pass target options

* Add example usage
 2016-05-23 10:32:12 -07:00
Wolodja Wentland
eaffddb0d0 Merge pull request #140 from Nytoca/patch-1 
Proper disabling of the default vhost
 2016-05-18 21:51:59 +02:00
Philipp Marmet
01c9ca4a56 use default style for cmd.run: instead of cmd: - run 2016-05-18 17:08:22 +02:00
Philipp Marmet
df5edcd8a2 Proper disabling of the default vhost 
Removing the file /etc/apache2/sites-available/000-default.conf leads to an error when Apache is restarted.
So the symlink in /etc/apache2/sites-enabled/ should be removed, the actual file can stay.
 2016-05-18 13:01:05 +02:00
Tibor Gemes
98e9c00661 enable mod_ssl on Redhat 2016-05-18 10:07:24 +02:00
Tibor Gemes
c7e23edf52 Add custom port to RedHat config 2016-05-17 18:59:01 +02:00
Javier Bértoli
2be52db8b8 Add mod_security management 
Add gitignore, kitchen-ci files
Add some tests and documentation
 2016-05-11 15:41:07 -03:00
Alexander Behling
3232866cc2 Added configurable variables, Fixed bug if vhostdir is something different than default value 2016-05-10 11:49:41 +02:00
Dominik Menzi
d1c3463154 Add support for NameVirtualHost on Debian 2016-04-15 09:08:14 +02:00
Dex Bleeker
653e445e00 rename no_default to no_default_vhost (matching README.md) 2016-04-13 17:20:58 +02:00
Dominik Menzi
16888bd927 Add support for Ubuntu precise 2016-04-13 13:32:42 +02:00
Fintan MacMahon
51b5acb151 Fixed directory typo for logrotate 2016-04-11 15:54:04 +01:00
Nils Kalchhauser
fa291e289a fix line feed suppression in standard.tmpl 2016-04-10 22:17:44 +02:00
sebastien.fleury
55c5bf598b #125 activate ssl module 2016-04-07 12:02:13 +02:00
Forrest
ba0ba8686f Merge pull request #119 from opdude/hotfix/require-new-line 
Fixed a bug where the Require parameter would be on the same line as …
 2016-02-18 11:45:12 -08:00
Daniel Hobley
9b8932b267 Fixed a bug where the Require parameter would be on the same line as location 
- This is then ignored by Apache
 2016-02-18 16:24:35 +01:00
Daniel Hobley
e281a7ba82 Added Timeout and LimitRequestsFields to vhosts 2016-02-18 16:22:22 +01:00
Daniel Hobley
2a84daf248 Added the ability to remove the vhost file from debian 2016-02-18 16:19:11 +01:00
a.genus
4d04d95b02 Manage ports.conf file on Debian 2016-02-01 19:03:47 +03:00
a.genus
ba6679ef66 Remove breaking changes 2016-02-01 19:01:02 +03:00
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