Compare commits

..

No commits in common. "a34cfcd89d6e7e42bae47e45e18dea91b9d37237" and "277d5fcf81e658c91e395ca91170dbd91bf76e5d" have entirely different histories.

6 changed files with 1 additions and 971 deletions

226
apache.cf
View File

@ -1,226 +0,0 @@
#
# Install and configure Apache with SSL and certbot
#
# Use:
# usebundle => install_apache;
# usebundle => apache_vhost(site_data);
#
#
bundle agent apache
{
vars:
freebsd::
"pkgs" slist => {
"apache24",
"mod_php74"
};
"log_dir" string =>"/var/log/httpd";
"service_name" string => "apache24";
"www_user" string => "www";
"www_group" string => "www";
"mime_types" string => "/usr/local/etc/apache24/mime.types";
"service_name" string => "apache24";
"restart_cmd" string => "/usr/sbin/service $(service_name) restart";
"etc_dir" string => "/usr/local/etc";
"cfg_dir" string => "$(etc_dir)/apache24";
"main_cfg" string => "$(cfg_dir)/httpd.conf";
"libexec_dir" string => "libexec/apache24";
"www_dir" string => "/usr/local/www";
"default_html_dir" string => "$(www_dir)/apache24";
"server_root" string => "/usr/local";
"modules" data => '[
{m: "autoindex",f:"mod_autoindex"},
{m: "log_config",f:"mod_log_config"},
{m: "version",f:"mod_version"},
{m: "unixd",f:"mod_unixd"},
{m: "php7",f:"libphp7"},
]';
debian::
"pkgs" slist => {
"apache2",
"libapache2-mod-php",
"libapache2-mod-svn",
};
"log_dir" string =>"/var/log/apache2";
"service_name" string => "apache2";
"restart_cmd" string => "/usr/bin/systemctl restart $(service_name)";
"www_user" string => "www-data";
"www_group" string => "www-data";
"mime_types" string => "/etc/mime.types";
"www_dir" string => "/var/www";
"default_html_dir" string => "$(www_dir)/html";
"etc_dir" string => "/etc";
"cfg_dir" string => "$(etc_dir)/apache2";
"main_cfg" string => "$(cfg_dir)/apache2.conf";
"libexec_dir" string => "lib/apache2/modules";
"server_root" string => "/usr";
"modules" data => '[
{m:"php",f:"libphp8.2"}
]';
centos::
"pkgs" slist => {
"httpd",
"libapache2-mod-php",
"libapache2-mod-svn",
};
"service_name" string => "httpd";
ubuntu_20::
"phpm" string => "php7";
ubuntu_22::
"phpm" string => "php";
ubuntu::
"modules" string => '[
{m:"$(phpm)",f:"libphp$(install_php.version)"},
{m:"proxy",f:"mod_proxy"},
{m:"proxy_http",f:"mod_proxy_http"},
{m: "autoindex",f:"mod_autoindex"},
{m: "dav",f:"mod_dav"},
{m: "dav_svn", f:"mod_dav_svn"},
{m: "authz_svn", f:"mod_authz_svn"},
]';
}
bundle agent install_apache(params)
{
classes:
packages:
freebsd::
"$(apache.pkgs)"
policy => "present",
package_module => pkg,
classes => if_repaired(apache_changed);
debian::
"$(apache.pkgs)"
policy => "present",
package_module => apt_get,
classes => if_repaired(apache_changed);
centos::
"$(apache.pkgs)"
policy => "present",
package_module => yum,
classes => if_repaired(apache_changed);
commands:
freebsd::
"/usr/sbin/sysrc"
handle => "apache_editrc",
args => "apache24_enable=yes",
inform=>"false";
debian|centos::
"/bin/true" handle => "apache_editrc",
inform => "false";
files:
"$(apache.www_dir)/."
create=>"true",
perms => uperm("root","root","755"),
handle => "apache_www_dir_created";
"$(apache.default_html_dir)/."
create=>"true",
perms => uperm("$(apache.www_user)","$(apache.www_group)","755"),
depends_on => {"apache_www_dir_created"},
handle=>"apache_default_html_dir_created";
"$(apache.cfg_dir)/Vhosts/dummy.conf"
create=>"true",
content=>"",
perms => uperm("root","root","644"),
handle=> "apache_vhost_dir_created";
"$(apache.main_cfg)"
create => "true",
edit_template => "$(sys.workdir)/inputs/$(def.mfdomain)/templates/httpd.conf.mustache",
template_method => "mustache",
classes => if_repaired(apache_changed);
services:
"$(apache.service_name)"
depends_on => {"apache_editrc","apache_vhost_dir_created"},
service_policy => "start",
handle => "apache_running";
php_changed|apache_changed::
"$(apache.service_name)"
service_policy => "restart";
}
bundle agent restart_apache(arg)
{
commands:
"/bin/sh -c "
args => "'/bin/echo $(arg) > /dev/null && /usr/bin/systemctl restart $(apache.service_name)'";
}
bundle agent apache_vhost
(site)
{
classes:
"delete" expression => $(site[disable]);
"use_ssl" expression => $(site[ssl]);
vars:
"cert_file" string => "$(certbot.certbot_dir)/live/$(site[domain])";
"template_file"
string =>
"$(sys.workdir)/inputs/$(def.mfdomain)/templates/httpd-vhost.conf.mustache";
"domain_file" string => "$(apache.cfg_dir)/Vhosts/$(site[domain]).conf";
"domain_dir" string => "$(apache.www_dir)/$(site[domain])/";
use_ssl::
"vhostdeps" slist => {"apache_ssl_created$(site[domain])"};
!use_ssl::
"vhostdeps" slist => {};
files:
delete::
"$(domain_file)"
delete => tidy,
classes => if_repaired(apache_restart);
!delete::
"$(domain_file)"
perms => uperm("$(apache.www_user)","$(apache.www_group)","644"),
create => "true",
edit_template => "$(template_file)",
template_method => "mustache",
handle => "vhost_cfg_done$(site[domain])",
depends_on => @(vhostdeps),
classes => if_repaired("apache_vhost_restart");
"$(domain_dir)."
create => "true",
perms => uperm("$(apache.www_user)","$(apache.www_group)","750");
methods:
use_ssl::
"any" usebundle => certbot_cert(@(site),"$(apache.default_html_dir)","$(site[domain])"),
handle => "apache_ssl_created$(site[domain])";
"apache_vhost_restart"::
"any" usebundle => restart_apache("$(site[domain])"),
depends_on => {"vhost_cfg_done$(site[domain])","apache_ssl_created$(site[domain])" };
!use_ssl::
"apache_vhost_restart"::
"any" usebundle => restart_apache("$(site[domain])"),
depends_on => {"vhost_cfg_done$(site[domain])" };
reports:
}

View File

@ -1,94 +0,0 @@
#
# Create SSL certificates using Letsencrypt
#
bundle agent certbot
{
vars:
"webroot" string => "$(wr)";
"renew" string => "$(rn)";
freebsd::
"certbot_dir" string => "/usr/local/etc/letsencrypt";
"exe" string => "/usr/local/bin/certbot";
"pkg" string => "py39-certbot";
debian::
"certbot_dir" string => "/etc/letsencrypt";
"exe" string => "/usr/bin/certbot";
"pkg" string => "certbot";
defaults:
"wr" string => "standalone";
"rn" string => "";
reports:
}
bundle agent install_certbot
{
packages:
freebsd::
"$(certbot.pkg)"
policy => "present",
package_module => pkg,
handle => "certbot_installed";
debian::
"$(certbot.pkg)"
policy => "present",
package_module => apt_get,
handle => "certbot_installed";
}
bundle agent certbot_cert(site,webroot,domain)
{
vars:
"site_json" string => storejson(@(site));
"args" string => string_mustache(
"-d {{domain}} {{#aliases}} -d {{.}} {{/aliases}}",
@(site)
);
"webroot_arg" string => ifelse( strcmp("$(webroot)","standalone"),
"--standalone",
"--webroot -w $(webroot)");
files:
"$(sys.workdir)/data/certbot/$(site[domain])-cert-created"
create => "true",
content => "$(args)",
classes => if_repaired(certbot_repaired);
classes:
"no_cert_file"
comment => "run certbot because no cert dir exists",
not => fileexists("$(certbot.certbot_dir)/live/$(site[domain])");
"run_certbot"
or => {no_cert_file, certbot_repaired};
defaults:
"webroot" string => "standalone";
methods:
"any" usebundle => install_certbot;
commands:
run_certbot::
"$(certbot.exe)"
depends_on => {"certbot_installed"},
handle => "certbot_dry_run_ok",
args => "certonly --dry-run --agree-tos -n $(webroot_arg) --expand --email $(site[email]) $(args)";
run_certbot::
"$(certbot.exe)"
depends_on => {"certbot_installed","certbot_dry_run_ok"},
args => "certonly --agree-tos -n $(webroot_arg) --expand --email $(site[email]) $(args)";
reports:
}

14
lib.cf
View File

@ -1,14 +0,0 @@
#
#
#
body perms uperm(user,group,mode)
{
mode => "$(mode)";
rxdirs => "false";
groups => { "$(group)" };
owners => { "$(user)" };
}

View File

@ -1,53 +0,0 @@
#
# Managed by CFEengine
#
<Directory {{vars.apache.www_dir}}/{{vars.apache_vhost.site.domain}}>
AllowOverride all
Options Indexes FollowSymLinks
Require all granted
<FilesMatch ".+(\.php)$">
SetHandler application/x-httpd-php
</FilesMatch>
DirectoryIndex index.php index.html
</Directory>
{{^vars.apache_vhost.site.ssl}}
<VirtualHost *:80>
ServerName {{vars.apache_vhost.site.domain}}
RewriteEngine On
Alias /.well-known/acme-challenge/ "{{vars.apache.default_html_dir}}/.well-known/acme-challenge/"
RewriteRule "^/.well-known/acme-challenge/" - [L]
DocumentRoot "{{vars.apache.www_dir}}/{{vars.apache_vhost.site.domain}}"
ServerAlias {{#vars.apache_vhost.site.aliases}}{{.}} {{/vars.apache_vhost.site.aliases}}
ErrorLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-error.log"
CustomLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-access.log" combined
</VirtualHost>
{{/vars.apache_vhost.site.ssl}}
{{#vars.apache_vhost.site.ssl}}
<VirtualHost *:80>
ServerName {{vars.apache_vhost.site.domain}}
ServerAlias {{#vars.apache_vhost.site.aliases}}{{.}} {{/vars.apache_vhost.site.aliases}}
RewriteEngine On
Alias /.well-known/acme-challenge/ "{{vars.apache.default_html_dir}}/.well-known/acme-challenge/"
RewriteRule "^/.well-known/acme-challenge/" - [L]
DocumentRoot "{{vars.apache.www_dir}}/{{vars.apache_vhost.site.domain}}"
Redirect permanent / https://{{vars.apache_vhost.site.domain}}/
</VirtualHost>
<VirtualHost *:443>
ServerAdmin {{vars.apache_vhost.site.email}}
DocumentRoot "{{vars.apache.www_dir}}/{{vars.apache_vhost.site.domain}}"
ServerName {{vars.apache_vhost.site.domain}}
ServerAlias {{#vars.apache_vhost.site.aliases}}{{.}} {{/vars.apache_vhost.site.aliases}}
ErrorLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-error.log"
CustomLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-access.log" combined
# SSL
SSLEngine on
SSLCertificateFile {{vars.certbot.certbot_dir}}/live/{{vars.apache_vhost.site.domain}}/fullchain.pem
SSLCertificateKeyFile {{vars.certbot.certbot_dir}}/live/{{vars.apache_vhost.site.domain}}/privkey.pem
RewriteEngine On
Alias /.well-known/acme-challenge/ "{{vars.apache.default_html_dir}}/.well-known/acme-challenge/"
RewriteRule "^/.well-known/acme-challenge/" - [L]
</VirtualHost>
{{/vars.apache_vhost.site.ssl}}

View File

@ -1,583 +0,0 @@
#managed by cfengine
#
# This is the main Apache HTTP server configuration file. It contains the
# configuration directives that give the server its instructions.
# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
# In particular, see
# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
# 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 "{{vars.apache.server_root}}"
#
# 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
#
# Listen: Allows you to bind Apache to specific IP addresses and/or
# ports, instead of the default. See also the <VirtualHost>
# 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
Listen 80
Listen 443
# Go ahead and accept connections for these vhosts
# from non-SNI clients
SSLStrictSNIVHostCheck on
#NameVirtualHost *:80
#NameVirtualHost *:443
ServerName localhost
#
# 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 {{vars.apache.libexec_dir}}/mod_mpm_event.so
LoadModule mpm_prefork_module {{vars.apache.libexec_dir}}/mod_mpm_prefork.so
#LoadModule mpm_worker_module {{vars.apache.libexec_dir}}/mod_mpm_worker.so
LoadModule authn_file_module {{vars.apache.libexec_dir}}/mod_authn_file.so
#LoadModule authn_dbm_module {{vars.apache.libexec_dir}}/mod_authn_dbm.so
#LoadModule authn_anon_module {{vars.apache.libexec_dir}}/mod_authn_anon.so
#LoadModule authn_dbd_module {{vars.apache.libexec_dir}}/mod_authn_dbd.so
#LoadModule authn_socache_module {{vars.apache.libexec_dir}}/mod_authn_socache.so
LoadModule authn_core_module {{vars.apache.libexec_dir}}/mod_authn_core.so
LoadModule authz_host_module {{vars.apache.libexec_dir}}/mod_authz_host.so
LoadModule authz_groupfile_module {{vars.apache.libexec_dir}}/mod_authz_groupfile.so
LoadModule authz_user_module {{vars.apache.libexec_dir}}/mod_authz_user.so
#LoadModule authz_dbm_module {{vars.apache.libexec_dir}}/mod_authz_dbm.so
#LoadModule authz_owner_module {{vars.apache.libexec_dir}}/mod_authz_owner.so
#LoadModule authz_dbd_module {{vars.apache.libexec_dir}}/mod_authz_dbd.so
LoadModule authz_core_module {{vars.apache.libexec_dir}}/mod_authz_core.so
#LoadModule authnz_fcgi_module {{vars.apache.libexec_dir}}/mod_authnz_fcgi.so
LoadModule access_compat_module {{vars.apache.libexec_dir}}/mod_access_compat.so
LoadModule auth_basic_module {{vars.apache.libexec_dir}}/mod_auth_basic.so
#LoadModule auth_form_module {{vars.apache.libexec_dir}}/mod_auth_form.so
#LoadModule auth_digest_module {{vars.apache.libexec_dir}}/mod_auth_digest.so
#LoadModule allowmethods_module {{vars.apache.libexec_dir}}/mod_allowmethods.so
#LoadModule file_cache_module {{vars.apache.libexec_dir}}/mod_file_cache.so
#LoadModule cache_module {{vars.apache.libexec_dir}}/mod_cache.so
#LoadModule cache_disk_module {{vars.apache.libexec_dir}}/mod_cache_disk.so
#LoadModule cache_socache_module {{vars.apache.libexec_dir}}/mod_cache_socache.so
LoadModule socache_shmcb_module {{vars.apache.libexec_dir}}/mod_socache_shmcb.so
#LoadModule socache_dbm_module {{vars.apache.libexec_dir}}/mod_socache_dbm.so
#LoadModule socache_memcache_module {{vars.apache.libexec_dir}}/mod_socache_memcache.so
#LoadModule watchdog_module {{vars.apache.libexec_dir}}/mod_watchdog.so
#LoadModule macro_module {{vars.apache.libexec_dir}}/mod_macro.so
#LoadModule dbd_module {{vars.apache.libexec_dir}}/mod_dbd.so
#LoadModule dumpio_module {{vars.apache.libexec_dir}}/mod_dumpio.so
#LoadModule buffer_module {{vars.apache.libexec_dir}}/mod_buffer.so
#LoadModule data_module {{vars.apache.libexec_dir}}/mod_data.so
#LoadModule ratelimit_module {{vars.apache.libexec_dir}}/mod_ratelimit.so
LoadModule reqtimeout_module {{vars.apache.libexec_dir}}/mod_reqtimeout.so
#LoadModule ext_filter_module {{vars.apache.libexec_dir}}/mod_ext_filter.so
#LoadModule request_module {{vars.apache.libexec_dir}}/mod_request.so
#LoadModule include_module {{vars.apache.libexec_dir}}/mod_include.so
LoadModule filter_module {{vars.apache.libexec_dir}}/mod_filter.so
#LoadModule reflector_module {{vars.apache.libexec_dir}}/mod_reflector.so
#LoadModule substitute_module {{vars.apache.libexec_dir}}/mod_substitute.so
#LoadModule sed_module {{vars.apache.libexec_dir}}/mod_sed.so
#LoadModule charset_lite_module {{vars.apache.libexec_dir}}/mod_charset_lite.so
#LoadModule deflate_module {{vars.apache.libexec_dir}}/mod_deflate.so
#LoadModule xml2enc_module {{vars.apache.libexec_dir}}/mod_xml2enc.so
#LoadModule proxy_html_module {{vars.apache.libexec_dir}}/mod_proxy_html.so
LoadModule mime_module {{vars.apache.libexec_dir}}/mod_mime.so
#LoadModule log_config_module {{vars.apache.libexec_dir}}/mod_log_config.so
#LoadModule log_debug_module {{vars.apache.libexec_dir}}/mod_log_debug.so
#LoadModule log_forensic_module {{vars.apache.libexec_dir}}/mod_log_forensic.so
#LoadModule logio_module {{vars.apache.libexec_dir}}/mod_logio.so
LoadModule env_module {{vars.apache.libexec_dir}}/mod_env.so
#LoadModule mime_magic_module {{vars.apache.libexec_dir}}/mod_mime_magic.so
#LoadModule cern_meta_module {{vars.apache.libexec_dir}}/mod_cern_meta.so
#LoadModule expires_module {{vars.apache.libexec_dir}}/mod_expires.so
LoadModule headers_module {{vars.apache.libexec_dir}}/mod_headers.so
#LoadModule usertrack_module {{vars.apache.libexec_dir}}/mod_usertrack.so
#LoadModule unique_id_module {{vars.apache.libexec_dir}}/mod_unique_id.so
LoadModule setenvif_module {{vars.apache.libexec_dir}}/mod_setenvif.so
#LoadModule version_module {{vars.apache.libexec_dir}}/mod_version.so
#LoadModule remoteip_module {{vars.apache.libexec_dir}}/mod_remoteip.so
#LoadModule proxy_module {{vars.apache.libexec_dir}}/mod_proxy.so
#LoadModule proxy_connect_module {{vars.apache.libexec_dir}}/mod_proxy_connect.so
#LoadModule proxy_ftp_module {{vars.apache.libexec_dir}}/mod_proxy_ftp.so
#LoadModule proxy_http_module {{vars.apache.libexec_dir}}/mod_proxy_http.so
#LoadModule proxy_fcgi_module {{vars.apache.libexec_dir}}/mod_proxy_fcgi.so
#LoadModule proxy_scgi_module {{vars.apache.libexec_dir}}/mod_proxy_scgi.so
#LoadModule proxy_uwsgi_module {{vars.apache.libexec_dir}}/mod_proxy_uwsgi.so
#LoadModule proxy_fdpass_module {{vars.apache.libexec_dir}}/mod_proxy_fdpass.so
#LoadModule proxy_wstunnel_module {{vars.apache.libexec_dir}}/mod_proxy_wstunnel.so
#LoadModule proxy_ajp_module {{vars.apache.libexec_dir}}/mod_proxy_ajp.so
#LoadModule proxy_balancer_module {{vars.apache.libexec_dir}}/mod_proxy_balancer.so
#LoadModule proxy_express_module {{vars.apache.libexec_dir}}/mod_proxy_express.so
#LoadModule proxy_hcheck_module {{vars.apache.libexec_dir}}/mod_proxy_hcheck.so
#LoadModule session_module {{vars.apache.libexec_dir}}/mod_session.so
#LoadModule session_cookie_module {{vars.apache.libexec_dir}}/mod_session_cookie.so
#LoadModule session_crypto_module {{vars.apache.libexec_dir}}/mod_session_crypto.so
#LoadModule session_dbd_module {{vars.apache.libexec_dir}}/mod_session_dbd.so
#LoadModule slotmem_shm_module {{vars.apache.libexec_dir}}/mod_slotmem_shm.so
#LoadModule slotmem_plain_module {{vars.apache.libexec_dir}}/mod_slotmem_plain.so
LoadModule ssl_module {{vars.apache.libexec_dir}}/mod_ssl.so
#LoadModule dialup_module {{vars.apache.libexec_dir}}/mod_dialup.so
#LoadModule http2_module {{vars.apache.libexec_dir}}/mod_http2.so
#LoadModule proxy_http2_module {{vars.apache.libexec_dir}}/mod_proxy_http2.so
#LoadModule md_module {{vars.apache.libexec_dir}}/mod_md.so
#LoadModule lbmethod_byrequests_module {{vars.apache.libexec_dir}}/mod_lbmethod_byrequests.so
#LoadModule lbmethod_bytraffic_module {{vars.apache.libexec_dir}}/mod_lbmethod_bytraffic.so
#LoadModule lbmethod_bybusyness_module {{vars.apache.libexec_dir}}/mod_lbmethod_bybusyness.so
#LoadModule lbmethod_heartbeat_module {{vars.apache.libexec_dir}}/mod_lbmethod_heartbeat.so
#LoadModule unixd_module {{vars.apache.libexec_dir}}/mod_unixd.so
#LoadModule heartbeat_module {{vars.apache.libexec_dir}}/mod_heartbeat.so
#LoadModule heartmonitor_module {{vars.apache.libexec_dir}}/mod_heartmonitor.so
#LoadModule dav_module {{vars.apache.libexec_dir}}/mod_dav.so
LoadModule status_module {{vars.apache.libexec_dir}}/mod_status.so
#LoadModule autoindex_module {{vars.apache.libexec_dir}}/mod_autoindex.so
#LoadModule asis_module {{vars.apache.libexec_dir}}/mod_asis.so
#LoadModule info_module {{vars.apache.libexec_dir}}/mod_info.so
{{#vars.apache.modules}}
LoadModule {{.m}}_module {{vars.apache.libexec_dir}}/{{.f}}.so
{{/#vars.apache.modules}}
<IfModule !mpm_prefork_module>
#LoadModule cgid_module {{vars.apache.libexec_dir}}/mod_cgid.so
</IfModule>
<IfModule mpm_prefork_module>
#LoadModule cgi_module {{vars.apache.libexec_dir}}/mod_cgi.so
</IfModule>
#LoadModule dav_fs_module {{vars.apache.libexec_dir}}/mod_dav_fs.so
#LoadModule dav_lock_module {{vars.apache.libexec_dir}}/mod_dav_lock.so
#LoadModule vhost_alias_module {{vars.apache.libexec_dir}}/mod_vhost_alias.so
#LoadModule negotiation_module {{vars.apache.libexec_dir}}/mod_negotiation.so
LoadModule dir_module {{vars.apache.libexec_dir}}/mod_dir.so
#LoadModule imagemap_module {{vars.apache.libexec_dir}}/mod_imagemap.so
#LoadModule actions_module {{vars.apache.libexec_dir}}/mod_actions.so
#LoadModule speling_module {{vars.apache.libexec_dir}}/mod_speling.so
#LoadModule userdir_module {{vars.apache.libexec_dir}}/mod_userdir.so
LoadModule alias_module {{vars.apache.libexec_dir}}/mod_alias.so
LoadModule rewrite_module {{vars.apache.libexec_dir}}/mod_rewrite.so
#LoadModule php7_module {{vars.apache.libexec_dir}}/libphp7.so
# Third party modules
#IncludeOptional etc/apache24/modules.d/[0-9][0-9][0-9]_*.conf
<IfModule unixd_module>
#
# 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 {{vars.apache.www_user}}
Group {{vars.apache.www_group}}
</IfModule>
# '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
# <VirtualHost> definition. These values also provide defaults for
# any <VirtualHost> containers you may define later in the file.
#
# All of these directives may appear inside <VirtualHost> 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
# <Directory> blocks below.
#
<Directory />
AllowOverride none
Require all denied
</Directory>
#
# 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 "{{vars.apache.default_html_dir}}"
#<Directory "{{www_dir}}/default">
#
# 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
#</Directory>
#
# DirectoryIndex: sets the file that Apache will serve if a directory
# is requested.
#
<IfModule dir_module>
DirectoryIndex index.html
</IfModule>
#
# The following lines prevent .htaccess and .htpasswd files from being
# viewed by Web clients.
#
<Files ".ht*">
Require all denied
</Files>
#
# ErrorLog: The location of the error log file.
# If you do not specify an ErrorLog directive within a <VirtualHost>
# container, error messages relating to that virtual host will be
# logged here. If you *do* define an error logfile for a <VirtualHost>
# 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
<IfModule log_config_module>
#
# 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
<IfModule logio_module>
# 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
</IfModule>
#
# The location and format of the access logfile (Common Logfile Format).
# If you do not define any access logfiles within a <VirtualHost>
# container, they will be logged here. Contrariwise, if you *do*
# define per-<VirtualHost> 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
</IfModule>
<IfModule alias_module>
#
# 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 <Directory> 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/"
</IfModule>
<IfModule cgid_module>
#
# ScriptSock: On threaded servers, designate the path to the UNIX
# socket used to communicate with the CGI daemon of mod_cgid.
#
#Scriptsock cgisock
</IfModule>
#
# "/usr/local/www/apache24/cgi-bin" should be changed to whatever your ScriptAliased
# CGI directory exists, if you have that configured.
#
<Directory "/usr/local/www/apache24/cgi-bin">
AllowOverride None
Options None
Require all granted
</Directory>
<IfModule headers_module>
#
# 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
</IfModule>
<IfModule mime_module>
#
# TypesConfig points to the file containing the list of mappings from
# filename extension to MIME-type.
#
TypesConfig {{vars.apache.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
</IfModule>
#
# 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
<IfModule proxy_html_module>
#Include etc/apache24/extra/proxy-html.conf
</IfModule>
# 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.
#
<IfModule ssl_module>
SSLRandomSeed startup builtin
SSLRandomSeed connect builtin
</IfModule>
# Default Vhost
<Directory {{vars.apache.default_html_dir}}>
AllowOverride all
Options Indexes FollowSymLinks
Require all granted
<FilesMatch ".+(\.php)$">
SetHandler application/x-httpd-php
</FilesMatch>
DirectoryIndex index.html
</Directory>
<VirtualHost *:80>
ServerAdmin webmaster@dummy-host.example.com
DocumentRoot "{{vars.apache.default_html_dir}}"
ErrorLog "{{vars.apache.log_dir}}/default-error.log"
CustomLog "{{vars.apache.log_dir}}/default-access.log" common
</VirtualHost>
Include {{vars.apache.cfg_dir}}/Vhosts/*.conf
#{#sites}
#Include {{cfg_dir}}/Vhosts/{{.domain}}*.conf
#{#sites}

2
vim.cf
View File

@ -37,7 +37,7 @@ packages:
files:
"$(vimrc)"
create => "true",
copy_from => local_dcp("$(sys.workdir)/inputs/$(def.mfdomain)/templates/vimrc.mustache");
copy_from => local_dcp("$(sys.workdir)/inputs/$(def.domain)/templates/vimrc.mustache");
reports: