Andreas Thienemann
4bba8862ab
Delete Red Hat provided ssl.conf ( #243 )
When using the mod_ssl state on Red Hat family systems the httpd
server will currently not start.
This is due to duplicate Listen directives provided in the
ssl.conf file shipped with the mod_ssl rpm package and the directives
configured by saltstack.
The easy solution is to just ensure the rpm shipped mod_ssl is removed.
6 anni fa
Andreas Thienemann
894e970549
Fix hardcoded path ( #242 )
The config.sls state uses a hardcoded file path for the welcome
config.
Use the confdir variable to build the path instead to allow for
overrides.
6 anni fa
Andreas Thienemann
4ed6e228f5
Improve document root fix for Red Hat ( #241 )
The docroot fix from PR#240 worked fine for default servers.
But as soon as one uses vhosts this broke as the vhosts were
created under the docroot in /var/www/html rather than the better
/var/www.
Fix this by differentiating between docroot and wwwdir.
Further allow to override both in Red Hat-style configs.
The override allows to reuse this formula for the softwarecollections
rpms.
6 anni fa
Andreas Thienemann
eca4daf767
Fix DocumentRoot on Red Hat
The current docroot ist set to /var/www. This is incorrect.
Fix with correct value /var/www/html.
6 anni fa
Arthur Lutz
feadd58f85
[standard/vhost] unique id renamed
6 anni fa
Arthur Lutz
c07e5846a4
[vhosts/standard] improve uniqueness of section id
6 anni fa
Sebastian Meyer
6f3ab21d62
Allow setting APACHE_SERVER_FLAGS on Suse ( #234 )
SUSE reads additional FLAGS that are used on the server start. They are
read from the APACHE_SERVER_FLAGS key, so we use a2enflag/a2disflag to
set those as we do with modules.
6 anni fa
ze42
1982f1ecc8
mod_remoteip: enable conf independantly ( #236 )
6 anni fa
Adrien "ze" Urban
70ae79b991
vhosts/standard: Directory_default to DocumentRoot
6 anni fa
ardin
7bac5c7c30
mod_mpm for RedHat ( #160 )
6 anni fa
Arthur Lutz
a5debf58b3
207 configure ssl ( #218 )
* [ssl] [debian] manage ssl.conf with pillars
* [apache] make cyphersuite a list
* [apache/ssl] switch back to strings, lists merge is not good
6 anni fa
Alexander Weidinger
33e1302a12
Create Apache's logdir if necessary
6 anni fa
Adrien "ze" Urban
fdaa62d7a9
vhosts/cleanup: clean non-salted sites
Makes it easier to clean any unwanted sites
6 anni fa
Adrien "ze" Urban
37f8af4b3a
vhosts/standard: rewrite, simplify code
* No more if.
* Allow lookup to set default value for all docroot
* updated pillar.example
6 anni fa
Adrien "ze" Urban
2bae6fea10
vhosts/standard: fix set user/group
unless test -d on file.directory seems useless.
6 anni fa
Adrien "ze" Urban
5211bdd72b
vhosts/standard: allow user/group option
Support for DocumentRootUser and DocumentRootGroup
6 anni fa
Adrien "ze" Urban
76f05dda8e
manage_security: fix file presence detection
Detect runtime, rather than before starting/installing anything.
6 anni fa
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.
6 anni fa
Adrien "ze" Urban
4e15435ef4
geoip: Debian support
6 anni fa
Arthur Lutz
d7e212d904
[apache/map.jinja] add RedHat fcgid package name
6 anni fa
Niels Abspoel
fe9407df47
replace iteritems with items
7 anni fa
noelmcloughlin
2c21dc0df6
Fix mod_fastcgi state/repo
7 anni fa
Javier Bértoli
fcb434e248
Added "Managed by Salt..." headers in template and made them unifom across the formula
7 anni fa
Noel McLoughin
147aa71551
Do not add ServerAlias unless defined
7 anni fa
Arthur Lutz
1ebee8bc07
[apache/vhosts] fix CustomLog on standard template
7 anni fa
Noel McLoughin
853ec8e118
Allow Skipping of service manipulation via pillar (+PR comments)
7 anni fa
Arthur Lutz
1b5e13a36c
Fix conflict ID #214
7 anni fa
Noel McLoughin
77a7cbf228
Allow Skipping of service manipulation via pillar (+PR comments)
7 anni fa
Alexander Weidinger
d3110f93f6
Manage TLS defaults
7 anni fa
Alexander Weidinger
9de2372789
map.jinja: corrected Debian's confdir
7 anni fa
Alexander Weidinger
cbc9ad29dc
map.jinja: corrected FreeBSD defaults
(We were only supporting 2.4 anyway.)
7 anni fa
Louis Haddrell
ac071586e0
Replace apache.conf_mod_wsgi if statement syntax ( fixes #209 )
7 anni fa
Alexander Weidinger
08a21edb73
Actually fix CustomLog default values in templates
7 anni fa
Alexander Weidinger
e20189e94a
Revert "Fix CustomLog default values in templates"
This reverts commit 429039819d
.
7 anni fa
Alexander Weidinger
429039819d
Fix CustomLog default values in templates
7 anni fa
emeygret
2142ab99f1
Add RedirectMatch option
in pillar add
RedirectMatch: true
7 anni fa
thomas Senay
5fea96a6a2
Split Logformat and CustomLog Directive to avoid syntax error on RedHat
7 anni fa
alexfrosa
dca6c1b4a3
Update minimal.tmpl
Adapted log format to Apache's new default
7 anni fa
Alex Rosa
0475eef4ad
fixed: missing LogFormat
7 anni fa
Noel McLoughin
1434dcc5e9
ArchLinux OS mapping
7 anni fa
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.
7 anni fa
Noel McLoughlin
be024a6475
workaround for #192
7 anni fa
Alexander Weidinger
ef1c55b45c
mod_fastcgi: use oscodename grain
7 anni fa
Niels Abspoel
9003d2b3ce
update grain check with Suse and SUSE
7 anni fa
Niels Abspoel
e5313af81a
add suse support to apache_modules
7 anni fa
Louis Haddrell
2360d722b6
Replaced use_require with Apache version check ( fixes #188 )
7 anni fa
Louis Haddrell
7e96ce8d3e
Replaced Apache 2.4 syntax in RedHat Apache 2.2 config ( fixes #115 )
7 anni fa
Raphaël Hertzog
1feaf1f392
Add map.jinja data for latest Debian and Ubuntu releases
7 anni fa
Niels Abspoel
adea6485ea
update suse config file with latest changes
7 anni fa
Alexander Weidinger
5fa91b7b91
Template security.conf in Debian
Including optional per-OS templates
(Solves https://github.com/saltstack-formulas/apache-formula/issues/153 )
7 anni fa