diff --git a/.travis.yml b/.travis.yml index f478dd91..e6086e5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,7 +89,7 @@ jobs: # - env: INSTANCE=modules-fedora-30-2017-7-py2 # - env: INSTANCE=modules-opensuse-leap-151-2017-7-py2 # - env: INSTANCE=modules-amazonlinux-1-2017-7-py2 - # env: INSTANCE=modules-arch-base-latest-2017-7-py2 + - env: INSTANCE=default-arch-base-latest-2017-7-py2 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/.yamllint b/.yamllint index 41bbdc11..464f8725 100644 --- a/.yamllint +++ b/.yamllint @@ -13,6 +13,7 @@ ignore: | test/**/states/**/*.sls .kitchen/ test/salt/pillar/modules.sls + test/salt/pillar/default.sls yaml-files: # Default settings diff --git a/apache/config/clean.sls b/apache/config/clean.sls index 93d9516d..8644dee3 100644 --- a/apache/config/clean.sls +++ b/apache/config/clean.sls @@ -20,6 +20,7 @@ apache-config-clean-file-absent: - /etc/apache2/global.conf - /etc/httpd/conf.modules.d - /etc/httpd/sites-enabled + - /etc/httpd/var - {{ apache.confdir }}/server-status{{ apache.confext }} - require: - sls: {{ sls_service_clean }} diff --git a/apache/config/file.sls b/apache/config/file.sls index 2dc6fd07..feaa184b 100644 --- a/apache/config/file.sls +++ b/apache/config/file.sls @@ -43,7 +43,25 @@ apache-config-file-directory-moddir: - require_in: - service: apache-service-running + {%- if apache.davlockdbdir %} + +apache-config-file-directory-davlockdbdir: + file.directory: + - name: {{ apache.davlockdbdir }} + - makedirs: True + - user: {{ apache.user }} + - group: {{ apache.group }} + - recurse: + - user + - group + - require: + - sls: {{ sls_package_install }} + - require_in: + - service: apache-service-running + + {%- endif %} {%- if 'sitesdir' in apache and apache.sitesdir %} + apache-config-file-directory-sites-enabled: file.directory: - name: {{ apache.sitesdir }} @@ -52,9 +70,10 @@ apache-config-file-directory-sites-enabled: - sls: {{ sls_package_install }} - require_in: - service: apache-service-running - {%- endif %} + {%- endif %} {%- if grains.os_family in ('Debian',) and 'confdir' in apache and apache.confdir %} + apache-config-file-directory-conf-enabled: file.directory: - name: {{ apache.confdir }} @@ -63,6 +82,7 @@ apache-config-file-directory-conf-enabled: - sls: {{ sls_package_install }} - require_in: - service: apache-service-running + {%- endif %} apache-config-file-managed: diff --git a/apache/config/modules/clean.sls b/apache/config/modules/clean.sls index 05f52c49..f10db622 100644 --- a/apache/config/modules/clean.sls +++ b/apache/config/modules/clean.sls @@ -3,10 +3,11 @@ {%- set tplroot = tpldir.split('/')[0] %} {%- set sls_package_clean = tplroot ~ '.package.clean' %} +{%- set sls_service_dead = tplroot ~ '.service.dead' %} {%- from tplroot ~ "/map.jinja" import apache with context %} include: - - {{ sls_package_clean }} + - {{ sls_service_dead }} {%- set existing_states = salt['cp.list_states']() %} {%- for module in salt['pillar.get']('apache:modules:disabled', []) %} @@ -18,11 +19,11 @@ apache-config-modules-{{ module }}-disable: - name: a2dismod -f {{ module }} - onlyif: ls {{ apache.moddir }}/{{ module }}.load - {%- elif grains['os_family']=="RedHat" %} + {%- elif grains.os_family in ('Redhat', 'Arch') %} cmd.run: - name: find /etc/httpd/ -name '*.conf' -type f -exec sed -i -e 's/\(^\s*LoadModule.{{ module }}_module\)/#\1/g' {} \; - - onlyif: httpd -M 2> /dev/null | grep "[[:space:]]{{ module }}_module" + - onlyif: {{ grains.os_family in ('Arch',) and 'true' }} || (httpd -M 2> /dev/null |grep "[[:space:]]{{ module }}_module") file.absent: - name: /etc/httpd/conf.modules.d/*{{ module }}.conf @@ -41,6 +42,8 @@ apache-config-modules-{{ module }}-disable: {%- endif %} - order: 225 + - require: + - sls: {{ sls_service_dead }} - require_in: - pkg: apache-package-clean-pkg-removed diff --git a/apache/config/modules/install.sls b/apache/config/modules/install.sls index c616982a..a3a67343 100644 --- a/apache/config/modules/install.sls +++ b/apache/config/modules/install.sls @@ -3,12 +3,12 @@ {%- set tplroot = tpldir.split('/')[0] %} {%- set sls_service_running = tplroot ~ '.service.running' %} -{%- set sls_package_install = tplroot ~ '.package.install' %} +{%- set sls_config_file = tplroot ~ '.config.file' %} {%- from tplroot ~ "/map.jinja" import apache with context %} include: - {{ sls_service_running }} - - {{ sls_package_install }} + - {{ sls_config_file }} {% set existing_states = salt['cp.list_states']() %} {% for module in salt['pillar.get']('apache:modules:enabled', []) %} @@ -20,11 +20,11 @@ apache-config-modules-{{ module }}-enable: - name: a2enmod -f {{ module }} - onlyif: ls {{ apache.moddir }}/{{ module }}.load - {% elif grains['os_family']=="RedHat" %} + {% elif grains.os_family in ('RedHat', 'Arch') %} cmd.run: - - name: find /etc/httpd/ -name '*.conf' -type f -exec sed -i -e 's/\(^\s*LoadModule.{{ module }}_module\)/\1/g' {} \; - - onlyif: httpd -M 2> /dev/null |grep "[[:space:]]{{ module }}_module" + - name: find /etc/httpd/ -name '*.conf' -type f -exec sed -i -e 's/\(^#\)\(\s*LoadModule.{{ module }}_module\)/\2/g' {} \; + - onlyif: {{ grains.os_family in ('Arch',) and 'true' }} || (httpd -M 2> /dev/null |grep "[[:space:]]{{ module }}_module") {% elif salt['grains.get']('os_family') == 'Suse' %} @@ -41,7 +41,7 @@ apache-config-modules-{{ module }}-enable: {%- endif %} - order: 225 - require: - - pkg: apache-package-install-pkg-installed + - sls: {{ sls_config_file }} - watch_in: - module: apache-service-running-restart - require_in: diff --git a/apache/config/modules/mod_security/init.sls b/apache/config/modules/mod_security/init.sls index 0dbfcf44..5b5c70fc 100644 --- a/apache/config/modules/mod_security/init.sls +++ b/apache/config/modules/mod_security/init.sls @@ -10,6 +10,8 @@ include: - {{ sls_service_running }} - {{ sls_package_install }} + {%- if grains.os_family not in ('Arch',) %} + apache-config-modules-security-pkg: pkg.installed: - name: {{ apache.mod_security.package }} @@ -23,7 +25,7 @@ apache-config-modules-security-pkg: - module: apache-service-running-reload - service: apache-service-running - {%- if apache.mod_security.crs_install and 'crs_package' in apache.mod_security %} + {%- if apache.mod_security.crs_install and 'crs_package' in apache.mod_security %} apache-config-modules-security-crs-pkg: pkg.installed: @@ -38,8 +40,8 @@ apache-config-modules-security-crs-pkg: - module: apache-service-running-reload - service: apache-service-running - {%- endif %} - {%- if apache.mod_security.manage_config and 'config_file' in apache.mod_security %} + {%- endif %} + {%- if apache.mod_security.manage_config and 'config_file' in apache.mod_security %} apache-config-modules-security-main-config-file-managed: file.managed: @@ -61,8 +63,7 @@ apache-config-modules-security-main-config-file-managed: - module: apache-service-running-reload - service: apache-service-running - {%- endif %} - {%- if grains.os_family not in ('Arch',) %} + {%- endif %} {%- if grains['os_family'] in ('Suse', 'Debian',) %} apache-config-modules-security-cmd-run-a2en-security2: diff --git a/apache/defaults.yaml b/apache/defaults.yaml index 8c1f70f2..2eed4e54 100644 --- a/apache/defaults.yaml +++ b/apache/defaults.yaml @@ -19,6 +19,7 @@ apache: group: www-data vhostdir: /etc/apache2/sites-available confdir: /etc/apache2/conf.d + davlockdbdir: null logdir: /var/log/apache2 wwwdir: /srv/apache2 document_root_user: null # Do not enforce group diff --git a/apache/files/Arch/apache-2.4.config.jinja b/apache/files/Arch/apache-2.4.config.jinja new file mode 100644 index 00000000..2907ad2a --- /dev/null +++ b/apache/files/Arch/apache-2.4.config.jinja @@ -0,0 +1,611 @@ +# +# This file is managed by Salt! Do not edit by hand! +# + +# This is the main Apache HTTP server configuration file. It contains the +# configuration directives that give the server its instructions. +# See for detailed information. +# In particular, see +# +# for a discussion of each configuration directive. +# +# Do NOT simply read the instructions in here without understanding +# what they do. They're here only as hints or reminders. If you are unsure +# consult the online docs. You have been warned. +# +# Configuration and logfile names: If the filenames you specify for many +# of the server's control files begin with "/" (or "drive:/" for Win32), the +# server will use that explicit path. If the filenames do *not* begin +# with "/", the value of ServerRoot is prepended -- so "logs/access_log" +# with ServerRoot set to "/usr/local/apache2" will be interpreted by the +# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" +# will be interpreted as '/logs/access_log'. + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# Do not add a slash at the end of the directory path. If you point +# ServerRoot at a non-local disk, be sure to specify a local disk on the +# Mutex directive, if file-based mutexes are used. If you wish to share the +# same ServerRoot for multiple httpd daemons, you will need to change at +# least PidFile. +# +ServerRoot "{{ apache.get('serverroot', '/etc/httpd') }}" + +# +# Mutex: Allows you to set the mutex mechanism and mutex file directory +# for individual mutexes, or change the global defaults +# +# Uncomment and change the directory if mutexes are file-based and the default +# mutex file directory is not on a local disk or is not appropriate for some +# other reason. +# +# Mutex default:/run/httpd + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses. +# +#Listen 12.34.56.78:80 +{% if salt['pillar.get']('apache:sites') is mapping %} + {%- set listen_directives = [] %} + {%- for id, site in salt['pillar.get']('apache:sites').items() %} + {%- set interfaces = site.get('interface', '*').split() %} + {%- set port = site.get('port', 80) %} + {%- for interface in interfaces %} + {%- if not site.get('exclude_listen_directive', False) and not port == '*' %} + {%- set listen_directive = interface ~ ':' ~ port %} + {%- if listen_directive not in listen_directives %} + {%- do listen_directives.append(listen_directive) %} + {%- endif %} + {%- endif %} + {%- endfor %} + {%- endfor %} + {%- for listen in listen_directives %} +Listen {{ listen }} + {%- endfor %} +{%- else %} +Listen 80 + + + Listen 443 + + +{%- endif %} + + +# +# Dynamic Shared Object (DSO) Support +# +# To be able to use the functionality of a module which was built as a DSO you +# have to place corresponding `LoadModule' lines at this location so the +# directives contained in it are actually available _before_ they are used. +# Statically compiled modules (those listed by `httpd -l') do not need +# to be loaded here. +# +# Example: +# LoadModule foo_module modules/mod_foo.so +# +LoadModule mpm_event_module modules/mod_mpm_event.so +#LoadModule mpm_prefork_module modules/mod_mpm_prefork.so +#LoadModule mpm_worker_module modules/mod_mpm_worker.so +LoadModule authn_file_module modules/mod_authn_file.so +#LoadModule authn_dbm_module modules/mod_authn_dbm.so +#LoadModule authn_anon_module modules/mod_authn_anon.so +#LoadModule authn_dbd_module modules/mod_authn_dbd.so +#LoadModule authn_socache_module modules/mod_authn_socache.so +LoadModule authn_core_module modules/mod_authn_core.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule authz_groupfile_module modules/mod_authz_groupfile.so +LoadModule authz_user_module modules/mod_authz_user.so +#LoadModule authz_dbm_module modules/mod_authz_dbm.so +#LoadModule authz_owner_module modules/mod_authz_owner.so +#LoadModule authz_dbd_module modules/mod_authz_dbd.so +LoadModule authz_core_module modules/mod_authz_core.so +#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so +#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so +LoadModule access_compat_module modules/mod_access_compat.so +LoadModule auth_basic_module modules/mod_auth_basic.so +#LoadModule auth_form_module modules/mod_auth_form.so +#LoadModule auth_digest_module modules/mod_auth_digest.so +#LoadModule allowmethods_module modules/mod_allowmethods.so +#LoadModule file_cache_module modules/mod_file_cache.so +#LoadModule cache_module modules/mod_cache.so +#LoadModule cache_disk_module modules/mod_cache_disk.so +#LoadModule cache_socache_module modules/mod_cache_socache.so +#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so +#LoadModule socache_dbm_module modules/mod_socache_dbm.so +#LoadModule socache_memcache_module modules/mod_socache_memcache.so +#LoadModule socache_redis_module modules/mod_socache_redis.so +#LoadModule watchdog_module modules/mod_watchdog.so +#LoadModule macro_module modules/mod_macro.so +#LoadModule dbd_module modules/mod_dbd.so +#LoadModule dumpio_module modules/mod_dumpio.so +#LoadModule echo_module modules/mod_echo.so +#LoadModule buffer_module modules/mod_buffer.so +#LoadModule data_module modules/mod_data.so +#LoadModule ratelimit_module modules/mod_ratelimit.so +LoadModule reqtimeout_module modules/mod_reqtimeout.so +#LoadModule ext_filter_module modules/mod_ext_filter.so +#LoadModule request_module modules/mod_request.so +LoadModule include_module modules/mod_include.so +LoadModule filter_module modules/mod_filter.so +#LoadModule reflector_module modules/mod_reflector.so +#LoadModule substitute_module modules/mod_substitute.so +#LoadModule sed_module modules/mod_sed.so +#LoadModule charset_lite_module modules/mod_charset_lite.so +#LoadModule deflate_module modules/mod_deflate.so +#LoadModule xml2enc_module modules/mod_xml2enc.so +#LoadModule proxy_html_module modules/mod_proxy_html.so +#LoadModule brotli_module modules/mod_brotli.so +LoadModule mime_module modules/mod_mime.so +#LoadModule ldap_module modules/mod_ldap.so +LoadModule log_config_module modules/mod_log_config.so +#LoadModule log_debug_module modules/mod_log_debug.so +#LoadModule log_forensic_module modules/mod_log_forensic.so +#LoadModule logio_module modules/mod_logio.so +#LoadModule lua_module modules/mod_lua.so +LoadModule env_module modules/mod_env.so +#LoadModule mime_magic_module modules/mod_mime_magic.so +#LoadModule cern_meta_module modules/mod_cern_meta.so +#LoadModule expires_module modules/mod_expires.so +LoadModule headers_module modules/mod_headers.so +#LoadModule ident_module modules/mod_ident.so +#LoadModule usertrack_module modules/mod_usertrack.so +#LoadModule unique_id_module modules/mod_unique_id.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule version_module modules/mod_version.so +#LoadModule remoteip_module modules/mod_remoteip.so +#LoadModule proxy_module modules/mod_proxy.so +#LoadModule proxy_connect_module modules/mod_proxy_connect.so +#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so +#LoadModule proxy_http_module modules/mod_proxy_http.so +#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so +#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so +#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so +#LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so +#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so +#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so +#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so +#LoadModule proxy_express_module modules/mod_proxy_express.so +#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so +#LoadModule session_module modules/mod_session.so +#LoadModule session_cookie_module modules/mod_session_cookie.so +#LoadModule session_crypto_module modules/mod_session_crypto.so +#LoadModule session_dbd_module modules/mod_session_dbd.so +LoadModule slotmem_shm_module modules/mod_slotmem_shm.so +#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so +#LoadModule ssl_module modules/mod_ssl.so +#LoadModule dialup_module modules/mod_dialup.so +#LoadModule http2_module modules/mod_http2.so +#LoadModule proxy_http2_module modules/mod_proxy_http2.so +#LoadModule md_module modules/mod_md.so +#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so +#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so +#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so +#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so +LoadModule unixd_module modules/mod_unixd.so +#LoadModule heartbeat_module modules/mod_heartbeat.so +#LoadModule heartmonitor_module modules/mod_heartmonitor.so +#LoadModule dav_module modules/mod_dav.so +LoadModule status_module modules/mod_status.so +LoadModule autoindex_module modules/mod_autoindex.so +#LoadModule asis_module modules/mod_asis.so +#LoadModule info_module modules/mod_info.so +#LoadModule suexec_module modules/mod_suexec.so + + #LoadModule cgid_module modules/mod_cgid.so + + + #LoadModule cgi_module modules/mod_cgi.so + +#LoadModule dav_fs_module modules/mod_dav_fs.so +#LoadModule dav_lock_module modules/mod_dav_lock.so +#LoadModule vhost_alias_module modules/mod_vhost_alias.so +LoadModule negotiation_module modules/mod_negotiation.so +LoadModule dir_module modules/mod_dir.so +#LoadModule imagemap_module modules/mod_imagemap.so +#LoadModule actions_module modules/mod_actions.so +#LoadModule speling_module modules/mod_speling.so +LoadModule userdir_module modules/mod_userdir.so +LoadModule alias_module modules/mod_alias.so +#LoadModule rewrite_module modules/mod_rewrite.so + + +# +# If you wish httpd to run as a different user or group, you must run +# httpd as root initially and it will switch. +# +# User/Group: The name (or #number) of the user/group to run httpd as. +# It is usually good practice to create a dedicated user and group for +# running httpd, as with most system services. +# +User {{ apache.user or 'http' }} +Group {{ apache.group or 'http' }} + + + +# 'Main' server configuration +# +# The directives in this section set up the values used by the 'main' +# server, which responds to any requests that aren't handled by a +# definition. These values also provide defaults for +# any containers you may define later in the file. +# +# All of these directives may appear inside containers, +# in which case these default settings will be overridden for the +# virtual host being defined. +# + +# +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +# +ServerAdmin you@example.com + +# +# ServerName gives the name and port that the server uses to identify itself. +# This can often be determined automatically, but we recommend you specify +# it explicitly to prevent problems during startup. +# +# If your host doesn't have a registered DNS name, enter its IP address here. +# +#ServerName www.example.com:80 + +# +# Deny access to the entirety of your server's filesystem. You must +# explicitly permit access to web content directories in other +# blocks below. +# + + AllowOverride none + Require all denied + + +# +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. +# + +# +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# +DocumentRoot "{{ apache.get('docroot', apache.wwwdir or '/srv/http') }}" + +# +# Relax access to content within {{ apache.wwwdir }}. +# + + AllowOverride None + # Allow open access: + Require all granted + + +# Further relax access to the default document root: + + # + # Possible values for the Options directive are "None", "All", + # or any combination of: + # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" + # doesn't give it to you. + # + # The Options directive is both complicated and important. Please see + # http://httpd.apache.org/docs/2.4/mod/core.html#options + # for more information. + # + Options Indexes FollowSymLinks + + # + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # AllowOverride FileInfo AuthConfig Limit + # + AllowOverride None + + # + # Controls who can get stuff from this server. + # + Require all granted + + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# + + DirectoryIndex index.html + + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog "{{ apache.logdir }}/error_log" + +# +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +# +LogLevel warn + + + # + # The following directives define some format nicknames for use with + # a CustomLog directive (see below). + # + {%- for log_format in salt['pillar.get']('apache:log_formats', []) %} + LogFormat {{ log_format }} + {%- endfor %} + + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined + LogFormat "%h %l %u %t \"%r\" %>s %b" common + + + # You need to enable mod_logio.c to use %I and %O + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + + + # + # The location and format of the access logfile (Common Logfile Format). + # If you do not define any access logfiles within a + # container, they will be logged here. Contrariwise, if you *do* + # define per- access logfiles, transactions will be + # logged therein and *not* in this file. + # + #CustomLog "/var/log/httpd/access_log" common + + # + # If you prefer a logfile with access, agent, and referer information + # (Combined Logfile Format) you can use the following directive. + # + #CustomLog "/var/log/httpd/access_log" combined + CustomLog "{{ apache.logdir }}/access_log" combined + + + + # + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client + # will make a new request for the document at its new location. + # Example: + # Redirect permanent /foo http://www.example.com/bar + + # + # Alias: Maps web paths into filesystem paths and is used to + # access content that does not live under the DocumentRoot. + # Example: + # Alias /webpath /full/filesystem/path + # + # If you include a trailing / on /webpath then the server will + # require it to be present in the URL. You will also likely + # need to provide a section to allow access to + # the filesystem path. + + # + # ScriptAlias: This controls which directories contain server scripts. + # ScriptAliases are essentially the same as Aliases, except that + # documents in the target directory are treated as applications and + # run by the server when requested rather than as documents sent to the + # client. The same rules about trailing "/" apply to ScriptAlias + # directives as to Alias. + # + ScriptAlias /cgi-bin/ "{{ apache.wwwdir }}/cgi-bin/" + + + + + # + # ScriptSock: On threaded servers, designate the path to the UNIX + # socket used to communicate with the CGI daemon of mod_cgid. + # + #Scriptsock cgisock + + +# +# "/srv/http/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# + + AllowOverride None + Options None + Require all granted + + + + # + # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied + # backend servers which have lingering "httpoxy" defects. + # 'Proxy' request header is undefined by the IETF, not listed by IANA + # + RequestHeader unset Proxy early + + + + # + # TypesConfig points to the file containing the list of mappings from + # filename extension to MIME-type. + # + TypesConfig conf/mime.types + + # + # AddType allows you to add to or override the MIME configuration + # file specified in TypesConfig for specific file types. + # + #AddType application/x-gzip .tgz + # + # AddEncoding allows you to have certain browsers uncompress + # information on the fly. Note: Not all browsers support this. + # + #AddEncoding x-compress .Z + #AddEncoding x-gzip .gz .tgz + # + # If the AddEncoding directives above are commented-out, then you + # probably should define those extensions to indicate media types: + # + AddType application/x-compress .Z + AddType application/x-gzip .gz .tgz + + # + # AddHandler allows you to map certain file extensions to "handlers": + # actions unrelated to filetype. These can be either built into the server + # or added with the Action directive (see below) + # + # To use CGI scripts outside of ScriptAliased directories: + # (You will also need to add "ExecCGI" to the "Options" directive.) + # + #AddHandler cgi-script .cgi + + # For type maps (negotiated resources): + #AddHandler type-map var + + # + # Filters allow you to process content before it is sent to the client. + # + # To parse .shtml files for server-side includes (SSI): + # (You will also need to add "Includes" to the "Options" directive.) + # + #AddType text/html .shtml + #AddOutputFilter INCLUDES .shtml + + +# +# Specify a default charset for all content served; this enables +# interpretation of all content as UTF-8 by default. To use the +# default browser choice (ISO-8859-1), or to allow the META tags +# in HTML content to override this choice, comment out this +# directive: +# +{%- if apache.get('default_charset', False) is none %} +# AddDefaultCharset UTF-8 +{%- else %} +AddDefaultCharset {{ apache.get('default_charset', 'UTF-8') }} +{%- endif %} + + +# +# The mod_mime_magic module allows the server to use various hints from the +# contents of the file itself to determine its type. The MIMEMagicFile +# directive tells the module where the hint definitions are located. +# +#MIMEMagicFile conf/magic + +# +# Customizable error responses come in three flavors: +# 1) plain text 2) local redirects 3) external redirects +# +# Some examples: +#ErrorDocument 500 "The server made a boo boo." +#ErrorDocument 404 /missing.html +#ErrorDocument 404 "/cgi-bin/missing_handler.pl" +#ErrorDocument 402 http://www.example.com/subscription_info.html +# + +# +# MaxRanges: Maximum number of Ranges in a request before +# returning the entire resource, or one of the special +# values 'default', 'none' or 'unlimited'. +# Default setting is to accept 200 Ranges. +#MaxRanges unlimited + +# +# EnableMMAP and EnableSendfile: On systems that support it, +# memory-mapping or the sendfile syscall may be used to deliver +# files. This usually improves server performance, but must +# be turned off when serving from networked-mounted +# filesystems or if support for these functions is otherwise +# broken on your system. +# Defaults: EnableMMAP On, EnableSendfile Off +# +#EnableMMAP off +#EnableSendfile on + +{%- for directive, dvalue in salt['pillar.get']('apache:global', {}).items() %} +{{ directive }} {{ dvalue }} +{%- endfor %} + +# Supplemental configuration +# +# The configuration files in the conf/extra/ directory can be +# included to add extra features or to modify the default configuration of +# the server, or you may simply copy their contents here and change as +# necessary. + +# Load config files in the "/etc/httpd/conf.d" directory, if any. +IncludeOptional {{ apache.confdir }}/*.conf +{% if apache.vhostdir != apache.confdir %} +IncludeOptional {{ apache.vhostdir }}/*.conf +{% endif %} + +# Server-pool management (MPM specific) +Include conf/extra/httpd-mpm.conf + +# Multi-language error messages +Include conf/extra/httpd-multilang-errordoc.conf + +# Fancy directory listings +Include conf/extra/httpd-autoindex.conf + +# Language settings +Include conf/extra/httpd-languages.conf + +# User home directories +Include conf/extra/httpd-userdir.conf + +# Real-time info on requests and configuration +#Include conf/extra/httpd-info.conf + +# Virtual hosts +#Include conf/extra/httpd-vhosts.conf + +# Local access to the Apache HTTP Server Manual +#Include conf/extra/httpd-manual.conf + +# Distributed authoring and versioning (WebDAV) + +Include conf/extra/httpd-dav.conf + + +# Various default settings +Include conf/extra/httpd-default.conf + +# Configure mod_proxy_html to understand HTML4/XHTML1 + +Include conf/extra/proxy-html.conf + + +# Secure (SSL/TLS) connections +#Include conf/extra/httpd-ssl.conf +# +# Note: The following must must be present to support +# starting without SSL on platforms with no /dev/random equivalent +# but a statically compiled-in mod_ssl. +# + +SSLRandomSeed startup builtin +SSLRandomSeed connect builtin + + diff --git a/apache/osfamilymap.yaml b/apache/osfamilymap.yaml index beeb62c0..c8f1d25a 100644 --- a/apache/osfamilymap.yaml +++ b/apache/osfamilymap.yaml @@ -150,16 +150,18 @@ Arch: name: apache service: name: httpd + service_state: skip user: http group: http config: /etc/httpd/conf/httpd.conf mod_wsgi: mod_wsgi - mod_security: - package: modsecurity + mod_security: null + # package: modsecurity vhostdir: /etc/httpd/conf/vhosts confdir: /etc/httpd/conf/extra + davlockdbdir: /etc/httpd/var/DavLock modulesdir: /usr/lib/httpd/modules confext: .conf logdir: /var/log/httpd diff --git a/apache/service/running.sls b/apache/service/running.sls index d32a8d0a..07299777 100644 --- a/apache/service/running.sls +++ b/apache/service/running.sls @@ -4,12 +4,10 @@ {%- set tplroot = tpldir.split('/')[0] %} {%- set sls_config_file = tplroot ~ '.config.file' %} {%- set sls_config_registersite = tplroot ~ '.config.register_site' %} -{%- set sls_package_install = tplroot ~ '.package.install' %} {%- from tplroot ~ "/map.jinja" import apache with context %} include: - {{ sls_config_file }} - - {{ sls_package_install }} - {{ sls_config_registersite }} apache-service-running: @@ -17,12 +15,9 @@ apache-service-running: {# By default run apache service states (unless pillar is false) #} service.running: - name: {{ apache.service.name }} - {%- if apache.service_state in [ 'running', 'dead' ] %} - enable: True - {%- endif %} - watch: - sls: {{ sls_config_file }} - - sls: {{ sls_package_install }} - retry: {{ apache.retry_option|json }} cmd.run: - names: diff --git a/pillar.example b/pillar.example index b28a568d..2785661e 100644 --- a/pillar.example +++ b/pillar.example @@ -303,7 +303,7 @@ apache: modules: enabled: # List modules to enable - - ssl + - ssl # not archlinux - prefork - rewrite - proxy @@ -312,6 +312,11 @@ apache: - geoip - status - logio + - dav + - dav_fs + - dav_lock + - auth_digest + - shmcb disabled: # List modules to disable - some_module diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls index dc91e2f4..2e20ce7c 100644 --- a/test/salt/pillar/default.sls +++ b/test/salt/pillar/default.sls @@ -1,3 +1,16 @@ # -*- coding: utf-8 -*- # vim: ft=yaml --- + + {%- if grains.os_family == 'Arch' %} + +apache: + modules: + enabled: + - auth_digest + - dav + - dav_fs + - dav_lock + - shmcb + + {%- endif %} diff --git a/test/salt/pillar/modules.sls b/test/salt/pillar/modules.sls index 468004fc..2570f5ae 100644 --- a/test/salt/pillar/modules.sls +++ b/test/salt/pillar/modules.sls @@ -48,7 +48,10 @@ apache: modules: enabled: # List modules to enable - ldap + {%- if grains.os_family != 'Arch' %} - ssl + {%- endif %} + - dav disabled: # List modules to disable - rewrite