diff --git a/apache/config.sls b/apache/config.sls index 2613ca7..29bc7e2 100644 --- a/apache/config.sls +++ b/apache/config.sls @@ -69,3 +69,17 @@ include: - context: apache: {{ apache }} {% endif %} + +{% if grains['os_family']=="FreeBSD" %} +{{ apache.portsfile }}: + file.managed: + - template: jinja + - source: + - salt://apache/files/{{ salt['grains.get']('os_family') }}/ports-{{ apache.version }}.conf.jinja + - require: + - pkg: apache + - watch_in: + - service: apache + - context: + apache: {{ apache }} +{% endif %} diff --git a/apache/files/FreeBSD/apache-2.4.config.jinja b/apache/files/FreeBSD/apache-2.4.config.jinja new file mode 100644 index 0000000..f354219 --- /dev/null +++ b/apache/files/FreeBSD/apache-2.4.config.jinja @@ -0,0 +1,517 @@ +# +# 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 "/usr/local" + +# +# 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:/var/run + +Include {{ apache.portsfile }} + +# +# 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 authn_file_module libexec/apache24/mod_authn_file.so +#LoadModule authn_dbm_module libexec/apache24/mod_authn_dbm.so +#LoadModule authn_anon_module libexec/apache24/mod_authn_anon.so +#LoadModule authn_dbd_module libexec/apache24/mod_authn_dbd.so +#LoadModule authn_socache_module libexec/apache24/mod_authn_socache.so +LoadModule authn_core_module libexec/apache24/mod_authn_core.so +LoadModule authz_host_module libexec/apache24/mod_authz_host.so +LoadModule authz_groupfile_module libexec/apache24/mod_authz_groupfile.so +LoadModule authz_user_module libexec/apache24/mod_authz_user.so +#LoadModule authz_dbm_module libexec/apache24/mod_authz_dbm.so +#LoadModule authz_owner_module libexec/apache24/mod_authz_owner.so +#LoadModule authz_dbd_module libexec/apache24/mod_authz_dbd.so +LoadModule authz_core_module libexec/apache24/mod_authz_core.so +#LoadModule authnz_fcgi_module libexec/apache24/mod_authnz_fcgi.so +LoadModule access_compat_module libexec/apache24/mod_access_compat.so +LoadModule auth_basic_module libexec/apache24/mod_auth_basic.so +#LoadModule auth_form_module libexec/apache24/mod_auth_form.so +#LoadModule auth_digest_module libexec/apache24/mod_auth_digest.so +#LoadModule allowmethods_module libexec/apache24/mod_allowmethods.so +#LoadModule file_cache_module libexec/apache24/mod_file_cache.so +#LoadModule cache_module libexec/apache24/mod_cache.so +#LoadModule cache_disk_module libexec/apache24/mod_cache_disk.so +#LoadModule cache_socache_module libexec/apache24/mod_cache_socache.so +#LoadModule socache_shmcb_module libexec/apache24/mod_socache_shmcb.so +#LoadModule socache_dbm_module libexec/apache24/mod_socache_dbm.so +#LoadModule socache_memcache_module libexec/apache24/mod_socache_memcache.so +#LoadModule watchdog_module libexec/apache24/mod_watchdog.so +#LoadModule macro_module libexec/apache24/mod_macro.so +#LoadModule dbd_module libexec/apache24/mod_dbd.so +#LoadModule dumpio_module libexec/apache24/mod_dumpio.so +#LoadModule buffer_module libexec/apache24/mod_buffer.so +#LoadModule data_module libexec/apache24/mod_data.so +#LoadModule ratelimit_module libexec/apache24/mod_ratelimit.so +LoadModule reqtimeout_module libexec/apache24/mod_reqtimeout.so +#LoadModule ext_filter_module libexec/apache24/mod_ext_filter.so +#LoadModule request_module libexec/apache24/mod_request.so +#LoadModule include_module libexec/apache24/mod_include.so +LoadModule filter_module libexec/apache24/mod_filter.so +#LoadModule reflector_module libexec/apache24/mod_reflector.so +#LoadModule substitute_module libexec/apache24/mod_substitute.so +#LoadModule sed_module libexec/apache24/mod_sed.so +#LoadModule charset_lite_module libexec/apache24/mod_charset_lite.so +#LoadModule deflate_module libexec/apache24/mod_deflate.so +#LoadModule xml2enc_module libexec/apache24/mod_xml2enc.so +#LoadModule proxy_html_module libexec/apache24/mod_proxy_html.so +LoadModule mime_module libexec/apache24/mod_mime.so +LoadModule log_config_module libexec/apache24/mod_log_config.so +#LoadModule log_debug_module libexec/apache24/mod_log_debug.so +#LoadModule log_forensic_module libexec/apache24/mod_log_forensic.so +#LoadModule logio_module libexec/apache24/mod_logio.so +LoadModule env_module libexec/apache24/mod_env.so +#LoadModule mime_magic_module libexec/apache24/mod_mime_magic.so +#LoadModule cern_meta_module libexec/apache24/mod_cern_meta.so +#LoadModule expires_module libexec/apache24/mod_expires.so +LoadModule headers_module libexec/apache24/mod_headers.so +#LoadModule usertrack_module libexec/apache24/mod_usertrack.so +#LoadModule unique_id_module libexec/apache24/mod_unique_id.so +LoadModule setenvif_module libexec/apache24/mod_setenvif.so +LoadModule version_module libexec/apache24/mod_version.so +#LoadModule remoteip_module libexec/apache24/mod_remoteip.so +#LoadModule proxy_module libexec/apache24/mod_proxy.so +#LoadModule proxy_connect_module libexec/apache24/mod_proxy_connect.so +#LoadModule proxy_ftp_module libexec/apache24/mod_proxy_ftp.so +#LoadModule proxy_http_module libexec/apache24/mod_proxy_http.so +#LoadModule proxy_fcgi_module libexec/apache24/mod_proxy_fcgi.so +#LoadModule proxy_scgi_module libexec/apache24/mod_proxy_scgi.so +#LoadModule proxy_fdpass_module libexec/apache24/mod_proxy_fdpass.so +#LoadModule proxy_wstunnel_module libexec/apache24/mod_proxy_wstunnel.so +#LoadModule proxy_ajp_module libexec/apache24/mod_proxy_ajp.so +#LoadModule proxy_balancer_module libexec/apache24/mod_proxy_balancer.so +#LoadModule proxy_express_module libexec/apache24/mod_proxy_express.so +#LoadModule proxy_hcheck_module libexec/apache24/mod_proxy_hcheck.so +#LoadModule session_module libexec/apache24/mod_session.so +#LoadModule session_cookie_module libexec/apache24/mod_session_cookie.so +#LoadModule session_crypto_module libexec/apache24/mod_session_crypto.so +#LoadModule session_dbd_module libexec/apache24/mod_session_dbd.so +#LoadModule slotmem_shm_module libexec/apache24/mod_slotmem_shm.so +#LoadModule slotmem_plain_module libexec/apache24/mod_slotmem_plain.so +#LoadModule ssl_module libexec/apache24/mod_ssl.so +#LoadModule dialup_module libexec/apache24/mod_dialup.so +#LoadModule lbmethod_byrequests_module libexec/apache24/mod_lbmethod_byrequests.so +#LoadModule lbmethod_bytraffic_module libexec/apache24/mod_lbmethod_bytraffic.so +#LoadModule lbmethod_bybusyness_module libexec/apache24/mod_lbmethod_bybusyness.so +#LoadModule lbmethod_heartbeat_module libexec/apache24/mod_lbmethod_heartbeat.so +#LoadModule mpm_event_module libexec/apache24/mod_mpm_event.so +LoadModule mpm_prefork_module libexec/apache24/mod_mpm_prefork.so +#LoadModule mpm_worker_module libexec/apache24/mod_mpm_worker.so +LoadModule unixd_module libexec/apache24/mod_unixd.so +#LoadModule heartbeat_module libexec/apache24/mod_heartbeat.so +#LoadModule heartmonitor_module libexec/apache24/mod_heartmonitor.so +#LoadModule dav_module libexec/apache24/mod_dav.so +LoadModule status_module libexec/apache24/mod_status.so +LoadModule autoindex_module libexec/apache24/mod_autoindex.so +#LoadModule asis_module libexec/apache24/mod_asis.so +#LoadModule info_module libexec/apache24/mod_info.so +#LoadModule suexec_module libexec/apache24/mod_suexec.so + + #LoadModule cgid_module libexec/apache24/mod_cgid.so + + + #LoadModule cgi_module libexec/apache24/mod_cgi.so + +#LoadModule dav_fs_module libexec/apache24/mod_dav_fs.so +#LoadModule dav_lock_module libexec/apache24/mod_dav_lock.so +#LoadModule vhost_alias_module libexec/apache24/mod_vhost_alias.so +#LoadModule negotiation_module libexec/apache24/mod_negotiation.so +LoadModule dir_module libexec/apache24/mod_dir.so +#LoadModule imagemap_module libexec/apache24/mod_imagemap.so +#LoadModule actions_module libexec/apache24/mod_actions.so +#LoadModule speling_module libexec/apache24/mod_speling.so +#LoadModule userdir_module libexec/apache24/mod_userdir.so +LoadModule alias_module libexec/apache24/mod_alias.so +#LoadModule rewrite_module libexec/apache24/mod_rewrite.so + +# Third party modules +IncludeOptional etc/apache24/modules.d/[0-9][0-9][0-9]_*.conf + + +# +# 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 www +Group www + + + +# '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 root@localhost + +# +# 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 "/usr/local/www/apache24/data" + + # + # 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 "/var/log/httpd-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). + # + 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 + + + + # + # 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/ "/usr/local/www/apache24/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 + + +# +# "/usr/local/www/apache24/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# + + AllowOverride None + Options None + Require all granted + + + + # + # TypesConfig points to the file containing the list of mappings from + # filename extension to MIME-type. + # + TypesConfig etc/apache24/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 + + +# +# 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 etc/apache24/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 + +# Supplemental configuration +# +# The configuration files in the etc/apache24/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. + +# Server-pool management (MPM specific) +#Include etc/apache24/extra/httpd-mpm.conf + +# Multi-language error messages +#Include etc/apache24/extra/httpd-multilang-errordoc.conf + +# Fancy directory listings +#Include etc/apache24/extra/httpd-autoindex.conf + +# Language settings +#Include etc/apache24/extra/httpd-languages.conf + +# User home directories +#Include etc/apache24/extra/httpd-userdir.conf + +# Real-time info on requests and configuration +#Include etc/apache24/extra/httpd-info.conf + +# Virtual hosts +#Include etc/apache24/extra/httpd-vhosts.conf + +# Local access to the Apache HTTP Server Manual +#Include etc/apache24/extra/httpd-manual.conf + +# Distributed authoring and versioning (WebDAV) +#Include etc/apache24/extra/httpd-dav.conf + +# Various default settings +#Include etc/apache24/extra/httpd-default.conf + +# Configure mod_proxy_html to understand HTML4/XHTML1 + +Include etc/apache24/extra/proxy-html.conf + + +# Secure (SSL/TLS) connections +#Include etc/apache24/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 + + +Include etc/apache24/Includes/*.conf + diff --git a/apache/files/FreeBSD/ports-2.4.conf.jinja b/apache/files/FreeBSD/ports-2.4.conf.jinja new file mode 100644 index 0000000..128c87a --- /dev/null +++ b/apache/files/FreeBSD/ports-2.4.conf.jinja @@ -0,0 +1,47 @@ +{%- from "apache/map.jinja" import apache with context -%} + +# Managed by saltstack + +{% 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) %} + {%- 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 + + + + Listen 443 + +{%- endif %} + +{%- if salt['pillar.get']('apache:name_virtual_hosts') is iterable %} + {%- set name_virtual_host_directives = [] %} + + {%- for name_virtual_host in salt['pillar.get']('apache:name_virtual_hosts') %} + {%- set interface = name_virtual_host.get('interface', '*') %} + {%- set port = name_virtual_host.get('port', 80) %} + {%- set name_virtual_host_directive = interface ~ ':' ~ port %} + {%- do name_virtual_host_directives.append(name_virtual_host_directive) %} + {%- endfor %} + + {%- for name_virtual_host in name_virtual_host_directives %} +NameVirtualHost {{ name_virtual_host }} + {%- endfor %} +{%- endif -%} diff --git a/apache/map.jinja b/apache/map.jinja index ef0838a..5ea22b4 100644 --- a/apache/map.jinja +++ b/apache/map.jinja @@ -83,6 +83,7 @@ 'server': 'apache22', 'service': 'apache22', 'configfile': '/usr/local/etc/apache22/httpd.conf', + 'portsfile': '/usr/local/etc/apache22/ports.conf', 'mod_wsgi': 'ap22-mod_wsgi3',