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

357 Commits

Author SHA1 Message Date
Adrien "ze" Urban
5211bdd72b vhosts/standard: allow user/group option 
Support for DocumentRootUser and DocumentRootGroup
 2018-06-28 10:20:33 +02:00
Javier Bértoli
dc46bc8340
Merge pull request #224 from arthurlogilab/fix-fcgid-redhat 
Fix fcgid redhat
 2018-06-27 14:32:40 -03:00
Adrien "ze" Urban
76f05dda8e manage_security: fix file presence detection 
Detect runtime, rather than before starting/installing anything.
 2018-06-07 14:52:57 +02:00
Adrien "ze" Urban
0ed8f9a94b DocumentRoot: fallback to SiteName like templates 
Templates already fallback to SiteName before site id.

This attemps to be consistent with them, and avoid having to explicitly specify
the DocumentRoot, when the template already does the proper inference.
 2018-05-22 15:23:11 +02:00
Adrien "ze" Urban
4e15435ef4 geoip: Debian support 2018-05-22 15:20:50 +02:00
Arthur Lutz
d7e212d904 [apache/map.jinja] add RedHat fcgid package name 2018-03-23 13:39:02 +01:00
N
da543013f4
Merge pull request #222 from noelmcloughlin/FixFastCgi 
Fix mod_fastcgi, mod_php5, and pkgrepo states
 2018-03-15 10:47:14 +00:00
N
7e66b260e4
Merge pull request #220 from noelmcloughlin/issue122 
Do not add ServerAlias unless defined
 2018-03-15 10:46:55 +00:00
Niels Abspoel
fe9407df47 replace iteritems with items 2018-03-07 21:05:22 +01:00
noelmcloughlin
2c21dc0df6 Fix mod_fastcgi state/repo 2018-02-14 21:01:43 +00:00
N
f1514dab84
Merge pull request #205 from emeygret/patch-1 
Add RedirectMatch option
 2018-02-05 12:06:51 +00:00
Javier Bértoli
fcb434e248 Added "Managed by Salt..." headers in template and made them unifom across the formula 2018-02-04 10:26:40 -03:00
Noel McLoughin
147aa71551 Do not add ServerAlias unless defined 2018-01-30 23:20:25 +00:00
Arthur Lutz
fd23f29cf8
Merge branch 'master' into 217-customlog 2018-01-30 14:24:16 +01:00
Arthur Lutz
1ebee8bc07 [apache/vhosts] fix CustomLog on standard template 2018-01-30 14:13:12 +01:00
Noel McLoughin
853ec8e118 Allow Skipping of service manipulation via pillar (+PR comments) 2018-01-30 14:10:01 +01:00
Arthur Lutz
1b5e13a36c
Fix conflict ID #214 2018-01-16 10:04:16 +01:00
Alexander Weidinger
d3110f93f6 Manage TLS defaults 2018-01-10 01:24:17 +01:00
Alexander Weidinger
9de2372789 map.jinja: corrected Debian's confdir 2018-01-09 23:38:47 +01:00
Alexander Weidinger
cbc9ad29dc map.jinja: corrected FreeBSD defaults 
(We were only supporting 2.4 anyway.)
 2018-01-09 22:12:31 +01:00
Louis Haddrell
ac071586e0 Replace apache.conf_mod_wsgi if statement syntax (fixes #209) 2018-01-05 13:26:06 +00:00
Alexander Weidinger
08a21edb73 Actually fix CustomLog default values in templates 2018-01-05 01:30:42 +01:00
Alexander Weidinger
e20189e94a Revert "Fix CustomLog default values in templates" 
This reverts commit 429039819d.
 2018-01-05 00:59:57 +01:00
Alexander Weidinger
429039819d Fix CustomLog default values in templates 2018-01-03 02:12:54 +01:00
Wolodja Wentland
147fc0581f
Merge pull request #184 from alxwr/template-security 
Template security.conf in Debian
 2017-12-19 10:24:14 +00:00
emeygret
2142ab99f1
Add RedirectMatch option 
in pillar add 
RedirectMatch: true
 2017-12-12 11:35:14 +01:00
thomas Senay
5fea96a6a2 Split Logformat and CustomLog Directive to avoid syntax error on RedHat 2017-11-13 10:41:25 +01:00
Niels Abspoel
c86760ee4c
Merge pull request #202 from alexfrosa/master 
fixed: missing LogFormat
 2017-11-05 14:18:57 +01:00
alexfrosa
dca6c1b4a3
Update minimal.tmpl 
Adapted log format to Apache's new default
 2017-11-05 10:44:24 -02:00
Javier Bértoli
e366517ffc
Merge pull request #201 from noelmcloughlin/archlinux 
ArchLinux support in map.jinja
 2017-11-05 09:02:35 -03:00
Niels Abspoel
9898b4fe2f
Merge pull request #191 from alxwr/mod_fastcgi-oscodename 
mod_fastcgi: use oscodename grain / call for testers
 2017-11-04 21:11:48 +01:00
Alex Rosa
0475eef4ad fixed: missing LogFormat 2017-11-04 16:38:31 -02:00
Noel McLoughin
1434dcc5e9 ArchLinux OS mapping 2017-11-03 16:47:20 +00:00
Niels Abspoel
185b98a38e Merge pull request #198 from irtnog/enable-custom-mod_ssl-package 
Add setting that allows deployers to override the default mod_ssl
 2017-10-23 20:23:01 +02:00
Matthew X. Economou
1899f2df5e
Add setting that allows deployers to override the default mod_ssl package 
Other states in this formula allow changing the Apache httpd or module
package on RHEL/CentOS, e.g., one may use packages from the httpd24
SCL to install newer versions than in the base repositories.  This
changes the apache.mod_ssl SLS to match them.
 2017-10-23 09:35:31 -04:00
Noel McLoughlin
be024a6475 workaround for #192 2017-08-24 11:41:05 +01:00
Alexander Weidinger
ef1c55b45c mod_fastcgi: use oscodename grain 2017-08-23 11:40:59 +02:00
Niels Abspoel
0b117e522d Merge pull request #189 from louis-haddrell/develop 
Replaced use_require with Apache version check (fixes #188)
 2017-08-22 18:01:20 +02:00
Niels Abspoel
9003d2b3ce update grain check with Suse and SUSE 2017-08-03 21:11:25 +02:00
Niels Abspoel
e5313af81a add suse support to apache_modules 2017-08-03 16:18:54 +02:00
Javier Bértoli
a61504f900 Merge pull request #185 from aboe76/update_suse_config 
update suse config file with latest changes
 2017-08-02 07:53:14 -03:00
Louis Haddrell
2360d722b6 Replaced use_require with Apache version check (fixes #188) 2017-08-02 00:05:18 +01:00
Louis Haddrell
7e96ce8d3e Replaced Apache 2.4 syntax in RedHat Apache 2.2 config (fixes #115) 2017-08-01 15:34:06 +01:00
Raphaël Hertzog
1feaf1f392 Add map.jinja data for latest Debian and Ubuntu releases 2017-06-08 16:09:07 +02:00
Niels Abspoel
adea6485ea update suse config file with latest changes 2017-05-21 23:31:24 +02:00
Alexander Weidinger
5fa91b7b91 Template security.conf in Debian 
Including optional per-OS templates

(Solves https://github.com/saltstack-formulas/apache-formula/issues/153)
 2017-05-17 07:54:02 +02:00
kadogo
69bb7744c8 Correct little error for mod_fastcgi 2017-05-17 06:41:55 +02:00
kadogo
14fa8d8616 Add variables for mod_xsendfile and mod_fastcgi 2017-05-17 06:41:54 +02:00
kadogo
858d012380 Add mod_fastcgi (Debian) 2017-05-17 06:41:54 +02:00
kadogo
d4e45322bf Add mod_proxy_fcgi (Debian) 2017-05-17 06:41:54 +02:00
kadogo
7495b5fdd8 Add mod_xsenfile (Debian) 2017-05-17 06:41:54 +02:00
Niels Abspoel
34a1050c66 Merge pull request #183 from netmanagers/master 
Remove duplicated ID (fixes #179), added minimal template (fixes #34)
 2017-04-24 22:14:03 +02:00
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