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 роки тому
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 роки тому
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 роки тому
Javier Bértoli
e1ab49cce3
Merge pull request #240 from bawuenet/fix_docroot
Fix DocumentRoot on Red Hat
6 роки тому
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 роки тому
Javier Bértoli
ff021d36aa
Merge pull request #237 from arthurlogilab/patch-3
[vhosts/standard] improve uniqueness of section id
6 роки тому
Arthur Lutz
feadd58f85
[standard/vhost] unique id renamed
6 роки тому
Arthur Lutz
c07e5846a4
[vhosts/standard] improve uniqueness of section id
6 роки тому
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 роки тому
ze42
1982f1ecc8
mod_remoteip: enable conf independantly ( #236 )
6 роки тому
N
8adcad3db8
Merge pull request #231 from ze42/directory_default
vhosts/standard: Directory_default to DocumentRoot
6 роки тому
Adrien "ze" Urban
49dedb64dc
directory.default: update pillar.example
New behavior properly explained in pillar.example
Warning: changes directory.default when used with non-standard documentroot.
Now uses documentroot, instead of previously "default" documentroot path.
6 роки тому
Adrien "ze" Urban
70ae79b991
vhosts/standard: Directory_default to DocumentRoot
6 роки тому
ardin
7bac5c7c30
mod_mpm for RedHat ( #160 )
6 роки тому
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 роки тому
Niels Abspoel
ac7e71bf56
Merge pull request #228 from ze42/docroot_sitename
DocumentRoot: fallback to SiteName like templates
6 роки тому
Niels Abspoel
32f92e8acd
Merge pull request #227 from ze42/geoip_debian
geoip: Debian support
6 роки тому
Niels Abspoel
03de980860
Merge pull request #230 from ze42/docroot_owner
vhosts/standard: allow to set docroot ownership
6 роки тому
Niels Abspoel
00b437aa27
Merge pull request #232 from ze42/vhosts_cleanup
vhosts/cleanup: clean non-salted sites
6 роки тому
Javier Bértoli
760cadebc3
Merge pull request #233 from alxwr/master
Create Apache's logdir if necessary
6 роки тому
Alexander Weidinger
33e1302a12
Create Apache's logdir if necessary
6 роки тому
Adrien "ze" Urban
fdaa62d7a9
vhosts/cleanup: clean non-salted sites
Makes it easier to clean any unwanted sites
6 роки тому
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 роки тому
Adrien "ze" Urban
2bae6fea10
vhosts/standard: fix set user/group
unless test -d on file.directory seems useless.
6 роки тому
Adrien "ze" Urban
5211bdd72b
vhosts/standard: allow user/group option
Support for DocumentRootUser and DocumentRootGroup
6 роки тому
Javier Bértoli
dc46bc8340
Merge pull request #224 from arthurlogilab/fix-fcgid-redhat
Fix fcgid redhat
6 роки тому
Javier Bértoli
4e73a80b62
Merge pull request #229 from ze42/manage_security_file_presence
manage_security: fix file presence detection
6 роки тому
Adrien "ze" Urban
76f05dda8e
manage_security: fix file presence detection
Detect runtime, rather than before starting/installing anything.
6 роки тому
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 роки тому
Adrien "ze" Urban
4e15435ef4
geoip: Debian support
6 роки тому
Arthur Lutz
d7e212d904
[apache/map.jinja] add RedHat fcgid package name
6 роки тому
N
da543013f4
Merge pull request #222 from noelmcloughlin/FixFastCgi
Fix mod_fastcgi, mod_php5, and pkgrepo states
6 роки тому
N
7e66b260e4
Merge pull request #220 from noelmcloughlin/issue122
Do not add ServerAlias unless defined
6 роки тому
N
7e0d861e0c
Merge pull request #223 from aboe76/python3_support
replace iteritems with items
6 роки тому
Niels Abspoel
fe9407df47
replace iteritems with items
6 роки тому
noelmcloughlin
2c21dc0df6
Fix mod_fastcgi state/repo
6 роки тому
N
f1514dab84
Merge pull request #205 from emeygret/patch-1
Add RedirectMatch option
6 роки тому
Niels Abspoel
142fb59bb1
Merge pull request #221 from netmanagers/master
Added "Managed by Salt..." headers in templates
6 роки тому
Javier Bértoli
fcb434e248
Added "Managed by Salt..." headers in template and made them unifom across the formula
6 роки тому
Javier Bértoli
6de9dd885d
Merge pull request #219 from arthurlogilab/217-customlog
[apache/vhosts] fix CustomLog on standard template
7 роки тому
Noel McLoughin
147aa71551
Do not add ServerAlias unless defined
7 роки тому
Niels Abspoel
48bab96af6
Merge pull request #212 from noelmcloughlin/issue186_travis
Updated Travis/Kitchen tests
7 роки тому
Arthur Lutz
fd23f29cf8
Merge branch 'master' into 217-customlog
7 роки тому
Arthur Lutz
1ebee8bc07
[apache/vhosts] fix CustomLog on standard template
7 роки тому
Noel McLoughin
853ec8e118
Allow Skipping of service manipulation via pillar (+PR comments)
7 роки тому
Niels Abspoel
7d46830814
Merge pull request #216 from emeygret/patch-2
pillar exemple for RedirectMatch directive
7 роки тому
emeygret
55c6010bde
pillar exemple for RedirectMatch directive
7 роки тому
Niels Abspoel
57b2c5d1aa
Merge pull request #215 from arthurlogilab/patch-1
Fix conflict ID #214
7 роки тому
Arthur Lutz
1b5e13a36c
Fix conflict ID #214
7 роки тому
Javier Bértoli
c6018aeac1
Merge pull request #211 from saltstack-formulas/manage-tls-defaults
Manage tls defaults
7 роки тому