Github merge

See merge request !1

# Conflicts:
#	apache/init.sls

Add server_status state to create a default server_status handler for localhost

use watch module: apache-[restart|reload] consequently

Fix osfinger map.jinja

made a copy paste error in map.jinja

this fixes #247

refactor map.jinja with defaults and import_yaml files

Add OCSP Stapling configuration capabilities to Debian

Some configuration changes only take effect after a restart of the service.
When the module 'apache-reload' is triggered too early, it fails which results
in a false-negative result of the Salt run.
In order to fix that 'apache-restart' and the service definition itself are
put before 'apache-reload'. Reload should always succeed if restart did.

Document Stapling options in pillar.example

The formula currently adds a Listen directive for the port '*' if
any configured vhost is configured to listen on :* which does not
work and instead prevents apache from starting.

It is possible to prevent this by setting the
exclude_listen_directive pillar to True but this is a manual
workaround.

Instead, this commit excludes :* Listeners automatically.

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.

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.

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.

Fix DocumentRoot on Red Hat

The current docroot ist set to /var/www. This is incorrect.
Fix with correct value /var/www/html.

[vhosts/standard] improve uniqueness of section id

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.

vhosts/standard: Directory_default to DocumentRoot

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.

* [ssl] [debian] manage ssl.conf with pillars
* [apache] make cyphersuite a list
* [apache/ssl] switch back to strings, lists merge is not good

DocumentRoot: fallback to SiteName like templates

geoip: Debian support

vhosts/standard: allow to set docroot ownership

vhosts/cleanup: clean non-salted sites

Create Apache's logdir if necessary

Makes it easier to clean any unwanted sites

* No more if.
* Allow lookup to set default value for all docroot
* updated pillar.example

unless test -d on file.directory seems useless.

Support for DocumentRootUser and DocumentRootGroup

Fix fcgid redhat