From c49df432fcf0032c134bae9da803c9cc6d8f8975 Mon Sep 17 00:00:00 2001 From: taragurung Date: Wed, 1 Nov 2017 07:55:14 +0000 Subject: [PATCH] these modulese are not installed previusly so removed and the manifests too --- manifests/node.pp | 13 - modules/apache/CHANGELOG.md | 953 --- modules/apache/CONTRIBUTING.md | 271 - modules/apache/Gemfile | 76 - modules/apache/LICENSE | 202 - modules/apache/MAINTAINERS.md | 6 - modules/apache/NOTICE | 15 - modules/apache/README.md | 5447 ----------------- modules/apache/Rakefile | 38 - modules/apache/checksums.json | 359 -- modules/apache/examples/apache.pp | 6 - modules/apache/examples/dev.pp | 1 - modules/apache/examples/init.pp | 1 - modules/apache/examples/mod_load_params.pp | 11 - modules/apache/examples/mods.pp | 9 - modules/apache/examples/mods_custom.pp | 16 - modules/apache/examples/php.pp | 4 - modules/apache/examples/vhost.pp | 261 - modules/apache/examples/vhost_directories.pp | 44 - modules/apache/examples/vhost_filter.pp | 17 - modules/apache/examples/vhost_ip_based.pp | 25 - modules/apache/examples/vhost_proxypass.pp | 66 - modules/apache/examples/vhost_ssl.pp | 23 - .../apache/examples/vhosts_without_listen.pp | 53 - modules/apache/files/httpd | 24 - modules/apache/lib/facter/apache_version.rb | 13 - .../puppet/parser/functions/apache_pw_hash.rb | 16 - .../lib/puppet/parser/functions/bool2httpd.rb | 30 - .../functions/validate_apache_log_level.rb | 27 - modules/apache/lib/puppet/provider/a2mod.rb | 34 - .../apache/lib/puppet/provider/a2mod/a2mod.rb | 35 - .../lib/puppet/provider/a2mod/gentoo.rb | 116 - .../lib/puppet/provider/a2mod/modfix.rb | 12 - .../lib/puppet/provider/a2mod/redhat.rb | 60 - modules/apache/lib/puppet/type/a2mod.rb | 30 - modules/apache/locales/config.yaml | 26 - .../apache/locales/ja/puppetlabs-apache.po | 28 - modules/apache/locales/puppetlabs-apache.pot | 25 - modules/apache/manifests/balancer.pp | 97 - modules/apache/manifests/balancermember.pp | 52 - modules/apache/manifests/confd/no_accf.pp | 10 - modules/apache/manifests/custom_config.pp | 67 - .../apache/manifests/default_confd_files.pp | 15 - modules/apache/manifests/default_mods.pp | 179 - modules/apache/manifests/default_mods/load.pp | 8 - modules/apache/manifests/dev.pp | 14 - modules/apache/manifests/fastcgi/server.pp | 29 - modules/apache/manifests/init.pp | 398 -- modules/apache/manifests/listen.pp | 9 - modules/apache/manifests/mod.pp | 176 - modules/apache/manifests/mod/actions.pp | 3 - modules/apache/manifests/mod/alias.pp | 23 - modules/apache/manifests/mod/auth_basic.pp | 3 - modules/apache/manifests/mod/auth_cas.pp | 55 - modules/apache/manifests/mod/auth_kerb.pp | 7 - modules/apache/manifests/mod/auth_mellon.pp | 26 - modules/apache/manifests/mod/authn_core.pp | 7 - modules/apache/manifests/mod/authn_dbd.pp | 30 - modules/apache/manifests/mod/authn_file.pp | 3 - modules/apache/manifests/mod/authnz_ldap.pp | 23 - modules/apache/manifests/mod/authnz_pam.pp | 4 - modules/apache/manifests/mod/authz_default.pp | 9 - modules/apache/manifests/mod/authz_user.pp | 3 - modules/apache/manifests/mod/autoindex.pp | 14 - modules/apache/manifests/mod/cache.pp | 3 - modules/apache/manifests/mod/cgi.pp | 19 - modules/apache/manifests/mod/cgid.pp | 42 - modules/apache/manifests/mod/cluster.pp | 39 - modules/apache/manifests/mod/dav.pp | 3 - modules/apache/manifests/mod/dav_fs.pp | 22 - modules/apache/manifests/mod/dav_svn.pp | 28 - modules/apache/manifests/mod/dbd.pp | 3 - modules/apache/manifests/mod/deflate.pp | 27 - modules/apache/manifests/mod/dev.pp | 5 - modules/apache/manifests/mod/dir.pp | 23 - modules/apache/manifests/mod/disk_cache.pp | 42 - modules/apache/manifests/mod/dumpio.pp | 18 - modules/apache/manifests/mod/env.pp | 3 - modules/apache/manifests/mod/event.pp | 76 - modules/apache/manifests/mod/expires.pp | 22 - modules/apache/manifests/mod/ext_filter.pp | 22 - modules/apache/manifests/mod/fastcgi.pp | 28 - modules/apache/manifests/mod/fcgid.pp | 28 - modules/apache/manifests/mod/filter.pp | 3 - modules/apache/manifests/mod/geoip.pp | 33 - modules/apache/manifests/mod/headers.pp | 3 - modules/apache/manifests/mod/include.pp | 3 - modules/apache/manifests/mod/info.pp | 33 - .../manifests/mod/intercept_form_submit.pp | 4 - modules/apache/manifests/mod/itk.pp | 96 - modules/apache/manifests/mod/jk.pp | 141 - modules/apache/manifests/mod/ldap.pp | 28 - .../apache/manifests/mod/lookup_identity.pp | 4 - modules/apache/manifests/mod/macro.pp | 4 - modules/apache/manifests/mod/mime.pp | 25 - modules/apache/manifests/mod/mime_magic.pp | 17 - modules/apache/manifests/mod/negotiation.pp | 21 - modules/apache/manifests/mod/nss.pp | 28 - modules/apache/manifests/mod/pagespeed.pp | 60 - modules/apache/manifests/mod/passenger.pp | 115 - modules/apache/manifests/mod/perl.pp | 4 - modules/apache/manifests/mod/peruser.pp | 77 - modules/apache/manifests/mod/php.pp | 94 - modules/apache/manifests/mod/prefork.pp | 98 - modules/apache/manifests/mod/proxy.pp | 23 - modules/apache/manifests/mod/proxy_ajp.pp | 4 - .../apache/manifests/mod/proxy_balancer.pp | 29 - modules/apache/manifests/mod/proxy_connect.pp | 10 - modules/apache/manifests/mod/proxy_fcgi.pp | 4 - modules/apache/manifests/mod/proxy_html.pp | 42 - modules/apache/manifests/mod/proxy_http.pp | 4 - .../apache/manifests/mod/proxy_wstunnel.pp | 5 - modules/apache/manifests/mod/python.pp | 6 - modules/apache/manifests/mod/remoteip.pp | 30 - modules/apache/manifests/mod/reqtimeout.pp | 15 - modules/apache/manifests/mod/rewrite.pp | 4 - modules/apache/manifests/mod/rpaf.pp | 23 - modules/apache/manifests/mod/security.pp | 133 - modules/apache/manifests/mod/setenvif.pp | 14 - modules/apache/manifests/mod/shib.pp | 20 - modules/apache/manifests/mod/socache_shmcb.pp | 3 - modules/apache/manifests/mod/speling.pp | 4 - modules/apache/manifests/mod/ssl.pp | 118 - modules/apache/manifests/mod/status.pp | 48 - modules/apache/manifests/mod/suexec.pp | 3 - modules/apache/manifests/mod/suphp.pp | 16 - modules/apache/manifests/mod/userdir.pp | 40 - modules/apache/manifests/mod/version.pp | 10 - modules/apache/manifests/mod/vhost_alias.pp | 3 - modules/apache/manifests/mod/worker.pp | 147 - modules/apache/manifests/mod/wsgi.pp | 44 - modules/apache/manifests/mod/xsendfile.pp | 4 - modules/apache/manifests/mpm.pp | 148 - modules/apache/manifests/namevirtualhost.pp | 9 - modules/apache/manifests/package.pp | 37 - modules/apache/manifests/params.pp | 603 -- .../apache/manifests/peruser/multiplexer.pp | 17 - modules/apache/manifests/peruser/processor.pp | 17 - modules/apache/manifests/php.pp | 18 - modules/apache/manifests/proxy.pp | 15 - modules/apache/manifests/python.pp | 18 - .../apache/manifests/security/rule_link.pp | 18 - modules/apache/manifests/service.pp | 51 - modules/apache/manifests/ssl.pp | 18 - modules/apache/manifests/version.pp | 49 - modules/apache/manifests/vhost.pp | 1076 ---- modules/apache/manifests/vhost/custom.pp | 40 - modules/apache/manifests/vhosts.pp | 6 - modules/apache/metadata.json | 82 - modules/apache/readmes/README_ja_JP.md | 5436 ---------------- .../spec/acceptance/apache_parameters_spec.rb | 536 -- .../apache/spec/acceptance/apache_ssl_spec.rb | 156 - modules/apache/spec/acceptance/class_spec.rb | 89 - .../spec/acceptance/custom_config_spec.rb | 94 - .../spec/acceptance/default_mods_spec.rb | 111 - .../apache/spec/acceptance/init_task_spec.rb | 20 - modules/apache/spec/acceptance/itk_spec.rb | 60 - .../spec/acceptance/mod_dav_svn_spec.rb | 63 - .../spec/acceptance/mod_deflate_spec.rb | 33 - .../apache/spec/acceptance/mod_fcgid_spec.rb | 57 - .../apache/spec/acceptance/mod_mime_spec.rb | 30 - .../spec/acceptance/mod_negotiation_spec.rb | 78 - .../spec/acceptance/mod_pagespeed_spec.rb | 61 - .../spec/acceptance/mod_passenger_spec.rb | 208 - .../apache/spec/acceptance/mod_php_spec.rb | 152 - .../spec/acceptance/mod_proxy_html_spec.rb | 36 - .../spec/acceptance/mod_security_spec.rb | 386 -- .../apache/spec/acceptance/mod_suphp_spec.rb | 57 - .../spec/acceptance/nodesets/centos-7-x64.yml | 10 - .../spec/acceptance/nodesets/debian-8-x64.yml | 10 - .../spec/acceptance/nodesets/default.yml | 10 - .../acceptance/nodesets/docker/centos-7.yml | 12 - .../acceptance/nodesets/docker/debian-8.yml | 11 - .../nodesets/docker/ubuntu-14.04.yml | 12 - .../apache/spec/acceptance/nodesets/suse.yml | 25 - .../spec/acceptance/prefork_worker_spec.rb | 80 - .../apache/spec/acceptance/service_spec.rb | 18 - modules/apache/spec/acceptance/version.rb | 96 - modules/apache/spec/acceptance/vhost_spec.rb | 1716 ------ modules/apache/spec/acceptance/vhosts_spec.rb | 32 - modules/apache/spec/classes/apache_spec.rb | 910 --- modules/apache/spec/classes/dev_spec.rb | 89 - modules/apache/spec/classes/mod/alias_spec.rb | 97 - .../apache/spec/classes/mod/auth_cas_spec.rb | 64 - .../apache/spec/classes/mod/auth_kerb_spec.rb | 106 - .../spec/classes/mod/auth_mellon_spec.rb | 90 - .../apache/spec/classes/mod/authn_dbd_spec.rb | 62 - .../spec/classes/mod/authnz_ldap_spec.rb | 76 - .../spec/classes/mod/authnz_pam_spec.rb | 44 - .../apache/spec/classes/mod/cluster_spec.rb | 105 - .../apache/spec/classes/mod/dav_svn_spec.rb | 80 - .../apache/spec/classes/mod/deflate_spec.rb | 127 - modules/apache/spec/classes/mod/dev_spec.rb | 32 - modules/apache/spec/classes/mod/dir_spec.rb | 137 - .../spec/classes/mod/disk_cache_spec.rb | 125 - .../apache/spec/classes/mod/dumpio_spec.rb | 51 - modules/apache/spec/classes/mod/event_spec.rb | 214 - .../apache/spec/classes/mod/expires_spec.rb | 83 - .../spec/classes/mod/ext_filter_spec.rb | 64 - .../apache/spec/classes/mod/fastcgi_spec.rb | 43 - modules/apache/spec/classes/mod/fcgid_spec.rb | 141 - modules/apache/spec/classes/mod/info_spec.rb | 222 - .../classes/mod/intercept_form_submit_spec.rb | 44 - modules/apache/spec/classes/mod/itk_spec.rb | 130 - modules/apache/spec/classes/mod/jk_spec.rb | 222 - modules/apache/spec/classes/mod/ldap_spec.rb | 86 - .../spec/classes/mod/lookup_identity.rb | 44 - .../spec/classes/mod/mime_magic_spec.rb | 110 - modules/apache/spec/classes/mod/mime_spec.rb | 52 - .../spec/classes/mod/negotiation_spec.rb | 56 - .../apache/spec/classes/mod/pagespeed_spec.rb | 51 - .../apache/spec/classes/mod/passenger_spec.rb | 331 - modules/apache/spec/classes/mod/perl_spec.rb | 74 - .../apache/spec/classes/mod/peruser_spec.rb | 43 - modules/apache/spec/classes/mod/php_spec.rb | 319 - .../apache/spec/classes/mod/prefork_spec.rb | 140 - .../spec/classes/mod/proxy_balancer_spec.rb | 95 - .../spec/classes/mod/proxy_connect_spec.rb | 65 - .../spec/classes/mod/proxy_html_spec.rb | 128 - .../apache/spec/classes/mod/proxy_wstunnel.rb | 5 - .../apache/spec/classes/mod/python_spec.rb | 75 - .../apache/spec/classes/mod/remoteip_spec.rb | 48 - .../spec/classes/mod/reqtimeout_spec.rb | 146 - modules/apache/spec/classes/mod/rpaf_spec.rb | 126 - .../apache/spec/classes/mod/security_spec.rb | 162 - modules/apache/spec/classes/mod/shib_spec.rb | 42 - .../apache/spec/classes/mod/speling_spec.rb | 37 - modules/apache/spec/classes/mod/ssl_spec.rb | 293 - .../apache/spec/classes/mod/status_spec.rb | 205 - modules/apache/spec/classes/mod/suphp_spec.rb | 38 - .../apache/spec/classes/mod/userdir_spec.rb | 56 - .../apache/spec/classes/mod/worker_spec.rb | 189 - modules/apache/spec/classes/mod/wsgi_spec.rb | 151 - modules/apache/spec/classes/params_spec.rb | 22 - modules/apache/spec/classes/service_spec.rb | 157 - modules/apache/spec/classes/vhosts_spec.rb | 35 - modules/apache/spec/defines/balancer_spec.rb | 72 - .../spec/defines/balancermember_spec.rb | 61 - .../apache/spec/defines/custom_config_spec.rb | 125 - .../spec/defines/fastcgi_server_spec.rb | 156 - modules/apache/spec/defines/mod_spec.rb | 166 - .../apache/spec/defines/modsec_link_spec.rb | 53 - .../apache/spec/defines/vhost_custom_spec.rb | 99 - modules/apache/spec/defines/vhost_spec.rb | 1528 ----- .../spec/fixtures/files/negotiation.conf | 4 - modules/apache/spec/fixtures/files/spec | 1 - .../site_apache/templates/fake.conf.erb | 1 - .../fixtures/templates/negotiation.conf.erb | 4 - modules/apache/spec/spec_helper.rb | 8 - modules/apache/spec/spec_helper_acceptance.rb | 123 - modules/apache/spec/spec_helper_local.rb | 39 - .../apache/spec/unit/apache_version_spec.rb | 33 - .../spec/unit/provider/a2mod/gentoo_spec.rb | 182 - .../parser/functions/apache_pw_hash_spec.rb | 32 - .../parser/functions/bool2httpd_spec.rb | 53 - .../functions/validate_apache_log_level.rb | 39 - modules/apache/tasks/init.json | 10 - modules/apache/tasks/init.rb | 23 - .../apache/templates/confd/no-accf.conf.erb | 4 - modules/apache/templates/fastcgi/server.erb | 22 - modules/apache/templates/httpd.conf.erb | 157 - modules/apache/templates/listen.erb | 6 - modules/apache/templates/mod/alias.conf.erb | 13 - .../apache/templates/mod/auth_cas.conf.erb | 58 - .../apache/templates/mod/auth_mellon.conf.erb | 21 - .../apache/templates/mod/authn_dbd.conf.erb | 17 - .../apache/templates/mod/authnz_ldap.conf.erb | 5 - .../apache/templates/mod/autoindex.conf.erb | 56 - modules/apache/templates/mod/cgid.conf.erb | 1 - modules/apache/templates/mod/cluster.conf.erb | 26 - modules/apache/templates/mod/dav_fs.conf.erb | 1 - modules/apache/templates/mod/deflate.conf.erb | 7 - modules/apache/templates/mod/dir.conf.erb | 1 - .../apache/templates/mod/disk_cache.conf.erb | 4 - modules/apache/templates/mod/dumpio.conf.erb | 3 - modules/apache/templates/mod/event.conf.erb | 33 - modules/apache/templates/mod/expires.conf.erb | 11 - .../apache/templates/mod/ext_filter.conf.erb | 6 - modules/apache/templates/mod/fastcgi.conf.erb | 8 - modules/apache/templates/mod/fcgid.conf.erb | 5 - modules/apache/templates/mod/geoip.conf.erb | 25 - modules/apache/templates/mod/info.conf.erb | 19 - modules/apache/templates/mod/itk.conf.erb | 8 - modules/apache/templates/mod/jk.conf.erb | 167 - .../mod/jk/uriworkermap.properties.erb | 40 - .../templates/mod/jk/workers.properties.erb | 62 - modules/apache/templates/mod/ldap.conf.erb | 29 - modules/apache/templates/mod/load.erb | 7 - modules/apache/templates/mod/mime.conf.erb | 38 - .../apache/templates/mod/mime_magic.conf.erb | 1 - .../apache/templates/mod/mpm_event.conf.erb | 9 - .../apache/templates/mod/negotiation.conf.erb | 2 - modules/apache/templates/mod/nss.conf.erb | 228 - .../apache/templates/mod/pagespeed.conf.erb | 102 - .../apache/templates/mod/passenger.conf.erb | 61 - modules/apache/templates/mod/peruser.conf.erb | 12 - modules/apache/templates/mod/php.conf.erb | 23 - modules/apache/templates/mod/prefork.conf.erb | 16 - modules/apache/templates/mod/proxy.conf.erb | 27 - .../templates/mod/proxy_balancer.conf.erb | 10 - .../apache/templates/mod/proxy_html.conf.erb | 19 - .../apache/templates/mod/remoteip.conf.erb | 23 - .../apache/templates/mod/reqtimeout.conf.erb | 3 - modules/apache/templates/mod/rpaf.conf.erb | 15 - .../apache/templates/mod/security.conf.erb | 80 - .../templates/mod/security_crs.conf.erb | 436 -- .../apache/templates/mod/setenvif.conf.erb | 34 - modules/apache/templates/mod/ssl.conf.erb | 44 - modules/apache/templates/mod/status.conf.erb | 16 - modules/apache/templates/mod/suphp.conf.erb | 19 - modules/apache/templates/mod/userdir.conf.erb | 27 - modules/apache/templates/mod/worker.conf.erb | 11 - modules/apache/templates/mod/wsgi.conf.erb | 16 - modules/apache/templates/namevirtualhost.erb | 8 - modules/apache/templates/ports_header.erb | 5 - .../apache/templates/vhost/_access_log.erb | 21 - modules/apache/templates/vhost/_action.erb | 4 - .../templates/vhost/_additional_includes.erb | 9 - modules/apache/templates/vhost/_aliases.erb | 16 - .../vhost/_allow_encoded_slashes.erb | 4 - modules/apache/templates/vhost/_auth_cas.erb | 65 - modules/apache/templates/vhost/_auth_kerb.erb | 32 - modules/apache/templates/vhost/_block.erb | 14 - modules/apache/templates/vhost/_charsets.erb | 4 - .../templates/vhost/_custom_fragment.erb | 5 - .../apache/templates/vhost/_directories.erb | 378 -- modules/apache/templates/vhost/_docroot.erb | 7 - .../templates/vhost/_error_document.erb | 7 - .../templates/vhost/_fallbackresource.erb | 4 - modules/apache/templates/vhost/_fastcgi.erb | 23 - .../apache/templates/vhost/_file_footer.erb | 1 - .../apache/templates/vhost/_file_header.erb | 12 - modules/apache/templates/vhost/_filters.erb | 10 - modules/apache/templates/vhost/_header.erb | 10 - .../vhost/_http_protocol_options.erb | 1 - modules/apache/templates/vhost/_itk.erb | 29 - modules/apache/templates/vhost/_jk_mounts.erb | 12 - .../templates/vhost/_keepalive_options.erb | 9 - modules/apache/templates/vhost/_logging.erb | 10 - modules/apache/templates/vhost/_passenger.erb | 39 - .../templates/vhost/_passenger_base_uris.erb | 7 - modules/apache/templates/vhost/_php.erb | 16 - modules/apache/templates/vhost/_php_admin.erb | 12 - modules/apache/templates/vhost/_proxy.erb | 98 - modules/apache/templates/vhost/_rack.erb | 7 - modules/apache/templates/vhost/_redirect.erb | 35 - .../apache/templates/vhost/_requestheader.erb | 10 - modules/apache/templates/vhost/_require.erb | 62 - modules/apache/templates/vhost/_rewrite.erb | 53 - .../apache/templates/vhost/_scriptalias.erb | 24 - modules/apache/templates/vhost/_security.erb | 43 - .../apache/templates/vhost/_serveralias.erb | 7 - .../templates/vhost/_serversignature.erb | 1 - modules/apache/templates/vhost/_setenv.erb | 17 - modules/apache/templates/vhost/_ssl.erb | 55 - modules/apache/templates/vhost/_sslproxy.erb | 29 - modules/apache/templates/vhost/_suexec.erb | 4 - modules/apache/templates/vhost/_suphp.erb | 11 - modules/apache/templates/vhost/_wsgi.erb | 38 - modules/concat/CHANGELOG.md | 381 -- modules/concat/CONTRIBUTING.md | 271 - modules/concat/Gemfile | 157 - modules/concat/LICENSE | 202 - modules/concat/MAINTAINERS.md | 6 - modules/concat/NOTICE | 15 - modules/concat/README.md | 492 -- modules/concat/Rakefile | 37 - modules/concat/appveyor.yml | 50 - modules/concat/checksums.json | 63 - modules/concat/examples/fragment.pp | 20 - modules/concat/examples/init.pp | 6 - modules/concat/lib/puppet/type/concat_file.rb | 308 - .../concat/lib/puppet/type/concat_fragment.rb | 81 - modules/concat/locales/config.yaml | 26 - modules/concat/manifests/fragment.pp | 37 - modules/concat/manifests/init.pp | 131 - modules/concat/metadata.json | 110 - modules/concat/spec/acceptance/backup_spec.rb | 115 - modules/concat/spec/acceptance/concat_spec.rb | 228 - .../spec/acceptance/concurrency_spec.rb | 37 - modules/concat/spec/acceptance/force_spec.rb | 178 - modules/concat/spec/acceptance/format_spec.rb | 212 - .../spec/acceptance/fragment_source_spec.rb | 156 - .../fragments_are_always_replaced_spec.rb | 139 - .../spec/acceptance/native/backup_spec.rb | 115 - .../spec/acceptance/native/concat_spec.rb | 228 - .../acceptance/native/concurrency_spec.rb | 37 - .../acceptance/native/fragment_source_spec.rb | 156 - .../fragments_are_always_replaced_spec.rb | 139 - .../spec/acceptance/native/newline_spec.rb | 67 - .../spec/acceptance/native/order_spec.rb | 123 - .../spec/acceptance/native/pup-1963_spec.rb | 69 - .../acceptance/native/quoted_paths_spec.rb | 42 - .../spec/acceptance/native/replace_spec.rb | 261 - .../acceptance/native/symbolic_name_spec.rb | 35 - .../spec/acceptance/native/validation_spec.rb | 35 - .../spec/acceptance/native/warnings_spec.rb | 29 - .../concat/spec/acceptance/newline_spec.rb | 67 - .../spec/acceptance/nodesets/centos-7-x64.yml | 10 - .../spec/acceptance/nodesets/debian-8-x64.yml | 10 - .../spec/acceptance/nodesets/debian-9-x64.yml | 20 - .../spec/acceptance/nodesets/default.yml | 18 - .../acceptance/nodesets/docker/centos-7.yml | 12 - .../acceptance/nodesets/docker/debian-8.yml | 11 - .../nodesets/docker/ubuntu-14.04.yml | 12 - modules/concat/spec/acceptance/order_spec.rb | 123 - .../concat/spec/acceptance/pup-1963_spec.rb | 69 - .../spec/acceptance/quoted_paths_spec.rb | 42 - .../concat/spec/acceptance/replace_spec.rb | 261 - .../concat/spec/acceptance/specinfra_stubs.rb | 19 - .../spec/acceptance/symbolic_name_spec.rb | 35 - .../concat/spec/acceptance/validation_spec.rb | 35 - .../spec/acceptance/warn_header_spec.rb | 104 - .../concat/spec/acceptance/warnings_spec.rb | 29 - .../spec/defines/concat_fragment_spec.rb | 157 - modules/concat/spec/defines/concat_spec.rb | 373 -- modules/concat/spec/spec_helper.rb | 8 - modules/concat/spec/spec_helper_acceptance.rb | 24 - modules/concat/spec/spec_helper_local.rb | 46 - .../concat/spec/unit/type/concat_file_spec.rb | 141 - .../spec/unit/type/concat_fragment_spec.rb | 111 - modules/motd/CHANGELOG.md | 67 - modules/motd/CONTRIBUTING.md | 271 - modules/motd/Gemfile | 157 - modules/motd/LICENSE | 202 - modules/motd/MAINTAINERS.md | 6 - modules/motd/NOTICE | 15 - modules/motd/README.md | 109 - modules/motd/Rakefile | 37 - modules/motd/appveyor.yml | 52 - modules/motd/checksums.json | 35 - modules/motd/locales/config.yaml | 26 - modules/motd/manifests/init.pp | 113 - modules/motd/metadata.json | 85 - modules/motd/spec/acceptance/motd_spec.rb | 160 - .../spec/acceptance/nodesets/centos-7-x64.yml | 10 - .../spec/acceptance/nodesets/debian-8-x64.yml | 10 - .../motd/spec/acceptance/nodesets/default.yml | 18 - .../acceptance/nodesets/docker/centos-7.yml | 12 - .../acceptance/nodesets/docker/debian-8.yml | 11 - .../nodesets/docker/ubuntu-14.04.yml | 12 - modules/motd/spec/classes/motd_spec.rb | 215 - modules/motd/spec/spec_helper.rb | 16 - modules/motd/spec/spec_helper_acceptance.rb | 19 - modules/motd/templates/motd.erb | 6 - modules/motd/templates/spec.erb | 1 - modules/motd/tests/README.md | 54 - .../motd/tests/beaker/config/redhat-6-64mda | 23 - .../motd/tests/beaker/config/redhat-7-64mda | 23 - .../tests/beaker/config/ubuntu-1204-64mda | 23 - .../tests/beaker/config/ubuntu-1404-64mda | 23 - .../tests/beaker/pre-suite/00_pe_install.rb | 15 - .../pre-suite/01_motd_module_install.rb | 9 - .../test_run_scripts/run_test_with_ankeny.sh | 19 - .../beaker/tests/01_create_motd_content.rb | 30 - modules/profile/manifests/base.pp | 6 - modules/role/manifests/default.pp | 9 - 457 files changed, 45067 deletions(-) delete mode 100644 manifests/node.pp delete mode 100644 modules/apache/CHANGELOG.md delete mode 100644 modules/apache/CONTRIBUTING.md delete mode 100644 modules/apache/Gemfile delete mode 100644 modules/apache/LICENSE delete mode 100644 modules/apache/MAINTAINERS.md delete mode 100644 modules/apache/NOTICE delete mode 100755 modules/apache/README.md delete mode 100644 modules/apache/Rakefile delete mode 100644 modules/apache/checksums.json delete mode 100644 modules/apache/examples/apache.pp delete mode 100644 modules/apache/examples/dev.pp delete mode 100644 modules/apache/examples/init.pp delete mode 100644 modules/apache/examples/mod_load_params.pp delete mode 100644 modules/apache/examples/mods.pp delete mode 100644 modules/apache/examples/mods_custom.pp delete mode 100644 modules/apache/examples/php.pp delete mode 100644 modules/apache/examples/vhost.pp delete mode 100644 modules/apache/examples/vhost_directories.pp delete mode 100644 modules/apache/examples/vhost_filter.pp delete mode 100644 modules/apache/examples/vhost_ip_based.pp delete mode 100644 modules/apache/examples/vhost_proxypass.pp delete mode 100644 modules/apache/examples/vhost_ssl.pp delete mode 100644 modules/apache/examples/vhosts_without_listen.pp delete mode 100644 modules/apache/files/httpd delete mode 100644 modules/apache/lib/facter/apache_version.rb delete mode 100644 modules/apache/lib/puppet/parser/functions/apache_pw_hash.rb delete mode 100644 modules/apache/lib/puppet/parser/functions/bool2httpd.rb delete mode 100644 modules/apache/lib/puppet/parser/functions/validate_apache_log_level.rb delete mode 100644 modules/apache/lib/puppet/provider/a2mod.rb delete mode 100644 modules/apache/lib/puppet/provider/a2mod/a2mod.rb delete mode 100644 modules/apache/lib/puppet/provider/a2mod/gentoo.rb delete mode 100644 modules/apache/lib/puppet/provider/a2mod/modfix.rb delete mode 100644 modules/apache/lib/puppet/provider/a2mod/redhat.rb delete mode 100644 modules/apache/lib/puppet/type/a2mod.rb delete mode 100644 modules/apache/locales/config.yaml delete mode 100644 modules/apache/locales/ja/puppetlabs-apache.po delete mode 100644 modules/apache/locales/puppetlabs-apache.pot delete mode 100644 modules/apache/manifests/balancer.pp delete mode 100644 modules/apache/manifests/balancermember.pp delete mode 100644 modules/apache/manifests/confd/no_accf.pp delete mode 100644 modules/apache/manifests/custom_config.pp delete mode 100644 modules/apache/manifests/default_confd_files.pp delete mode 100644 modules/apache/manifests/default_mods.pp delete mode 100644 modules/apache/manifests/default_mods/load.pp delete mode 100644 modules/apache/manifests/dev.pp delete mode 100644 modules/apache/manifests/fastcgi/server.pp delete mode 100755 modules/apache/manifests/init.pp delete mode 100644 modules/apache/manifests/listen.pp delete mode 100644 modules/apache/manifests/mod.pp delete mode 100644 modules/apache/manifests/mod/actions.pp delete mode 100644 modules/apache/manifests/mod/alias.pp delete mode 100644 modules/apache/manifests/mod/auth_basic.pp delete mode 100644 modules/apache/manifests/mod/auth_cas.pp delete mode 100644 modules/apache/manifests/mod/auth_kerb.pp delete mode 100644 modules/apache/manifests/mod/auth_mellon.pp delete mode 100644 modules/apache/manifests/mod/authn_core.pp delete mode 100644 modules/apache/manifests/mod/authn_dbd.pp delete mode 100644 modules/apache/manifests/mod/authn_file.pp delete mode 100644 modules/apache/manifests/mod/authnz_ldap.pp delete mode 100644 modules/apache/manifests/mod/authnz_pam.pp delete mode 100644 modules/apache/manifests/mod/authz_default.pp delete mode 100644 modules/apache/manifests/mod/authz_user.pp delete mode 100644 modules/apache/manifests/mod/autoindex.pp delete mode 100644 modules/apache/manifests/mod/cache.pp delete mode 100644 modules/apache/manifests/mod/cgi.pp delete mode 100644 modules/apache/manifests/mod/cgid.pp delete mode 100644 modules/apache/manifests/mod/cluster.pp delete mode 100644 modules/apache/manifests/mod/dav.pp delete mode 100644 modules/apache/manifests/mod/dav_fs.pp delete mode 100644 modules/apache/manifests/mod/dav_svn.pp delete mode 100644 modules/apache/manifests/mod/dbd.pp delete mode 100644 modules/apache/manifests/mod/deflate.pp delete mode 100644 modules/apache/manifests/mod/dev.pp delete mode 100644 modules/apache/manifests/mod/dir.pp delete mode 100644 modules/apache/manifests/mod/disk_cache.pp delete mode 100644 modules/apache/manifests/mod/dumpio.pp delete mode 100644 modules/apache/manifests/mod/env.pp delete mode 100644 modules/apache/manifests/mod/event.pp delete mode 100644 modules/apache/manifests/mod/expires.pp delete mode 100644 modules/apache/manifests/mod/ext_filter.pp delete mode 100644 modules/apache/manifests/mod/fastcgi.pp delete mode 100644 modules/apache/manifests/mod/fcgid.pp delete mode 100644 modules/apache/manifests/mod/filter.pp delete mode 100644 modules/apache/manifests/mod/geoip.pp delete mode 100644 modules/apache/manifests/mod/headers.pp delete mode 100644 modules/apache/manifests/mod/include.pp delete mode 100644 modules/apache/manifests/mod/info.pp delete mode 100644 modules/apache/manifests/mod/intercept_form_submit.pp delete mode 100644 modules/apache/manifests/mod/itk.pp delete mode 100644 modules/apache/manifests/mod/jk.pp delete mode 100644 modules/apache/manifests/mod/ldap.pp delete mode 100644 modules/apache/manifests/mod/lookup_identity.pp delete mode 100644 modules/apache/manifests/mod/macro.pp delete mode 100644 modules/apache/manifests/mod/mime.pp delete mode 100644 modules/apache/manifests/mod/mime_magic.pp delete mode 100644 modules/apache/manifests/mod/negotiation.pp delete mode 100644 modules/apache/manifests/mod/nss.pp delete mode 100644 modules/apache/manifests/mod/pagespeed.pp delete mode 100644 modules/apache/manifests/mod/passenger.pp delete mode 100644 modules/apache/manifests/mod/perl.pp delete mode 100644 modules/apache/manifests/mod/peruser.pp delete mode 100644 modules/apache/manifests/mod/php.pp delete mode 100644 modules/apache/manifests/mod/prefork.pp delete mode 100644 modules/apache/manifests/mod/proxy.pp delete mode 100644 modules/apache/manifests/mod/proxy_ajp.pp delete mode 100644 modules/apache/manifests/mod/proxy_balancer.pp delete mode 100644 modules/apache/manifests/mod/proxy_connect.pp delete mode 100644 modules/apache/manifests/mod/proxy_fcgi.pp delete mode 100644 modules/apache/manifests/mod/proxy_html.pp delete mode 100644 modules/apache/manifests/mod/proxy_http.pp delete mode 100644 modules/apache/manifests/mod/proxy_wstunnel.pp delete mode 100644 modules/apache/manifests/mod/python.pp delete mode 100644 modules/apache/manifests/mod/remoteip.pp delete mode 100644 modules/apache/manifests/mod/reqtimeout.pp delete mode 100644 modules/apache/manifests/mod/rewrite.pp delete mode 100644 modules/apache/manifests/mod/rpaf.pp delete mode 100644 modules/apache/manifests/mod/security.pp delete mode 100644 modules/apache/manifests/mod/setenvif.pp delete mode 100644 modules/apache/manifests/mod/shib.pp delete mode 100644 modules/apache/manifests/mod/socache_shmcb.pp delete mode 100644 modules/apache/manifests/mod/speling.pp delete mode 100644 modules/apache/manifests/mod/ssl.pp delete mode 100644 modules/apache/manifests/mod/status.pp delete mode 100644 modules/apache/manifests/mod/suexec.pp delete mode 100644 modules/apache/manifests/mod/suphp.pp delete mode 100644 modules/apache/manifests/mod/userdir.pp delete mode 100644 modules/apache/manifests/mod/version.pp delete mode 100644 modules/apache/manifests/mod/vhost_alias.pp delete mode 100644 modules/apache/manifests/mod/worker.pp delete mode 100644 modules/apache/manifests/mod/wsgi.pp delete mode 100644 modules/apache/manifests/mod/xsendfile.pp delete mode 100644 modules/apache/manifests/mpm.pp delete mode 100644 modules/apache/manifests/namevirtualhost.pp delete mode 100644 modules/apache/manifests/package.pp delete mode 100644 modules/apache/manifests/params.pp delete mode 100644 modules/apache/manifests/peruser/multiplexer.pp delete mode 100644 modules/apache/manifests/peruser/processor.pp delete mode 100644 modules/apache/manifests/php.pp delete mode 100644 modules/apache/manifests/proxy.pp delete mode 100644 modules/apache/manifests/python.pp delete mode 100644 modules/apache/manifests/security/rule_link.pp delete mode 100644 modules/apache/manifests/service.pp delete mode 100644 modules/apache/manifests/ssl.pp delete mode 100644 modules/apache/manifests/version.pp delete mode 100644 modules/apache/manifests/vhost.pp delete mode 100644 modules/apache/manifests/vhost/custom.pp delete mode 100644 modules/apache/manifests/vhosts.pp delete mode 100644 modules/apache/metadata.json delete mode 100644 modules/apache/readmes/README_ja_JP.md delete mode 100755 modules/apache/spec/acceptance/apache_parameters_spec.rb delete mode 100644 modules/apache/spec/acceptance/apache_ssl_spec.rb delete mode 100644 modules/apache/spec/acceptance/class_spec.rb delete mode 100644 modules/apache/spec/acceptance/custom_config_spec.rb delete mode 100644 modules/apache/spec/acceptance/default_mods_spec.rb delete mode 100644 modules/apache/spec/acceptance/init_task_spec.rb delete mode 100644 modules/apache/spec/acceptance/itk_spec.rb delete mode 100644 modules/apache/spec/acceptance/mod_dav_svn_spec.rb delete mode 100644 modules/apache/spec/acceptance/mod_deflate_spec.rb delete mode 100644 modules/apache/spec/acceptance/mod_fcgid_spec.rb delete mode 100644 modules/apache/spec/acceptance/mod_mime_spec.rb delete mode 100644 modules/apache/spec/acceptance/mod_negotiation_spec.rb delete mode 100644 modules/apache/spec/acceptance/mod_pagespeed_spec.rb delete mode 100644 modules/apache/spec/acceptance/mod_passenger_spec.rb delete mode 100644 modules/apache/spec/acceptance/mod_php_spec.rb delete mode 100644 modules/apache/spec/acceptance/mod_proxy_html_spec.rb delete mode 100644 modules/apache/spec/acceptance/mod_security_spec.rb delete mode 100644 modules/apache/spec/acceptance/mod_suphp_spec.rb delete mode 100644 modules/apache/spec/acceptance/nodesets/centos-7-x64.yml delete mode 100644 modules/apache/spec/acceptance/nodesets/debian-8-x64.yml delete mode 100644 modules/apache/spec/acceptance/nodesets/default.yml delete mode 100644 modules/apache/spec/acceptance/nodesets/docker/centos-7.yml delete mode 100644 modules/apache/spec/acceptance/nodesets/docker/debian-8.yml delete mode 100644 modules/apache/spec/acceptance/nodesets/docker/ubuntu-14.04.yml delete mode 100644 modules/apache/spec/acceptance/nodesets/suse.yml delete mode 100644 modules/apache/spec/acceptance/prefork_worker_spec.rb delete mode 100644 modules/apache/spec/acceptance/service_spec.rb delete mode 100644 modules/apache/spec/acceptance/version.rb delete mode 100644 modules/apache/spec/acceptance/vhost_spec.rb delete mode 100644 modules/apache/spec/acceptance/vhosts_spec.rb delete mode 100644 modules/apache/spec/classes/apache_spec.rb delete mode 100644 modules/apache/spec/classes/dev_spec.rb delete mode 100644 modules/apache/spec/classes/mod/alias_spec.rb delete mode 100644 modules/apache/spec/classes/mod/auth_cas_spec.rb delete mode 100644 modules/apache/spec/classes/mod/auth_kerb_spec.rb delete mode 100644 modules/apache/spec/classes/mod/auth_mellon_spec.rb delete mode 100644 modules/apache/spec/classes/mod/authn_dbd_spec.rb delete mode 100644 modules/apache/spec/classes/mod/authnz_ldap_spec.rb delete mode 100644 modules/apache/spec/classes/mod/authnz_pam_spec.rb delete mode 100644 modules/apache/spec/classes/mod/cluster_spec.rb delete mode 100644 modules/apache/spec/classes/mod/dav_svn_spec.rb delete mode 100644 modules/apache/spec/classes/mod/deflate_spec.rb delete mode 100644 modules/apache/spec/classes/mod/dev_spec.rb delete mode 100644 modules/apache/spec/classes/mod/dir_spec.rb delete mode 100644 modules/apache/spec/classes/mod/disk_cache_spec.rb delete mode 100644 modules/apache/spec/classes/mod/dumpio_spec.rb delete mode 100644 modules/apache/spec/classes/mod/event_spec.rb delete mode 100644 modules/apache/spec/classes/mod/expires_spec.rb delete mode 100644 modules/apache/spec/classes/mod/ext_filter_spec.rb delete mode 100644 modules/apache/spec/classes/mod/fastcgi_spec.rb delete mode 100644 modules/apache/spec/classes/mod/fcgid_spec.rb delete mode 100644 modules/apache/spec/classes/mod/info_spec.rb delete mode 100644 modules/apache/spec/classes/mod/intercept_form_submit_spec.rb delete mode 100644 modules/apache/spec/classes/mod/itk_spec.rb delete mode 100644 modules/apache/spec/classes/mod/jk_spec.rb delete mode 100644 modules/apache/spec/classes/mod/ldap_spec.rb delete mode 100644 modules/apache/spec/classes/mod/lookup_identity.rb delete mode 100644 modules/apache/spec/classes/mod/mime_magic_spec.rb delete mode 100644 modules/apache/spec/classes/mod/mime_spec.rb delete mode 100644 modules/apache/spec/classes/mod/negotiation_spec.rb delete mode 100644 modules/apache/spec/classes/mod/pagespeed_spec.rb delete mode 100644 modules/apache/spec/classes/mod/passenger_spec.rb delete mode 100644 modules/apache/spec/classes/mod/perl_spec.rb delete mode 100644 modules/apache/spec/classes/mod/peruser_spec.rb delete mode 100644 modules/apache/spec/classes/mod/php_spec.rb delete mode 100644 modules/apache/spec/classes/mod/prefork_spec.rb delete mode 100644 modules/apache/spec/classes/mod/proxy_balancer_spec.rb delete mode 100644 modules/apache/spec/classes/mod/proxy_connect_spec.rb delete mode 100644 modules/apache/spec/classes/mod/proxy_html_spec.rb delete mode 100644 modules/apache/spec/classes/mod/proxy_wstunnel.rb delete mode 100644 modules/apache/spec/classes/mod/python_spec.rb delete mode 100644 modules/apache/spec/classes/mod/remoteip_spec.rb delete mode 100644 modules/apache/spec/classes/mod/reqtimeout_spec.rb delete mode 100644 modules/apache/spec/classes/mod/rpaf_spec.rb delete mode 100644 modules/apache/spec/classes/mod/security_spec.rb delete mode 100644 modules/apache/spec/classes/mod/shib_spec.rb delete mode 100644 modules/apache/spec/classes/mod/speling_spec.rb delete mode 100644 modules/apache/spec/classes/mod/ssl_spec.rb delete mode 100644 modules/apache/spec/classes/mod/status_spec.rb delete mode 100644 modules/apache/spec/classes/mod/suphp_spec.rb delete mode 100644 modules/apache/spec/classes/mod/userdir_spec.rb delete mode 100644 modules/apache/spec/classes/mod/worker_spec.rb delete mode 100644 modules/apache/spec/classes/mod/wsgi_spec.rb delete mode 100644 modules/apache/spec/classes/params_spec.rb delete mode 100644 modules/apache/spec/classes/service_spec.rb delete mode 100644 modules/apache/spec/classes/vhosts_spec.rb delete mode 100644 modules/apache/spec/defines/balancer_spec.rb delete mode 100644 modules/apache/spec/defines/balancermember_spec.rb delete mode 100644 modules/apache/spec/defines/custom_config_spec.rb delete mode 100644 modules/apache/spec/defines/fastcgi_server_spec.rb delete mode 100644 modules/apache/spec/defines/mod_spec.rb delete mode 100644 modules/apache/spec/defines/modsec_link_spec.rb delete mode 100644 modules/apache/spec/defines/vhost_custom_spec.rb delete mode 100644 modules/apache/spec/defines/vhost_spec.rb delete mode 100644 modules/apache/spec/fixtures/files/negotiation.conf delete mode 100644 modules/apache/spec/fixtures/files/spec delete mode 100644 modules/apache/spec/fixtures/site_apache/templates/fake.conf.erb delete mode 100644 modules/apache/spec/fixtures/templates/negotiation.conf.erb delete mode 100644 modules/apache/spec/spec_helper.rb delete mode 100644 modules/apache/spec/spec_helper_acceptance.rb delete mode 100644 modules/apache/spec/spec_helper_local.rb delete mode 100644 modules/apache/spec/unit/apache_version_spec.rb delete mode 100644 modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb delete mode 100644 modules/apache/spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb delete mode 100644 modules/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb delete mode 100644 modules/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb delete mode 100644 modules/apache/tasks/init.json delete mode 100755 modules/apache/tasks/init.rb delete mode 100644 modules/apache/templates/confd/no-accf.conf.erb delete mode 100644 modules/apache/templates/fastcgi/server.erb delete mode 100755 modules/apache/templates/httpd.conf.erb delete mode 100644 modules/apache/templates/listen.erb delete mode 100644 modules/apache/templates/mod/alias.conf.erb delete mode 100644 modules/apache/templates/mod/auth_cas.conf.erb delete mode 100644 modules/apache/templates/mod/auth_mellon.conf.erb delete mode 100644 modules/apache/templates/mod/authn_dbd.conf.erb delete mode 100644 modules/apache/templates/mod/authnz_ldap.conf.erb delete mode 100644 modules/apache/templates/mod/autoindex.conf.erb delete mode 100644 modules/apache/templates/mod/cgid.conf.erb delete mode 100644 modules/apache/templates/mod/cluster.conf.erb delete mode 100644 modules/apache/templates/mod/dav_fs.conf.erb delete mode 100644 modules/apache/templates/mod/deflate.conf.erb delete mode 100644 modules/apache/templates/mod/dir.conf.erb delete mode 100644 modules/apache/templates/mod/disk_cache.conf.erb delete mode 100644 modules/apache/templates/mod/dumpio.conf.erb delete mode 100644 modules/apache/templates/mod/event.conf.erb delete mode 100644 modules/apache/templates/mod/expires.conf.erb delete mode 100644 modules/apache/templates/mod/ext_filter.conf.erb delete mode 100644 modules/apache/templates/mod/fastcgi.conf.erb delete mode 100644 modules/apache/templates/mod/fcgid.conf.erb delete mode 100644 modules/apache/templates/mod/geoip.conf.erb delete mode 100644 modules/apache/templates/mod/info.conf.erb delete mode 100644 modules/apache/templates/mod/itk.conf.erb delete mode 100644 modules/apache/templates/mod/jk.conf.erb delete mode 100644 modules/apache/templates/mod/jk/uriworkermap.properties.erb delete mode 100644 modules/apache/templates/mod/jk/workers.properties.erb delete mode 100644 modules/apache/templates/mod/ldap.conf.erb delete mode 100644 modules/apache/templates/mod/load.erb delete mode 100644 modules/apache/templates/mod/mime.conf.erb delete mode 100644 modules/apache/templates/mod/mime_magic.conf.erb delete mode 100644 modules/apache/templates/mod/mpm_event.conf.erb delete mode 100644 modules/apache/templates/mod/negotiation.conf.erb delete mode 100644 modules/apache/templates/mod/nss.conf.erb delete mode 100644 modules/apache/templates/mod/pagespeed.conf.erb delete mode 100644 modules/apache/templates/mod/passenger.conf.erb delete mode 100644 modules/apache/templates/mod/peruser.conf.erb delete mode 100644 modules/apache/templates/mod/php.conf.erb delete mode 100644 modules/apache/templates/mod/prefork.conf.erb delete mode 100644 modules/apache/templates/mod/proxy.conf.erb delete mode 100644 modules/apache/templates/mod/proxy_balancer.conf.erb delete mode 100644 modules/apache/templates/mod/proxy_html.conf.erb delete mode 100644 modules/apache/templates/mod/remoteip.conf.erb delete mode 100644 modules/apache/templates/mod/reqtimeout.conf.erb delete mode 100644 modules/apache/templates/mod/rpaf.conf.erb delete mode 100644 modules/apache/templates/mod/security.conf.erb delete mode 100644 modules/apache/templates/mod/security_crs.conf.erb delete mode 100644 modules/apache/templates/mod/setenvif.conf.erb delete mode 100644 modules/apache/templates/mod/ssl.conf.erb delete mode 100644 modules/apache/templates/mod/status.conf.erb delete mode 100644 modules/apache/templates/mod/suphp.conf.erb delete mode 100644 modules/apache/templates/mod/userdir.conf.erb delete mode 100644 modules/apache/templates/mod/worker.conf.erb delete mode 100644 modules/apache/templates/mod/wsgi.conf.erb delete mode 100644 modules/apache/templates/namevirtualhost.erb delete mode 100644 modules/apache/templates/ports_header.erb delete mode 100644 modules/apache/templates/vhost/_access_log.erb delete mode 100644 modules/apache/templates/vhost/_action.erb delete mode 100644 modules/apache/templates/vhost/_additional_includes.erb delete mode 100644 modules/apache/templates/vhost/_aliases.erb delete mode 100644 modules/apache/templates/vhost/_allow_encoded_slashes.erb delete mode 100644 modules/apache/templates/vhost/_auth_cas.erb delete mode 100644 modules/apache/templates/vhost/_auth_kerb.erb delete mode 100644 modules/apache/templates/vhost/_block.erb delete mode 100644 modules/apache/templates/vhost/_charsets.erb delete mode 100644 modules/apache/templates/vhost/_custom_fragment.erb delete mode 100644 modules/apache/templates/vhost/_directories.erb delete mode 100644 modules/apache/templates/vhost/_docroot.erb delete mode 100644 modules/apache/templates/vhost/_error_document.erb delete mode 100644 modules/apache/templates/vhost/_fallbackresource.erb delete mode 100644 modules/apache/templates/vhost/_fastcgi.erb delete mode 100644 modules/apache/templates/vhost/_file_footer.erb delete mode 100644 modules/apache/templates/vhost/_file_header.erb delete mode 100644 modules/apache/templates/vhost/_filters.erb delete mode 100644 modules/apache/templates/vhost/_header.erb delete mode 100644 modules/apache/templates/vhost/_http_protocol_options.erb delete mode 100644 modules/apache/templates/vhost/_itk.erb delete mode 100644 modules/apache/templates/vhost/_jk_mounts.erb delete mode 100644 modules/apache/templates/vhost/_keepalive_options.erb delete mode 100644 modules/apache/templates/vhost/_logging.erb delete mode 100644 modules/apache/templates/vhost/_passenger.erb delete mode 100644 modules/apache/templates/vhost/_passenger_base_uris.erb delete mode 100644 modules/apache/templates/vhost/_php.erb delete mode 100644 modules/apache/templates/vhost/_php_admin.erb delete mode 100644 modules/apache/templates/vhost/_proxy.erb delete mode 100644 modules/apache/templates/vhost/_rack.erb delete mode 100644 modules/apache/templates/vhost/_redirect.erb delete mode 100644 modules/apache/templates/vhost/_requestheader.erb delete mode 100644 modules/apache/templates/vhost/_require.erb delete mode 100644 modules/apache/templates/vhost/_rewrite.erb delete mode 100644 modules/apache/templates/vhost/_scriptalias.erb delete mode 100644 modules/apache/templates/vhost/_security.erb delete mode 100644 modules/apache/templates/vhost/_serveralias.erb delete mode 100644 modules/apache/templates/vhost/_serversignature.erb delete mode 100644 modules/apache/templates/vhost/_setenv.erb delete mode 100644 modules/apache/templates/vhost/_ssl.erb delete mode 100644 modules/apache/templates/vhost/_sslproxy.erb delete mode 100644 modules/apache/templates/vhost/_suexec.erb delete mode 100644 modules/apache/templates/vhost/_suphp.erb delete mode 100644 modules/apache/templates/vhost/_wsgi.erb delete mode 100644 modules/concat/CHANGELOG.md delete mode 100644 modules/concat/CONTRIBUTING.md delete mode 100644 modules/concat/Gemfile delete mode 100644 modules/concat/LICENSE delete mode 100644 modules/concat/MAINTAINERS.md delete mode 100644 modules/concat/NOTICE delete mode 100644 modules/concat/README.md delete mode 100644 modules/concat/Rakefile delete mode 100644 modules/concat/appveyor.yml delete mode 100644 modules/concat/checksums.json delete mode 100644 modules/concat/examples/fragment.pp delete mode 100644 modules/concat/examples/init.pp delete mode 100644 modules/concat/lib/puppet/type/concat_file.rb delete mode 100644 modules/concat/lib/puppet/type/concat_fragment.rb delete mode 100644 modules/concat/locales/config.yaml delete mode 100644 modules/concat/manifests/fragment.pp delete mode 100644 modules/concat/manifests/init.pp delete mode 100644 modules/concat/metadata.json delete mode 100644 modules/concat/spec/acceptance/backup_spec.rb delete mode 100644 modules/concat/spec/acceptance/concat_spec.rb delete mode 100644 modules/concat/spec/acceptance/concurrency_spec.rb delete mode 100644 modules/concat/spec/acceptance/force_spec.rb delete mode 100644 modules/concat/spec/acceptance/format_spec.rb delete mode 100644 modules/concat/spec/acceptance/fragment_source_spec.rb delete mode 100644 modules/concat/spec/acceptance/fragments_are_always_replaced_spec.rb delete mode 100644 modules/concat/spec/acceptance/native/backup_spec.rb delete mode 100644 modules/concat/spec/acceptance/native/concat_spec.rb delete mode 100644 modules/concat/spec/acceptance/native/concurrency_spec.rb delete mode 100644 modules/concat/spec/acceptance/native/fragment_source_spec.rb delete mode 100644 modules/concat/spec/acceptance/native/fragments_are_always_replaced_spec.rb delete mode 100644 modules/concat/spec/acceptance/native/newline_spec.rb delete mode 100644 modules/concat/spec/acceptance/native/order_spec.rb delete mode 100644 modules/concat/spec/acceptance/native/pup-1963_spec.rb delete mode 100644 modules/concat/spec/acceptance/native/quoted_paths_spec.rb delete mode 100644 modules/concat/spec/acceptance/native/replace_spec.rb delete mode 100644 modules/concat/spec/acceptance/native/symbolic_name_spec.rb delete mode 100644 modules/concat/spec/acceptance/native/validation_spec.rb delete mode 100644 modules/concat/spec/acceptance/native/warnings_spec.rb delete mode 100644 modules/concat/spec/acceptance/newline_spec.rb delete mode 100644 modules/concat/spec/acceptance/nodesets/centos-7-x64.yml delete mode 100644 modules/concat/spec/acceptance/nodesets/debian-8-x64.yml delete mode 100644 modules/concat/spec/acceptance/nodesets/debian-9-x64.yml delete mode 100644 modules/concat/spec/acceptance/nodesets/default.yml delete mode 100644 modules/concat/spec/acceptance/nodesets/docker/centos-7.yml delete mode 100644 modules/concat/spec/acceptance/nodesets/docker/debian-8.yml delete mode 100644 modules/concat/spec/acceptance/nodesets/docker/ubuntu-14.04.yml delete mode 100644 modules/concat/spec/acceptance/order_spec.rb delete mode 100644 modules/concat/spec/acceptance/pup-1963_spec.rb delete mode 100644 modules/concat/spec/acceptance/quoted_paths_spec.rb delete mode 100644 modules/concat/spec/acceptance/replace_spec.rb delete mode 100644 modules/concat/spec/acceptance/specinfra_stubs.rb delete mode 100644 modules/concat/spec/acceptance/symbolic_name_spec.rb delete mode 100644 modules/concat/spec/acceptance/validation_spec.rb delete mode 100644 modules/concat/spec/acceptance/warn_header_spec.rb delete mode 100644 modules/concat/spec/acceptance/warnings_spec.rb delete mode 100644 modules/concat/spec/defines/concat_fragment_spec.rb delete mode 100644 modules/concat/spec/defines/concat_spec.rb delete mode 100644 modules/concat/spec/spec_helper.rb delete mode 100644 modules/concat/spec/spec_helper_acceptance.rb delete mode 100644 modules/concat/spec/spec_helper_local.rb delete mode 100644 modules/concat/spec/unit/type/concat_file_spec.rb delete mode 100644 modules/concat/spec/unit/type/concat_fragment_spec.rb delete mode 100644 modules/motd/CHANGELOG.md delete mode 100644 modules/motd/CONTRIBUTING.md delete mode 100644 modules/motd/Gemfile delete mode 100644 modules/motd/LICENSE delete mode 100644 modules/motd/MAINTAINERS.md delete mode 100644 modules/motd/NOTICE delete mode 100644 modules/motd/README.md delete mode 100644 modules/motd/Rakefile delete mode 100644 modules/motd/appveyor.yml delete mode 100644 modules/motd/checksums.json delete mode 100644 modules/motd/locales/config.yaml delete mode 100644 modules/motd/manifests/init.pp delete mode 100644 modules/motd/metadata.json delete mode 100644 modules/motd/spec/acceptance/motd_spec.rb delete mode 100644 modules/motd/spec/acceptance/nodesets/centos-7-x64.yml delete mode 100644 modules/motd/spec/acceptance/nodesets/debian-8-x64.yml delete mode 100644 modules/motd/spec/acceptance/nodesets/default.yml delete mode 100644 modules/motd/spec/acceptance/nodesets/docker/centos-7.yml delete mode 100644 modules/motd/spec/acceptance/nodesets/docker/debian-8.yml delete mode 100644 modules/motd/spec/acceptance/nodesets/docker/ubuntu-14.04.yml delete mode 100644 modules/motd/spec/classes/motd_spec.rb delete mode 100644 modules/motd/spec/spec_helper.rb delete mode 100644 modules/motd/spec/spec_helper_acceptance.rb delete mode 100644 modules/motd/templates/motd.erb delete mode 100644 modules/motd/templates/spec.erb delete mode 100644 modules/motd/tests/README.md delete mode 100644 modules/motd/tests/beaker/config/redhat-6-64mda delete mode 100644 modules/motd/tests/beaker/config/redhat-7-64mda delete mode 100644 modules/motd/tests/beaker/config/ubuntu-1204-64mda delete mode 100644 modules/motd/tests/beaker/config/ubuntu-1404-64mda delete mode 100755 modules/motd/tests/beaker/pre-suite/00_pe_install.rb delete mode 100755 modules/motd/tests/beaker/pre-suite/01_motd_module_install.rb delete mode 100755 modules/motd/tests/beaker/test_run_scripts/run_test_with_ankeny.sh delete mode 100755 modules/motd/tests/beaker/tests/01_create_motd_content.rb delete mode 100644 modules/profile/manifests/base.pp delete mode 100644 modules/role/manifests/default.pp diff --git a/manifests/node.pp b/manifests/node.pp deleted file mode 100644 index c897d38..0000000 --- a/manifests/node.pp +++ /dev/null @@ -1,13 +0,0 @@ -node default{ - -class {'apache':} - -#this is how you fetch the hiera value -#hiera file location /production/data/common.yaml (default location is dir , default name is common check hiera.yaml for details) -$data=hiera('hierakey') -notify{"============fetchin from hiera===>${data}":} - - -#$myvhosts = create_resources('apache::vhost', hiera('vhosts',{})) - -} diff --git a/modules/apache/CHANGELOG.md b/modules/apache/CHANGELOG.md deleted file mode 100644 index 46ee4e9..0000000 --- a/modules/apache/CHANGELOG.md +++ /dev/null @@ -1,953 +0,0 @@ -# Change log - -All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) -and this project adheres to [Semantic Versioning](http://semver.org). - -## Supported Release [2.3.0] -### Summary -This is a feature release. It includes a task that will reload the apache service. - -#### Added -- Add a task that allows the reloading of the Apache service. - -## Supported Release [2.2.0] -### Summary -This is a maintainence and feature release. It will include updates to translations in Japanese, some maintainence and adding `PassengerSpawnMethod` to vhost. - -#### Added -- `PassengerSpawnMethod` added to `vhost`. - -#### Changed -- Improve version match fact for `apache_version` -- Update to prefork.conf params for Apache 2.4 -- Updates to `CONTRIBUTING.md` -- Do not install mod_fastcgi on el7 -- Include mod_wsgi when using wsgi options - -## Supported Release [2.1.0] -### Summary -This is a feature release including a security patch (CVE-2017-2299) - -#### Added -- `apache::mod::jk` class for managing the mod_jk connector -- `apache_pw_hash` function -- the ProxyPass directive in location contexts -- more Puppet 4 type validation -- `apache::mod::macro` class for managing mod_macro - -#### Changed -- $ssl_certs_dir default to `undef` for all platorms -- $ssl_verify_client must now be set to use any of the following: `$ssl_certs_dir`, `$ssl_ca`, `$ssl_crl_path`, `$ssl_crl`, `$ssl_verify_depth`, `$ssl_crl_check` - -#### Fixed -- issue where mod_alias was not being loaded when RedirectMatch* directives were being used ([MODULES-3942](https://tickets.puppet.com/browse/MODULES-3942)) -- issue with `$directories` parameter in `apache::vhost` -- issue in UserDir template where the UserDir path did not match the Directory path -- **Issue where the $ssl_certs_dir default set Apache to implicitly trust all client certificates that were issued by any CA in that directory** - -#### Removed -- support for EOL platforms: Ubuntu 10.04, 12.04 and Debian 6 (Squeeze) - -## Supported Release [2.0.0] -### Summary -Major release **removing Puppet 3 support** and other backwards-incompatible changes. - -#### Added -- support for FileETag directive configurable with the `file_e_tag` parameter -- ability to configure multiple ports per vhost -- RequestHeader directive to vhost template ([MODULES-4156](https://tickets.puppet.com/browse/MODULES-4156)) -- customizability for AllowOverride directive in userdir.conf ([MODULES-4516](https://tickets.puppet.com/browse/MODULES-4516)) -- AdvertiseFrequency directive for cluster.conf ([MODULES-4500](https://tickets.puppet.com/browse/MODULES-4500)) -- `ssl_proxy_protocol` and `ssl_sessioncache` parameters for mod::ssl ([MODULES-4737](https://tickets.puppet.com/browse/MODULES-4737)) -- SSLCACertificateFile directive in ssl.conf configurable with `ssl_ca` parameter -- mod::authnz_pam -- mod::intercept_form_submit -- mod::lookup_identity -- Suse compatibility for mod::proxy_html -- support for AddCharset directive configurable with `add_charset` parameter -- support for SSLProxyVerifyDepth and SSLProxyCACertificateFile directives configurable with `ssl_proxy_verify_depth` and `ssl_proxy_ca_cert` respectively -- `manage_security_crs` parameter for mod::security -- support for LimitExcept directive configurable with `limit_except` parameter -- support for WSGIRestrictEmbedded directive configurable with `wsgi_restrict_embedded` parameter -- support for custom UserDir path ([MODULES-4933](https://tickets.puppet.com/browse/MODULES-4933)) -- support for PassengerMaxRequests directive configurable with `passenger_max_requests` -- option to override module package names with `mod_packages` parameter ([MODULES-3838](https://tickets.puppet.com/browse/MODULES-3838)) - -#### Removed -- enclose_ipv6 as it was added to puppetlabs-stdlib -- deprecated `$verifyServerCert` parameter from the `apache::mod::authnz_ldap` class ([MODULES-4445](https://tickets.puppet.com/browse/MODULES-4445)) - -#### Changed -- `keepalive` default to 'On' from 'Off' -- Puppet version compatibility to ">= 4.7.0 < 6.0.0" -- puppetlabs-stdlib dependency to ">= 4.12.0 < 5.0.0" -- `ssl_cipher` to explicitly disable 3DES because of Sweet32 - -#### Fixed -- various issues in the vhost template -- use of deprecated `include_src` parameter in vhost_spec -- management of ssl.conf on RedHat systems -- various SLES/Suse params -- mod::cgi ordering for FreeBSD -- issue where ProxyPreserveHost could not be set without other Proxy* directives -- the module attempting to install proxy_html on Ubuntu Xenial and Debian Stretch - -## Supported Release [1.11.1] -#### Summary -This is a security patch release (CVE-2017-2299). These changes are also in version 2.1.0 and higher. - -#### Changed -- $ssl_certs_dir default to `undef` for all platorms -- $ssl_verify_client must now be set to use any of the following: `$ssl_certs_dir`, `$ssl_ca`, `$ssl_crl_path`, `$ssl_crl`, `$ssl_verify_depth`, `$ssl_crl_check` - -#### Fixed -- **Issue where the $ssl_certs_dir default set Apache to implicitly trust all client certificates that were issued by any CA in that directory** ([MODULES-5471](https://tickets.puppet.com/browse/MODULES-5471)) - -## Supported Release [1.11.0] -### Summary -This release adds SLES12 Support and many more features and bugfixes. - -#### Features -- (MODULES-4049) Adds SLES 12 Support -- Adds additional directories options for LDAP Auth - - `auth_ldap_url` - - `auth_ldap_bind_dn` - - `auth_ldap_bind_password` - - `auth_ldap_group_attribute` - - `auth_ldap_group_attribute_is_dn` -- Allows `mod_event` parameters to be unset -- Allows management of default root directory access rights -- Adds class `apache::vhosts` to create apache::vhost resources -- Adds class `apache::mod::proxy_wstunnel` -- Adds class `apache::mod::dumpio` -- Adds class `apache::mod::socache_shmcb` -- Adds class `apache::mod::authn_dbd` -- Adds support for apache 2.4 on Amazon Linux -- Support the newer `mod_auth_cas` config options -- Adds `wsgi_script_aliases_match` parameter to `apache::vhost` -- Allow to override all SecDefaultAction attributes -- Add audit_log_relevant_status parameter to apache::mod::security -- Allow absolute path to $apache::mod::security::activated_rules -- Allow setting SecAuditLog -- Adds `passenger_max_instances_per_app` to `mod::passenger` -- Allow the proxy_via setting to be configured -- Allow no_proxy_uris to be used within proxy_pass -- Add rpaf.conf template parameter to `mod::rpaf` -- Allow user to specify alternative package and library names for shibboleth module -- Allows configuration of shibboleth lib path -- Adds parameter `passenger_data_buffer_dir` to `mod::passenger` -- Adds SSL stapling -- Allows use of `balance_manager` with `mod_proxy_balancer` -- Raises lower bound of `stdlib` dependency to version 4.2 -- Adds support for Passenger repo on Amazon Linux -- Add ability to set SSLStaplingReturnResponderErrors on server level -- (MODULES-4213) Allow global rewrite rules inheritance in vhosts -- Moves `mod_env` to its own class and load it when required - -#### Bugfixes -- Deny access to .ht and .hg, which are created by mercurial hg. -- Instead of failing, include apache::mod::prefork in manifests/mod/itk.pp instead. -- Only set SSLCompression when it is set to true. -- Remove duplicate shib2 hash element -- (MODULES-3388) Include mpm_module classes instead of class declaration -- Updates `apache::balancer` to respect `apache::confd_dir` -- Wrap mod_security directives in an IfModule -- Fixes to various mods for Ubuntu Xenial -- Fix /etc/modsecurity perms to match package -- Fix PassengerRoot under Debian stretch -- (MODULES-3476) Updates regex in apache_version custom fact to work with EL5 -- Dont sql_injection_attacks.data -- Add force option to confd file resource to purge directory without warnings -- Patch httpoxy through mod_security -- Fixes config ordering of IncludeOptional -- Fixes bug where port numbers were unquoted -- Fixes bug where empty servername for vhost were written to template -- Auto-load `slotmem_shm` and `lbmethod_byrequests` with `proxy_balancer` on 2.4 -- Simplify MPM setup on FreeBSD -- Adds requirement for httpd package -- Do not set ssl_certs_dir on FreeBSD -- Fixes bug that produces a duplicate `Listen 443` after a package update on EL7 -- Fixes bug where custom facts break structured facts -- Avoid relative classname inclusion -- Fixes a failure in `vhost` if the first element of `$rewrites` is not a hash -- (MODULES-3744) Process $crs_package before $modsec_dir -- (MODULES-1491) Adds `::apache` include to mods that need it - -## Supported Release [1.10.0] -#### Summary -This release fixes backwards compatibility bugs introduced in 1.9.0. Also includes a new mod class and a new vhost feature. - -#### Features -- Allow setting KeepAlive related options per vhost - - `apache::vhost::keepalive` - - `apache::vhost::keepalive_timeout` - - `apache::vhost::max_keepalive_requests` -- Adds new class `apache::mod::cluster` - -#### Bugfixes -- MODULES-2890: Allow php_version != 5 -- MODULES-2890: mod::php: Explicit test on jessie -- MODULES-2890: Fix PHP on Debian stretch and Ubuntu Xenial -- MODULES-2890: Fix mod_php SetHandler and cleanup -- Fixed trailing slash in lib_path on Suse -- Revert "MODULES-2956: Enable options within location block on proxy_match". Bug introduced in release 1.9.0. -- Revert "changed rpaf Configuration Directives: RPAF -> RPAF_". Bug introduced in release 1.9.0. -- Set actual path to apachectl on FreeBSD. Fixes snippets verification. - -## Supported Release [1.9.0] [DELETED] -#### Features -- Added `apache_version` fact -- Added `apache::balancer::target` attribute -- Added `apache::fastcgi::server::pass_header` attribute -- Added ability for `apache::fastcgi::server::host` using sockets -- Added `apache::root_directory_options` attribute -- Added for `apache::mod::ldap`: - - `ldap_shared_cache_size` - - `ldap_cache_entries` - - `ldap_cache_ttl` - - `ldap_opcache_entries` - - `ldap_opcache_ttl` -- Added `apache::mod::pagespeed::package_ensure` attribute -- Added `apache::mod::passenger` attributes: - - `passenger_log_level` - - `manage_repo` -- Added upstream repo for `apache::mod::passenger` -- Added `apache::mod::proxy_fcgi` class -- Added `apache::mod::security` attributes: - - `audit_log_parts` - - `secpcrematchlimit` - - `secpcrematchlimitrecursion` - - `secdefaultaction` - - `anomaly_score_blocking` - - `inbound_anomaly_threshold` - - `outbound_anomaly_threshold` -- Added `apache::mod::ssl` attributes: - - `ssl_mutex` - - `apache_version` -- Added ubuntu 16.04 support -- Added `apache::mod::authnz_ldap::package_name` attribute -- Added `apache::mod::ldap::package_name` attribute -- Added `apache::mod::proxy::package_name` attribute -- Added `apache::vhost` attributes: - - `ssl_proxy_check_peen_expire` - - `ssl_proxy_protocol` - - `logroot_owner` - - `logroot_group` - - `setenvifnocase` - - `passenger_user` - - `passenger_high_performance` - - `jk_mounts` - - `fastcgi_idle_timeout` - - `modsec_disable_msgs` - - `modsec_disable_tags` -- Added ability for 2.4-style `RequireAll|RequireNone|RequireAny` directory permissions -- Added ability for includes in vhost directory -- Added directory values: - - `AuthMerging` - - `MellonSPMetadataFile` -- Adds Configurability of Collaborative Detection Severity Levels for OWASP Core Rule Set to `apache::mod::security` class - - `critical_anomaly_score` - - `error_anomaly_score` - - `warning_anomaly_score` - - `notice_anomaly_score` -- Adds ability to configure `info_path` in `apache::mod::info` class -- Adds ability to configure `verify_config` in `apache::vhost::custom` - -#### Bugfixes -- Fixed apache mod setup for event/worker failing syntax -- Fixed concat deprecation warnings -- Fixed pagespeed mod -- Fixed service restart on mod update -- Fixed mod dir purging to happen after package installs -- Fixed various `apache::mod::*` file modes -- Fixed `apache::mod::authnz_ldap` parameter `verifyServerCert` to be `verify_server_cert` -- Fixed loadfile name in `apache::mod::fcgid` -- Fixed `apache::mod::remoteip` to fail on apache < 2.4 (because it is not available) -- Fixed `apache::mod::ssl::ssl_honorcipherorder` interpolation -- Lint fixes -- Strict variable fixes -- Fixed `apache::vhost` attribute `redirectmatch_status` to be optional -- Fixed SSLv3 on by default in mod\_nss -- Fixed mod\_rpaf directive names in template -- Fixed mod\_worker needing MaxClients with ThreadLimit -- Fixed quoting on vhost php\_value -- Fixed xml2enc for proxy\_html on debian -- Fixed a problem where the apache service restarts too fast - -## Supported Release [1.8.1] -### Summary -This release includes bug fixes and a documentation update. - -#### Bugfixes -- Fixes a bug that occurs when using the module in combination with puppetlabs-concat 2.x. -- Fixes a bug where passenger.conf was vulnerable to purging. -- Removes the pin of the concat module dependency. - -## Supported Release [1.8.0] -### Summary -This release includes a lot of bug fixes and feature updates, including support for Debian 8, as well as many test improvements. - -#### Features -- Debian 8 Support. -- Added the 'file_mode' property to allow a custom permission setting for config files. -- Enable 'PassengerMaxRequestQueueSize' to be set for mod_passenger. -- MODULES-2956: Enable options within location block on proxy_match. -- Support itk on redhat. -- Support the mod_ssl SSLProxyVerify directive. -- Support ProxPassReverseCookieDomain directive (mod_proxy). -- Support proxy provider for vhost directories. -- Added new 'apache::vhost::custom' resource. - -#### Bugfixes -- Fixed ProxyPassReverse configuration. -- Fixed error in Amazon operatingsystem detection. -- Fixed mod_security catalog ordering issues for RedHat 7. -- Fixed paths and packages for the shib2 apache module on Debian pre Jessie. -- Fixed EL7 directory path for apache modules. -- Fixed validation error when empty array is passed for the rewrites parameter. -- Idempotency fixes with regards to '::apache::mod_enable_dir'. -- ITK fixes. -- (MODULES-2865) fix $mpm_module logic for 'false'. -- Set SSLProxy directives even if ssl is false, due to issue with RewriteRules and ProxyPass directives. -- Enable setting LimitRequestFieldSize globally, and remove it from vhost. - -#### Improvements -- apache::mod::php now uses FilesMatch to configure the php handler. This is following the recommended upstream configuration guidelines (http://php.net/manual/en/install.unix.apache2.php#example-20) and distribution's default config (e.g.: http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/php5/vivid/view/head:/debian/php5.conf). It avoids inadvertently exposing the PHP handler to executing uploads with names like 'file.php.jpg', but might impact setups with unusual requirements. -- Improved compatibility for Gentoo. -- Vhosts can now be supplied with a wildcard listen value. -- Numerous test improvements. -- Removed workarounds for https://bz.apache.org/bugzilla/show_bug.cgi?id=38864 as the issues have been fixed in Apache. -- Documentation updates. -- Ensureed order of ProxyPass and ProxyPassMatch parameters. -- Ensure that ProxyPreserveHost is set to off mode explicitly if not set in manifest. -- Put headers and request headers before proxy with regards to template generation. -- Added X-Forwarded-For into log_formats defaults. -- (MODULES-2703) Allow mod pagespeed to take an array of lines as additional_configuration. - -## Supported Release [1.7.1] -###Summary - -Small release for support of newer PE versions. This increments the version of PE in the metadata.json file. - -## Supported Release [1.7.0] -### Summary -This release includes many new features and bugfixes. There are test, documentation and misc improvements. - -#### Features -- allow groups with - like vhost-users -- ability to enable/disable the secruleengine through a parameter -- add mod_auth_kerb parameters to vhost -- client auth for reverse proxy -- support for mod_auth_mellon -- change SSLProtocol in apache::vhost to be space separated -- RewriteLock support - -#### Bugfixes -- fix apache::mod::cgid so it can be used with the event MPM -- load unixd before fcgid on all operating systems -- fixes conditional in vhost aliases -- corrects mod_cgid worker/event defaults -- ProxyPassMatch parameters were ending up on a newline -- catch that mod_authz_default has been removed in Apache 2.4 -- mod::ssl fails on SLES -- fix typo of MPM_PREFORK for FreeBSD package install -- install all modules before adding custom configs -- fix acceptance testing for SSLProtocol behaviour for real -- fix ordering issue with conf_file and ports_file - -#### Known Issues -- mod_passenger is having issues installing on Redhat/Centos 6, This is due to package dependency issues. - -#### Improvements -- added docs for forcetype directive -- removes ruby 1.8.7 from the travisci test matrix -- readme reorganisation, minor fixups -- support the mod_proxy ProxyPassReverseCookiePath directive -- the purge_vhost_configs parameter is actually called purge_vhost_dir -- add ListenBacklog for mod worker -- deflate application/json by default -- install mod_authn_alias as default mod in debian for apache < 2.4 -- optionally set LimitRequestFieldSize on an apache::vhost -- add SecUploadDir parameter to support file uploads with mod_security -- optionally set parameters for mod_ext_filter module -- allow SetOutputFilter to be set on a directory -- RC4 is deprecated -- allow empty docroot -- add option to configure the include pattern for the vhost_enable dir -- allow multiple IP addresses per vhost -- default document root update for Ubuntu 14.04 and Debian 8 - -## Supported Release [1.6.0] -### Summary -This release includes a couple of new features, along with test and documentation updates, and support for the latest AIO puppet builds. - -#### Features -- Add `scan_proxy_header_field` parameter to `apache::mod::geoip` -- Add `ssl_openssl_conf_cmd` parameter to `apache::vhost` and `apache::mod::ssl` -- Add `filters` parameter to `apache::vhost` - -#### Bugfixes -- Test updates -- Do not use systemd on Amazon Linux -- Add missing docs for `timeout` parameter (MODULES-2148) - -## Supported Release [1.5.0] -### Summary -This release primarily adds Suse compatibility. It also adds a handful of other -parameters for greater configuration control. - -#### Features -- Add `apache::lib_path` parameter -- Add `apache::service_restart` parameter -- Add `apache::vhost::geoip_enable` parameter -- Add `apache::mod::geoip` class -- Add `apache::mod::remoteip` class -- Add parameters to `apache::mod::expires` class -- Add `index_style_sheet` handling to `apache::vhost::directories` -- Add some compatibility for SLES 11 -- Add `apache::mod::ssl::ssl_sessioncachetimeout` parameter -- Add `apache::mod::ssl::ssl_cryptodevice` parameter -- Add `apache::mod::ssl::ssl_honorcipherorder` parameter -- Add `apache::mod::userdir::options` parameter - -#### Bugfixes -- Document `apache::user` parameter -- Document `apache::group` parameter -- Fix apache::dev on FreeBSD -- Fix proxy\_connect on apache >= 2.2 -- Validate log levels better -- Fix `apache::apache_name` for package and vhost -- Fix Debian Jessie mod\_prefork package name -- Fix alias module being declared even when vhost is absent -- Fix proxy\_pass\_match handling in vhost's proxy template -- Fix userdir access permissions -- Fix issue where the module was trying to use systemd on Amazon Linux. - -## Supported Release [1.4.1] - -This release corrects a metadata issue that has been present since release 1.2.0. The refactoring of `apache::vhost` to use `puppetlabs-concat` requires a version of concat newer than the version required in PE. If you are using PE 3.3.0 or earlier you will need to use version 1.1.1 or earlier of the `puppetlabs-apache` module. - -## Supported Release [1.4.0] -###Summary - -This release fixes the issue where the docroot was still managed even if the default vhosts were disabled and has many other features and bugfixes including improved support for 'deny' and 'require' as arrays in the 'directories' parameter under `apache::vhost` - -#### Features -- New parameters to `apache` - - `default_charset` - - `default_type` -- New parameters to `apache::vhost` - - `proxy_error_override` - - `passenger_app_env` (MODULES-1776) - - `proxy_dest_match` - - `proxy_dest_reverse_match` - - `proxy_pass_match` - - `no_proxy_uris_match` -- New parameters to `apache::mod::passenger` - - `passenger_app_env` - - `passenger_min_instances` -- New parameter to `apache::mod::alias` - - `icons_options` -- New classes added under `apache::mod::*` - - `authn_file` - - `authz_default` - - `authz_user` -- Added support for 'deny' as an array in 'directories' under `apache::vhost` -- Added support for RewriteMap -- Improved support for FreeBSD. (Note: If using apache < 2.4.12, see the discussion [here](https://github.com/puppetlabs/puppetlabs-apache/pull/1030)) -- Added check for deprecated options in directories and fail when they are unsupported -- Added gentoo compatibility -- Added proper array support for `require` in the `directories` parameter in `apache::vhost` -- Added support for `setenv` inside proxy locations - -### Bugfixes -- Fix issue in `apache::vhost` that was preventing the scriptalias fragment from being included (MODULES-1784) -- Install required `mod_ldap` package for EL7 (MODULES-1779) -- Change default value of `maxrequestworkers` in `apache::mod::event` to be a multiple of the default `ThreadsPerChild` of 25. -- Use the correct `mod_prefork` package name for trusty and jessie -- Don't manage docroot when default vhosts are disabled -- Ensure resources notify `Class['Apache::Service']` instead of `Service['httpd']` (MODULES-1829) -- Change the loadfile name for `mod_passenger` so `mod_proxy` will load by default before `mod_passenger` -- Remove old Debian work-around that removed `passenger_extra.conf` - -## Supported Release [1.3.0] -### Summary - -This release has many new features and bugfixes, including the ability to optionally not trigger service restarts on config changes. - -#### Features -- New parameters - `apache` - - `service_manage` - - `use_optional_includes` -- New parameters - `apache::service` - - `service_manage` -- New parameters - `apache::vhost` - - `access_logs` - - `php_flags` - - `php_values` - - `modsec_disable_vhost` - - `modsec_disable_ids` - - `modsec_disable_ips` - - `modsec_body_limit` -- Improved FreeBSD support -- Add ability to omit priority prefix if `$priority` is set to false -- Add `apache::security::rule_link` define -- Improvements to `apache::mod::*` - - Add `apache::mod::auth_cas` class - - Add `threadlimit`, `listenbacklog`, `maxrequestworkers`, `maxconnectionsperchild` parameters to `apache::mod::event` - - Add `apache::mod::filter` class - - Add `root_group` to `apache::mod::php` - - Add `apache::mod::proxy_connect` class - - Add `apache::mod::security` class - - Add `ssl_pass_phrase_dialog` and `ssl_random_seed_bytes` parameters to `apache::mod::ssl` (MODULES-1719) - - Add `status_path` parameter to `apache::mod::status` - - Add `apache_version` parameter to `apache::mod::version` - - Add `package_name` and `mod_path` parameters to `apache::mod::wsgi` (MODULES-1458) -- Improved SCL support - - Add support for specifying the docroot -- Updated `_directories.erb` to add support for SetEnv -- Support multiple access log directives (MODULES-1382) -- Add passenger support for Debian Jessie -- Add support for not having puppet restart the apache service (MODULES-1559) - -#### Bugfixes -- For apache 2.4 `mod_itk` requires `mod_prefork` (MODULES-825) -- Allow SSLCACertificatePath to be unset in `apache::vhost` (MODULES-1457) -- Load fcgid after unixd on RHEL7 -- Allow disabling default vhost for Apache 2.4 -- Test fixes -- `mod_version` is now built-in (MODULES-1446) -- Sort LogFormats for idempotency -- `allow_encoded_slashes` was omitted from `apache::vhost` -- Fix documentation bug (MODULES-1403, MODULES-1510) -- Sort `wsgi_script_aliases` for idempotency (MODULES-1384) -- lint fixes -- Fix automatic version detection for Debian Jessie -- Fix error docs and icons path for RHEL7-based systems (MODULES-1554) -- Sort php_* hashes for idempotency (MODULES-1680) -- Ensure `mod::setenvif` is included if needed (MODULES-1696) -- Fix indentation in `vhost/_directories.erb` template (MODULES-1688) -- Create symlinks on all distros if `vhost_enable_dir` is specified - -## Supported Release [1.2.0] -### Summary - -This release features many improvements and bugfixes, including several new defines, a reworking of apache::vhost for more extensibility, and many new parameters for more customization. This release also includes improved support for strict variables and the future parser. - -#### Features -- Convert apache::vhost to use concat for easier extensions -- Test improvements -- Synchronize files with modulesync -- Strict variable and future parser support -- Added apache::custom_config defined type to allow validation of configs before they are created -- Added bool2httpd function to convert true/false to apache 'On' and 'Off'. Intended for internal use in the module. -- Improved SCL support - - allow overriding of the mod_ssl package name -- Add support for reverse_urls/ProxyPassReverse in apache::vhost -- Add satisfy directive in apache::vhost::directories -- Add apache::fastcgi::server defined type -- New parameters - apache - - allow_encoded_slashes - - apache_name - - conf_dir - - default_ssl_crl_check - - docroot - - logroot_mode - - purge_vhost_dir -- New parameters - apache::vhost - - add_default_charset - - allow_encoded_slashes - - logroot_ensure - - logroot_mode - - manage_docroot - - passenger_app_root - - passenger_min_instances - - passenger_pre_start - - passenger_ruby - - passenger_start_timeout - - proxy_preserve_host - - redirectmatch_dest - - ssl_crl_check - - wsgi_chunked_request - - wsgi_pass_authorization -- Add support for ScriptAlias and ScriptAliasMatch in the apache::vhost::aliases parameter -- Add support for rewrites in the apache::vhost::directories parameter -- If the service_ensure parameter in apache::service is set to anything other than true, false, running, or stopped, ensure will not be passed to the service resource, allowing for the service to not be managed by puppet -- Turn of SSLv3 by default -- Improvements to apache::mod* - - Add restrict_access parameter to apache::mod::info - - Add force_language_priority and language_priority parameters to apache::mod::negotiation - - Add threadlimit parameter to apache::mod::worker - - Add content, template, and source parameters to apache::mod::php - - Add mod_authz_svn support via the authz_svn_enabled parameter in apache::mod::dav_svn - - Add loadfile_name parameter to apache::mod - - Add apache::mod::deflate class - - Add options parameter to apache::mod::fcgid - - Add timeouts parameter to apache::mod::reqtimeout - - Add apache::mod::shib - - Add apache_version parameter to apache::mod::ldap - - Add magic_file parameter to apache::mod::mime_magic - - Add apache_version parameter to apache::mod::pagespeed - - Add passenger_default_ruby parameter to apache::mod::passenger - - Add content, template, and source parameters to apache::mod::php - - Add apache_version parameter to apache::mod::proxy - - Add loadfiles parameter to apache::mod::proxy_html - - Add ssl_protocol and package_name parameters to apache::mod::ssl - - Add apache_version parameter to apache::mod::status - - Add apache_version parameter to apache::mod::userdir - - Add apache::mod::version class - -#### Bugfixes -- Set osfamily defaults for wsgi_socket_prefix -- Support multiple balancermembers with the same url -- Validate apache::vhost::custom_fragment -- Add support for itk with mod_php -- Allow apache::vhost::ssl_certs_dir to not be set -- Improved passenger support for Debian -- Improved 2.4 support without mod_access_compat -- Support for more than one 'Allow from'-directive in _directories.erb -- Don't load systemd on Amazon linux based on CentOS6 with apache 2.4 -- Fix missing newline in ModPagespeed filter and memcached servers directive -- Use interpolated strings instead of numbers where required by future parser -- Make auth_require take precedence over default with apache 2.4 -- Lint fixes -- Set default for php_admin_flags and php_admin_values to be empty hash instead of empty array -- Correct typo in mod::pagespeed -- spec_helper fixes -- Install mod packages before dealing with the configuration -- Use absolute scope to check class definition in apache::mod::php -- Fix dependency loop in apache::vhost -- Properly scope variables in the inline template in apache::balancer -- Documentation clarification, typos, and formatting -- Set apache::mod::ssl::ssl_mutex to default for debian on apache >= 2.4 -- Strict variables fixes -- Add authn_core mode to Ubuntu trusty defaults -- Keep default loadfile for authz_svn on Debian -- Remove '.conf' from the site-include regexp for better Ubuntu/Debian support -- Load unixd before fcgid for EL7 -- Fix RedirectMatch rules -- Fix misleading error message in apache::version - -#### Known Bugs -* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`. -* SLES is unsupported. - -## Supported Release [1.1.1] -### Summary - -This release merely updates metadata.json so the module can be uninstalled and -upgraded via the puppet module command. - -## Supported Release [1.1.0] - -### Summary - -This release primarily focuses on extending the httpd 2.4 support, tested -through adding RHEL7 and Ubuntu 14.04 support. It also includes Passenger -4 support, as well as several new modules and important bugfixes. - -#### Features - -- Add support for RHEL7 and Ubuntu 14.04 -- More complete apache24 support -- Passenger 4 support -- Add support for max_keepalive_requests and log_formats parameters -- Add mod_pagespeed support -- Add mod_speling support -- Added several parameters for mod_passenger -- Added ssl_cipher parameter to apache::mod::ssl -- Improved examples in documentation -- Added docroot_mode, action, and suexec_user_group parameters to apache::vhost -- Add support for custom extensions for mod_php -- Improve proxy_html support for Debian - -#### Bugfixes - -- Remove NameVirtualHost directive for apache >= 2.4 -- Order proxy_set option so it doesn't change between runs -- Fix inverted SSL compression -- Fix missing ensure on concat::fragment resources -- Fix bad dependencies in apache::mod and apache::mod::mime - -#### Known Bugs -* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`. -* SLES is unsupported. - -## Supported Release [1.0.1] -### Summary - -This is a supported release. This release removes a testing symlink that can -cause trouble on systems where /var is on a seperate filesystem from the -modulepath. - -#### Features -#### Bugfixes -#### Known Bugs -* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`. -* SLES is unsupported. - -## Supported Release [1.0.0] -### Summary - -This is a supported release. This release introduces Apache 2.4 support for -Debian and RHEL based osfamilies. - -#### Features - -- Add apache24 support -- Add rewrite_base functionality to rewrites -- Updated README documentation -- Add WSGIApplicationGroup and WSGIImportScript directives - -#### Bugfixes - -- Replace mutating hashes with merge() for Puppet 3.5 -- Fix WSGI import_script and mod_ssl issues on Lucid - -#### Known Bugs -* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`. -* SLES is unsupported. - ---- - -## Supported Release [0.11.0] -### Summary: - -This release adds preliminary support for Windows compatibility and multiple rewrite support. - -#### Backwards-incompatible Changes: - -- The rewrite_rule parameter is deprecated in favor of the new rewrite parameter - and will be removed in a future release. - -#### Features: - -- add Match directive -- quote paths for windows compatibility -- add auth_group_file option to README.md -- allow AuthGroupFile directive for vhosts -- Support Header directives in vhost context -- Don't purge mods-available dir when separate enable dir is used -- Fix the servername used in log file name -- Added support for mod_include -- Remove index parameters. -- Support environment variable control for CustomLog -- added redirectmatch support -- Setting up the ability to do multiple rewrites and conditions. -- Convert spec tests to beaker. -- Support php_admin_(flag|value)s - -#### Bugfixes: - -- directories are either a Hash or an Array of Hashes -- Configure Passenger in separate .conf file on RH so PassengerRoot isn't lost -- (docs) Update list of `apache::mod::[name]` classes -- (docs) Fix apache::namevirtualhost example call style -- Fix $ports_file reference in apache::listen. -- Fix $ports_file reference in Namevirtualhost. - - -## Supported Release [0.10.0] -### Summary: - -This release adds FreeBSD osfamily support and various other improvements to some mods. - -#### Features: - -- Add suPHP_UserGroup directive to directory context -- Add support for ScriptAliasMatch directives -- Set SSLOptions StdEnvVars in server context -- No implicit entry for ScriptAlias path -- Add support for overriding ErrorDocument -- Add support for AliasMatch directives -- Disable default "allow from all" in vhost-directories -- Add WSGIPythonPath as an optional parameter to mod_wsgi. -- Add mod_rpaf support -- Add directives: IndexOptions, IndexOrderDefault -- Add ability to include additional external configurations in vhost -- need to use the provider variable not the provider key value from the directory hash for matches -- Support for FreeBSD and few other features -- Add new params to apache::mod::mime class -- Allow apache::mod to specify module id and path -- added $server_root parameter -- Add Allow and ExtendedStatus support to mod_status -- Expand vhost/_directories.pp directive support -- Add initial support for nss module (no directives in vhost template yet) -- added peruser and event mpms -- added $service_name parameter -- add parameter for TraceEnable -- Make LogLevel configurable for server and vhost -- Add documentation about $ip -- Add ability to pass ip (instead of wildcard) in default vhost files - -#### Bugfixes: - -- Don't listen on port or set NameVirtualHost for non-existent vhost -- only apply Directory defaults when provider is a directory -- Working mod_authnz_ldap support on Debian/Ubuntu - -## Supported Release [0.9.0] -### Summary: -This release adds more parameters to the base apache class and apache defined -resource to make the module more flexible. It also adds or enhances SuPHP, -WSGI, and Passenger mod support, and support for the ITK mpm module. - -#### Backwards-incompatible Changes: -- Remove many default mods that are not normally needed. -- Remove `rewrite_base` `apache::vhost` parameter; did not work anyway. -- Specify dependencies on stdlib >=2.4.0 (this was already the case, but -making explicit) -- Deprecate `a2mod` in favor of the `apache::mod::*` classes and `apache::mod` -defined resource. - -#### Features: -- `apache` class - - Add `httpd_dir` parameter to change the location of the configuration - files. - - Add `logroot` parameter to change the logroot - - Add `ports_file` parameter to changes the `ports.conf` file location - - Add `keepalive` parameter to enable persistent connections - - Add `keepalive_timeout` parameter to change the timeout - - Update `default_mods` to be able to take an array of mods to enable. -- `apache::vhost` - - Add `wsgi_daemon_process`, `wsgi_daemon_process_options`, - `wsgi_process_group`, and `wsgi_script_aliases` parameters for per-vhost - WSGI configuration. - - Add `access_log_syslog` parameter to enable syslogging. - - Add `error_log_syslog` parameter to enable syslogging of errors. - - Add `directories` hash parameter. Please see README for documentation. - - Add `sslproxyengine` parameter to enable SSLProxyEngine - - Add `suphp_addhandler`, `suphp_engine`, and `suphp_configpath` for - configuring SuPHP. - - Add `custom_fragment` parameter to allow for arbitrary apache - configuration injection. (Feature pull requests are prefered over using - this, but it is available in a pinch.) -- Add `apache::mod::suphp` class for configuring SuPHP. -- Add `apache::mod::itk` class for configuring ITK mpm module. -- Update `apache::mod::wsgi` class for global WSGI configuration with -`wsgi_socket_prefix` and `wsgi_python_home` parameters. -- Add README.passenger.md to document the `apache::mod::passenger` usage. -Added `passenger_high_performance`, `passenger_pool_idle_time`, -`passenger_max_requests`, `passenger_stat_throttle_rate`, `rack_autodetect`, -and `rails_autodetect` parameters. -- Separate the httpd service resource into a new `apache::service` class for -dependency chaining of `Class['apache'] -> ~> -Class['apache::service']` -- Added `apache::mod::proxy_balancer` class for `apache::balancer` - -#### Bugfixes: -- Change dependency to puppetlabs-concat -- Fix ruby 1.9 bug for `a2mod` -- Change servername to be `$::hostname` if there is no `$::fqdn` -- Make `/etc/ssl/certs` the default ssl certs directory for RedHat non-5. -- Make `php` the default php package for RedHat non-5. -- Made `aliases` able to take a single alias hash instead of requiring an -array. - -## Supported Release [0.8.1] -#### Bugfixes: -- Update `apache::mpm_module` detection for worker/prefork -- Update `apache::mod::cgi` and `apache::mod::cgid` detection for -worker/prefork - -## Supported Release [0.8.0] -#### Features: -- Add `servername` parameter to `apache` class -- Add `proxy_set` parameter to `apache::balancer` define - -#### Bugfixes: -- Fix ordering for multiple `apache::balancer` clusters -- Fix symlinking for sites-available on Debian-based OSs -- Fix dependency ordering for recursive confdir management -- Fix `apache::mod::*` to notify the service on config change -- Documentation updates - -## Supported Release [0.7.0] -#### Changes: -- Essentially rewrite the module -- too many to list -- `apache::vhost` has many abilities -- see README.md for details -- `apache::mod::*` classes provide httpd mod-loading capabilities -- `apache` base class is much more configurable - -#### Bugfixes: -- Many. And many more to come - -## Supported Release [0.6.0] -- update travis tests (add more supported versions) -- add access log_parameter -- make purging of vhost dir configurable - -## Supported Release [0.4.0] -#### Changes: -- `include apache` is now required when using `apache::mod::*` - -#### Bugfixes: -- Fix syntax for validate_re -- Fix formatting in vhost template -- Fix spec tests such that they pass - -## Supported Release [0.0.4] -* e62e362 Fix broken tests for ssl, vhost, vhost::* -* 42c6363 Changes to match style guide and pass puppet-lint without error -* 42bc8ba changed name => path for file resources in order to name namevar by it's name -* 72e13de One end too much -* 0739641 style guide fixes: 'true' <> true, $operatingsystem needs to be $::operatingsystem, etc. -* 273f94d fix tests -* a35ede5 (#13860) Make a2enmod/a2dismo commands optional -* 98d774e (#13860) Autorequire Package['httpd'] -* 05fcec5 (#13073) Add missing puppet spec tests -* 541afda (#6899) Remove virtual a2mod definition -* 976cb69 (#13072) Move mod python and wsgi package names to params -* 323915a (#13060) Add .gitignore to repo -* fdf40af (#13060) Remove pkg directory from source tree -* fd90015 Add LICENSE file and update the ModuleFile -* d3d0d23 Re-enable local php class -* d7516c7 Make management of firewalls configurable for vhosts -* 60f83ba Explicitly lookup scope of apache_name in templates. -* f4d287f (#12581) Add explicit ordering for vdir directory -* 88a2ac6 (#11706) puppetlabs-apache depends on puppetlabs-firewall -* a776a8b (#11071) Fix to work with latest firewall module -* 2b79e8b (#11070) Add support for Scientific Linux -* 405b3e9 Fix for a2mod -* 57b9048 Commit apache::vhost::redirect Manifest -* 8862d01 Commit apache::vhost::proxy Manifest -* d5c1fd0 Commit apache::mod::wsgi Manifest -* a825ac7 Commit apache::mod::python Manifest -* b77062f Commit Templates -* 9a51b4a Vhost File Declarations -* 6cf7312 Defaults for Parameters -* 6a5b11a Ensure installed -* f672e46 a2mod fix -* 8a56ee9 add pthon support to apache - -[2.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.1.0...2.2.0 -[2.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/2.0.0...2.1.0 -[2.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...2.0.0 -[1.11.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.11.0...1.11.1 -[1.11.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.10.0...1.11.0 -[1.10.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.9.0...1.10.0 -[1.9.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.1...1.9.0 -[1.8.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.0...1.8.1 -[1.8.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.7.1...1.8.0 -[1.7.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.7.0...1.7.1 -[1.7.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.6.0...1.7.0 -[1.6.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.5.0...1.6.0 -[1.5.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.4.1...1.5.0 -[1.4.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.4.0...1.4.1 -[1.4.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.3.0...1.4.0 -[1.3.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.2.0...1.3.0 -[1.2.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.1.1...1.2.0 -[1.1.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.1.0...1.1.1 -[1.1.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.0.1...1.1.0 -[1.0.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.0.0...1.0.1 -[1.0.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.11.0...1.0.0 -[0.11.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.10.0...0.11.0 -[0.10.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.9.0...0.10.0 -[0.9.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/1.8.1...0.9.0 -[0.8.1]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.8.0...0.8.1 -[0.8.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.7.0...0.8.0 -[0.7.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.6.0...0.7.0 -[0.6.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.5.0-rc1...0.6.0 -[0.5.0-rc1]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.4.0...0.5.0-rc1 -[0.4.0]:https://github.com/puppetlabs/puppetlabs-apache/compare/0.3.0...0.4.0 -[0.0.4]:https://github.com/puppetlabs/puppetlabs-apache/commits/0.0.4 diff --git a/modules/apache/CONTRIBUTING.md b/modules/apache/CONTRIBUTING.md deleted file mode 100644 index 1a9fb3a..0000000 --- a/modules/apache/CONTRIBUTING.md +++ /dev/null @@ -1,271 +0,0 @@ -# Contributing to Puppet modules - -So you want to contribute to a Puppet module: Great! Below are some instructions to get you started doing -that very thing while setting expectations around code quality as well as a few tips for making the -process as easy as possible. - -### Table of Contents - -1. [Getting Started](#getting-started) -1. [Commit Checklist](#commit-checklist) -1. [Submission](#submission) -1. [More about commits](#more-about-commits) -1. [Testing](#testing) - - [Running Tests](#running-tests) - - [Writing Tests](#writing-tests) -1. [Get Help](#get-help) - -## Getting Started - -- Fork the module repository on GitHub and clone to your workspace - -- Make your changes! - -## Commit Checklist - -### The Basics - -- [x] my commit is a single logical unit of work - -- [x] I have checked for unnecessary whitespace with "git diff --check" - -- [x] my commit does not include commented out code or unneeded files - -### The Content - -- [x] my commit includes tests for the bug I fixed or feature I added - -- [x] my commit includes appropriate documentation changes if it is introducing a new feature or changing existing functionality - -- [x] my code passes existing test suites - -### The Commit Message - -- [x] the first line of my commit message includes: - - - [x] an issue number (if applicable), e.g. "(MODULES-xxxx) This is the first line" - - - [x] a short description (50 characters is the soft limit, excluding ticket number(s)) - -- [x] the body of my commit message: - - - [x] is meaningful - - - [x] uses the imperative, present tense: "change", not "changed" or "changes" - - - [x] includes motivation for the change, and contrasts its implementation with the previous behavior - -## Submission - -### Pre-requisites - -- Make sure you have a [GitHub account](https://github.com/join) - -- [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for. - -### Push and PR - -- Push your changes to your fork - -- [Open a Pull Request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) against the repository in the puppetlabs organization - -## More about commits - - 1. Make separate commits for logically separate changes. - - Please break your commits down into logically consistent units - which include new or changed tests relevant to the rest of the - change. The goal of doing this is to make the diff easier to - read for whoever is reviewing your code. In general, the easier - your diff is to read, the more likely someone will be happy to - review it and get it into the code base. - - If you are going to refactor a piece of code, please do so as a - separate commit from your feature or bug fix changes. - - We also really appreciate changes that include tests to make - sure the bug is not re-introduced, and that the feature is not - accidentally broken. - - Describe the technical detail of the change(s). If your - description starts to get too long, that is a good sign that you - probably need to split up your commit into more finely grained - pieces. - - Commits which plainly describe the things which help - reviewers check the patch and future developers understand the - code are much more likely to be merged in with a minimum of - bike-shedding or requested changes. Ideally, the commit message - would include information, and be in a form suitable for - inclusion in the release notes for the version of Puppet that - includes them. - - Please also check that you are not introducing any trailing - whitespace or other "whitespace errors". You can do this by - running "git diff --check" on your changes before you commit. - - 2. Sending your patches - - To submit your changes via a GitHub pull request, we _highly_ - recommend that you have them on a topic branch, instead of - directly on "master". - It makes things much easier to keep track of, especially if - you decide to work on another thing before your first change - is merged in. - - GitHub has some pretty good - [general documentation](http://help.github.com/) on using - their site. They also have documentation on - [creating pull requests](https://help.github.com/articles/creating-a-pull-request-from-a-fork/). - - In general, after pushing your topic branch up to your - repository on GitHub, you can switch to the branch in the - GitHub UI and click "Pull Request" towards the top of the page - in order to open a pull request. - - 3. Update the related JIRA issue. - - If there is a JIRA issue associated with the change you - submitted, then you should update the ticket to include the - location of your branch, along with any other commentary you - may wish to make. - -# Testing - -## Getting Started - -Our Puppet modules provide [`Gemfile`](./Gemfile)s, which can tell a Ruby package manager such as [bundler](http://bundler.io/) what Ruby packages, -or Gems, are required to build, develop, and test this software. - -Please make sure you have [bundler installed](http://bundler.io/#getting-started) on your system, and then use it to -install all dependencies needed for this project in the project root by running - -```shell -% bundle install --path .bundle/gems -Fetching gem metadata from https://rubygems.org/........ -Fetching gem metadata from https://rubygems.org/.. -Using rake (10.1.0) -Using builder (3.2.2) --- 8><-- many more --><8 -- -Using rspec-system-puppet (2.2.0) -Using serverspec (0.6.3) -Using rspec-system-serverspec (1.0.0) -Using bundler (1.3.5) -Your bundle is complete! -Use `bundle show [gemname]` to see where a bundled gem is installed. -``` - -NOTE: some systems may require you to run this command with sudo. - -If you already have those gems installed, make sure they are up-to-date: - -```shell -% bundle update -``` - -## Running Tests - -With all dependencies in place and up-to-date, run the tests: - -### Unit Tests - -```shell -% bundle exec rake spec -``` - -This executes all the [rspec tests](http://rspec-puppet.com/) in the directories defined [here](https://github.com/puppetlabs/puppetlabs_spec_helper/blob/699d9fbca1d2489bff1736bb254bb7b7edb32c74/lib/puppetlabs_spec_helper/rake_tasks.rb#L17) and so on. -rspec tests may have the same kind of dependencies as the module they are testing. Although the module defines these dependencies in its [metadata.json](./metadata.json), -rspec tests define them in [.fixtures.yml](./fixtures.yml). - -### Acceptance Tests - -Some Puppet modules also come with acceptance tests, which use [beaker][]. These tests spin up a virtual machine under -[VirtualBox](https://www.virtualbox.org/), controlled with [Vagrant](http://www.vagrantup.com/), to simulate scripted test -scenarios. In order to run these, you need both Virtualbox and Vagrant installed on your system. - -Run the tests by issuing the following command - -```shell -% bundle exec rake spec_clean -% bundle exec rspec spec/acceptance -``` - -This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml), -install Puppet, copy this module, and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb) -and then run all the tests under [spec/acceptance](./spec/acceptance). - -## Writing Tests - -### Unit Tests - -When writing unit tests for Puppet, [rspec-puppet][] is your best friend. It provides tons of helper methods for testing your manifests against a -catalog (e.g. contain_file, contain_package, with_params, etc). It would be ridiculous to try and top rspec-puppet's [documentation][rspec-puppet_docs] -but here's a tiny sample: - -Sample manifest: - -```puppet -file { "a test file": - ensure => present, - path => "/etc/sample", -} -``` - -Sample test: - -```ruby -it 'does a thing' do - expect(subject).to contain_file("a test file").with({:path => "/etc/sample"}) -end -``` - -### Acceptance Tests - -Writing acceptance tests for Puppet involves [beaker][] and its cousin [beaker-rspec][]. A common pattern for acceptance tests is to create a test manifest, apply it -twice to check for idempotency or errors, then run expectations. - -```ruby -it 'does an end-to-end thing' do - pp = <<-EOF - file { 'a test file': - ensure => present, - path => "/etc/sample", - content => "test string", - } - - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - -end - -describe file("/etc/sample") do - it { is_expected.to contain "test string" } -end - -``` - -# If you have commit access to the repository - -Even if you have commit access to the repository, you still need to go through the process above, and have someone else review and merge -in your changes. The rule is that **all changes must be reviewed by a project developer that did not write the code to ensure that -all changes go through a code review process.** - -The record of someone performing the merge is the record that they performed the code review. Again, this should be someone other than the author of the topic branch. - -# Get Help - -### On the web -* [Puppet help messageboard](http://puppet.com/community/get-help) -* [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing) -* [General GitHub documentation](http://help.github.com/) -* [GitHub pull request documentation](http://help.github.com/send-pull-requests/) - -### On chat -* Slack (slack.puppet.com) #forge-modules, #puppet-dev, #windows, #voxpupuli -* IRC (freenode) #puppet-dev, #voxpupuli - - -[rspec-puppet]: http://rspec-puppet.com/ -[rspec-puppet_docs]: http://rspec-puppet.com/documentation/ -[beaker]: https://github.com/puppetlabs/beaker -[beaker-rspec]: https://github.com/puppetlabs/beaker-rspec diff --git a/modules/apache/Gemfile b/modules/apache/Gemfile deleted file mode 100644 index a9f0161..0000000 --- a/modules/apache/Gemfile +++ /dev/null @@ -1,76 +0,0 @@ -#This file is generated by ModuleSync, do not edit. - -source ENV['GEM_SOURCE'] || "https://rubygems.org" - -# Determines what type of gem is requested based on place_or_version. -def gem_type(place_or_version) - if place_or_version =~ /^git:/ - :git - elsif place_or_version =~ /^file:/ - :file - else - :gem - end -end - -# Find a location or specific version for a gem. place_or_version can be a -# version, which is most often used. It can also be git, which is specified as -# `git://somewhere.git#branch`. You can also use a file source location, which -# is specified as `file://some/location/on/disk`. -def location_for(place_or_version, fake_version = nil) - if place_or_version =~ /^(git[:@][^#]*)#(.*)/ - [fake_version, { :git => $1, :branch => $2, :require => false }].compact - elsif place_or_version =~ /^file:\/\/(.*)/ - ['>= 0', { :path => File.expand_path($1), :require => false }] - else - [place_or_version, { :require => false }] - end -end - -# Used for gem conditionals -supports_windows = false -ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments -minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}" - -group :development do - gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby" - gem "puppet-module-win-default-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] - gem "puppet-module-posix-dev-r#{minor_version}", :require => false, :platforms => "ruby" - gem "puppet-module-win-dev-r#{minor_version}", '0.0.7', :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] - gem "json_pure", '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') - gem "fast_gettext", '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0') - gem "fast_gettext", :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') -end - -group :system_tests do - gem "puppet-module-posix-system-r#{minor_version}", :require => false, :platforms => "ruby" - gem "puppet-module-win-system-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] - gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3') - gem "beaker-pe", :require => false - gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION']) - gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION']) - gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1') - gem "puppet-blacksmith", '~> 3.4', :require => false -end - -gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION']) - -# Only explicitly specify Facter/Hiera if a version has been specified. -# Otherwise it can lead to strange bundler behavior. If you are seeing weird -# gem resolution behavior, try setting `DEBUG_RESOLVER` environment variable -# to `1` and then run bundle install. -gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION'] -gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION'] - - -# Evaluate Gemfile.local if it exists -if File.exists? "#{__FILE__}.local" - eval(File.read("#{__FILE__}.local"), binding) -end - -# Evaluate ~/.gemfile if it exists -if File.exists?(File.join(Dir.home, '.gemfile')) - eval(File.read(File.join(Dir.home, '.gemfile')), binding) -end - -# vim:ft=ruby diff --git a/modules/apache/LICENSE b/modules/apache/LICENSE deleted file mode 100644 index d645695..0000000 --- a/modules/apache/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/modules/apache/MAINTAINERS.md b/modules/apache/MAINTAINERS.md deleted file mode 100644 index 18a3388..0000000 --- a/modules/apache/MAINTAINERS.md +++ /dev/null @@ -1,6 +0,0 @@ -## Maintenance - -Maintainers: - - Puppet Forge Modules Team `forge-modules |at| puppet |dot| com` - -Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `apache`. diff --git a/modules/apache/NOTICE b/modules/apache/NOTICE deleted file mode 100644 index 77c1308..0000000 --- a/modules/apache/NOTICE +++ /dev/null @@ -1,15 +0,0 @@ -Puppet Module - puppetlabs-apache - -Copyright 2017 Puppet, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file diff --git a/modules/apache/README.md b/modules/apache/README.md deleted file mode 100755 index fdbf933..0000000 --- a/modules/apache/README.md +++ /dev/null @@ -1,5447 +0,0 @@ -# apache - -[Module description]: #module-description - -[Setup]: #setup -[Beginning with Apache]: #beginning-with-apache - -[Usage]: #usage -[Configuring virtual hosts]: #configuring-virtual-hosts -[Configuring virtual hosts with SSL]: #configuring-virtual-hosts-with-ssl -[Configuring virtual host port and address bindings]: #configuring-virtual-host-port-and-address-bindings -[Configuring virtual hosts for apps and processors]: #configuring-virtual-hosts-for-apps-and-processors -[Configuring IP-based virtual hosts]: #configuring-ip-based-virtual-hosts -[Installing Apache modules]: #installing-apache-modules -[Installing arbitrary modules]: #installing-arbitrary-modules -[Installing specific modules]: #installing-specific-modules -[Configuring FastCGI servers]: #configuring-fastcgi-servers-to-handle-php-files -[Load balancing examples]: #load-balancing-examples -[apache affects]: #what-the-apache-module-affects - -[Reference]: #reference -[Public classes]: #public-classes -[Private classes]: #private-classes -[Public defined types]: #public-defined-types -[Private defined types]: #private-defined-types -[Templates]: #templates -[Tasks]: #tasks - -[Limitations]: #limitations - -[Development]: #development -[Contributing]: #contributing - -[`AddDefaultCharset`]: https://httpd.apache.org/docs/current/mod/core.html#adddefaultcharset -[`add_listen`]: #add_listen -[`Alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#alias -[`AliasMatch`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#aliasmatch -[aliased servers]: https://httpd.apache.org/docs/current/urlmapping.html -[`AllowEncodedSlashes`]: https://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes -[`apache`]: #class-apache -[`apache_version`]: #apache_version -[`apache::balancer`]: #defined-type-apachebalancer -[`apache::balancermember`]: #defined-type-apachebalancermember -[`apache::fastcgi::server`]: #defined-type-apachefastcgiserver -[`apache::mod`]: #defined-type-apachemod -[`apache::mod::`]: #classes-apachemodmodule-name -[`apache::mod::alias`]: #class-apachemodalias -[`apache::mod::auth_cas`]: #class-apachemodauth_cas -[`apache::mod::auth_mellon`]: #class-apachemodauth_mellon -[`apache::mod::authn_dbd`]: #class-apachemodauthn_dbd -[`apache::mod::authnz_ldap`]: #class-apachemodauthnz_ldap -[`apache::mod::cluster`]: #class-apachemodcluster -[`apache::mod::disk_cache`]: #class-apachemoddisk_cache -[`apache::mod::dumpio`]: #class-apachemoddumpio -[`apache::mod::event`]: #class-apachemodevent -[`apache::mod::ext_filter`]: #class-apachemodext_filter -[`apache::mod::geoip`]: #class-apachemodgeoip -[`apache::mod::itk`]: #class-apachemoditk -[`apache::mod::jk`]: #class-apachemodjk -[`apache::mod::ldap`]: #class-apachemodldap -[`apache::mod::passenger`]: #class-apachemodpassenger -[`apache::mod::peruser`]: #class-apachemodperuser -[`apache::mod::prefork`]: #class-apachemodprefork -[`apache::mod::proxy`]: #class-apachemodproxy -[`apache::mod::proxy_balancer`]: #class-apachemodproxybalancer -[`apache::mod::proxy_fcgi`]: #class-apachemodproxy_fcgi -[`apache::mod::proxy_html`]: #class-apachemodproxy_html -[`apache::mod::security`]: #class-apachemodsecurity -[`apache::mod::shib`]: #class-apachemodshib -[`apache::mod::ssl`]: #class-apachemodssl -[`apache::mod::status`]: #class-apachemodstatus -[`apache::mod::userdir`]: #class-apachemoduserdir -[`apache::mod::worker`]: #class-apachemodworker -[`apache::mod::wsgi`]: #class-apachemodwsgi -[`apache::params`]: #class-apacheparams -[`apache::version`]: #class-apacheversion -[`apache::vhost`]: #defined-type-apachevhost -[`apache::vhost::custom`]: #defined-type-apachevhostcustom -[`apache::vhost::WSGIImportScript`]: #wsgiimportscript -[Apache HTTP Server]: https://httpd.apache.org -[Apache modules]: https://httpd.apache.org/docs/current/mod/ -[array]: https://docs.puppet.com/puppet/latest/reference/lang_data_array.html - -[audit log]: https://github.com/SpiderLabs/ModSecurity/wiki/ModSecurity-2-Data-Formats#audit-log - -[beaker-rspec]: https://github.com/puppetlabs/beaker-rspec - -[certificate revocation list]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationfile -[certificate revocation list path]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationpath -[common gateway interface]: https://httpd.apache.org/docs/current/howto/cgi.html -[`confd_dir`]: #confd_dir -[`content`]: #content -[CONTRIBUTING.md]: CONTRIBUTING.md -[custom error documents]: https://httpd.apache.org/docs/current/custom-error.html -[`custom_fragment`]: #custom_fragment - -[`default_mods`]: #default_mods -[`default_ssl_crl`]: #default_ssl_crl -[`default_ssl_crl_path`]: #default_ssl_crl_path -[`default_ssl_vhost`]: #default_ssl_vhost -[`dev_packages`]: #dev_packages -[`directory`]: #directory -[`directories`]: #parameter-directories-for-apachevhost -[`DirectoryIndex`]: https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex -[`docroot`]: #docroot -[`docroot_owner`]: #docroot_owner -[`docroot_group`]: #docroot_group -[`DocumentRoot`]: https://httpd.apache.org/docs/current/mod/core.html#documentroot - -[`EnableSendfile`]: https://httpd.apache.org/docs/current/mod/core.html#enablesendfile -[enforcing mode]: http://selinuxproject.org/page/Guide/Mode -[`ensure`]: https://docs.puppet.com/latest/type.html#package-attribute-ensure -[`error_log_file`]: #error_log_file -[`error_log_syslog`]: #error_log_syslog -[`error_log_pipe`]: #error_log_pipe -[`ExpiresByType`]: https://httpd.apache.org/docs/current/mod/mod_expires.html#expiresbytype -[exported resources]: http://docs.puppet.com/latest/reference/lang_exported.md -[`ExtendedStatus`]: https://httpd.apache.org/docs/current/mod/core.html#extendedstatus - -[Facter]: http://docs.puppet.com/facter/ -[FastCGI]: http://www.fastcgi.com/ -[FallbackResource]: https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource -[`fallbackresource`]: #fallbackresource -[`FileETag`]: https://httpd.apache.org/docs/current/mod/core.html#fileetag -[filter rules]: https://httpd.apache.org/docs/current/filter.html -[`filters`]: #filters -[`ForceType`]: https://httpd.apache.org/docs/current/mod/core.html#forcetype - -[GeoIPScanProxyHeaders]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Proxy-Related_Directives -[`gentoo/puppet-portage`]: https://github.com/gentoo/puppet-portage - -[Hash]: https://docs.puppet.com/puppet/latest/reference/lang_data_hash.html -[`HttpProtocolOptions`]: http://httpd.apache.org/docs/current/mod/core.html#httpprotocoloptions - -[`IncludeOptional`]: https://httpd.apache.org/docs/current/mod/core.html#includeoptional -[`Include`]: https://httpd.apache.org/docs/current/mod/core.html#include -[interval syntax]: https://httpd.apache.org/docs/current/mod/mod_expires.html#AltSyn -[`ip`]: #ip -[`ip_based`]: #ip_based -[IP-based virtual hosts]: https://httpd.apache.org/docs/current/vhosts/ip-based.html - -[`KeepAlive`]: https://httpd.apache.org/docs/current/mod/core.html#keepalive -[`KeepAliveTimeout`]: https://httpd.apache.org/docs/current/mod/core.html#keepalivetimeout -[`keepalive` parameter]: #keepalive -[`keepalive_timeout`]: #keepalive_timeout -[`limitreqfieldsize`]: https://httpd.apache.org/docs/current/mod/core.html#limitrequestfieldsize - -[`lib`]: #lib -[`lib_path`]: #lib_path -[`Listen`]: https://httpd.apache.org/docs/current/bind.html -[`ListenBackLog`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#listenbacklog -[`LoadFile`]: https://httpd.apache.org/docs/current/mod/mod_so.html#loadfile -[`LogFormat`]: https://httpd.apache.org/docs/current/mod/mod_log_config.html#logformat -[`logroot`]: #logroot -[Log security]: https://httpd.apache.org/docs/current/logs.html#security - -[`manage_docroot`]: #manage_docroot -[`manage_user`]: #manage_user -[`manage_group`]: #manage_group -[`supplementary_groups`]: #supplementary_groups -[`MaxConnectionsPerChild`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxconnectionsperchild -[`max_keepalive_requests`]: #max_keepalive_requests -[`MaxRequestWorkers`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxrequestworkers -[`MaxSpareThreads`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxsparethreads -[MIME `content-type`]: https://www.iana.org/assignments/media-types/media-types.xhtml -[`MinSpareThreads`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#minsparethreads -[`mod_alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html -[`mod_auth_cas`]: https://github.com/Jasig/mod_auth_cas -[`mod_auth_kerb`]: http://modauthkerb.sourceforge.net/configure.html -[`mod_authnz_external`]: https://github.com/phokz/mod-auth-external -[`mod_auth_dbd`]: http://httpd.apache.org/docs/current/mod/mod_authn_dbd.html -[`mod_auth_mellon`]: https://github.com/UNINETT/mod_auth_mellon -[`mod_dbd`]: http://httpd.apache.org/docs/current/mod/mod_dbd.html -[`mod_disk_cache`]: https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html -[`mod_dumpio`]: https://httpd.apache.org/docs/2.4/mod/mod_dumpio.html -[`mod_env`]: http://httpd.apache.org/docs/current/mod/mod_env.html -[`mod_expires`]: https://httpd.apache.org/docs/current/mod/mod_expires.html -[`mod_ext_filter`]: https://httpd.apache.org/docs/current/mod/mod_ext_filter.html -[`mod_fcgid`]: https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html -[`mod_geoip`]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/ -[`mod_info`]: https://httpd.apache.org/docs/current/mod/mod_info.html -[`mod_ldap`]: https://httpd.apache.org/docs/2.2/mod/mod_ldap.html -[`mod_mpm_event`]: https://httpd.apache.org/docs/current/mod/event.html -[`mod_negotiation`]: https://httpd.apache.org/docs/current/mod/mod_negotiation.html -[`mod_pagespeed`]: https://developers.google.com/speed/pagespeed/module/?hl=en -[`mod_passenger`]: https://www.phusionpassenger.com/library/config/apache/reference/ -[`mod_php`]: http://php.net/manual/en/book.apache.php -[`mod_proxy`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html -[`mod_proxy_balancer`]: https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html -[`mod_reqtimeout`]: https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html -[`mod_rewrite`]: https://httpd.apache.org/docs/current/mod/mod_rewrite.html -[`mod_security`]: https://www.modsecurity.org/ -[`mod_ssl`]: https://httpd.apache.org/docs/current/mod/mod_ssl.html -[`mod_status`]: https://httpd.apache.org/docs/current/mod/mod_status.html -[`mod_version`]: https://httpd.apache.org/docs/current/mod/mod_version.html -[`mod_wsgi`]: https://modwsgi.readthedocs.org/en/latest/ -[module contribution guide]: https://docs.puppet.com/forge/contributing.html -[`mpm_module`]: #mpm_module -[multi-processing module]: https://httpd.apache.org/docs/current/mpm.html - -[name-based virtual hosts]: https://httpd.apache.org/docs/current/vhosts/name-based.html -[`no_proxy_uris`]: #no_proxy_uris - -[open source Puppet]: https://docs.puppet.com/puppet/ -[`Options`]: https://httpd.apache.org/docs/current/mod/core.html#options - -[`path`]: #path -[`Peruser`]: https://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr -[`port`]: #port -[`priority`]: #defined-types-apachevhost -[`proxy_dest`]: #proxy_dest -[`proxy_dest_match`]: #proxy_dest_match -[`proxy_pass`]: #proxy_pass -[`ProxyPass`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass -[`ProxySet`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset -[Puppet Enterprise]: https://docs.puppet.com/pe/ -[Puppet Forge]: https://forge.puppet.com -[Puppet]: https://puppet.com -[Puppet module]: https://docs.puppet.com/puppet/latest/reference/modules_fundamentals.html -[Puppet module's code]: https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp -[`purge_configs`]: #purge_configs -[`purge_vhost_dir`]: #purge_vhost_dir -[Python]: https://www.python.org/ - -[Rack]: http://rack.github.io/ -[`rack_base_uris`]: #rack_base_uris -[RFC 2616]: https://www.ietf.org/rfc/rfc2616.txt -[`RequestReadTimeout`]: https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html#requestreadtimeout -[rspec-puppet]: http://rspec-puppet.com/ - -[`ScriptAlias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#scriptalias -[`ScriptAliasMatch`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#scriptaliasmatch -[`scriptalias`]: #scriptalias -[SELinux]: http://selinuxproject.org/ -[`ServerAdmin`]: https://httpd.apache.org/docs/current/mod/core.html#serveradmin -[`serveraliases`]: #serveraliases -[`ServerLimit`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#serverlimit -[`ServerName`]: https://httpd.apache.org/docs/current/mod/core.html#servername -[`ServerRoot`]: https://httpd.apache.org/docs/current/mod/core.html#serverroot -[`ServerTokens`]: https://httpd.apache.org/docs/current/mod/core.html#servertokens -[`ServerSignature`]: https://httpd.apache.org/docs/current/mod/core.html#serversignature -[Service attribute restart]: http://docs.puppet.com/latest/type.html#service-attribute-restart -[`source`]: #source -[`SSLCARevocationCheck`]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck -[SSL certificate key file]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatekeyfile -[SSL chain]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatechainfile -[SSL encryption]: https://httpd.apache.org/docs/current/ssl/index.html -[`ssl`]: #ssl -[`ssl_cert`]: #ssl_cert -[`ssl_compression`]: #ssl_compression -[`ssl_key`]: #ssl_key -[`StartServers`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#startservers -[suPHP]: http://www.suphp.org/Home.html -[`suphp_addhandler`]: #suphp_addhandler -[`suphp_configpath`]: #suphp_configpath -[`suphp_engine`]: #suphp_engine -[supported operating system]: https://forge.puppet.com/supported#puppet-supported-modules-compatibility-matrix - -[`ThreadLimit`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#threadlimit -[`ThreadsPerChild`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#threadsperchild -[`TimeOut`]: https://httpd.apache.org/docs/current/mod/core.html#timeout -[template]: http://docs.puppet.com/puppet/latest/reference/lang_template.html -[`TraceEnable`]: https://httpd.apache.org/docs/current/mod/core.html#traceenable - -[`verify_config`]: #verify_config -[`vhost`]: #defined-type-apachevhost -[`vhost_dir`]: #vhost_dir -[`virtual_docroot`]: #virtual_docroot - -[Web Server Gateway Interface]: https://www.python.org/dev/peps/pep-3333/#abstract -[`WSGIRestrictEmbedded`]: http://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIRestrictEmbedded.html -[`WSGIPythonPath`]: http://modwsgi.readthedocs.org/en/develop/configuration-directives/WSGIPythonPath.html -[`WSGIPythonHome`]: http://modwsgi.readthedocs.org/en/develop/configuration-directives/WSGIPythonHome.html - -#### Table of Contents - -1. [Module description - What is the apache module, and what does it do?][Module description] -2. [Setup - The basics of getting started with apache][Setup] - - [What the apache module affects][apache affects] - - [Beginning with Apache - Installation][Beginning with Apache] -3. [Usage - The classes and defined types available for configuration][Usage] - - [Configuring virtual hosts - Examples to help get started][Configuring virtual hosts] - - [Configuring FastCGI servers to handle PHP files][Configuring FastCGI servers] - - [Load balancing with exported and non-exported resources][Load balancing examples] -4. [Reference - An under-the-hood peek at what the module is doing and how][Reference] - - [Public classes][] - - [Private classes][] - - [Public defined types][] - - [Private defined types][] - - [Templates][] - - [Tasks][] -5. [Limitations - OS compatibility, etc.][Limitations] -6. [Development - Guide for contributing to the module][Development] - - [Contributing to the apache module][Contributing] - - [Running tests - A quick guide][Running tests] - -## Module description - -[Apache HTTP Server][] (also called Apache HTTPD, or simply Apache) is a widely used web server. This [Puppet module][] simplifies the task of creating configurations to manage Apache servers in your infrastructure. It can configure and manage a range of virtual host setups and provides a streamlined way to install and configure [Apache modules][]. - -## Setup - -### What the apache module affects: - -- Configuration files and directories (created and written to) - - **WARNING**: Configurations *not* managed by Puppet will be purged. -- Package/service/configuration files for Apache -- Apache modules -- Virtual hosts -- Listened-to ports -- `/etc/make.conf` on FreeBSD and Gentoo - -On Gentoo, this module depends on the [`gentoo/puppet-portage`][] Puppet module. Note that while several options apply or enable certain features and settings for Gentoo, it is not a [supported operating system][] for this module. - -> **Warning**: This module modifies Apache configuration files and directories and purges any configuration not managed by Puppet. Apache configuration should be managed by Puppet, as unmanaged configuration files can cause unexpected failures. -> ->To temporarily disable full Puppet management, set the [`purge_configs`][] parameter in the [`apache`][] class declaration to false. We recommend this only as a temporary means of saving and relocating customized configurations. - -### Beginning with Apache - -To have Puppet install Apache with the default parameters, declare the [`apache`][] class: - -``` puppet -class { 'apache': } -``` - -When you declare this class with the default options, the module: - -- Installs the appropriate Apache software package and [required Apache modules](#default_mods) for your operating system. -- Places the required configuration files in a directory, with the [default location](#conf_dir) Depends on operating system. -- Configures the server with a default virtual host and standard port ('80') and address ('\*') bindings. -- Creates a document root directory Depends on operating system, typically `/var/www`. -- Starts the Apache service. - -Apache defaults depend on your operating system. These defaults work in testing environments but are not suggested for production. We recommend customizing the class's parameters to suit your site. - -For instance, this declaration installs Apache without the apache module's [default virtual host configuration][Configuring virtual hosts], allowing you to customize all Apache virtual hosts: - -``` puppet -class { 'apache': - default_vhost => false, -} -``` - -> **Note**: When `default_vhost` is set to `false`, you have to add at least one `apache::vhost` resource or Apache will not start. To establish a default virtual host, either set the `default_vhost` in the `apache` class or use the [`apache::vhost`][] defined type. You can also configure additional specific virtual hosts with the [`apache::vhost`][] defined type. - -## Usage - -### Configuring virtual hosts - -The default [`apache`][] class sets up a virtual host on port 80, listening on all interfaces and serving the [`docroot`][] parameter's default directory of `/var/www`. - - -To configure basic [name-based virtual hosts][], specify the [`port`][] and [`docroot`][] parameters in the [`apache::vhost`][] defined type: - -``` puppet -apache::vhost { 'vhost.example.com': - port => '80', - docroot => '/var/www/vhost', -} -``` - -See the [`apache::vhost`][] defined type's reference for a list of all virtual host parameters. - -> **Note**: Apache processes virtual hosts in alphabetical order, and server administrators can prioritize Apache's virtual host processing by prefixing a virtual host's configuration file name with a number. The [`apache::vhost`][] defined type applies a default [`priority`][] of 15, which Puppet interprets by prefixing the virtual host's file name with `15-`. This all means that if multiple sites have the same priority, or if you disable priority numbers by setting the `priority` parameter's value to false, Apache still processes virtual hosts in alphabetical order. - -To configure user and group ownership for `docroot`, use the [`docroot_owner`][] and [`docroot_group`][] parameters: - -``` puppet -apache::vhost { 'user.example.com': - port => '80', - docroot => '/var/www/user', - docroot_owner => 'www-data', - docroot_group => 'www-data', -} -``` - -#### Configuring virtual hosts with SSL - -To configure a virtual host to use [SSL encryption][] and default SSL certificates, set the [`ssl`][] parameter. You must also specify the [`port`][] parameter, typically with a value of '443', to accommodate HTTPS requests: - -``` puppet -apache::vhost { 'ssl.example.com': - port => '443', - docroot => '/var/www/ssl', - ssl => true, -} -``` - -To configure a virtual host to use SSL and specific SSL certificates, use the paths to the certificate and key in the [`ssl_cert`][] and [`ssl_key`][] parameters, respectively: - -``` puppet -apache::vhost { 'cert.example.com': - port => '443', - docroot => '/var/www/cert', - ssl => true, - ssl_cert => '/etc/ssl/fourth.example.com.cert', - ssl_key => '/etc/ssl/fourth.example.com.key', -} -``` - -To configure a mix of SSL and unencrypted virtual hosts at the same domain, declare them with separate [`apache::vhost`][] defined types: - -``` puppet -# The non-ssl virtual host -apache::vhost { 'mix.example.com non-ssl': - servername => 'mix.example.com', - port => '80', - docroot => '/var/www/mix', -} - -# The SSL virtual host at the same domain -apache::vhost { 'mix.example.com ssl': - servername => 'mix.example.com', - port => '443', - docroot => '/var/www/mix', - ssl => true, -} -``` - -To configure a virtual host to redirect unencrypted connections to SSL, declare them with separate [`apache::vhost`][] defined types and redirect unencrypted requests to the virtual host with SSL enabled: - -``` puppet -apache::vhost { 'redirect.example.com non-ssl': - servername => 'redirect.example.com', - port => '80', - docroot => '/var/www/redirect', - redirect_status => 'permanent', - redirect_dest => 'https://redirect.example.com/' -} - -apache::vhost { 'redirect.example.com ssl': - servername => 'redirect.example.com', - port => '443', - docroot => '/var/www/redirect', - ssl => true, -} -``` - -#### Configuring virtual host port and address bindings - -Virtual hosts listen on all IP addresses ('\*') by default. To configure the virtual host to listen on a specific IP address, use the [`ip`][] parameter: - -``` puppet -apache::vhost { 'ip.example.com': - ip => '127.0.0.1', - port => '80', - docroot => '/var/www/ip', -} -``` - -You can also configure more than one IP address per virtual host by using an array of IP addresses for the [`ip`][] parameter: - -``` puppet -apache::vhost { 'ip.example.com': - ip => ['127.0.0.1','169.254.1.1'], - port => '80', - docroot => '/var/www/ip', -} -``` - -You can configure multiple ports per virtual host by using an array of ports for the [`port`][] parameter: - -``` puppet -apache::vhost { 'ip.example.com': - ip => ['127.0.0.1'], - port => ['80','8080'] - docroot => '/var/www/ip', -} -``` - -To configure a virtual host with [aliased servers][], refer to the aliases using the [`serveraliases`][] parameter: - -``` puppet -apache::vhost { 'aliases.example.com': - serveraliases => [ - 'aliases.example.org', - 'aliases.example.net', - ], - port => '80', - docroot => '/var/www/aliases', -} -``` - -To set up a virtual host with a wildcard alias for the subdomain mapped to a directory of the same name, such as 'http://example.com.loc' mapped to `/var/www/example.com`, define the wildcard alias using the [`serveraliases`][] parameter and the document root with the [`virtual_docroot`][] parameter: - -``` puppet -apache::vhost { 'subdomain.loc': - vhost_name => '*', - port => '80', - virtual_docroot => '/var/www/%-2+', - docroot => '/var/www', - serveraliases => ['*.loc',], -} -``` - -To configure a virtual host with [filter rules][], pass the filter directives as an [array][] using the [`filters`][] parameter: - -``` puppet -apache::vhost { 'subdomain.loc': - port => '80', - filters => [ - 'FilterDeclare COMPRESS', - 'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/html', - 'FilterChain COMPRESS', - 'FilterProtocol COMPRESS DEFLATE change=yes;byteranges=no', - ], - docroot => '/var/www/html', -} -``` - -#### Configuring virtual hosts for apps and processors - -To set up a virtual host with [suPHP][], use the following parameters: - -* [`suphp_engine`][], to enable the suPHP engine. -* [`suphp_addhandler`][], to define a MIME type. -* [`suphp_configpath`][], to set which path suPHP passes to the PHP interpreter. -* [`directory`][], to configure Directory, File, and Location directive blocks. - -For example: - -``` puppet -apache::vhost { 'suphp.example.com': - port => '80', - docroot => '/home/appuser/myphpapp', - suphp_addhandler => 'x-httpd-php', - suphp_engine => 'on', - suphp_configpath => '/etc/php5/apache2', - directories => [ - { 'path' => '/home/appuser/myphpapp', - 'suphp' => { - user => 'myappuser', - group => 'myappgroup', - }, - }, - ], -} -``` - -To configure a virtual host to use the [Web Server Gateway Interface][] (WSGI) for [Python][] applications, use the `wsgi` set of parameters: - -``` puppet -apache::vhost { 'wsgi.example.com': - port => '80', - docroot => '/var/www/pythonapp', - wsgi_application_group => '%{GLOBAL}', - wsgi_daemon_process => 'wsgi', - wsgi_daemon_process_options => { - processes => '2', - threads => '15', - display-name => '%{GROUP}', - }, - wsgi_import_script => '/var/www/demo.wsgi', - wsgi_import_script_options => { - process-group => 'wsgi', - application-group => '%{GLOBAL}', - }, - wsgi_process_group => 'wsgi', - wsgi_script_aliases => { '/' => '/var/www/demo.wsgi' }, -} -``` - -As of Apache 2.2.16, Apache supports [FallbackResource][], a simple replacement for common RewriteRules. You can set a FallbackResource using the [`fallbackresource`][] parameter: - -``` puppet -apache::vhost { 'wordpress.example.com': - port => '80', - docroot => '/var/www/wordpress', - fallbackresource => '/index.php', -} -``` - -> **Note**: The `fallbackresource` parameter only supports the 'disabled' value since Apache 2.2.24. - -To configure a virtual host with a designated directory for [Common Gateway Interface][] (CGI) files, use the [`scriptalias`][] parameter to define the `cgi-bin` path: - -``` puppet -apache::vhost { 'cgi.example.com': - port => '80', - docroot => '/var/www/cgi', - scriptalias => '/usr/lib/cgi-bin', -} -``` - -To configure a virtual host for [Rack][], use the [`rack_base_uris`][] parameter: - -``` puppet -apache::vhost { 'rack.example.com': - port => '80', - docroot => '/var/www/rack', - rack_base_uris => ['/rackapp1', '/rackapp2'], -} -``` - -#### Configuring IP-based virtual hosts - -You can configure [IP-based virtual hosts][] to listen on any port and have them respond to requests on specific IP addresses. In this example, the server listens on ports 80 and 81, because the example virtual hosts are _not_ declared with a [`port`][] parameter: - -``` puppet -apache::listen { '80': } - -apache::listen { '81': } -``` - -Configure the IP-based virtual hosts with the [`ip_based`][] parameter: - -``` puppet -apache::vhost { 'first.example.com': - ip => '10.0.0.10', - docroot => '/var/www/first', - ip_based => true, -} - -apache::vhost { 'second.example.com': - ip => '10.0.0.11', - docroot => '/var/www/second', - ip_based => true, -} -``` - -You can also configure a mix of IP- and [name-based virtual hosts][] in any combination of [SSL][SSL encryption] and unencrypted configurations. - -In this example, we add two IP-based virtual hosts on an IP address (in this example, 10.0.0.10). One uses SSL and the other is unencrypted: - -``` puppet -apache::vhost { 'The first IP-based virtual host, non-ssl': - servername => 'first.example.com', - ip => '10.0.0.10', - port => '80', - ip_based => true, - docroot => '/var/www/first', -} - -apache::vhost { 'The first IP-based vhost, ssl': - servername => 'first.example.com', - ip => '10.0.0.10', - port => '443', - ip_based => true, - docroot => '/var/www/first-ssl', - ssl => true, -} -``` - -Next, we add two name-based virtual hosts listening on a second IP address (10.0.0.20): - -``` puppet -apache::vhost { 'second.example.com': - ip => '10.0.0.20', - port => '80', - docroot => '/var/www/second', -} - -apache::vhost { 'third.example.com': - ip => '10.0.0.20', - port => '80', - docroot => '/var/www/third', -} -``` - -To add name-based virtual hosts that answer on either 10.0.0.10 or 10.0.0.20, you **must** disable the Apache default `Listen 80`, as it conflicts with the preceding IP-based virtual hosts. To do this, set the [`add_listen`][] parameter to `false`: - -``` puppet -apache::vhost { 'fourth.example.com': - port => '80', - docroot => '/var/www/fourth', - add_listen => false, -} - -apache::vhost { 'fifth.example.com': - port => '80', - docroot => '/var/www/fifth', - add_listen => false, -} -``` - -### Installing Apache modules - -There are two ways to install [Apache modules][] using the Puppet apache module: - -- Use the [`apache::mod::`][] classes to [install specific Apache modules with parameters][Installing specific modules]. -- Use the [`apache::mod`][] defined type to [install arbitrary Apache modules][Installing arbitrary modules]. - -#### Installing specific modules - -The Puppet apache module supports installing many common [Apache modules][], often with parameterized configuration options. For a list of supported Apache modules, see the [`apache::mod::`][] class references. - -For example, you can install the `mod_ssl` Apache module with default settings by declaring the [`apache::mod::ssl`][] class: - -``` puppet -class { 'apache::mod::ssl': } -``` - -[`apache::mod::ssl`][] has several parameterized options that you can set when declaring it. For instance, to enable `mod_ssl` with compression enabled, set the [`ssl_compression`][] parameter to true: - -``` puppet -class { 'apache::mod::ssl': - ssl_compression => true, -} -``` - -Note that some modules have prerequisites, which are documented in their references under [`apache::mod::`][]. - -#### Installing arbitrary modules - -You can pass the name of any module that your operating system's package manager can install to the [`apache::mod`][] defined type to install it. Unlike the specific-module classes, the [`apache::mod`][] defined type doesn't tailor the installation based on other installed modules or with specific parameters---Puppet only grabs and installs the module's package, leaving detailed configuration up to you. - -For example, to install the [`mod_authnz_external`][] Apache module, declare the defined type with the 'mod_authnz_external' name: - -``` puppet -apache::mod { 'mod_authnz_external': } -``` - -There are several optional parameters you can specify when defining Apache modules this way. See the [defined type's reference][`apache::mod`] for details. - -### Configuring FastCGI servers to handle PHP files - -Add the [`apache::fastcgi::server`][] defined type to allow [FastCGI][] servers to handle requests for specific files. For example, the following defines a FastCGI server at 127.0.0.1 (localhost) on port 9000 to handle PHP requests: - -``` puppet -apache::fastcgi::server { 'php': - host => '127.0.0.1:9000', - timeout => 15, - flush => false, - faux_path => '/var/www/php.fcgi', - fcgi_alias => '/php.fcgi', - file_type => 'application/x-httpd-php' -} -``` - -You can then use the [`custom_fragment`][] parameter to configure the virtual host to have the FastCGI server handle the specified file type: - -``` puppet -apache::vhost { 'www': - ... - custom_fragment => 'AddType application/x-httpd-php .php' - ... -} -``` - -### Load balancing examples - -Apache supports load balancing across groups of servers through the [`mod_proxy`][] Apache module. Puppet supports configuring Apache load balancing groups (also known as balancer clusters) through the [`apache::balancer`][] and [`apache::balancermember`][] defined types. - -To enable load balancing with [exported resources][], export the [`apache::balancermember`][] defined type from the load balancer member server: - -``` puppet -@@apache::balancermember { "${::fqdn}-puppet00": - balancer_cluster => 'puppet00', - url => "ajp://${::fqdn}:8009", - options => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'], -} -``` - -Then, on the proxy server, create the load balancing group: - -``` puppet -apache::balancer { 'puppet00': } -``` - -To enable load balancing without exporting resources, declare the following on the proxy server: - -``` puppet -apache::balancer { 'puppet00': } - -apache::balancermember { "${::fqdn}-puppet00": - balancer_cluster => 'puppet00', - url => "ajp://${::fqdn}:8009", - options => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'], -} -``` - -Then declare the `apache::balancer` and `apache::balancermember` defined types on the proxy server. - -To use the [ProxySet](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset) directive on the balancer, use the [`proxy_set`](#proxy_set) parameter of `apache::balancer`: - -``` puppet -apache::balancer { 'puppet01': - proxy_set => { - 'stickysession' => 'JSESSIONID', - 'lbmethod' => 'bytraffic', - }, -} -``` - -Load balancing scheduler algorithms (`lbmethod`) are listed [in mod_proxy_balancer documentation](https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html). - -## Reference - -- [**Public classes**](#public-classes) - - [Class: apache](#class-apache) - - [Class: apache::dev](#class-apachedev) - - [Class: apache::vhosts](#class-apachevhosts) - - [Classes: apache::mod::\*](#classes-apachemodname) -- [**Private classes**](#private-classes) - - [Class: apache::confd::no_accf](#class-apacheconfdno_accf) - - [Class: apache::default_confd_files](#class-apachedefault_confd_files) - - [Class: apache::default_mods](#class-apachedefault_mods) - - [Class: apache::package](#class-apachepackage) - - [Class: apache::params](#class-apacheparams) - - [Class: apache::service](#class-apacheservice) - - [Class: apache::version](#class-apacheversion) -- [**Public defined types**](#public-defined-types) - - [Defined type: apache::balancer](#defined-type-apachebalancer) - - [Defined type: apache::balancermember](#defined-type-apachebalancermember) - - [Defined type: apache::custom_config](#defined-type-apachecustom_config) - - [Defined type: apache::fastcgi::server](#defined-type-fastcgi-server) - - [Defined type: apache::listen](#defined-type-apachelisten) - - [Defined type: apache::mod](#defined-type-apachemod) - - [Defined type: apache::namevirtualhost](#defined-type-apachenamevirtualhost) - - [Defined type: apache::vhost](#defined-type-apachevhost) - - [Defined type: apache::vhost::custom](#defined-type-apachevhostcustom) -- [**Private defined types**](#private-defined-types) - - [Defined type: apache::default_mods::load](#defined-type-default_mods-load) - - [Defined type: apache::peruser::multiplexer](#defined-type-apacheperusermultiplexer) - - [Defined type: apache::peruser::processor](#defined-type-apacheperuserprocessor) - - [Defined type: apache::security::file_link](#defined-type-apachesecurityfile_link) -- [**Templates**](#templates) -- [**Tasks**](#tasks) - -### Public Classes - -#### Class: `apache` - -Guides the basic setup and installation of Apache on your system. - -When this class is declared with the default options, Puppet: - -- Installs the appropriate Apache software package and [required Apache modules](#default_mods) for your operating system. -- Places the required configuration files in a directory, with the [default location](#conf_dir) determined by your operating system. -- Configures the server with a default virtual host and standard port ('80') and address ('\*') bindings. -- Creates a document root directory determined by your operating system, typically `/var/www`. -- Starts the Apache service. - -You can simply declare the default `apache` class: - -``` puppet -class { 'apache': } -``` - -##### `allow_encoded_slashes` - -Sets the server default for the [`AllowEncodedSlashes`][] declaration, which modifies the responses to URLs containing '\' and '/' characters. If not specified, this parameter omits the declaration from the server's configuration and uses Apache's default setting of 'off'. - -Values: 'on', 'off', 'nodecode'. - -Default: `undef`. - -##### `apache_version` - -Configures module template behavior, package names, and default Apache modules by defining the version of Apache to use. We do not recommend manually configuring this parameter without reason. - -Default: Depends on operating system and release version detected by the [`apache::version`][] class. - -##### `conf_dir` - -Sets the directory where the Apache server's main configuration file is located. - -Default: Depends on operating system. - -- **Debian**: `/etc/apache2` -- **FreeBSD**: `/usr/local/etc/apache22` -- **Gentoo**: `/etc/apache2` -- **Red Hat**: `/etc/httpd/conf` - -##### `conf_template` - -Defines the [template][] used for the main Apache configuration file. Modifying this parameter is potentially risky, as the apache module is designed to use a minimal configuration file customized by `conf.d` entries. - -Default: `apache/httpd.conf.erb`. - -##### `confd_dir` - -Sets the location of the Apache server's custom configuration directory. - -Default: Depends on operating system. - -- **Debian**: `/etc/apache2/conf.d` -- **FreeBSD**: `/usr/local/etc/apache22` -- **Gentoo**: `/etc/apache2/conf.d` -- **Red Hat**: `/etc/httpd/conf.d` - -##### `default_charset` - -Used as the [`AddDefaultCharset`][] directive in the main configuration file. - -Default: `undef`. - -##### `default_confd_files` - -Determines whether Puppet generates a default set of includable Apache configuration files in the directory defined by the [`confd_dir`][] parameter. These configuration files correspond to what is typically installed with the Apache package on the server's operating system. - -Boolean. - -Default: `true`. - -##### `default_mods` - -Determines whether to configure and enable a set of default [Apache modules][] depending on your operating system. - -If `false`, Puppet includes only the Apache modules required to make the HTTP daemon work on your operating system, and you can declare any other modules separately using the [`apache::mod::`][] class or [`apache::mod`][] defined type. - -If `true`, Puppet installs additional modules, depending on the operating system and the values of [`apache_version`][] and [`mpm_module`][] parameters. Because these lists of modules can change frequently, consult the [Puppet module's code][] for up-to-date lists. - -If this parameter contains an array, Puppet instead enables all passed Apache modules. - -Values: Boolean or an array of Apache module names. - -Default: `true`. - -##### `default_ssl_ca` - -Sets the default certificate authority for the Apache server. - -Although the default value results in a functioning Apache server, you **must** update this parameter with your certificate authority information before deploying this server in a production environment. - -Boolean. - -Default: `undef`. - -##### `default_ssl_cert` - -Sets the [SSL encryption][] certificate location. - -Although the default value results in a functioning Apache server, you **must** update this parameter with your certificate location before deploying this server in a production environment. - -Default: Depends on operating system. - -- **Debian**: `/etc/ssl/certs/ssl-cert-snakeoil.pem` -- **FreeBSD**: `/usr/local/etc/apache22/server.crt` -- **Gentoo**: `/etc/ssl/apache2/server.crt` -- **Red Hat**: `/etc/pki/tls/certs/localhost.crt` - -##### `default_ssl_chain` - -Sets the default [SSL chain][] location. - -Although this default value results in a functioning Apache server, you **must** update this parameter with your SSL chain before deploying this server in a production environment. - -Default: `undef`. - -##### `default_ssl_crl` - -Sets the path of the default [certificate revocation list][] (CRL) file to use. - -Although this default value results in a functioning Apache server, you **must** update this parameter with the CRL file path before deploying this server in a production environment. You can use this parameter with or in place of the [`default_ssl_crl_path`][]. - -Default: `undef`. - -##### `default_ssl_crl_path` - -Sets the server's [certificate revocation list path][], which contains your CRLs. - -Although this default value results in a functioning Apache server, you **must** update this parameter with the CRL file path before deploying this server in a production environment. - -Default: `undef`. - -##### `default_ssl_crl_check` - -Sets the default certificate revocation check level via the [`SSLCARevocationCheck`][] directive. This parameter applies only to Apache 2.4 or higher and is ignored on older versions. - -Although this default value results in a functioning Apache server, you **must** specify this parameter when using certificate revocation lists in a production environment. - -Default: `undef`. - -##### `default_ssl_key` - -Sets the [SSL certificate key file][] location. - -Although the default values result in a functioning Apache server, you **must** update this parameter with your SSL key's location before deploying this server in a production environment. - -Default: Depends on operating system. - -- **Debian**: `/etc/ssl/private/ssl-cert-snakeoil.key` -- **FreeBSD**: `/usr/local/etc/apache22/server.key` -- **Gentoo**: `/etc/ssl/apache2/server.key` -- **Red Hat**: `/etc/pki/tls/private/localhost.key` - - -##### `default_ssl_vhost` - -Configures a default [SSL][SSL encryption] virtual host. - -If `true`, Puppet automatically configures the following virtual host using the [`apache::vhost`][] defined type: - -```puppet -apache::vhost { 'default-ssl': - port => 443, - ssl => true, - docroot => $docroot, - scriptalias => $scriptalias, - serveradmin => $serveradmin, - access_log_file => "ssl_${access_log_file}", - } -``` - -> **Note**: SSL virtual hosts only respond to HTTPS queries. - - -Boolean. - -Default: `false`. - -##### `default_type` - -_Apache 2.2 only_. Sets the [MIME `content-type`][] sent if the server cannot otherwise determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and newer, and is only for backwards compatibility in configuration files. - -Default: `undef`. - -##### `default_vhost` - -Configures a default virtual host when the class is declared. - -To configure [customized virtual hosts][Configuring virtual hosts], set this parameter's value to `false`. - -> **Note**: Apache will not start without at least one virtual host. If you set this to `false` you must configure a virtual host elsewhere. - -Boolean. - -Default: `true`. - -##### `dev_packages` - -Configures a specific dev package to use. - -Values: A string or array of strings. - -Example for using httpd 2.4 from the IUS yum repo: - -``` puppet -include ::apache::dev -class { 'apache': - apache_name => 'httpd24u', - dev_packages => 'httpd24u-devel', -} -``` - -Default: Depends on operating system. - -- **Red Hat:** 'httpd-devel' -- **Debian 8/Ubuntu 13.10 or newer:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev'] -- **Older Debian/Ubuntu versions:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev'] -- **FreeBSD, Gentoo:** `undef` -- **Suse:** ['libapr-util1-devel', 'libapr1-devel'] - -##### `docroot` - -Sets the default [`DocumentRoot`][] location. - -Default: Depends on operating system. - -- **Debian**: `/var/www/html` -- **FreeBSD**: `/usr/local/www/apache22/data` -- **Gentoo**: `/var/www/localhost/htdocs` -- **Red Hat**: `/var/www/html` - -##### `error_documents` - -Determines whether to enable [custom error documents][] on the Apache server. - -Boolean. - -Default: `false`. - -##### `group` - -Sets the group ID that owns any Apache processes spawned to answer requests. - -By default, Puppet attempts to manage this group as a resource under the `apache` class, determining the group based on the operating system as detected by the [`apache::params`][] class. To to prevent the group resource from being created and use a group created by another Puppet module, set the [`manage_group`][] parameter's value to `false`. - -> **Note**: Modifying this parameter only changes the group ID that Apache uses to spawn child processes to access resources. It does not change the user that owns the parent server process. - -##### `httpd_dir` - -Sets the Apache server's base configuration directory. This is useful for specially repackaged Apache server builds but might have unintended consequences when combined with the default distribution packages. - -Default: Depends on operating system. - -- **Debian**: `/etc/apache2` -- **FreeBSD**: `/usr/local/etc/apache22` -- **Gentoo**: `/etc/apache2` -- **Red Hat**: `/etc/httpd` - -##### `http_protocol_options` - -Specifies the strictness of HTTP protocol checks. - -Valid options: any sequence of the following alternative values: `Strict` or `Unsafe`, `RegisteredMethods` or `LenientMethods`, and `Allow0.9` or `Require1.0`. - -Default '`Strict LenientMethods Allow0.9`'. - -##### `keepalive` - -Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive. If you set this to 'On', use the [`keepalive_timeout`][] and [`max_keepalive_requests`][] parameters to set relevant options. - -Values: 'Off', 'On'. - -Default: 'Off'. - -##### `keepalive_timeout` - -Sets the [`KeepAliveTimeout`] directive, which determines the amount of time the Apache server waits for subsequent requests on a persistent HTTP connection. This parameter is only relevant if the [`keepalive` parameter][] is enabled. - -Default: '15'. - -##### `max_keepalive_requests` - -Limits the number of requests allowed per connection when the [`keepalive` parameter][] is enabled. - -Default: '100'. - -##### `lib_path` - -Specifies the location where [Apache module][Apache modules] files are stored. - -Default: Depends on operating system. - -- **Debian** and **Gentoo**: `/usr/lib/apache2/modules` -- **FreeBSD**: `/usr/local/libexec/apache24` -- **Red Hat**: `modules` - -> **Note**: Do not configure this parameter manually without special reason. - -##### `log_level` - -Changes the error log's verbosity. Values: 'alert', 'crit', 'debug', 'emerg', 'error', 'info', 'notice', 'warn'. - -Default: 'warn'. - -##### `log_formats` - -Define additional [`LogFormat`][] directives. Values: A [hash][], such as: - -``` puppet -$log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' } -``` - -There are a number of predefined `LogFormats` in the `httpd.conf` that Puppet creates: - -``` httpd -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %b" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent -LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded -``` - -If your `log_formats` parameter contains one of those, it will be overwritten with **your** definition. - -##### `logroot` - -Changes the directory of Apache log files for the virtual host. - -Default: Depends on operating system. - -- **Debian**: `/var/log/apache2` -- **FreeBSD**: `/var/log/apache22` -- **Gentoo**: `/var/log/apache2` -- **Red Hat**: `/var/log/httpd` - -##### `logroot_mode` - -Overrides the default [`logroot`][] directory's mode. - -> **Note**: Do _not_ grant write access to the directory where the logs are stored without being aware of the consequences. See the [Apache documentation][Log security] for details. - -Default: `undef`. - -##### `manage_group` - -When `false`, stops Puppet from creating the group resource. - -If you have a group created from another Puppet module that you want to use to run Apache, set this to `false`. Without this parameter, attempting to use a previously established group results in a duplicate resource error. - -Boolean. - -Default: `true`. - -##### `supplementary_groups` - -A list of groups to which the user belongs. These groups are in addition to the primary group. - -Default: No additional groups. - -Notice: This option only has an effect when `manage_user` is set to true. - -##### `manage_user` - -When `false`, stops Puppet from creating the user resource. - -This is for instances when you have a user, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established user would result in a duplicate resource error. - -Boolean. - -Default: `true`. - -##### `mod_dir` - -Sets where Puppet places configuration files for your [Apache modules][]. - -Default: Depends on operating system. - -- **Debian**: `/etc/apache2/mods-available` -- **FreeBSD**: `/usr/local/etc/apache22/Modules` -- **Gentoo**: `/etc/apache2/modules.d` -- **Red Hat**: `/etc/httpd/conf.d` - -##### `mod_packages` - -Allows the user to override default module package names. - -```puppet -include apache::params -class { 'apache': - mod_packages => merge($::apache::params::mod_packages, { - 'auth_kerb' => 'httpd24-mod_auth_kerb', - }) -} -``` - -Hash. Default: `$apache::params::mod_packages` - -##### `mpm_module` - -Determines which [multi-processing module][] (MPM) is loaded and configured for the HTTPD process. Values: 'event', 'itk', 'peruser', 'prefork', 'worker', or `false`. - -You must set this to `false` to explicitly declare the following classes with custom parameters: - -- [`apache::mod::event`][] -- [`apache::mod::itk`][] -- [`apache::mod::peruser`][] -- [`apache::mod::prefork`][] -- [`apache::mod::worker`][] - -Default: Depends on operating system. - -- **Debian**: 'worker' -- **FreeBSD, Gentoo, and Red Hat**: 'prefork' - -##### `package_ensure` - -Controls the `package` resource's [`ensure`][] attribute. Values: 'absent', 'installed' (or equivalent 'present'), or a version string. - -Default: 'installed'. - -##### `pidfile` - -Allows settting a custom location for the pid file. Useful if using a custom-built Apache rpm. - -Default: Depends on operating system. - -- **Debian:** '\${APACHE_PID_FILE}' -- **FreeBSD:** '/var/run/httpd.pid' -- **Red Hat:** 'run/httpd.pid' - -##### `ports_file` - -Sets the path to the file containing Apache ports configuration. - -Default: '{$conf_dir}/ports.conf'. - -##### `purge_configs` - -Removes all other Apache configs and virtual hosts. - -Setting this to `false` is a stopgap measure to allow the apache module to coexist with existing or unmanaged configurations. We recommend moving your configuration to resources within this module. For virtual host configurations, see [`purge_vhost_dir`][]. - -Boolean. - -Default: `true`. - -##### `purge_vhost_dir` - -If the [`vhost_dir`][] parameter's value differs from the [`confd_dir`][] parameter's, this parameter determines whether Puppet removes any configurations inside `vhost_dir` that are _not_ managed by Puppet. - -Setting `purge_vhost_dir` to `false` is a stopgap measure to allow the apache module to coexist with existing or otherwise unmanaged configurations within `vhost_dir`. - -Boolean. - -Default: same as [`purge_configs`][]. - -##### `rewrite_lock` - -Allows setting a custom location for a rewrite lock - considered best practice if using a RewriteMap of type prg in the [`rewrites`][] parameter of your virtual host. This parameter only applies to Apache version 2.2 or lower and is ignored on newer versions. - -Default: `undef`. - -##### `sendfile` - -Forces Apache to use the Linux kernel's `sendfile` support to serve static files, via the [`EnableSendfile`][] directive. Values: 'On', 'Off'. - -Default: 'On'. - -##### `serveradmin` - -Sets the Apache server administrator's contact information via Apache's [`ServerAdmin`][] directive. - -Default: 'root@localhost'. - -##### `servername` - -Sets the Apache server name via Apache's [`ServerName`][] directive. - -Setting to `false` will not set ServerName at all. - -Default: the 'fqdn' fact reported by [Facter][]. - -##### `server_root` - -Sets the Apache server's root directory via Apache's [`ServerRoot`][] directive. - -Default: Depends on operating system. - -- **Debian**: `/etc/apache2` -- **FreeBSD**: `/usr/local` -- **Gentoo**: `/var/www` -- **Red Hat**: `/etc/httpd` - -##### `server_signature` - -Configures a trailing footer line to display at the bottom of server-generated documents, such as error documents and output of certain [Apache modules][], via Apache's [`ServerSignature`][] directive. Values: 'Off', 'On'. - -Default: 'On'. - -##### `server_tokens` - -Controls how much information Apache sends to the browser about itself and the operating system, via Apache's [`ServerTokens`][] directive. - -Default: 'OS'. - -##### `service_enable` - -Determines whether Puppet enables the Apache HTTPD service when the system is booted. - -Boolean. - -Default: `true`. - -##### `service_ensure` - -Determines whether Puppet should make sure the service is running. Values: `true` (or 'running'), `false` (or 'stopped'). - -The `false` or 'stopped' values set the 'httpd' service resource's `ensure` parameter to `false`, which is useful when you want to let the service be managed by another application, such as Pacemaker. - -Default: 'running'. - -##### `service_name` - -Sets the name of the Apache service. - -Default: Depends on operating system. - -- **Debian and Gentoo**: 'apache2' -- **FreeBSD**: 'apache22' -- **Red Hat**: 'httpd' - -##### `service_manage` - -Determines whether Puppet manages the HTTPD service's state. - -Boolean. - -Default: `true`. - -##### `service_restart` - -Determines whether Puppet should use a specific command to restart the HTTPD service. - -Values: a command to restart the Apache service. The default setting uses the [default Puppet behavior][Service attribute restart]. - -Default: `undef`. - -##### `ssl_ca` - -Specifies the SSL certificate authority. [SSLCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcacertificatefile) to use to verify certificate used in ssl client authentication. - -It is possible to override this on a vhost level. - -Default: `undef`. - - -##### `timeout` - -Sets Apache's [`TimeOut`][] directive, which defines the number of seconds Apache waits for certain events before failing a request. - -Default: 120. - -##### `trace_enable` - -Controls how Apache handles `TRACE` requests (per [RFC 2616][]) via the [`TraceEnable`][] directive. - -Values: 'Off', 'On'. - -Default: 'On'. - -##### `use_systemd` - -Controls whether the systemd module should be installed on Centos 7 servers, this is especially useful if using custom-built RPMs. - -Boolean. - -Default: `true`. - -##### `file_mode` - -Sets the desired permissions mode for config files. - -Values: A string, with permissions mode in symbolic or numeric notation. - -Default: '0644'. - -##### `root_directory_options` - -Array of the desired options for the / directory in httpd.conf. - -Defaults: 'FollowSymLinks'. - -##### `root_directory_secured` - -Sets the default access policy for the / directory in httpd.conf. A value of `false` allows access to all resources that are missing a more specific access policy. A value of `true` denies access to all resources by default. If `true`, more specific rules must be used to allow access to these resources (for example, in a directory block using the [`directories`](#parameter-directories-for-apachevhost) parameter). - -Boolean. - -Default: `false`. - -##### `vhost_dir` - -Changes your virtual host configuration files' location. - -Default: Depends on operating system: - -- **Debian**: `/etc/apache2/sites-available` -- **FreeBSD**: `/usr/local/etc/apache22/Vhosts` -- **Gentoo**: `/etc/apache2/vhosts.d` -- **Red Hat**: `/etc/httpd/conf.d` - -##### `vhost_include_pattern` - -Defines the pattern for files included from the `vhost_dir`. - -If set to a value like `[^.#]\*.conf[^~]` to make sure that files accidentally created in this directory (such as files created by version control systems or editor backups) are *not* included in your server configuration. - -Default: '*'. - -Some operating systems use a value of `*.conf`. By default, this module creates configuration files ending in `.conf`. - -##### `user` - -Changes the user that Apache uses to answer requests. Apache's parent process continues to run as root, but child processes access resources as the user defined by this parameter. To prevent Puppet from managing the user, set the [`manage_user`][] parameter to `false`. - -Default: Depends on the user set by [`apache::params`][] class, based on your operating system: - -- **Debian**: 'www-data' -- **FreeBSD**: 'www' -- **Gentoo** and **Red Hat**: 'apache' - -To prevent Puppet from managing the user, set the [`manage_user`][] parameter to false. - -##### `apache_name` - -The name of the Apache package to install. If you are using a non-standard Apache package, such as those from Red Hat's software collections, you might need to override the default setting. - -Default: Depends on the user set by [`apache::params`][] class, based on your operating system: - -- **Debian**: 'apache2' -- **FreeBSD**: 'apache24' -- **Gentoo**: 'www-servers/apache' -- **Red Hat**: 'httpd' - -##### `error_log` - -The name of the error log file for the main server instance. If the string starts with `/`, `|`, or `syslog`: the full path is set. Otherwise, the filename is prefixed with `$logroot`. - -Default: Depends on operating system: - -- **Debian**: 'error.log' -- **FreeBSD**: 'httpd-error.log' -- **Gentoo**: 'error.log' -- **Red Hat**: 'error_log' -- **Suse**: 'error.log' - -##### `scriptalias` - -Directory to use for global script alias - -Default: Depends on operating system: - -- **Debian**: '/usr/lib/cgi-bin' -- **FreeBSD**: '/usr/local/www/apache24/cgi-bin' -- **Gentoo**: 'var/www/localhost/cgi-bin' -- **Red Hat**: '/var/www/cgi-bin' -- **Suse**: '/usr/lib/cgi-bin' - -##### `access_log_file` - -The name of the access log file for the main server instance. - -Default: Depends on operating system: - -- **Debian**: 'error.log' -- **FreeBSD**: 'httpd-access.log' -- **Gentoo**: 'access.log' -- **Red Hat**: 'access_log' -- **Suse**: 'access.log' - -#### Class: `apache::dev` - -Installs Apache development libraries. - -Default: Depends on the operating system:[`dev_packages`][] parameter of the [`apache::params`][] class, based on your operating system: - -- **Debian** : 'libaprutil1-dev', 'libapr1-dev'; 'apache2-dev' on Ubuntu 13.10 and Debian 8; 'apache2-prefork-dev' on other versions. -- **FreeBSD**: `undef`; on FreeBSD, you must declare the `apache::package` or `apache` classes before declaring `apache::dev`. -- **Gentoo**: `undef`. -- **Red Hat**: 'httpd-devel'. - -#### Class: `apache::vhosts` - -Creates [`apache::vhost`][] defined types. - -**Parameters**: - -* `vhosts`: Specifies the [`apache::vhost`][] defined type's parameters. - - Values: A [hash][], where the key represents the name and the value represents a [hash][] of [`apache::vhost`][] defined type's parameters. - - Default: '{}' - - > **Note**: See the [`apache::vhost`][] defined type's reference for a list of all virtual host parameters or [Configuring virtual hosts]. - - For example, to create a [name-based virtual host][name-based virtual hosts] 'custom_vhost_1, declare this class with the `vhosts` parameter set to '{ "custom_vhost_1" => { "docroot" => "/var/www/custom_vhost_1", "port" => "81" }': - -``` puppet -class { 'apache::vhosts': - vhosts => { - 'custom_vhost_1' => { - 'docroot' => '/var/www/custom_vhost_1', - 'port' => '81', - }, - }, -} -``` - -#### Classes: `apache::mod::` - -Enables specific [Apache modules][]. Enable and configure an Apache module by declaring its class. - -For example, to install and enable [`mod_alias`][] with no icons, declare the [`apache::mod::alias`][] class with the `icons_options` parameter set to 'None': - -``` puppet -class { 'apache::mod::alias': - icons_options => 'None', -} -``` - -The following Apache modules have supported classes, many of which allow for parameterized configuration. You can install other Apache modules with the [`apache::mod`][] defined type. - -* `actions` -* `alias` (see [`apache::mod::alias`][]) -* `auth_basic` -* `auth_cas`\* (see [`apache::mod::auth_cas`][]) -* `auth_mellon`\* (see [`apache::mod::auth_mellon`][]) -* `auth_kerb` -* `authn_core` -* `authn_dbd`\* (see [`apache::mod::authn_dbd`][]) -* `authn_file` -* `authnz_ldap`\* (see [`apache::mod::authnz_ldap`][]) -* `authnz_pam` -* `authz_default` -* `authz_user` -* `autoindex` -* `cache` -* `cgi` -* `cgid` -* `cluster` (see [`apache::mod::cluster`][]) -* `dav` -* `dav_fs` -* `dav_svn`\* -* `dbd` -* `deflate\` -* `dev` -* `dir`\* -* `disk_cache` (see [`apache::mod::disk_cache`][]) -* `dumpio` (see [`apache::mod::dumpio`][]) -* `env` -* `event` (see [`apache::mod::event`][]) -* `expires` -* `ext_filter` (see [`apache::mod::ext_filter`][]) -* `fastcgi` -* `fcgid` -* `filter` -* `geoip` (see [`apache::mod::geoip`][]) -* `headers` -* `include` -* `info`\* -* `intercept_form_submit` -* `itk` -* `jk` (see [`apache::mod::jk`]) -* `ldap` (see [`apache::mod::ldap`][]) -* `lookup_identity` -* `macro` (see [`apache:mod:macro`][]) -* `mime` -* `mime_magic`\* -* `negotiation` -* `nss`\* (see [`apache::mod::nss`][]) -* `pagespeed` (see [`apache::mod::pagespeed`][]) -* `passenger`\* (see [`apache::mod::passenger`][]) -* `perl` -* `peruser` -* `php` (requires [`mpm_module`][] set to `prefork`) -* `prefork`\* -* `proxy`\* (see [`apache::mod::proxy`][]) -* `proxy_ajp` -* `proxy_balancer`\* (see [`apache::mod::proxy_balancer`][]) -* `proxy_balancer` -* `proxy_html` (see [`apache::mod::proxy_html`][]) -* `proxy_http` -* `python` -* `reqtimeout` -* `remoteip`\* -* `rewrite` -* `rpaf`\* -* `setenvif` -* `security` -* `shib`\* (see [`apache::mod::shib`]) -* `speling` -* `ssl`\* (see [`apache::mod::ssl`][]) -* `status`\* (see [`apache::mod::status`][]) -* `suphp` -* `userdir`\* (see [`apache::mod::userdir`][]) -* `version` -* `vhost_alias` -* `worker`\* -* `wsgi` (see [`apache::mod::wsgi`][]) -* `xsendfile` - -Modules noted with a * indicate that the module has settings and a template that includes parameters to configure the module. Most Apache module class parameters have default values and don't require configuration. For modules with templates, Puppet installs template files with the module; these template files are required for the module to work. - -##### Class: `apache::mod::alias` - -Installs and manages [`mod_alias`][]. - -**Parameters**: - -* `icons_options`: Disables directory listings for the icons directory, via Apache [`Options`] directive. - - Default: 'Indexes MultiViews'. - -* `icons_path`: Sets the local path for an `/icons/` Alias. - - Default: Depends on operating system. - - * **Debian**: `/usr/share/apache2/icons` - * **FreeBSD**: `/usr/local/www/apache24/icons` - * **Gentoo**: `/var/www/icons` - * *Red Hat**: `/var/www/icons`, except on Apache 2.4, where it's `/usr/share/httpd/icons` - -#### Class: `apache::mod::disk_cache` - -Installs and configures [`mod_disk_cache`][] on Apache 2.2, or [`mod_cache_disk`][] on Apache 2.4. - -Default: Depends on the Apache version and operating system: - -- **Debian**: `/var/cache/apache2/mod_cache_disk` -- **FreeBSD**: `/var/cache/mod_cache_disk` -- **Red Hat, Apache 2.4**: `/var/cache/httpd/proxy` -- **Red Hat, Apache 2.2**: `/var/cache/mod_proxy` - -To specify the cache root, pass a path as a string to the `cache_root` parameter. - -``` puppet -class {'::apache::mod::disk_cache': - cache_root => '/path/to/cache', -} -``` - -##### Class: `apache::mod::diskio` - -Installs and configures [`mod_diskio`][]. - -```puppet -class{'apache': - default_mods => `false`, - log_level => 'dumpio:trace7', -} -class{'apache::mod::diskio': - disk_io_input => 'On', - disk_io_output => 'Off', -} -``` - -**Parameters**: - -* `dump_io_input`: Dump all input data to the error log. - - Values: 'On', 'Off'. - - Default: 'Off'. - -* `dump_io_output`: Dump all output data to the error log. - - Values: 'On', 'Off'. - - Defaults to 'Off'. - -##### Class: `apache::mod::event` - -Installs and manages [`mod_mpm_event`][]. You cannot include `apache::mod::event` with [`apache::mod::itk`][], [`apache::mod::peruser`][], [`apache::mod::prefork`][], or [`apache::mod::worker`][] on the same server. - -**Parameters**: - -* `listenbacklog`: Sets the maximum length of the pending connections queue via the module's [`ListenBackLog`][] directive. Setting this to `false` removes the parameter. - - Default: '511'. - -* `maxrequestworkers` (_Apache 2.3.12 or older_: `maxclients`): Sets the maximum number of connections Apache can simultaneously process, via the module's [`MaxRequestWorkers`][] directive. Setting these to `false` removes the parameters. - - Default: '150'. - -* `maxconnectionsperchild` (_Apache 2.3.8 or older_: `maxrequestsperchild`): Limits the number of connections a child server handles during its life, via the module's [`MaxConnectionsPerChild`][] directive. Setting these to `false` removes the parameters. - - Default: '0'. - -* `maxsparethreads` and `minsparethreads`: Sets the maximum and minimum number of idle threads, via the [`MaxSpareThreads`][] and [`MinSpareThreads`][] directives. Setting these to `false` removes the parameters. - - Default: '75' and '25', respectively. - -* `serverlimit`: Limits the configurable number of processes via the [`ServerLimit`][] directive. Setting this to `false` removes the parameter. - - Default: '25'. - -* `startservers`: Sets the number of child server processes created at startup, via the module's [`StartServers`][] directive. Setting this to `false` removes the parameter. - - Default: '2'. - -* `threadlimit`: Limits the number of event threads via the module's [`ThreadLimit`][] directive. Setting this to `false` removes the parameter. - - Default: '64'. - -* `threadsperchild`: Sets the number of threads created by each child process, via the [`ThreadsPerChild`][] directive. - - Default: '25'. Setting this to `false` removes the parameter. - -##### Class: `apache::mod::auth_cas` - -Installs and manages [`mod_auth_cas`][]. Parameters share names with the Apache module's directives. - -The `cas_login_url` and `cas_validate_url` parameters are required; several other parameters have `undef` default values. - -> **Note**: The auth_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL. See [https://github.com/Jasig/mod_auth_cas]() - -**Parameters**: - -- `cas_attribute_prefix`: Adds a header with the value of this header being the attribute values when SAML validation is enabled. - - Default: CAS_. - -- `cas_attribute_delimiter`: The delimiter between attribute values in the header created by `cas_attribute_prefix`. - - Default: , - -- `cas_authoritative`: Determines whether an optional authorization directive is authoritative and binding. - - Default: `undef`. - -- `cas_certificate_path`: Sets the path to the X509 certificate of the Certificate Authority for the server in `cas_login_url` and `cas_validate_url`. - - Default: `undef`. - -- `cas_cache_clean_interval`: Sets the minimum number of seconds that must pass between cache cleanings. - - Default: `undef`. - -- `cas_cookie_domain`: Sets the value of the `Domain=` parameter in the `Set-Cookie` HTTP header. - - Default: `undef`. - -- `cas_cookie_entropy`: Sets the number of bytes to use when creating session identifiers. - - Default: `undef`. - -- `cas_cookie_http_only`: Sets the optional `HttpOnly` flag when `mod_auth_cas` issues cookies. - - Default: `undef`. - -- `cas_cookie_path`: Where cas cookie session data is stored. Should be writable by web server user. - - Default: OS dependent. - -- `cas_cookie_path_mode`: The mode of `cas_cookie_path`. - - Default: '0750'. - -- `cas_debug`: Determines whether to enable the module's debugging mode. - - Default: 'Off'. - -- `cas_idle_timeout`: Sets the idle timeout limit, in seconds. - - Default: `undef`. - -- `cas_login_url`: **Required**. Sets the URL to which the module redirects users when they attempt to access a CAS-protected resource and don't have an active session. - -- `cas_proxy_validate_url`: The URL to use when performing a proxy validation. - - Default: `undef`. - -- `cas_root_proxied_as`: Sets the URL end users see when access to this Apache server is proxied. - - Default: `undef`. - -- `cas_scrub_request_headers`: Remove inbound request headers that may have special meaning within mod_auth_cas. - -- `cas_sso_enabled`: Enables experimental support for single sign out (may mangle POST data). - - Default: 'Off'. - -- `cas_timeout`: Limits the number of seconds a `mod_auth_cas` session can remain active. - - Default: `undef`. - -- `cas_validate_depth`: Limits the depth for chained certificate validation. - - Default: `undef`. - -- `cas_validate_saml`: Parse response from CAS server for SAML. - - Default: 'Off'. - -- `cas_validate_server`: Whether to validate the cert of the CAS server (deprecated in 1.1 - RedHat 7). - - Default: `undef`. - -- `cas_validate_url`: **Required**. Sets the URL to use when validating a client-presented ticket in an HTTP query string. - -- `cas_version`: The CAS protocol version to adhere to. Values: '1', '2'. - - Default: '2'. - -- `suppress_warning`: Suppress warning about being on RedHat (`mod_auth_cas` package is now available in epel-testing repo). - - Default: `false`. - -##### Class: `apache::mod::auth_mellon` - -Installs and manages [`mod_auth_mellon`][]. Parameters share names with the Apache module's directives. - -``` puppet -class{ 'apache::mod::auth_mellon': - mellon_cache_size => 101, -} -``` - -**Parameters**: - -* `mellon_cache_entry_size`: Maximum size for a single session. - - Default: `undef`. - -* `mellon_cache_size`: Size in megabytes of the mellon cache. - - Default: 100. - -* `mellon_lock_file`: Location of lock file. - - Default: '`/run/mod_auth_mellon/lock`'. - -* `mellon_post_directory`: Full path where post requests are saved. - - Default: '`/var/cache/apache2/mod_auth_mellon/`' - -* `mellon_post_ttl`: Time to keep post requests. - - Default: `undef`. - -* `mellon_post_size`: Maximum size of post requests. - - Default: `undef`. - -* `mellon_post_count`: Maximum number of post requests. - - Default: `undef`. - -##### Class: `apache::mod::authn_dbd` - -Installs `mod_authn_dbd` and uses `authn_dbd.conf.erb` template to generate its configuration. Optionally, creates AuthnProviderAlias. - -``` puppet -class { 'apache::mod::authn_dbd': - $authn_dbd_params => - 'host=db01 port=3306 user=apache password=xxxxxx dbname=apacheauth', - $authn_dbd_query => 'SELECT password FROM authn WHERE user = %s', - $authn_dbd_alias => 'db_auth', -} -``` - -**Parameters**: - -* `authn_dbd_alias`: Name for the 'AuthnProviderAlias'. - -* `authn_dbd_dbdriver`: Specifies the database driver to use. - - Default: 'mysql'. - -* `authn_dbd_exptime`: corresponds to DBDExptime. - - Default: 300. - -* `authn_dbd_keep`: Corresponds to DBDKeep. - - Default: 8. - -* `authn_dbd_max`: Corresponds to DBDMax. - - Default: 20. - -* `authn_dbd_min`: Corresponds to DBDMin. - - Default: 4. - -* `authn_dbd_params`: **Required**. Corresponds to DBDParams for the connection string. - -* `authn_dbd_query`: Whether to query the user and password for authentication. - -##### Class: `apache::mod::authnz_ldap` - -Installs `mod_authnz_ldap` and uses the `authnz_ldap.conf.erb` template to generate its configuration. - -**Parameters**: - -* `package_name`: The name of the package. - - Default: `undef`. - -* `verify_server_cert`: Whether to verify the server certificate. - - Default: `undef`. - -##### Class: `apache::mod::cluster` - -**Note**: There is no official package available for `mod_cluster`, so you must make it available outside of the apache module. Binaries can be found at http://mod-cluster.jboss.org/ - -``` puppet -class { '::apache::mod::cluster': - ip => '172.17.0.1', - allowed_network => '172.17.0.', - balancer_name => 'mycluster', - version => '1.3.1' -} -``` - -**Parameters**: - -* `port`: mod_cluster listen port. - - Default: '6666'. - -* `server_advertise`: Whether the server should advertise. - - Default: `true`. - -* `advertise_frequency`: Sets the interval between advertise messages in seconds[.miliseconds]. - - Default: 10. - -* `manager_allowed_network`: Whether to allow the network to access the mod_cluster_manager. - - Default: '127.0.0.1'. - -* `keep_alive_timeout`: Specifies how long Apache should wait for a request, in seconds. - - Default: 60. - -* `max_keep_alive_requests`: Maximum number of requests kept alive. - - Default: 0. - -* `enable_mcpm_receive`: Whether MCPM should be enabled. - - Default: `true`. - -* `ip`: Specifies the IP address to listen to. - -* `allowed_network`: Balanced members network. - -* `version`: Specifies the `mod_cluster` version. Version 1.3.0 or greater is required for httpd 2.4. - -##### Class: `apache::mod::deflate` - -Installs and configures [`mod_deflate`][]. - -**Parameters**: - -* `types`: An [array][] of [MIME types][MIME `content*type`] to be deflated. - - Default: [ 'text/html text/plain text/xml', 'text/css', 'application/x*javascript application/javascript application/ecmascript', 'application/rss+xml', 'application/json' ]. - -* `notes`: A [Hash][] where the key represents the type and the value represents the note name. - - Default: { 'Input' => 'instream', 'Output' => 'outstream', 'Ratio' => 'ratio' }. - -##### Class: `apache::mod::expires` - -Installs [`mod_expires`][] and uses the `expires.conf.erb` template to generate its configuration. - -**Parameters**: - -* `expires_active`: Enables generation of `Expires` headers for a document realm. - - Boolean. - - Default: `true`. - -* `expires_default`: Specifies the default algorithm for calculating expiration time using [`ExpiresByType`][] syntax or [interval syntax][]. - - Default: `undef`. - -* `expires_by_type`: Describes a set of [MIME `content*type`][] and their expiration times. - - Values: An [array][] of [Hashes][Hash], with each Hash's key a valid MIME `content*type` (i.e. 'text/json') and its value following valid [interval syntax][]. - - Default: `undef`. - -##### Class: `apache::mod::ext_filter` - -Installs and configures [`mod_ext_filter`][]. - -``` puppet -class { 'apache::mod::ext_filter': - ext_filter_define => { - 'slowdown' => 'mode=output cmd=/bin/cat preservescontentlength', - 'puppetdb-strip' => 'mode=output outtype=application/json cmd="pdb-resource-filter"', - }, -} -``` - -**Parameters**: - -* `ext_filter_define`: A hash of filter names and their parameters. - - Default: `undef`. - -##### Class: `apache::mod::fcgid` - -Installs and configures [`mod_fcgid`][]. - -The class does not individually parameterize all available options. Instead, configure `mod_fcgid` using the `options` [hash][]. For example: - -``` puppet -class { 'apache::mod::fcgid': - options => { - 'FcgidIPCDir' => '/var/run/fcgidsock', - 'SharememPath' => '/var/run/fcgid_shm', - 'AddHandler' => 'fcgid-script .fcgi', - }, -} -``` - -For a full list of options, see the [official `mod_fcgid` documentation][`mod_fcgid`]. - -If you include `apache::mod::fcgid`, you can set the [`FcgidWrapper`][] per directory, per virtual host. The module must be loaded first; Puppet will not automatically enable it if you set the `fcgiwrapper` parameter in `apache::vhost`. - -``` puppet -include apache::mod::fcgid - -apache::vhost { 'example.org': - docroot => '/var/www/html', - directories => { - path => '/var/www/html', - fcgiwrapper => { - command => '/usr/local/bin/fcgiwrapper', - } - }, -} -``` - -##### Class: `apache::mod::geoip` - -Installs and manages [`mod_geoip`][]. - -**Parameters**: - -* `db_file`: Sets the path to your GeoIP database file. - - Values: a path, or an [array][] paths for multiple GeoIP database files. - - Default: `/usr/share/GeoIP/GeoIP.dat`. - -* `enable`: Determines whether to globally enable [`mod_geoip`][]. - - Boolean. - - Default: `false`. - -* `flag`: Sets the GeoIP flag. - - Values: 'CheckCache', 'IndexCache', 'MemoryCache', 'Standard'. - - Default: 'Standard'. - -* `output`: Defines which output variables to use. - - Values: 'All', 'Env', 'Request', 'Notes'. - - Default: 'All'. - -* `enable_utf8`: Changes the output from ISO*8859*1 (Latin*1) to UTF*8. - - Boolean. - - Default: `undef`. - -* `scan_proxy_headers`: Enables the [GeoIPScanProxyHeaders][] option. - - Boolean. - - Default: `undef`. - -* `scan_proxy_header_field`: Specifies the header [`mod_geoip`][] uses to determine the client's IP address. - - Default: `undef`. - -* `use_last_xforwarededfor_ip` (sic): Determines whether to use the first or last IP address for the client's IP in a comma-separated list of IP addresses is found. - - Boolean. - - Default: `undef`. - -##### Class: `apache::mod::info` - -Installs and manages [`mod_info`][], which provides a comprehensive overview of the server configuration. - -**Parameters**: - -* `allow_from`: Whitelist of IPv4 or IPv6 addresses or ranges that can access `/server*info`. - - Values: One or more octets of an IPv4 address, an IPv6 address or range, or an array of either. - - Default: ['127.0.0.1','::1']. - -* `apache_version`: Apache's version number as a string, such as '2.2' or '2.4'. - - Default: The value of [`$::apache::apache_version`][`apache_version`]. - - -* `restrict_access`: Determines whether to enable access restrictions. If `false`, the `allow_from` whitelist is ignored and any IP address can access `/server*info`. - - Boolean. - - Default: `true`. - -##### Class: `apache::mod::jk` - -Installs and manages `mod_jk`, a connector for Apache httpd redirection to old versions of TomCat and JBoss - -**Note**: There is no official package available for mod\_jk and thus it must be made available by means outside of the control of the apache module. Binaries can be found at [Apache Tomcat Connectors download page](https://tomcat.apache.org/download-connectors.cgi) - -``` puppet -class { '::apache::mod::jk': - ip = '192.168.2.15', - workers_file = 'conf/workers.properties', - mount_file = 'conf/uriworkermap.properties', - shm_file = 'run/jk.shm', - shm_size = '50M', - $workers_file_content = { - - }, -} -``` - -**Parameters within `apache::mod::jk`**: - -The best source for understanding the `mod_jk` parameters is the [official documentation](https://tomcat.apache.org/connectors-doc/reference/apache.html), except for: - -**add_listen** - -Defines if a `Listen` directive according to parameters `ip` and `port` (see below), so that Apache listens to the IP/port combination and redirect to `mod_jk`. -Useful when another `Listen` directive, like `Listen *:` or `Listen `, can conflict with the one necessary for `mod_jk` binding. - -Type: Boolean -Default: true - -**ip** - -IP for binding to `mod_jk`. -Useful when the binding address is not the primary network interface IP. - -Type: String -Default: `$facts['ipaddress']` - -**port** - -Port for binding to `mod_jk`. -Useful when something else, like a reverse proxy or cache, is receiving requests at port 80, then needs to forward them to Apache at a different port. - -Type: String (numerical) -Default: '80' - -**workers\_file\_content** - -Each directive has the format `worker..=`. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash specifies each worker properties and values. -Plus, there are two global directives, 'worker.list' and 'worker.mantain' -For example, the workers file below: - -``` -worker.list = status -worker.list = some_name,other_name - -worker.mantain = 60 - -# Optional comment -worker.some_name.type=ajp13 -worker.some_name.socket_keepalive=true - -# I just like comments -worker.other_name.type=ajp12 (why would you?) -worker.other_name.socket_keepalive=false -``` - -Should be parameterized as: - -``` -$workers_file_content = { - worker_lists => ['status', 'some_name,other_name'], - worker_mantain => '60', - some_name => { - comment => 'Optional comment', - type => 'ajp13', - socket_keepalive => 'true', - }, - other_name => { - comment => 'I just like comments', - type => 'ajp12', - socket_keepalive => 'false', - }, -} -``` - -**mount\_file\_content** - -Each directive has the format ` = `. This maps as a hash of hashes, where the outer hash specifies workers, and each inner hash contains two items: uri_list - an array with URIs to be mapped to the worker - and comment - an optional string with a comment for the worker. -For example, the mount file below: - -``` -# Worker 1 -/context_1/ = worker_1 -/context_1/* = worker_1 - -# Worker 2 -/ = worker_2 -/context_2/ = worker_2 -/context_2/* = worker_2 -``` - -Should be parameterized as: - -``` -$mount_file_content = { - worker_1 => { - uri_list => ['/context_1/', '/context_1/*'], - comment => 'Worker 1', - }, - worker_2 => { - uri_list => ['/context_2/', '/context_2/*'], - comment => 'Worker 2', - }, -}, -``` - -**shm\_file and log\_file** - -Depending on how these files are specified, the class creates their final path differently: -- Relative path: prepends supplied path with `logroot` (see below) -- Absolute path or pipe: uses supplied path as-is - -Examples (RHEL 6): - -``` -shm_file => 'shm_file' -# Ends up in -$shm_path = '/var/log/httpd/shm_file' -``` -``` -shm_file => '/run/shm_file' -# Ends up in -$shm_path = '/run/shm_file' -``` -``` -shm_file => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"' -# Ends up in -$shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"' -``` - -> The default logroot is sane enough. Therefore, it is not recommended to specify absolute paths. - -**logroot** - -The base directory for `shm_file` and `log_file` is determined by the `logroot` parameter. If unspecified, defaults to `apache::params::logroot`. - -> The default logroot is sane enough. Therefore, it is not recommended to override it. - -##### Class: `apache::mod::passenger` - -Installs and manages [`mod_passenger`][]. For Red Hat-based systems, ensure that you meet the minimum requirements described in the [passenger docs](https://www.phusionpassenger.com/library/install/apache/install/oss/el6/#step-1:-upgrade-your-kernel,-or-disable-selinux). - -**Parameters**: - -* `passenger_high_performance`: Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance). - - Values: 'On', 'Off'. - - Default: `undef`. - -* `passenger_pool_idle_time`: Sets the [`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpoolidletime). - - Default: `undef`. - -* `passenger_max_pool_size`: Sets the [`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpoolsize). - - Default: `undef`. - -* `passenger_max_request_queue_size`: Sets the [`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize). - - Default: `undef`. - -* `passenger_max_requests`: Sets the [`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests). - - Default: `undef`. - -* `passenger_data_buffer_dir`: Sets the [`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerdatabufferdir). - - Default: `undef`. - -##### Class: `apache::mod::ldap` - -Installs and configures [`mod_ldap`][], and allows you to modify the -[`LDAPTrustedGlobalCert`](https://httpd.apache.org/docs/current/mod/mod_ldap.html#ldaptrustedglobalcert) Directive: - -``` puppet -class { 'apache::mod::ldap': - ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt', - ldap_trusted_global_cert_type => 'CA_DER', - ldap_shared_cache_size => '500000', - ldap_cache_entries => '1024', - ldap_cache_ttl => '600', - ldap_opcache_entries => '1024', - ldap_opcache_ttl => '600', -} -``` - -**Parameters** - -* `apache_version`: Specifies the installed Apache version. - - Default: `undef`. - -* `ldap_trusted_global_cert_file`: Specifies the path and file name of the trusted CA certificates to use when establishing SSL or TLS connections to an LDAP server. - -* `ldap_trusted_global_cert_type`: Specifies the global trust certificate format. - - Default: 'CA_BASE64'. - -* `ldap_shared_cache_size`: Specifies the size, in bytes, of the shared memory cache. - -* `ldap_cache_entries`: Specifies the maximum number of entries in the primary LDAP cache. - -* `ldap_cache_ttl`: Specifies the time, in seconds, that cached items remain valid. - -* `ldap_opcache_entries`: Specifies the number of entries used to cache LDAP compare operations. - -* `ldap_opcache_ttl`: Specifies the time, in seconds, that entries in the operation cache remain valid. - -* `package_name`: Specifies the custom package name. - - Default: `undef`. - -##### Class: `apache::mod::negotiation` - -Installs and configures [`mod_negotiation`][]. - -**Parameters**: - -* `force_language_priority`: Sets the `ForceLanguagePriority` option. - - Values: A string. - - Default: `Prefer Fallback`. - -* `language_priority`: An [array][] of languages to set the `LanguagePriority` option of the module. - - Default: [ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et', 'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn', 'no', 'pl', 'pt', 'pt*BR', 'ru', 'sv', 'zh*CN', 'zh*TW' ] - -##### Class: `apache::mod::nss` - -An SSL provider for Apache using the NSS crypto libraries. - -**Parameters:** - -- `transfer_log`: path to access.log -- `error_log`: path to error.log -- `passwd_file`: path to file used for NSSPassPhraseDialog directive -- `port`: SSL port. Defaults to 8443 - -##### Class: `apache::mod::pagespeed` - -Installs and manages [`mod_pagespeed`][], a Google module that rewrites web pages to reduce latency and bandwidth. - -Although this apache module requires the `mod-pagespeed-stable` package, Puppet **does not** manage the software repositories required to automatically install the package. If you declare this class when the package is either not installed or not available to your package manager, your Puppet run will fail. - -> **Note:** Verify that your system is compatible with the latest Google Pagespeed requirements. - -**Parameters**: - -These parameters correspond to the module's directives. See the [module's documentation][`mod_pagespeed`] for details. - -* `inherit_vhost_config`: Default: 'on'. -* `filter_xhtml`: Default: `false`. -* `cache_path`: Default: '/var/cache/mod_pagespeed/'. -* `log_dir`: Default: '/var/log/pagespeed'. -* `memcache_servers`: Default: []. -* `rewrite_level`: Default: 'CoreFilters'. -* `disable_filters`: Default: []. -* `enable_filters`: Default: []. -* `forbid_filters`: Default: []. -* `rewrite_deadline_per_flush_ms`: Default: 10. -* `additional_domains`: Default: `undef`. -* `file_cache_size_kb`: Default: 102400. -* `file_cache_clean_interval_ms`: Default: 3600000. -* `lru_cache_per_process`: Default: 1024. -* `lru_cache_byte_limit`: Default: 16384. -* `css_flatten_max_bytes`: Default: 2048. -* `css_inline_max_bytes`: Default: 2048. -* `css_image_inline_max_bytes`: Default: 2048. -* `image_inline_max_bytes`: Default: 2048. -* `js_inline_max_bytes`: Default: 2048. -* `css_outline_min_bytes`: Default: 3000. -* `js_outline_min_bytes`: Default: 3000. -* `inode_limit`: Default: 500000. -* `image_max_rewrites_at_once`: Default: 8. -* `num_rewrite_threads`: Default: 4. -* `num_expensive_rewrite_threads`: Default: 4. -* `collect_statistics`: Default: 'on'. -* `statistics_logging`: Default: 'on'. -* `allow_view_stats`: Default: []. -* `allow_pagespeed_console`: Default: []. -* `allow_pagespeed_message`: Default: []. -* `message_buffer_size`: Default: 100000. -* `additional_configuration`: A hash of directive value pairs, or an array of lines to insert at the end of the pagespeed configuration. Default: '{ }'. - -##### Class: `apache::mod::passenger` - -Installs and configures `mod_passenger`. - ->**Note**: The passenger module isn't available on RH/CentOS without providing the dependency packages provided by EPEL and the `mod_passengers` custom repository. See the `manage_repo` parameter above and [https://www.phusionpassenger.com/library/install/apache/install/oss/el7/]() - -**Parameters**: - -* `passenger_conf_file`: `$::apache::params::passenger_conf_file` -* `passenger_conf_package_file: `$::apache::params::passenger_conf_package_file` -* `passenger_high_performance`: Default: `undef` -* `passenger_pool_idle_time`: Default: `undef` -* `passenger_max_request_queue_size`: Default: `undef` -* `passenger_max_requests`: Default: `undef` -* `passenger_spawn_method`: Default: `undef` -* `passenger_stat_throttle_rate`: Default: `undef` -* `rack_autodetect`: Default: `undef` -* `rails_autodetect`: Default: `undef` -* `passenger_root` : `$::apache::params::passenger_root` -* `passenger_ruby` : `$::apache::params::passenger_ruby` -* `passenger_default_ruby`: `$::apache::params::passenger_default_ruby` -* `passenger_max_pool_size`: Default: `undef` -* `passenger_min_instances`: Default: `undef` -* `passenger_max_instances_per_app`: Default: `undef` -* `passenger_use_global_queue`: Default: `undef` -* `passenger_app_env`: Default: `undef` -* `passenger_log_file`: Default: `undef` -* `passenger_log_level`: Default: `undef` -* `passenger_data_buffer_dir`: Default: `undef` -* `manage_repo`: Whether to manage the phusionpassenger.com repository. Default: `true`. -* `mod_package`: Default: `undef`. -* `mod_package_ensure`: Default: `undef`. -* `mod_lib`: Default: `undef`. -* `mod_lib_path`: Default: `undef`. -* `mod_id`: Default: `undef`. -* `mod_path`: Default: `undef`. - -##### Class: `apache::mod::proxy` - -Installs `mod_proxy` and uses the `proxy.conf.erb` template to generate its configuration. - -**Parameters within `apache::mod::proxy`**: - -- `allow_from`: Default: `undef`. -- `apache_version`: Default: `undef`. -- `package_name`: Default: `undef`. -- `proxy_requests`: Default: 'Off'. -- `proxy_via`: Default: 'On'. - -##### Class: `apache::mod::proxy_balancer` - -Installs and manages [`mod_proxy_balancer`][], which provides load balancing. - -**Parameters**: - -* `manager`: Determines whether to enable balancer manager support. - - Default: `false`. - -* `manager_path`: The server location of the balancer manager. - - Default: '/balancer*manager'. - -* `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/balancer*manager`. - - Default: ['127.0.0.1','::1']. - -* `apache_version`: Apache's version number as a string, such as '2.2' or '2.4'. - - Default: the value of [`$::apache::apache_version`][`apache_version`]. On Apache 2.4 or greater, `mod_slotmem_shm` is loaded. - -##### Class: `apache::mod::php` - -Installs and configures [`mod_php`][]. - -**Parameters**: - -Default values for these parameters depend on your operating system. Most of this class's parameters correspond to `mod_php` directives; see the [module's documentation][`mod_php`] for details. - -* `package_name`: Names the package that installs `mod_php`. -* `path`: Defines the path to the `mod_php` shared object (`.so`) file. -* `source`: Defines the path to the default configuration. Values include a `puppet:///` path. -* `template`: Defines the path to the `php.conf` template Puppet uses to generate the configuration file. -* `content`: Adds arbitrary content to `php.conf`. - -##### Class: `apache::mod::proxy_html` - -**Note**: There is no official package available for `mod_proxy_html`, so you must make it available outside of the apache module. - -##### Class: `apache::mod::reqtimeout` - -Installs and configures [`mod_reqtimeout`][]. - -**Parameters** - -* `timeouts`: Sets the [`RequestReadTimeout`][] option. - - Values: A string or [array][]. - - Default: ['header=20-40,MinRate=500', 'body=20,MinRate=500']. - -##### Class: `apache::mod::rewrite` - -Installs and enables the Apache module `mod_rewrite`. - -##### Class: `apache::mod::shib` - -Installs the [Shibboleth](http://shibboleth.net/) Apache module `mod_shib`, which enables SAML2 single sign-on (SSO) authentication by Shibboleth Identity Providers and Shibboleth Federations. Defining this class enables Shibboleth-specific parameters in `apache::vhost` instances. - -This class installs and configures only the Apache components of a web application that consumes Shibboleth SSO identities. You can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth). - -**Note**: The shibboleth module isn't available on RH/CentOS without providing dependency packages provided by Shibboleth's repositories. See [http://wiki.aaf.edu.au/tech-info/sp-install-guide]() - -##### Class: `apache::mod::ssl` - -Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template to generate its configuration. On most operating systems, this `ssl.conf` is placed in the module configuration directory. On Red Hat-based operating systems, this file is placed in `/etc/httpd/conf.d`, the same location in which the RPM stores the configuration. - -To use SSL with a virtual host, you must either set the [`default_ssl_vhost`][] parameter in `::apache` to `true` **or** the [`ssl`][] parameter in [`apache::vhost`][] to `true`. - -- `ssl_cipher`: Default: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'. -- `ssl_compression`: Default: false. -- `ssl_cryptodevice`: Default: 'builtin'. -- `ssl_honorcipherorder`: Default: true. -- `ssl_openssl_conf_cmd`: Default: undef. -- `ssl_options`: Default: [ 'StdEnvVars' ] -- `ssl_pass_phrase_dialog`: Default: 'builtin'. -- `ssl_protocol`: Default: [ 'all', '-SSLv2', '-SSLv3' ]. -- `ssl_proxy_protocol`: Default: []. -- `ssl_random_seed_bytes`: Valid options: A string. Default: '512'. -- `ssl_sessioncache`: Valid options: A string. Default: '300'. -- `ssl_sessioncachetimeout`: Valid options: A string. Default: '300'. -- `ssl_mutex`: Default: Determined based on the OS. Valid options: See [mod_ssl][mod_ssl] documentation. - - RedHat/FreeBSD/Suse/Gentoo: 'default' - - Debian/Ubuntu + Apache >= 2.4: 'default' - - Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex' -**Parameters: - -* `ssl_cipher` - - Default: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'. - -* `ssl_compression` - - Default: `false`. - -* `ssl_cryptodevice` - - Default: 'builtin'. - -* `ssl_honorcipherorder` - - Default: `true`. - -* `ssl_openssl_conf_cmd` - - Default: `undef`. - -* `ssl_options` - - Default: [ 'StdEnvVars' ] - -* `ssl_pass_phrase_dialog` - - Default: 'builtin'. - -* `ssl_protocol` - - Default: [ 'all', '*SSLv2', '*SSLv3' ]. - -* `ssl_random_seed_bytes` - - Values: A string. - - Default: '512'. - -* `ssl_sessioncachetimeout` - - Values: A string. - - Default: '300'. - -* `ssl_mutex`: - - Values: See [mod_ssl][mod_ssl] documentation. - - Default: Based on the OS: - - * RedHat/FreeBSD/Suse/Gentoo: 'default'. - * Debian/Ubuntu + Apache >= 2.4: 'default'. - * Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex'. - * Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'. - - -##### Class: `apache::mod::status` - -Installs [`mod_status`][] and uses the `status.conf.erb` template to generate its configuration. - -**Parameters**: - -* `allow_from`: An [array][] of IPv4 or IPv6 addresses that can access `/server-status`. - - Default: ['127.0.0.1','::1']. -* `extended_status`: Determines whether to track extended status information for each request, via the [`ExtendedStatus`][] directive. - - Values: 'Off', 'On'. - - Default: 'On'. - -* `status_path`: The server location of the status page. - - Default: '/server-status'. - -##### Class: `apache::mod::userdir` - -Allows user-specific directories to be accessed using the `http://example.com/~user/` syntax. All parameters can be found in in the [official Apache documentation](https://httpd.apache.org/docs/2.4/mod/mod_userdir.html). - -**Parameters**: - -* `overrides`: An [array][] of directive-types. - - Default: '[ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ]'. - -##### Class: `apache::mod::version` - -Installs [`mod_version`][] on many operating systems and Apache configurations. - -If Debian and Ubuntu systems with Apache 2.4 are classified with `apache::mod::version`, Puppet warns that `mod_version` is built-in and can't be loaded. - -##### Class: `apache::mod::security` - -Installs and configures Trustwave's [`mod_security`][]. It is enabled and runs by default on all virtual hosts. - -**Parameters**: - -* `activated_rules`: An [array][] of rules from the `modsec_crs_path` or absolute to activate via symlinks. -* `allowed_methods`: A space*separated list of allowed HTTP methods. - - Default: 'GET HEAD POST OPTIONS'. - -* `content_types`: A list of one or more allowed [MIME types][MIME `content*type`]. - - Default: 'application/x*www*form*urlencoded|multipart/form*data|text/xml|application/xml|application/x*amf'. - -* `crs_package`: Names the package that installs CRS rules. - - Default: `modsec_crs_package` in [`apache::params`][]. - -* `manage_security_crs`: Manage security_crs.conf rules file. - - Default: `true`. - -* `modsec_dir`: Defines the path where Puppet installs the modsec configuration and activated rules links. - - Default: 'On', set by `modsec_dir` in [`apache::params`][]. -${modsec\_dir}/activated\_rules. - -* `modsec_secruleengine`: Configures the modsec rules engine. Values: 'On', 'Off', and 'DetectionOnly'. - - Default: `modsec_secruleengine` in [`apache::params`][]. - -* `restricted_extensions`: A space*separated list of prohibited file extensions. - - Default: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'. - -* `restricted_headers`: A list of restricted headers separated by slashes and spaces. - - Default: 'Proxy*Connection/ /Lock*Token/ /Content*Range/ /Translate/ /via/ /if/'. - -* `secdefaultaction`: Configures the Mode of Operation, Self-Contained ('deny') or Collaborative Detection ('pass'), for the OWASP ModSecurity Core Rule Set. - - Default: 'deny'. You can also set full values, such as "log,auditlog,deny,status:406,tag:'SLA 24/7'". - -* `secpcrematchlimit`: Sets the number for the match limit in the PCRE library. - - Default: 1500. - -* `secpcrematchlimitrecursion`: Sets the number for the match limit recursion in the PCRE library. - - Default: 1500. - -* `logroot`: Configures the location of audit and debug logs. - - Defaults to the Apache log directory (Redhat: `/var/log/httpd`, Debian: `/var/log/apache2`). - -* `audit_log_releavant_status`: Configures which response status code is to be considered relevant for the purpose of audit logging. - - Default: '^(?:5|4(?!04))'. - -* `audit_log_parts`: Sets the sections to be put in the [audit log][]. - - Default: 'ABIJDEFHZ'. - -* `anomaly_score_blocking`: Activates or deactivates the Collaborative Detection Blocking of the OWASP ModSecurity Core Rule Set. - - Default: 'off'. - -* `inbound_anomaly_threshold`: Sets the scoring threshold level of the inbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. - - Default: 5. - -* `outbound_anomaly_threshold`: Sets the scoring threshold level of the outbound blocking rules for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. - - Default: 4. - -* `critical_anomaly_score`: Sets the scoring points of the critical severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. - - Default: 5. - -* `error_anomaly_score`: Sets the scoring points of the error severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. - - Default: 4. - -* `warning_anomaly_score`: Sets the scoring points of the warning severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. - - Default: 3. - -* `notice_anomaly_score`: Sets the scoring points of the notice severity level for the Collaborative Detection Mode in the OWASP ModSecurity Core Rule Set. - -Default: 2. - -* `secrequestmaxnumargs`: Sets the Maximum number of arguments in the request. - - Default: 255. - -* `secrequestbodylimit`: Sets the maximum request body size ModSecurity accepts for buffering. - - Default: '13107200'. - -* `secrequestbodynofileslimit`: Sets the maximum request body size ModSecurity accepts for buffering, excluding the size of any files being transported in the request. - - Default: '131072'. - -* `secrequestbodyinmemorylimit`: Sets the maximum request body size that ModSecurity stores in memory. - - Default: '131072' - -##### Class: `apache::mod::wsgi` - -Enables Python support via [`mod_wsgi`][]. - -**Parameters**: - -* `mod_path`: Defines the path to the `mod_wsgi` shared object (`.so`) file. - - Default: `undef`. - - * If the `mod_path` parameter doesn't contain `/`, Puppet prefixes it with your operating system's default module path. Otherwise, Puppet follows it literally. - -* `package_name`: Names the package that installs `mod_wsgi`. - - Default: `undef`. - -* `wsgi_python_home`: Defines the [`WSGIPythonHome`][] directive, such as '/path/to/venv'. - - Values: A string specifying a path. - - Default: `undef`. - -* `wsgi_python_path`: Defines the [`WSGIPythonPath`][] directive, such as '/path/to/venv/site*packages'. - - Values: A string specifying a path. - - Default: `undef`. - -* `wsgi_restrict_embedded`: Defines the [`WSGIRestrictEmbedded`][] directive, such as 'On'. - -Values: On|Off|undef. - -Default: undef. - -* `wsgi_socket_prefix`: Defines the [`WSGISocketPrefix`][] directive, such as "\${APACHE\_RUN\_DIR}WSGI". - - Default: `wsgi_socket_prefix` in [`apache::params`][]. - -The class's parameters correspond to the module's directives. See the [module's documentation][`mod_wsgi`] for details. - -### Private Classes - -#### Class: `apache::confd::no_accf` - -Creates the `no-accf.conf` configuration file in `conf.d`, required by FreeBSD's Apache 2.4. - -#### Class: `apache::default_confd_files` - -Includes `conf.d` files for FreeBSD. - -#### Class: `apache::default_mods` - -Installs the Apache modules required to run the default configuration. See the `apache` class's [`default_mods`][] parameter for details. - -#### Class: `apache::package` - -Installs and configures basic Apache packages. - -#### Class: `apache::params` - -Manages Apache parameters for different operating systems. - -#### Class: `apache::service` - -Manages the Apache daemon. - -#### Class: `apache::version` - -Attempts to automatically detect the Apache version based on the operating system. - -### Public defined types - -#### Defined type: `apache::balancer` - -Creates an Apache load balancing group, also known as a balancer cluster, using [`mod_proxy`][]. Each load balancing group needs one or more balancer members, which you can declare in Puppet with the [`apache::balancermember`][] defined type. - -Declare one `apache::balancer` defined type for each Apache load balancing group. You can export `apache::balancermember` defined types for all balancer members and collect them on a single Apache load balancer server using [exported resources][]. - -**Parameters**: - -##### `name` - -Sets the title of the balancer cluster and name of the `conf.d` file containing its configuration. - -##### `proxy_set` - -Configures key-value pairs as [`ProxySet`][] lines. Values: a [hash][]. - -Default: '{}'. - -##### `collect_exported` - -Determines whether to use [exported resources][]. - -If you statically declare all of your backend servers, set this parameter to `false` to rely on existing, declared balancer member resources. Also, use `apache::balancermember` with [array][] arguments. - -To dynamically declare backend servers via exported resources collected on a central node, set this parameter to `true` to collect the balancer member resources exported by the balancer member nodes. - -If you don't use exported resources, a single Puppet run configures all balancer members. If you use exported resources, Puppet has to run on the balanced nodes first, then run on the balancer. - -Boolean. - -Default: `true`. - -#### Defined type: `apache::balancermember` - -Defines members of [`mod_proxy_balancer`][], which sets up a balancer member inside a listening service configuration block in the load balancer's `apache.cfg`. - -**Parameters**: - -##### `balancer_cluster` - -**Required**. - -Sets the Apache service's instance name, and must match the name of a declared [`apache::balancer`][] resource. - -##### `url` - -Specifies the URL used to contact the balancer member server. - -Default: 'http://${::fqdn}/'. - -##### `options` - -Specifies an [array][] of [options](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember) after the URL, and accepts any key-value pairs available to [`ProxyPass`][]. - -Default: an empty array. - -#### Defined type: `apache::custom_config` - -Adds a custom configuration file to the Apache server's `conf.d` directory. If the file is invalid and this defined type's [`verify_config`][] parameter's value is `true`, Puppet throws an error during a Puppet run. - -**Parameters**: - -##### `ensure` - -Specifies whether the configuration file should be present. - -Values: 'absent', 'present'. - -Default: 'present'. - -##### `confdir` - -Sets the directory in which Puppet places configuration files. - -Default: the value of [`$::apache::confd_dir`][`confd_dir`]. - -##### `content` - -Sets the configuration file's content. The `content` and [`source`][] parameters are exclusive of each other. - -Default: `undef` - -##### `filename` - -Sets the name of the file under `confdir` in which Puppet stores the configuration. - -Default: Filename generated from the `priority` parameter and the resource name. - -##### `priority` - -Sets the configuration file's priority by prefixing its filename with this parameter's numeric value, as Apache processes configuration files in alphanumeric order. - -To omit the priority prefix in the configuration file's name, set this parameter to `false`. - -Default: '25'. - -##### `source` - -Points to the configuration file's source. The [`content`][] and `source` parameters are exclusive of each other. - -Default: `undef` - -##### `verify_command` - -Specifies the command Puppet uses to verify the configuration file. Use a fully qualified command. - -This parameter is used only if the [`verify_config`][] parameter's value is `true`. If the `verify_command` fails, the Puppet run deletes the configuration file and raises an error, but does not notify the Apache service. - -Default: '/usr/sbin/apachectl -t'. - -##### `verify_config` - -Specifies whether to validate the configuration file before notifying the Apache service. - -Boolean. - -Default: `true`. - -#### Defined type: `apache::fastcgi::server` - -Defines one or more external FastCGI servers to handle specific file types. Use this defined type with [`mod_fastcgi`][FastCGI]. - -**Parameters** - -##### `host` - -Determines the FastCGI's hostname or IP address and TCP port number (1-65535). - -Default: '127.0.0.1:9000'. - -##### `timeout` - -Sets the number of seconds a [FastCGI][] application can be inactive before aborting the request and logging the event at the error LogLevel. The inactivity timer applies only as long as a connection is pending with the FastCGI application. If a request is queued to an application, but the application doesn't respond by writing and flushing within this period, the request is aborted. If communication is complete with the application but incomplete with the client (the response is buffered), the timeout does not apply. - -Default: 15. - -##### `flush` - -Forces [`mod_fastcgi`][FastCGI] to write to the client as data is received from the application. By default, `mod_fastcgi` buffers data in order to free the application as quickly as possible. - -Default: `false`. - -##### `faux_path` - -Apache has [FastCGI][] handle URIs that resolve to this filename. The path set in this parameter does not have to exist in the local filesystem. - -Default: "/var/www/${name}.fcgi". - -##### `alias` - -Internally links actions with the FastCGI server. This alias must be unique. - -Default: "/${name}.fcgi". - -##### `file_type` - -Sets the [MIME `content-type`][] of the file to be processed by the FastCGI server. - -Default: 'application/x-httpd-php'. - -#### Defined type: `apache::listen` - -Adds [`Listen`][] directives to `ports.conf` in the Apache configuration directory that define the Apache server's or a virtual host's listening address and port. The [`apache::vhost`][] class uses this defined type, and titles take the form ``, `:`, or `:`. - -#### Defined type: `apache::mod` - -Installs packages for an Apache module that doesn't have a corresponding [`apache::mod::`][] class, and checks for or places the module's default configuration files in the Apache server's `module` and `enable` directories. The default locations depend on your operating system. - -**Parameters**: - -##### `package` - -**Required**. - -Names the package Puppet uses to install the Apache module. - -Default: `undef`. - -##### `package_ensure` - -Determines whether Puppet ensures the Apache module should be installed. - -Values: 'absent', 'present'. - -Default: 'present'. - -##### `lib` - -Defines the module's shared object name. Do not configure manually without special reason. - -Default: `mod_$name.so`. - -##### `lib_path` - -Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The [`path`][] parameter overrides this value. - -Default: The `apache` class's [`lib_path`][] parameter. - - -##### `loadfile_name` - -Sets the filename for the module's [`LoadFile`][] directive, which can also set the module load order as Apache processes them in alphanumeric order. - -Values: Filenames formatted `\*.load`. - -Default: the resource's name followed by 'load', as in '$name.load'. - -##### `loadfiles` - -Specifies an array of [`LoadFile`][] directives. - -Default: `undef`. - -##### `path` - -Specifies a path to the module. Do not manually set this parameter without a special reason. - -Default: [`lib_path`][]/[`lib`][]. - -#### Defined type: `apache::namevirtualhost` - -Enables [name-based virtual hosts][] and adds all related directives to the `ports.conf` file in the Apache HTTPD configuration directory. Titles can take the forms '\*', '\*:\', '\_default\_:\, '\', or '\:\'. - -#### Defined type: `apache::vhost` - -The apache module allows a lot of flexibility in the setup and configuration of virtual hosts. This flexibility is due, in part, to `vhost` being a defined resource type, which allows Apache to evaluate it multiple times with different parameters. - -The `apache::vhost` defined type allows you to have specialized configurations for virtual hosts that have requirements outside the defaults. You can set up a default virtual host within the base `::apache` class, as well as set a customized virtual host as the default. Customized virtual hosts have a lower numeric [`priority`][] than the base class's, causing Apache to process the customized virtual host first. - -The `apache::vhost` defined type uses `concat::fragment` to build the configuration file. To inject custom fragments for pieces of the configuration that the defined type doesn't inherently support, add a custom fragment. - -For the custom fragment's `order` parameter, the `apache::vhost` defined type uses multiples of 10, so any `order` that isn't a multiple of 10 should work. - -> **Note:** When creating an `apache::vhost`, it cannot be named `default` or `default-ssl`, because vhosts with these titles are always managed by the module. This means that you cannot override `Apache::Vhost['default']` or `Apache::Vhost['default-ssl]` resources. An optional workaround is to create a vhost named something else, such as `my default`, and ensure that the `default` and `default_ssl` vhosts are set to `false`: - -``` -class { 'apache': - default_vhost => false - default_ssl_vhost => false, -} -``` - -**Parameters**: - -##### `access_log` - -Determines whether to configure `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`). - -Boolean. - -Default: `true`. - -##### `access_log_env_var` - -Specifies that only requests with particular environment variables be logged. - -Default: `undef`. - -##### `access_log_file` - -Sets the filename of the `*_access.log` placed in [`logroot`][]. Given a virtual host---for instance, example.com---it defaults to 'example.com_ssl.log' for [SSL-encrypted][SSL encryption] virtual hosts and 'example.com_access.log' for unencrypted virtual hosts. - -Default: `false`. - -##### `access_log_format` - -Specifies the use of either a [`LogFormat`][] nickname or a custom-formatted string for the access log. - -Default: 'combined'. - -##### `access_log_pipe` - -Specifies a pipe where Apache sends access log messages. - -Default: `undef`. - -##### `access_log_syslog` - -Sends all access log messages to syslog. - -Default: `undef`. - -##### `add_default_charset` - -Sets a default media charset value for the [`AddDefaultCharset`][] directive, which is added to `text/plain` and `text/html` responses. - -Default: `undef`. - -##### `add_listen` - -Determines whether the virtual host creates a [`Listen`][] statement. - -Setting `add_listen` to `false` prevents the virtual host from creating a `Listen` statement. This is important when combining virtual hosts that aren't passed an `ip` parameter with those that are. - -Boolean. - -Default: `true`. - -##### `use_optional_includes` - -Specifies whether Apache uses the [`IncludeOptional`][] directive instead of [`Include`][] for `additional_includes` in Apache 2.4 or newer. - -Boolean. - -Default: `false`. - -##### `additional_includes` - -Specifies paths to additional static, virtual host-specific Apache configuration files. You can use this parameter to implement a unique, custom configuration not supported by this module. - -Values: a string or [array][] of strings specifying paths. - -Default: an empty array. - -##### `aliases` - -Passes a list of [hashes][hash] to the virtual host to create [`Alias`][], [`AliasMatch`][], [`ScriptAlias`][] or [`ScriptAliasMatch`][] directives as per the [`mod_alias`][] documentation. - -For example: - -``` puppet -aliases => [ - { aliasmatch => '^/image/(.*)\.jpg$', - path => '/files/jpg.images/$1.jpg', - }, - { alias => '/image', - path => '/ftp/pub/image', - }, - { scriptaliasmatch => '^/cgi-bin(.*)', - path => '/usr/local/share/cgi-bin$1', - }, - { scriptalias => '/nagios/cgi-bin/', - path => '/usr/lib/nagios/cgi-bin/', - }, - { alias => '/nagios', - path => '/usr/share/nagios/html', - }, -], -``` - -For the `alias`, `aliasmatch`, `scriptalias` and `scriptaliasmatch` keys to work, each needs a corresponding context, such as `` or ``. Puppet creates the directives in the order specified in the `aliases` parameter. As described in the [`mod_alias`][] documentation, add more specific `alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters before the more general ones to avoid shadowing. - -> **Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because you can precisely control the order of various alias directives. Defining `ScriptAliases` using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after *all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias` directives. This often causes problems; for example, this could cause problems with Nagios. - -If [`apache::mod::passenger`][] is loaded and `PassengerHighPerformance` is `true`, the `Alias` directive might not be able to honor the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details. - -##### `allow_encoded_slashes` - -Sets the [`AllowEncodedSlashes`][] declaration for the virtual host, overriding the server default. This modifies the virtual host responses to URLs with `\` and `/` characters. Values: 'nodecode', 'off', 'on'. The default setting omits the declaration from the server configuration and selects the Apache default setting of 'Off'. - -Default: `undef` - -##### `block` - -Specifies the list of things to which Apache blocks access. Valid option: 'scm', which blocks web access to `.svn`, `.git`, and `.bzr` directories. - -Default: an empty [array][]. - -##### `cas_attribute_prefix` - -Adds a header with the value of this header being the attribute values when SAML validation is enabled. - -Defaults: The value set by [`apache::mod::auth_cas`][]. - -##### `cas_attribute_delimiter` - -Sets the delimiter between attribute values in the header created by `cas_attribute_prefix`. - -Default: The value set by [`apache::mod::auth_cas`][]. - -##### `cas_login_url` - -Sets the URL to which the module redirects users when they attempt to access a CAS-protected resource and -don't have an active session. - -Default: The value set by [`apache::mod::auth_cas`][]. - -##### `cas_scrub_request_headers` - -Remove inbound request headers that may have special meaning within mod_auth_cas. - -Default: The value set by [`apache::mod::auth_cas`][]. - -##### `cas_sso_enabled` - -Enables experimental support for single sign out (may mangle POST data). - -Default: The value set by [`apache::mod::auth_cas`][]. - -##### `cas_validate_saml` - -Parse response from CAS server for SAML. - -Default: The value set by [`apache::mod::auth_cas`][]. - -##### `cas_validate_url` - -Sets the URL to use when validating a client-presented ticket in an HTTP query string. - -Defaults to the value set by [`apache::mod::auth_cas`][]. - -##### `custom_fragment` - -Passes a string of custom configuration directives to place at the end of the virtual host configuration. - -Default: `undef`. - -##### `default_vhost` - -Sets a given `apache::vhost` defined type as the default to serve requests that do not match any other `apache::vhost` defined types. - -Default: `false`. - -##### `directories` - -See the [`directories`](#parameter-directories-for-apachevhost) section. - -##### `directoryindex` - -Sets the list of resources to look for when a client requests an index of the directory by specifying a '/' at the end of the directory name. See the [`DirectoryIndex`][] directive documentation for details. - -Default: `undef`. - -##### `docroot` - -**Required**. - -Sets the [`DocumentRoot`][] location, from which Apache serves files. - -If `docroot` and [`manage_docroot`][] are both set to `false`, no [`DocumentRoot`][] will be set and the accompanying `` block will not be created. - -Values: A string specifying a directory path. - -##### `docroot_group` - -Sets group access to the [`docroot`][] directory. - -Values: A string specifying a system group. - -Default: 'root'. - -##### `docroot_owner` - -Sets individual user access to the [`docroot`][] directory. - -Values: A string specifying a user account. - -Default: 'root'. - -##### `docroot_mode` - -Sets access permissions for the [`docroot`][] directory, in numeric notation. - -Values: A string. - -Default: `undef`. - -##### `manage_docroot` - -Determines whether Puppet manages the [`docroot`][] directory. - -Boolean. - -Default: `true`. - -##### `error_log` - -Specifies whether `*_error.log` directives should be configured. - -Boolean. - -Default: `true`. - -##### `error_log_file` - -Points the virtual host's error logs to a `*_error.log` file. If this parameter is undefined, Puppet checks for values in [`error_log_pipe`][], then [`error_log_syslog`][]. - -If none of these parameters is set, given a virtual host `example.com`, Puppet defaults to '$logroot/example.com_error_ssl.log' for SSL virtual hosts and '$logroot/example.com_error.log' for non-SSL virtual hosts. - -Default: `undef`. - -##### `error_log_pipe` - -Specifies a pipe to send error log messages to. - -This parameter has no effect if the [`error_log_file`][] parameter has a value. If neither this parameter nor `error_log_file` has a value, Puppet then checks [`error_log_syslog`][]. - -Default: `undef`. - -##### `error_log_syslog` - -Determines whether to send all error log messages to syslog. - -This parameter has no effect if either of the [`error_log_file`][] or [`error_log_pipe`][] parameters has a value. If none of these parameters has a value, given a virtual host `example.com`, Puppet defaults to '$logroot/example.com_error_ssl.log' for SSL virtual hosts and '$logroot/example.com_error.log' for non-SSL virtual hosts. - -Boolean. - -Default: `undef`. - -##### `error_documents` - -A list of hashes which can be used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for this virtual host. - -For example: - -``` puppet -apache::vhost { 'sample.example.net': - error_documents => [ - { 'error_code' => '503', 'document' => '/service-unavail' }, - { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' }, - ], -} -``` - -Default: '[]'. - -##### `ensure` - -Specifies if the virtual host is present or absent. - -Values: 'absent', 'present'. - -Default: 'present'. - -##### `fallbackresource` - -Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) directive, which specifies an action to take for any URL that doesn't map to anything in your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Values must either begin with a '/' or be 'disabled'. - -Default: `undef`. - -#####`fastcgi_idle_timeout` - -If using fastcgi, this option sets the timeout for the server to respond. - -Default: `undef`. - -##### `file_e_tag` - -Sets the server default for the [`FileETag`][] declaration, which modifies the response header field for static files. - -Values: 'INode', 'MTime', 'Size', 'All', 'None'. - -Default: `undef`, which uses Apache's default setting of 'MTime Size'. - -##### `filters` - -[Filters](https://httpd.apache.org/docs/current/mod/mod_filter.html) enable smart, context-sensitive configuration of output content filters. - -``` puppet -apache::vhost { "$::fqdn": - filters => [ - 'FilterDeclare COMPRESS', - 'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/html', - 'FilterChain COMPRESS', - 'FilterProtocol COMPRESS DEFLATE change=yes;byteranges=no', - ], -} -``` - -##### `force_type` - -Sets the [`ForceType`][] directive, which forces Apache to serve all matching files with a [MIME `content-type`][] matching this parameter's value. - -#### `add_charset` - -Lets Apache set custom content character sets per directory and/or file extension - -##### `headers` - -Adds lines to replace, merge, or remove response headers. See [Apache's mod_headers documentation](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information. - -Values: A string or an array of strings. - -Default: `undef`. - -##### `ip` - -Sets the IP address the virtual host listens on. By default, uses Apache's default behavior of listening on all IPs. - -Values: A string or an array of strings. - -Default: `undef`. - -##### `ip_based` - -Enables an [IP-based](https://httpd.apache.org/docs/current/vhosts/ip-based.html) virtual host. This parameter inhibits the creation of a NameVirtualHost directive, since those are used to funnel requests to name-based virtual hosts. - -Default: `false`. - -##### `itk` - -Configures [ITK](http://mpm-itk.sesse.net/) in a hash. - -Usage typically looks something like: - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - itk => { - user => 'someuser', - group => 'somegroup', - }, -} -``` - -Values: a hash, which can include the keys: - -* user + group -* `assignuseridexpr` -* `assigngroupidexpr` -* `maxclientvhost` -* `nice` -* `limituidrange` (Linux 3.5.0 or newer) -* `limitgidrange` (Linux 3.5.0 or newer) - -Usage typically looks like: - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - itk => { - user => 'someuser', - group => 'somegroup', - }, -} -``` - -Default: `undef`. - -##### `jk_mounts` - -Sets up a virtual host with 'JkMount' and 'JkUnMount' directives to handle the paths for URL mapping between Tomcat and Apache. - -The parameter must be an array of hashes where each hash must contain the 'worker' and either the 'mount' or 'unmount' keys. - -Usage typically looks like: - -``` puppet -apache::vhost { 'sample.example.net': - jk_mounts => [ - { mount => '/*', worker => 'tcnode1', }, - { unmount => '/*.jpg', worker => 'tcnode1', }, - ], -} -``` -Default: `undef`. - -##### `keepalive` - -Determines whether to enable persistent HTTP connections with the [`KeepAlive`][] directive for the virtual host. By default, the global, server-wide [`KeepAlive`][] setting is in effect. - -Use the `keepalive_timeout` and `max_keepalive_requests` parameters to set relevant options for the virtual host. - -Values: 'Off', 'On'. - -Default: `undef` - -##### `keepalive_timeout` - -Sets the [`KeepAliveTimeout`] directive for the virtual host, which determines the amount of time to wait for subsequent requests on a persistent HTTP connection. By default, the global, server-wide [`KeepAlive`][] setting is in effect. - -This parameter is only relevant if either the global, server-wide [`keepalive` parameter][] or the per-vhost `keepalive` parameter is enabled. - -Default: `undef` - -##### `max_keepalive_requests` - -Limits the number of requests allowed per connection to the virtual host. By default, the global, server-wide [`KeepAlive`][] setting is in effect. - -This parameter is only relevant if either the global, server-wide [`keepalive` parameter][] or the per-vhost `keepalive` parameter is enabled. - -Default: `undef`. - -##### `auth_kerb` - -Enable [`mod_auth_kerb`][] parameters for a virtual host. - -Usage typically looks like: - -``` puppet -apache::vhost { 'sample.example.net': - auth_kerb => `true`, - krb_method_negotiate => 'on', - krb_auth_realms => ['EXAMPLE.ORG'], - krb_local_user_mapping => 'on', - directories => { - path => '/var/www/html', - auth_name => 'Kerberos Login', - auth_type => 'Kerberos', - auth_require => 'valid-user', - }, -} -``` - -Related parameters follow the names of `mod_auth_kerb` directives: - -- `krb_method_negotiate`: Determines whether to use the Negotiate method. Default: 'on'. -- `krb_method_k5passwd`: Determines whether to use password-based authentication for Kerberos v5. Default: 'on'. -- `krb_authoritative`: If set to 'off', authentication controls can be passed on to another module. Default: 'on'. -- `krb_auth_realms`: Specifies an array of Kerberos realms to use for authentication. Default: '[]'. -- `krb_5keytab`: Specifies the Kerberos v5 keytab file's location. Default: `undef`. -- `krb_local_user_mapping`: Strips @REALM from usernames for further use. Default: `undef`. - -Boolean. - -Default: `false`. - -##### `krb_verify_kdc` - -This option can be used to disable the verification tickets against local keytab to prevent KDC spoofing attacks. - -Default: 'on'. - -##### `krb_servicename` - -Specifies the service name that will be used by Apache for authentication. Corresponding key of this name must be stored in the keytab. - -Default: 'HTTP'. - -##### `krb_save_credentials` - -This option enables credential saving functionality. - -Default is 'off' - -##### `logroot` - -Specifies the location of the virtual host's logfiles. - -Default: '/var/log//'. - -##### `$logroot_ensure` - -Determines whether or not to remove the logroot directory for a virtual host. - -Values: 'directory', 'absent'. - -Default: 'directory'. - -##### `logroot_mode` - -Overrides the mode the logroot directory is set to. Do *not* grant write access to the directory the logs are stored in without being aware of the consequences; for more information, see [Apache's log security documentation](https://httpd.apache.org/docs/2.4/logs.html#security). - -Default: `undef`. - -##### `logroot_owner` - -Sets individual user access to the logroot directory. - -Defaults to `undef`. - -##### `logroot_group` - -Sets group access to the [`logroot`][] directory. - -Defaults to `undef`. - -##### `log_level` - -Specifies the verbosity of the error log. - -Values: 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info' or 'debug'. - -Default: 'warn' for the global server configuration. Can be overridden on a per-virtual host basis. - -###### `modsec_body_limit` - -Configures the maximum request body size (in bytes) ModSecurity accepts for buffering. - -Values: An integer. - -Default: `undef`. - -###### `modsec_disable_vhost` - -Disables [`mod_security`][] on a virtual host. Only valid if [`apache::mod::security`][] is included. - -Boolean. - -Default: `undef`. - -###### `modsec_disable_ids` - -Removes `mod_security` IDs from the virtual host. - -Values: An array of `mod_security` IDs to remove from the virtual host. Also takes a hash allowing removal of an ID from a specific location. - -``` puppet -apache::vhost { 'sample.example.net': - modsec_disable_ids => [ 90015, 90016 ], -} -``` - -``` puppet -apache::vhost { 'sample.example.net': - modsec_disable_ids => { '/location1' => [ 90015, 90016 ] }, -} -``` - -Default: `undef`. - -###### `modsec_disable_ips` - -Specifies an array of IP addresses to exclude from [`mod_security`][] rule matching. - -Default: `undef`. - -###### `modsec_disable_msgs` - -Array of mod_security Msgs to remove from the virtual host. Also takes a hash allowing removal of an Msg from a specific location. - -``` puppet -apache::vhost { 'sample.example.net': - modsec_disable_msgs => [ 'Blind SQL Injection Attack', 'Session Fixation Attack' ], -} -``` - -``` puppet -apache::vhost { 'sample.example.net': - modsec_disable_msgs => { '/location1' => [ 'Blind SQL Injection Attack', 'Session Fixation Attack' ] }, -} -``` - -Default: `undef`. - -###### `modsec_disable_tags` - -Array of mod_security Tags to remove from the virtual host. Also takes a hash allowing removal of an Tag from a specific location. - -``` puppet -apache::vhost { 'sample.example.net': - modsec_disable_tags => [ 'WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS' ], -} -``` - -``` puppet -apache::vhost { 'sample.example.net': - modsec_disable_tags => { '/location1' => [ 'WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS' ] }, -} -``` - -Default: `undef`. - -##### `modsec_audit*` - -* `modsec_audit_log` -* `modsec_audit_log_file` -* `modsec_audit_log_pipe` - -These three parameters together determine how to send `mod_security` audit log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)). - -* If `modsec_audit_log_file` is set, it is relative to [`logroot`][]. - - Default: `undef`. - -* If `modsec_audit_log_pipe` is set, it should start with a pipe. Example '|/path/to/mlogc /path/to/mlogc.conf'. - - Default: `undef`. - -* If `modsec_audit_log` is `true`, given a virtual host---for instance, example.com---it defaults to 'example.com\_security\_ssl.log' for [SSL-encrypted][SSL encryption] virtual hosts and 'example.com\_security.log' for unencrypted virtual hosts. - - Default: `false`. - -If none of those parameters are set, the global audit log is used (''/var/log/httpd/modsec\_audit.log''; Debian and derivatives: ''/var/log/apache2/modsec\_audit.log''; others: ). - -##### `no_proxy_uris` - -Specifies URLs you do not want to proxy. This parameter is meant to be used in combination with [`proxy_dest`](#proxy_dest). - -Default: []. - -##### `no_proxy_uris_match` - -This directive is equivalent to [`no_proxy_uris`][], but takes regular expressions. - -Default: []. - -##### `proxy_preserve_host` - -Sets the [ProxyPreserveHost Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost). - -Setting this parameter to `true` enables the `Host:` line from an incoming request to be proxied to the host instead of hostname. Setting it to `false` sets this directive to 'Off'. - -Boolean. - -Default: `false`. - -##### `proxy_add_headers` - -Sets the [ProxyAddHeaders Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders). - -This parameter controlls whether proxy-related HTTP headers (X-Forwarded-For, X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server. - -Boolean. - -Default: `false`. - -##### `proxy_error_override` - -Sets the [ProxyErrorOverride Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride). This directive controls whether Apache should override error pages for proxied content. - -Boolean. - -Default: `false`. - -##### `options` - -Sets the [`Options`][] for the specified virtual host. For example: - -``` puppet -apache::vhost { 'site.name.fdqn': - … - options => ['Indexes','FollowSymLinks','MultiViews'], -} -``` - -> **Note**: If you use the [`directories`][] parameter of [`apache::vhost`][], 'Options', 'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`. - -Default: ['Indexes','FollowSymLinks','MultiViews'], - -##### `override` - -Sets the overrides for the specified virtual host. Accepts an array of [AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments. - -Default: '[none]'. - -##### `passenger_spawn_method` - -Sets [PassengerSpawnMethod](https://www.phusionpassenger.com/library/config/apache/reference/#passengerspawnmethod), whether Passenger spawns applications directly, or using a prefork copy-on-write mechanism. - -Valid options: `smart` or `direct`. - -Default: `undef`. - -##### `passenger_app_root` - -Sets [PassengerRoot](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapproot), the location of the Passenger application root if different from the DocumentRoot. - -Values: A string specifying a path. - -Default: `undef`. - -##### `passenger_app_env` - -Sets [PassengerAppEnv](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappenv), the environment for the Passenger application. If not specified, defaults to the global setting or 'production'. - -Values: A string specifying the name of the environment. - -Default: `undef`. - -##### `passenger_log_file` - -By default, Passenger log messages are written to the Apache global error log. With [PassengerLogFile](https://www.phusionpassenger.com/library/config/apache/reference/#passengerlogfile), you can configure those messages to be logged to a different file. This option is only available since Passenger 5.0.5. - -Values: A string specifying a path. - -Default: `undef`. - -##### `passenger_log_level` - -This option allows to specify how much information should be written to the log file. If not set, [PassengerLogLevel](https://www.phusionpassenger.com/library/config/apache/reference/#passengerloglevel) will not show up in the configuration file and the defaults are used. - -Default: Passenger versions less than 3.0.0: '0'; 5.0.0 and later: '3'. - -##### `passenger_ruby` - -Sets [PassengerRuby](https://www.phusionpassenger.com/library/config/apache/reference/#passengerruby), the Ruby interpreter to use for the application, on this virtual host. - -Default: `undef`. - -##### `passenger_min_instances` - -Sets [PassengerMinInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermininstances), the minimum number of application processes to run. - -##### `passenger_max_requests` - -Sets [PassengerMaxRequests](https://www.phusionpassenger.com/library/config/apache/reference/#pas -sengermaxrequests), the maximum number of requests an application process will process. - -##### `passenger_max_instances_per_app` - -Sets [PassengerMaxInstancesPerApp](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxinstancesperapp), the maximum number of application processes that may simultaneously exist for a single application. - -Default: `undef`. - -##### `passenger_start_timeout` - -Sets [PassengerStartTimeout](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstarttimeout), the timeout for the application startup. - -##### `passenger_pre_start` - -Sets [PassengerPreStart](https://www.phusionpassenger.com/library/config/apache/reference/#passengerprestart), the URL of the application if pre-starting is required. - -##### `passenger_user` - -Sets [PassengerUser](https://www.phusionpassenger.com/library/config/apache/reference/#passengeruser), the running user for sandboxing applications. - -##### `passenger_high_performance` - -Sets the [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance) parameter. - -Values: `true`, `false`. - -Default: `undef`. - -##### `passenger_nodejs` - -Sets the [`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#passengernodejs), the NodeJS interpreter to use for the application, on this virtual host. - -##### `passenger_sticky_sessions` - -Sets the [`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessions) parameter. - -Boolean. - -Default: `undef`. - -##### `passenger_startup_file` - -Sets the [`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstartupfile) path. This path is relative to the application root. - -##### `php_flags & values` - -Allows per-virtual host setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application. - -Default: '{}'. - -##### `php_admin_flags & values` - -Allows per-virtual host setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application. - -Default: '{}'. - -##### `port` - -Sets the port the host is configured on. The module's defaults ensure the host listens on port 80 for non-SSL virtual hosts and port 443 for SSL virtual hosts. The host only listens on the port set in this parameter. - -##### `priority` - -Sets the relative load-order for Apache HTTPD VirtualHost configuration files. - -If nothing matches the priority, the first name-based virtual host is used. Likewise, passing a higher priority causes the alphabetically first name-based virtual host to be used if no other names match. - -> **Note:** You should not need to use this parameter. However, if you do use it, be aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'. - -To omit the priority prefix in file names, pass a priority of `false`. - -Default: '25'. - -##### `proxy_dest` - -Specifies the destination address of a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. - -Default: `undef`. - -##### `proxy_pass` - -Specifies an array of `path => URI` values for a [ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Optionally, parameters can be added as an array. - -Default: `undef`. - -``` puppet -apache::vhost { 'site.name.fdqn': - … - proxy_pass => [ - { 'path' => '/a', 'url' => 'http://backend-a/' }, - { 'path' => '/b', 'url' => 'http://backend-b/' }, - { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300}}, - { 'path' => '/l', 'url' => 'http://backend-xy', - 'reverse_urls' => ['http://backend-x', 'http://backend-y'] }, - { 'path' => '/d', 'url' => 'http://backend-a/d', - 'params' => { 'retry' => '0', 'timeout' => '5' }, }, - { 'path' => '/e', 'url' => 'http://backend-a/e', - 'keywords' => ['nocanon', 'interpolate'] }, - { 'path' => '/f', 'url' => 'http://backend-f/', - 'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']}, - { 'path' => '/g', 'url' => 'http://backend-g/', - 'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], }, - { 'path' => '/h', 'url' => 'http://backend-h/h', - 'no_proxy_uris' => ['/h/admin', '/h/server-status'] }, - ], -} -``` - -* `reverse_urls`. *Optional.* This setting is useful when used with `mod_proxy_balancer`. Values: an array or string. -* `reverse_cookies`. *Optional.* Sets `ProxyPassReverseCookiePath` and `ProxyPassReverseCookieDomain`. -* `params`. *Optional.* Allows for ProxyPass key-value parameters, such as connection settings. -* `setenv`. *Optional.* Sets [environment variables](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings) for the proxy directive. Values: array. - -##### `proxy_dest_match` - -This directive is equivalent to [`proxy_dest`][], but takes regular expressions, see [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) for details. - -##### `proxy_dest_reverse_match` - -Allows you to pass a ProxyPassReverse if [`proxy_dest_match`][] is specified. See [ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse) for details. - -##### `proxy_pass_match` - -This directive is equivalent to [`proxy_pass`][], but takes regular expressions, see [ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch) for details. - -##### `rack_base_uris` - -Specifies the resource identifiers for a rack configuration. The file paths specified are listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. - -Default: `undef`. - -#####`passenger_base_uris` - -Used to specify that the given URI is a Phusion Passenger-served application. The file paths specified are listed as passenger application roots for [Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI) in the _passenger_base_uris.erb template. - -Default: `undef`. - -##### `redirect_dest` - -Specifies the address to redirect to. - -Default: `undef`. - -##### `redirect_source` - -Specifies the source URIs that redirect to the destination specified in `redirect_dest`. If more than one item for redirect is supplied, the source and destination must be the same length, and the items are order-dependent. - -``` puppet -apache::vhost { 'site.name.fdqn': - … - redirect_source => ['/images','/downloads'], - redirect_dest => ['http://img.example.com/','http://downloads.example.com/'], -} -``` - -##### `redirect_status` - -Specifies the status to append to the redirect. - -Default: `undef`. - -``` puppet -apache::vhost { 'site.name.fdqn': - … - redirect_status => ['temp','permanent'], -} -``` - -##### `redirectmatch_*` - -* `redirectmatch_regexp` -* `redirectmatch_status` -* `redirectmatch_dest` - -Determines which server status should be raised for a given regular expression and where to forward the user to. Entered as arrays. - -Default: `undef`. - -``` puppet -apache::vhost { 'site.name.fdqn': - … - redirectmatch_status => ['404','404'], - redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'], - redirectmatch_dest => ['http://www.example.com/1','http://www.example.com/2'], -} -``` - -##### `request_headers` - -Modifies collected [request headers](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, and so on. - -Default: `undef`. - -``` puppet -apache::vhost { 'site.name.fdqn': - … - request_headers => [ - 'append MirrorID "mirror 12"', - 'unset MirrorID', - ], -} -``` - -##### `rewrites` - -Creates URL rewrite rules. Expects an array of hashes. - -Values: Hash keys that are any of 'comment', 'rewrite_base', 'rewrite_cond', 'rewrite_rule' or 'rewrite_map'. - -Default: `undef`. - -For example, you can specify that anyone trying to access index.html is served welcome.html - -``` puppet -apache::vhost { 'site.name.fdqn': - … - rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ] -} -``` - -The parameter allows rewrite conditions that, when `true`, execute the associated rule. For instance, if you wanted to rewrite URLs only if the visitor is using IE - -``` puppet -apache::vhost { 'site.name.fdqn': - … - rewrites => [ - { - comment => 'redirect IE', - rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'], - rewrite_rule => ['^index\.html$ welcome.html'], - }, - ], -} -``` - -You can also apply multiple conditions. For instance, rewrite index.html to welcome.html only when the browser is Lynx or Mozilla (version 1 or 2) - -``` puppet -apache::vhost { 'site.name.fdqn': - … - rewrites => [ - { - comment => 'Lynx or Mozilla v1/2', - rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'], - rewrite_rule => ['^index\.html$ welcome.html'], - }, - ], -} -``` - -Multiple rewrites and conditions are also possible - -``` puppet -apache::vhost { 'site.name.fdqn': - … - rewrites => [ - { - comment => 'Lynx or Mozilla v1/2', - rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'], - rewrite_rule => ['^index\.html$ welcome.html'], - }, - { - comment => 'Internet Explorer', - rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'], - rewrite_rule => ['^index\.html$ /index.IE.html [L]'], - }, - { - rewrite_base => /apps/, - rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'], - }, - { comment => 'Rewrite to lower case', - rewrite_cond => ['%{REQUEST_URI} [A-Z]'], - rewrite_map => ['lc int:tolower'], - rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'], - }, - ], -} -``` - -Refer to the [`mod_rewrite` documentation][`mod_rewrite`] for more details on what is possible with rewrite rules and conditions. - -##### `rewrite_inherit` - -Determines whether the virtual host inherits global rewrite rules. - -Default: `false`. - -Rewrite rules may be specified globally (in `$conf_file` or `$confd_dir`) or inside the virtual host `.conf` file. By default, virtual hosts do not inherit global settings. To activate inheritance, specify the `rewrites` parameter and set `rewrite_inherit` parameter to `true`: - -``` puppet -apache::vhost { 'site.name.fdqn': - … - rewrites => [ - , - ], - rewrite_inherit => `true`, -} -``` - -> **Note**: The `rewrites` parameter is **required** for this to have effect - -Apache activates global `Rewrite` rules inheritance if the virtual host files contains the following directives: - -``` ApacheConf -RewriteEngine On -RewriteOptions Inherit -``` - -Refer to the [official `mod_rewrite` documentation](https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html), section "Rewriting in Virtual Hosts". - -##### `scriptalias` - -Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as '/usr/scripts'. - -Default: `undef`. - -##### `scriptaliases` - -> **Note**: This parameter is deprecated in favor of the `aliases` parameter. - -Passes an array of hashes to the virtual host to create either ScriptAlias or ScriptAliasMatch statements per the [`mod_alias` documentation][`mod_alias`]. - -``` puppet -scriptaliases => [ - { - alias => '/myscript', - path => '/usr/share/myscript', - }, - { - aliasmatch => '^/foo(.*)', - path => '/usr/share/fooscripts$1', - }, - { - aliasmatch => '^/bar/(.*)', - path => '/usr/share/bar/wrapper.sh/$1', - }, - { - alias => '/neatscript', - path => '/usr/share/neatscript', - }, -] -``` - -The ScriptAlias and ScriptAliasMatch directives are created in the order specified. As with [Alias and AliasMatch](#aliases) directives, specify more specific aliases before more general ones to avoid shadowing. - -##### `serveradmin` - -Specifies the email address Apache displays when it renders one of its error pages. - -Default: `undef`. - -##### `serveraliases` - -Sets the [ServerAliases](https://httpd.apache.org/docs/current/mod/core.html#serveralias) of the site. - -Default: '[]'. - -##### `servername` - -Sets the servername corresponding to the hostname you connect to the virtual host at. - -Default: the title of the resource. - -##### `setenv` - -Used by HTTPD to set environment variables for virtual hosts. - -Default: '[]'. - -Example: - -``` puppet -apache::vhost { 'setenv.example.com': - setenv => ['SPECIAL_PATH /foo/bin'], -} -``` - -##### `setenvif` - -Used by HTTPD to conditionally set environment variables for virtual hosts. - -Default: '[]'. - -##### `setenvifnocase` - -Used by HTTPD to conditionally set environment variables for virtual hosts (caseless matching). - -Default: '[]'. - -##### `suphp_*` - -* `suphp_addhandler` -* `suphp_configpath` -* `suphp_engine` - -Sets up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG). - -* `suphp_addhandler`. Default: 'php5-script' on RedHat and FreeBSD, and 'x-httpd-php' on Debian and Gentoo. -* `suphp_configpath`. Default: `undef` on RedHat and FreeBSD, and '/etc/php5/apache2' on Debian and Gentoo. -* `suphp_engine`. Values: 'on' or 'off'. Default: 'off'. - -An example virtual host configuration with suPHP: - -``` puppet -apache::vhost { 'suphp.example.com': - port => '80', - docroot => '/home/appuser/myphpapp', - suphp_addhandler => 'x-httpd-php', - suphp_engine => 'on', - suphp_configpath => '/etc/php5/apache2', - directories => { path => '/home/appuser/myphpapp', - 'suphp' => { user => 'myappuser', group => 'myappgroup' }, - } -} -``` - -##### `vhost_name` - -Enables name-based virtual hosting. If no IP is passed to the virtual host, but the virtual host is assigned a port, then the virtual host name is 'vhost_name:port'. If the virtual host has no assigned IP or port, the virtual host name is set to the title of the resource. - -Default: '*'. - -##### `virtual_docroot` - -Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. - -Default: `false`. - -``` puppet -apache::vhost { 'subdomain.loc': - vhost_name => '*', - port => '80', - virtual_docroot => '/var/www/%-2+', - docroot => '/var/www', - serveraliases => ['*.loc',], -} -``` - -##### `wsgi*` - -* `wsgi_daemon_process` -* `wsgi_daemon_process_options` -* `wsgi_process_group` -* `wsgi_script_aliases` -* `wsgi_pass_authorization` - -Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi). - -* `wsgi_daemon_process`: A hash that sets the name of the WSGI daemon, accepting [certain keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html). Default: `undef`. -* `wsgi_daemon_process_options`. _Optional._ Default: `undef`. -* `wsgi_process_group`: Sets the group ID that the virtual host runs under. Default: `undef`. -* `wsgi_script_aliases`: Requires a hash of web paths to filesystem .wsgi paths. Default: `undef`. -* `wsgi_script_aliases_match`: Requires a hash of web path regexes to filesystem .wsgi paths. Default: `undef` -* `wsgi_pass_authorization`: Uses the WSGI application to handle authorization instead of Apache when set to 'On'. For more information, see [mod_wsgi's WSGIPassAuthorization documentation] (https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html). Default: `undef`, leading Apache to use its default value of 'Off'. -* `wsgi_chunked_request`: Enables support for chunked requests. Default: `undef`. - -An example virtual host configuration with WSGI: - -``` puppet -apache::vhost { 'wsgi.example.com': - port => '80', - docroot => '/var/www/pythonapp', - wsgi_daemon_process => 'wsgi', - wsgi_daemon_process_options => - { processes => '2', - threads => '15', - display-name => '%{GROUP}', - }, - wsgi_process_group => 'wsgi', - wsgi_script_aliases => { '/' => '/var/www/demo.wsgi' }, - wsgi_chunked_request => 'On', -} -``` - -#### Parameter `directories` for `apache::vhost` - -The `directories` parameter within the `apache::vhost` class passes an array of hashes to the virtual host to create [Directory](https://httpd.apache.org/docs/current/mod/core.html#directory), [File](https://httpd.apache.org/docs/current/mod/core.html#files), and [Location](https://httpd.apache.org/docs/current/mod/core.html#location) directive blocks. These blocks take the form, '< Directory /path/to/directory>...< /Directory>'. - -The `path` key sets the path for the directory, files, and location blocks. Its value must be a path for the 'directory', 'files', and 'location' providers, or a regex for the 'directorymatch', 'filesmatch', or 'locationmatch' providers. Each hash passed to `directories` **must** contain `path` as one of the keys. - -The `provider` key is optional. If missing, this key defaults to 'directory'. Values: 'directory', 'files', 'proxy', 'location', 'directorymatch', 'filesmatch', 'proxymatch' or 'locationmatch'. If you set `provider` to 'directorymatch', it uses the keyword 'DirectoryMatch' in the Apache config file. - -An example use of `directories`: - -``` puppet -apache::vhost { 'files.example.net': - docroot => '/var/www/files', - directories => [ - { 'path' => '/var/www/files', - 'provider' => 'files', - 'deny' => 'from all', - }, - ], -} -``` - -> **Note:** At least one directory should match the `docroot` parameter. After you start declaring directories, `apache::vhost` assumes that all required Directory blocks will be declared. If not defined, a single default Directory block is created that matches the `docroot` parameter. - -Available handlers, represented as keys, should be placed within the `directory`, `files`, or `location` hashes. This looks like - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ { path => '/path/to/directory', handler => value } ], -} -``` - -Any handlers you do not set in these hashes are considered 'undefined' within Puppet and are not added to the virtual host, resulting in the module using their default values. Supported handlers are: - -##### `addhandlers` - -Sets [AddHandler](https://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension'] }`. - -An example: - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - addhandlers => [{ handler => 'cgi-script', extensions => ['.cgi']}], - }, - ], -} -``` - -##### `allow` - -Sets an [Allow](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - allow => 'from example.org', - }, - ], -} -``` - -##### `allow_override` - -Sets the types of directives allowed in [.htaccess](https://httpd.apache.org/docs/current/mod/core.html#allowoverride) files. Accepts an array. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - allow_override => ['AuthConfig', 'Indexes'], - }, - ], -} -``` - -##### `auth_basic_authoritative` - -Sets the value for [AuthBasicAuthoritative](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicauthoritative), which determines whether authorization and authentication are passed to lower level Apache modules. - -##### `auth_basic_fake` - -Sets the value for [AuthBasicFake](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicfake), which statically configures authorization credentials for a given directive block. - -##### `auth_basic_provider` - -Sets the value for [AuthBasicProvider](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicprovider), which sets the authentication provider for a given location. - -##### `auth_digest_algorithm` - -Sets the value for [AuthDigestAlgorithm](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestalgorithm), which selects the algorithm used to calculate the challenge and response hashes. - -###### `auth_digest_domain` - -Sets the value for [AuthDigestDomain](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestdomain), which allows you to specify one or more URIs in the same protection space for digest authentication. - -##### `auth_digest_nonce_lifetime` - -Sets the value for [AuthDigestNonceLifetime](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestnoncelifetime), which controls how long the server nonce is valid. - -##### `auth_digest_provider` - -Sets the value for [AuthDigestProvider](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestprovider), which sets the authentication provider for a given location. - -##### `auth_digest_qop` - -Sets the value for [AuthDigestQop](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestqop), which determines the quality-of-protection to use in digest authentication. - -##### `auth_digest_shmem_size` - -Sets the value for [AuthAuthDigestShmemSize](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestshmemsize), which defines the amount of shared memory allocated to the server for keeping track of clients. - -##### `auth_group_file` - -Sets the value for [AuthGroupFile](https://httpd.apache.org/docs/current/mod/mod_authz_groupfile.html#authgroupfile), which sets the name of the text file containing the list of user groups for authorization. - -##### `auth_name` - -Sets the value for [AuthName](https://httpd.apache.org/docs/current/mod/mod_authn_core.html#authname), which sets the name of the authorization realm. - -##### `auth_require` - -Sets the entity name you're requiring to allow access. Read more about [Require](https://httpd.apache.org/docs/current/mod/mod_authz_host.html#requiredirectives). - -##### `auth_type` - -Sets the value for [AuthType](https://httpd.apache.org/docs/current/mod/mod_authn_core.html#authtype), which guides the type of user authentication. - -##### `auth_user_file` - -Sets the value for [AuthUserFile](https://httpd.apache.org/docs/current/mod/mod_authn_file.html#authuserfile), which sets the name of the text file containing the users/passwords for authentication. - -##### `auth_merging` - -Sets the value for [AuthMerging](https://httpd.apache.org/docs/current/mod/mod_authz_core.html#authmerging), which determines if authorization logic should be combined - -##### `auth_ldap_url` - -Sets the value for [AuthLDAPURL](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapurl), which determines URL of LDAP-server(s) if AuthBasicProvider 'ldap' is used - -##### `auth_ldap_bind_dn` - -Sets the value for [AuthLDAPBindDN](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbinddn), which allows use of an optional DN used to bind to the LDAP-server when searching for entries if AuthBasicProvider 'ldap' is used. - -##### `auth_ldap_bind_password` - -Sets the value for [AuthLDAPBindPassword](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbindpassword), which allows use of an optional bind password to use in conjunction with the bind DN if AuthBasicProvider 'ldap' is used. - -##### `auth_ldap_group_attribute` - -Array of values for [AuthLDAPGroupAttribute](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattribute), specifies which LDAP attributes are used to check for user members within ldap-groups. - -Default: "member" and "uniquemember". - -##### `auth_ldap_group_attribute_is_dn` - -Sets value for [AuthLDAPGroupAttributeIsDN](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattributeisdn), specifies if member of a ldapgroup is a dn or simple username. When set on, this directive says to use the distinguished name of the client username when checking for group membership. Otherwise, the username will be used. valid values are: "on" or "off" - -##### `custom_fragment` - -Pass a string of custom configuration directives to be placed at the end of the directory configuration. - -``` puppet -apache::vhost { 'monitor': - … - directories => [ - { - path => '/path/to/directory', - custom_fragment => ' - - SetHandler balancer-manager - Order allow,deny - Allow from all - - - SetHandler server-status - Order allow,deny - Allow from all - -ProxyStatus On', - }, - ] -} -``` - -##### `dav` - -Sets the value for [Dav](http://httpd.apache.org/docs/current/mod/mod_dav.html#dav), which determines if the WebDAV HTTP methods should be enabled. The value can be either 'On', 'Off' or the name of the provider. A value of 'On' enables the default filesystem provider implemented by the `mod_dav_fs` module. - -##### `dav_depth_infinity` - -Sets the value for [DavDepthInfinity](http://httpd.apache.org/docs/current/mod/mod_dav.html#davdepthinfinity), which is used to enable the processing of `PROPFIND` requests having a `Depth: Infinity` header. - -##### `dav_min_timeout` - -Sets the value for [DavMinTimeout](http://httpd.apache.org/docs/current/mod/mod_dav.html#davmintimeout), which sets the time the server holds a lock on a DAV resource. The value should be the number of seconds to set. - -##### `deny` - -Sets a [Deny](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - deny => 'from example.org', - }, - ], -} -``` - -##### `error_documents` - -An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for the directory. - -``` puppet -apache::vhost { 'sample.example.net': - directories => [ - { path => '/srv/www', - error_documents => [ - { 'error_code' => '503', - 'document' => '/service-unavail', - }, - ], - }, - ], -} -``` - -##### `ext_filter_options` - -Sets the [ExtFilterOptions](https://httpd.apache.org/docs/current/mod/mod_ext_filter.html) directive. -Note that you must declare `class { 'apache::mod::ext_filter': }` before using this directive. - -``` puppet -apache::vhost { 'filter.example.org': - docroot => '/var/www/filter', - directories => [ - { path => '/var/www/filter', - ext_filter_options => 'LogStderr Onfail=abort', - }, - ], -} -``` - -##### `geoip_enable` - -Sets the [GeoIPEnable](http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Configuration) directive. -Note that you must declare `class {'apache::mod::geoip': }` before using this directive. - -``` puppet -apache::vhost { 'first.example.com': - docroot => '/var/www/first', - directories => [ - { path => '/var/www/first', - geoip_enable => `true`, - }, - ], -} -``` - -##### `headers` - -Adds lines for [Header](https://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => { - path => '/path/to/directory', - headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"', - }, -} -``` - -##### `index_options` - -Allows configuration settings for [directory indexing](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions). - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - directoryindex => 'disabled', # this is needed on Apache 2.4 or mod_autoindex doesn't work - options => ['Indexes','FollowSymLinks','MultiViews'], - index_options => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'], - }, - ], -} -``` - -##### `index_order_default` - -Sets the [default ordering](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexorderdefault) of the directory index. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - order => 'Allow,Deny', - index_order_default => ['Descending', 'Date'], - }, - ], -} -``` - -###### `index_style_sheet` - -Sets the [IndexStyleSheet](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexstylesheet), which adds a CSS stylesheet to the directory index. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - options => ['Indexes','FollowSymLinks','MultiViews'], - index_options => ['FancyIndexing'], - index_style_sheet => '/styles/style.css', - }, - ], -} -``` - -##### `limit` - -Creates a [Limit](https://httpd.apache.org/docs/current/mod/core.html#limit) block inside the Directory block, which can also contain `require` directives. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/docroot', - directories => [ - { path => '/', - provider => 'location', - limit => [ - { methods => 'GET HEAD', - require => ['valid-user'] - }, - ], - }, - ], -} -``` - -##### `limit_except` - -Creates a [LimitExcept](https://httpd.apache.org/docs/current/mod/core.html#limitexcept) block inside the Directory block, which can also contain `require` directives. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/docroot', - directories => [ - { path => '/', - provider => 'location', - limit_except => [ - { methods => 'GET HEAD', - require => ['valid-user'] - }, - ], - }, - ], -} -``` - -##### `mellon_enable` - -Sets the [MellonEnable][`mod_auth_mellon`] directory to enable [`mod_auth_mellon`][]. You can use [`apache::mod::auth_mellon`][] to install `mod_auth_mellon`. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/', - provider => 'directory', - mellon_enable => 'info', - mellon_sp_private_key_file => '/etc/certs/${::fqdn}.key', - mellon_endpoint_path => '/mellon', - mellon_set_env_no_prefix => { 'ADFS_GROUP' => 'http://schemas.xmlsoap.org/claims/Group', - 'ADFS_EMAIL' => 'http://schemas.xmlsoap.org/claims/EmailAddress', }, - mellon_user => 'ADFS_LOGIN', - }, - { path => '/protected', - provider => 'location', - mellon_enable => 'auth', - auth_type => 'Mellon', - auth_require => 'valid-user', - mellon_cond => ['ADFS_LOGIN userA [MAP]','ADFS_LOGIN userB [MAP]'], - }, - ] -} -``` - -Related parameters follow the names of `mod_auth_mellon` directives: - -- `mellon_cond`: Takes an array of mellon conditions that must be met to grant access, and creates a [MellonCond][`mod_auth_mellon`] directive for each item in the array. -- `mellon_endpoint_path`: Sets the [MellonEndpointPath][`mod_auth_mellon`] to set the mellon endpoint path. -- `mellon_sp_metadata_file`: Sets the [MellonSPMetadataFile][`mod_auth_mellon`] location of the SP metadata file. -- `mellon_idp_metadata_file`: Sets the [MellonIDPMetadataFile][`mod_auth_mellon`] location of the IDP metadata file. -- `mellon_saml_rsponse_dump`: Sets the [MellonSamlResponseDump][`mod_auth_mellon`] directive to enable debug of SAML. -- `mellon_set_env_no_prefix`: Sets the [MellonSetEnvNoPrefix][`mod_auth_mellon`] directive to a hash of attribute names to map -to environment variables. -- `mellon_sp_private_key_file`: Sets the [MellonSPPrivateKeyFile][`mod_auth_mellon`] directive for the private key location of the service provider. -- `mellon_sp_cert_file`: Sets the [MellonSPCertFile][`mod_auth_mellon`] directive for the public key location of the service provider. -- `mellon_user`: Sets the [MellonUser][`mod_auth_mellon`] attribute to use for the username. - -##### `options` - -Lists the [Options](https://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - options => ['Indexes','FollowSymLinks','MultiViews'], - }, - ], -} -``` - -##### `order` - -Sets the order of processing Allow and Deny statements as per [Apache core documentation](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It only works with Apache 2.2 and lower. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - order => 'Allow,Deny', - }, - ], -} -``` - -##### `passenger_enabled` - -Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directive to 'on' or 'off'. Requires `apache::mod::passenger` to be included. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - passenger_enabled => 'on', - }, - ], -} -``` - -> **Note:** There is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive. - -##### `php_value` and `php_flag` - -`php_value` sets the value of the directory, and `php_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php). - -##### `php_admin_value` and `php_admin_flag` - -`php_admin_value` sets the value of the directory, and `php_admin_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php). - - -##### `require` - - -Sets a `Require` directive as per the [Apache Authz documentation](https://httpd.apache.org/docs/current/mod/mod_authz_core.html#require). If no `require` is set, it will default to `Require all granted`. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - require => 'ip 10.17.42.23', - } - ], -} -``` - -When more complex sets of requirement are needed, apache >= 2.4 provides the use of [RequireAll](https://httpd.apache.org/docs/2.4/mod/mod_authz_core.html#requireall), [RequireNone](https://httpd.apache.org/docs/2.4/mod/mod_authz_core.html#requirenone) or [RequireAny](https://httpd.apache.org/docs/2.4/mod/mod_authz_core.html#requireany) directives. -Using the 'enforce' key, which only supports 'any','none','all' (other values are silently ignored), this could be established like: - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - require => { - enforce => 'any', - requires => [ - 'ip 1.2.3.4', - 'not host host.example.com', - 'user xyz', - ], - }, - }, - ], -} -``` - -If `require` is set to `unmanaged` it will not be set at all. This is useful for complex authentication/authorization requirements which are handled in a custom fragment. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - require => 'unmanaged', - } - ], -} -``` - - - -##### `satisfy` - -Sets a `Satisfy` directive per the [Apache Core documentation](https://httpd.apache.org/docs/2.2/mod/core.html#satisfy). **Deprecated:** This parameter is deprecated due to a change in Apache and only works with Apache 2.2 and lower. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - satisfy => 'Any', - } - ], -} -``` - -##### `sethandler` - -Sets a `SetHandler` directive per the [Apache Core documentation](https://httpd.apache.org/docs/2.2/mod/core.html#sethandler). - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - sethandler => 'None', - } - ], -} -``` - -##### `set_output_filter` - -Sets a `SetOutputFilter` directive per the [Apache Core documentation](https://httpd.apache.org/docs/current/mod/core.html#setoutputfilter). - -``` puppet -apache::vhost{ 'filter.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - set_output_filter => puppetdb-strip-resource-params, - }, - ], -} -``` - -##### `rewrites` - -Creates URL [`rewrites`](#rewrites) rules in virtual host directories. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'. - -``` puppet -apache::vhost { 'secure.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - rewrites => [ { comment => 'Permalink Rewrites', - rewrite_base => '/' - }, - { rewrite_rule => [ '^index\.php$ - [L]' ] - }, - { rewrite_cond => [ '%{REQUEST_FILENAME} !-f', - '%{REQUEST_FILENAME} !-d', - ], - rewrite_rule => [ '. /index.php [L]' ], - } - ], - }, - ], -} -``` - -> **Note**: If you include rewrites in your directories, also include `apache::mod::rewrite` and consider setting the rewrites using the `rewrites` parameter in `apache::vhost` rather than setting the rewrites in the virtual host's directories. - -##### `shib_request_settings` - -Allows a valid content setting to be set or altered for the application request. This command takes two parameters: the name of the content setting, and the value to set it to. Check the Shibboleth [content setting documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPContentSettings) for valid settings. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details. - -``` puppet -apache::vhost { 'secure.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - shib_request_settings => { 'requiresession' => 'On' }, - shib_use_headers => 'On', - }, - ], -} -``` - -##### `shib_use_headers` - -When set to 'On', this turns on the use of request headers to publish attributes to applications. Values for this key is 'On' or 'Off', and the default value is 'Off'. This key is disabled if `apache::mod::shib` is not defined. Check the [`mod_shib` documentation](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions) for more details. - -##### `ssl_options` - -String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the virtual host. - -``` puppet -apache::vhost { 'secure.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - ssl_options => '+ExportCertData', - }, - { path => '/path/to/different/dir', - ssl_options => [ '-StdEnvVars', '+ExportCertData'], - }, - ], -} -``` - -##### `suphp` - -A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting. It must be used with `suphp_engine => on` in the virtual host declaration, and can only be passed within `directories`. - -``` puppet -apache::vhost { 'secure.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - suphp => { - user => 'myappuser', - group => 'myappgroup', - }, - }, - ], -} -``` -##### `additional_includes` - -Specifies paths to additional static, specific Apache configuration files in virtual host directories. Values: a array of string path. - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/different/dir', - additional_includes => [ '/custom/path/includes', '/custom/path/another_includes', ], - }, - ], -} -``` - -#### SSL parameters for `apache::vhost` - -All of the SSL parameters for `::vhost` default to whatever is set in the base `apache` class. Use the below parameters to tweak individual SSL settings for specific virtual hosts. - -##### `ssl` - -Enables SSL for the virtual host. SSL virtual hosts only respond to HTTPS queries. Values: Boolean. - -Default: `false`. - -##### `ssl_ca` - -Specifies the SSL certificate authority to be used to verify client certificates used for authentication. You must also set `ssl_verify_client` to use this. - -Default: `undef`. - -##### `ssl_cert` - -Specifies the SSL certification. - -Default: Depends on operating system. - -* RedHat: '/etc/pki/tls/certs/localhost.crt' -* Debian: '/etc/ssl/certs/ssl-cert-snakeoil.pem' -* FreeBSD: '/usr/local/etc/apache22/server.crt' -* Gentoo: '/etc/ssl/apache2/server.crt' - -##### `ssl_protocol` - -Specifies [SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Expects an array or space separated string of accepted protocols. - -Defaults: 'all', '-SSLv2', '-SSLv3'. - -##### `ssl_cipher` - -Specifies [SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite). - -Default: 'HIGH:MEDIUM:!aNULL:!MD5'. - -##### `ssl_honorcipherorder` - -Sets [SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder), to cause Apache to use the server's preferred order of ciphers rather than the client's preferred order. Values: - -Values: Boolean, 'on', 'off'. - -Default: `true`. - -##### `ssl_certs_dir` - -Specifies the location of the SSL certification directory to verify client certs. Will not be used unless `ssl_verify_client` is also set (see below). - -Default: undef - -##### `ssl_chain` - -Specifies the SSL chain. This default works out of the box, but it must be updated in the base `apache` class with your specific certificate information before being used in production. - -Default: `undef`. - -##### `ssl_crl` - -Specifies the certificate revocation list to use. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.) - -Default: `undef`. - -##### `ssl_crl_path` - -Specifies the location of the certificate revocation list to verify certificates for client authentication with. (This default works out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.) - -Default: `undef`. - -##### `ssl_crl_check` - -Sets the certificate revocation check level via the [SSLCARevocationCheck directive](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck) for ssl client authentication. The default works out of the box but must be specified when using CRLs in production. Only applicable to Apache 2.4 or higher; the value is ignored on older versions. - -Default: `undef`. - -##### `ssl_key` - -Specifies the SSL key. - -Defaults are based on your operating system. Default work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production. - -* RedHat: '/etc/pki/tls/private/localhost.key' -* Debian: '/etc/ssl/private/ssl-cert-snakeoil.key' -* FreeBSD: '/usr/local/etc/apache22/server.key' -* Gentoo: '/etc/ssl/apache2/server.key' - -##### `ssl_verify_client` - -Sets the [SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication. - -``` puppet -apache::vhost { 'sample.example.net': - … - ssl_verify_client => 'optional', -} -``` - -Values: 'none', 'optional', 'require', and 'optional_no_ca'. - -Default: `undef`. - - -##### `ssl_verify_depth` - -Sets the [SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) directive, which specifies the maximum depth of CA certificates in client certificate verification. You must set `ssl_verify_client` for it to take effect. - -``` puppet -apache::vhost { 'sample.example.net': - … - ssl_verify_client => 'require', - ssl_verify_depth => 1, -} -``` - -Default: `undef`. - -##### `ssl_proxy_protocol` - -Sets the [SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyprotocol) directive, which controls which SSL protocol flavors `mod_ssl` should use when establishing its server environment for proxy. It connects to servers using only one of the provided protocols. - -Default: `undef`. - -##### `ssl_proxy_verify` - -Sets the [SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify) directive, which configures certificate verification of the remote server when a proxy is configured to forward requests to a remote SSL server. - -Default: `undef`. - -##### `ssl_proxy_verify_depth` - -Sets the [SSLProxyVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverifydepth) directive, which configures how deeply mod_ssl should verify before deciding that the remote server does not have a valid certificate. - -A depth of 0 means that only self-signed remote server certificates are accepted, the default depth of 1 means the remote server certificate can be self-signed or signed by a CA that is directly known to the server. - -Default: `undef` - -##### `ssl_proxy_ca_cert` - -Sets the [SSLProxyCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycacertificatefile) directive, which specifies an all-in-one file where you can assemble the Certificates of Certification Authorities (CA) whose remote servers you deal with. These are used for Remote Server Authentication. This file should be a concatenation of the PEM-encoded certificate files in order of preference. - -Default: `undef` - -##### `ssl_proxy_machine_cert` - -Sets the [SSLProxyMachineCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile) directive, which specifies an all-in-one file where you keep the certs and keys used for this server to authenticate itself to remote servers. This file should be a concatenation of the PEM-encoded certificate files in order of preference. - -``` puppet -apache::vhost { 'sample.example.net': - … - ssl_proxy_machine_cert => '/etc/httpd/ssl/client_certificate.pem', -} -``` - -Default: `undef` - -##### `ssl_proxy_check_peer_cn` - -Sets the [SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. - -Values: 'on', 'off'. - -Default: `undef` - -##### `ssl_proxy_check_peer_name` - -Sets the [SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername) directive, which specifies whether the remote server certificate's CN field is compared against the hostname of the request URL. - -Values: 'on', 'off'. - -Default: `undef` - -##### `ssl_proxy_check_peer_expire` - -Sets the [SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire) directive, which specifies whether the remote server certificate is checked for expiration or not. - -Values: 'on', 'off'. - -Default: `undef` - -##### `ssl_options` - -Sets the [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given virtual host and can be a string or an array. - -A string: - -``` puppet -apache::vhost { 'sample.example.net': - … - ssl_options => '+ExportCertData', -} -``` - -An array: - -``` puppet -apache::vhost { 'sample.example.net': - … - ssl_options => [ '+StrictRequire', '+ExportCertData' ], -} -``` - -Default: `undef`. - -##### `ssl_openssl_conf_cmd` - -Sets the [SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd) directive, which provides direct configuration of OpenSSL parameters. - -Default: `undef` - -##### `ssl_proxyengine` - -Specifies whether or not to use [SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). - -Boolean. - -Default: `true`. - -##### `ssl_stapling` - -Specifies whether or not to use [SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling). By default, uses what is set globally. - -This parameter only applies to Apache 2.4 or higher and is ignored on older versions. - -Boolean or `undef`. - -Default: `undef` - -##### `ssl_stapling_timeout` - -Can be used to set the [SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout) directive. - -This parameter only applies to Apache 2.4 or higher and is ignored on older versions. - -Default: none. - -##### `ssl_stapling_return_errors` - -Can be used to set the [SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors) directive. - -This parameter only applies to Apache 2.4 or higher and is ignored on older versions. - -Default: none. - -#### Defined type: FastCGI Server - -This type is intended for use with mod\_fastcgi. It allows you to define one or more external FastCGI servers to handle specific file types. - -** Note ** If using Ubuntu 10.04+, you'll need to manually enable the multiverse repository. - -Ex: - -``` puppet -apache::fastcgi::server { 'php': - host => '127.0.0.1:9000', - timeout => 15, - flush => `false`, - faux_path => '/var/www/php.fcgi', - fcgi_alias => '/php.fcgi', - file_type => 'application/x-httpd-php', - pass_header => '' -} -``` - -Within your virtual host, you can then configure the specified file type to be handled by the fastcgi server specified above. - -``` puppet -apache::vhost { 'www': - ... - custom_fragment => 'AddType application/x-httpd-php .php' - ... -} -``` - -##### `host` - -The hostname or IP address and TCP port number (1-65535) of the FastCGI server. - -It is also possible to pass a unix socket: - -``` puppet -apache::fastcgi::server { 'php': - host => '/var/run/fcgi.sock', -} -``` - -##### `timeout` - -The number of seconds of FastCGI application inactivity allowed before the request is aborted and the event is logged (at the error LogLevel). The inactivity timer applies only as long as a connection is pending with the FastCGI application. If a request is queued to an application, but the application doesn't respond (by writing and flushing) within this period, the request is aborted. If communication is complete with the application but incomplete with the client (the response is buffered), the timeout does not apply. - -##### `flush` - -Force a write to the client as data is received from the application. By default, `mod_fastcgi` buffers data in order to free the application as quickly as possible. - -##### `faux_path` - -Does not have to exist in the local filesystem. URIs that Apache resolves to this filename are handled by this external FastCGI application. - -##### `alias` - -A unique alias. This is used internally to link the action with the FastCGI server. - -##### `file_type` - -The MIME-type of the file to be processed by the FastCGI server. - -##### `pass_header` - -The name of an HTTP Request Header to be passed in the request environment. This option makes available the contents of headers which are normally not available (e.g. Authorization) to a CGI environment. - -#### Defined type: `apache::vhost::custom` - -The `apache::vhost::custom` defined type is a thin wrapper around the `apache::custom_config` defined type, and simply overrides some of its default settings specific to the virtual host directory in Apache. - -**Parameters within `apache::vhost::custom`**: - -##### `content` - -Sets the configuration file's content. - -##### `ensure` - -Specifies if the virtual host file is present or absent. - -Values: 'absent', 'present'. - -Default: 'present'. - -##### `priority` - -Sets the relative load order for Apache HTTPD VirtualHost configuration files. - -Default: '25'. - -##### `verify_config` - -Specifies whether to validate the configuration file before notifying the Apache service. - -Boolean. - -Default: `true`. - -### Private defined types - -#### Defined type: `apache::peruser::multiplexer` - -This defined type checks if an Apache module has a class. If it does, it includes that class. If it does not, it passes the module name to the [`apache::mod`][] defined type. - -#### Defined type: `apache::peruser::multiplexer` - -Enables the [`Peruser`][] module for FreeBSD only. - -#### Defined type: `apache::peruser::processor` - -Enables the [`Peruser`][] module for FreeBSD only. - -#### Defined type: `apache::security::file_link` - -Links the `activated_rules` from [`apache::mod::security`][] to the respective CRS rules on disk. - -### Templates - -The Apache module relies heavily on templates to enable the [`apache::vhost`][] and [`apache::mod`][] defined types. These templates are built based on [Facter][] facts specific to your operating system. Unless explicitly called out, most templates are not meant for configuration. - -### Tasks - -The Apache module has a task that allows a user to reload the Apache config without restarting the service. Please refer to to the [PE documentation](https://puppet.com/docs/pe/2017.3/orchestrator/running_tasks.html) or [Bolt documentation](https://puppet.com/docs/bolt/latest/bolt.html) on how to execute a task. - -### Functions -#### apache_pw_hash -Hashes a password in a format suitable for htpasswd files read by apache. - -Currently uses SHA-hashes, because although this format is considered insecure, its the -most secure format supported by the most platforms. - -## Limitations - -### General - -This module is CI tested against both [open source Puppet][] and [Puppet Enterprise][] on: - -- CentOS 5 and 6 -- Ubuntu 12.04 and 14.04 -- Debian 7 -- RHEL 5, 6, and 7 - -This module also provides functions for other distributions and operating systems, such as FreeBSD, Gentoo, and Amazon Linux, but is not formally tested on them and are subject to regressions. - -### FreeBSD - -In order to use this module on FreeBSD, you _must_ use apache24-2.4.12 (www/apache24) or newer. - -### Gentoo - -On Gentoo, this module depends on the [`gentoo/puppet-portage`][] Puppet module. Although several options apply or enable certain features and settings for Gentoo, it is not a [supported operating system][] for this module. - -### RHEL/CentOS -The [`apache::mod::auth_cas`][], [`apache::mod::passenger`][], [`apache::mod::proxy_html`][] and [`apache::mod::shib`][] classes are not functional on RH/CentOS without providing dependency packages from extra repositories. - -See their respective documentation below for related repositories and packages. - -#### RHEL/CentOS 5 - -The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are untested because repositories are missing compatible packages. - -#### RHEL/CentOS 6 - -The [`apache::mod::passenger`][] class is not installing, because the the EL6 repository is missing compatible packages. - -#### RHEL/CentOS 7 - -The [`apache::mod::passenger`][] and [`apache::mod::proxy_html`][] classes are untested because the EL7 repository is missing compatible packages, which also blocks us from testing the [`apache::vhost`][] defined type's [`rack_base_uris`][] parameter. - -### SELinux and custom paths - -If [SELinux][] is in [enforcing mode][] and you want to use custom paths for `logroot`, `mod_dir`, `vhost_dir`, and `docroot`, you need to manage the files' context yourself. - -You can do this with Puppet: - -``` puppet -exec { 'set_apache_defaults': - command => 'semanage fcontext -a -t httpd_sys_content_t "/custom/path(/.*)?"', - path => '/bin:/usr/bin/:/sbin:/usr/sbin', - require => Package['policycoreutils-python'], -} - -package { 'policycoreutils-python': - ensure => installed, -} - -exec { 'restorecon_apache': - command => 'restorecon -Rv /apache_spec', - path => '/bin:/usr/bin/:/sbin:/usr/sbin', - before => Class['Apache::Service'], - require => Class['apache'], -} - -class { 'apache': } - -host { 'test.server': - ip => '127.0.0.1', -} - -file { '/custom/path': - ensure => directory, -} - -file { '/custom/path/include': - ensure => present, - content => '#additional_includes', -} - -apache::vhost { 'test.server': - docroot => '/custom/path', - additional_includes => '/custom/path/include', -} -``` - -You must set the contexts using `semanage fcontext` instead of `chcon` because Puppet's `file` resources reset the values' context in the database if the resource doesn't specify it. - -### Ubuntu 10.04 - -The [`apache::vhost::WSGIImportScript`][] parameter creates a statement inside the virtual host that is unsupported on older versions of Apache, causing it to fail. This will be remedied in a future refactoring. - -### Ubuntu 16.04 -The [`apache::mod::suphp`][] class is untested since repositories are missing compatible packages. - -## Development - -### Contributing - -[Puppet][] modules on the [Puppet Forge][] are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad hardware, software, and deployment configurations that Puppet is intended to serve. - -We want to make it as easy as possible to contribute changes so our modules work in your environment, but we also need contributors to follow a few guidelines to help us maintain and improve the modules' quality. - -For more information, please read the complete [module contribution guide][] and check out [CONTRIBUTING.md][]. diff --git a/modules/apache/Rakefile b/modules/apache/Rakefile deleted file mode 100644 index 3994519..0000000 --- a/modules/apache/Rakefile +++ /dev/null @@ -1,38 +0,0 @@ -require 'puppetlabs_spec_helper/rake_tasks' -require 'puppet-lint/tasks/puppet-lint' -require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any? - -PuppetLint.configuration.fail_on_warnings = true -PuppetLint.configuration.send('relative') -PuppetLint.configuration.send('disable_only_variable_string') - -desc 'Generate pooler nodesets' -task :gen_nodeset do - require 'beaker-hostgenerator' - require 'securerandom' - require 'fileutils' - - agent_target = ENV['TEST_TARGET'] - if ! agent_target - STDERR.puts 'TEST_TARGET environment variable is not set' - STDERR.puts 'setting to default value of "redhat-64default."' - agent_target = 'redhat-64default.' - end - - master_target = ENV['MASTER_TEST_TARGET'] - if ! master_target - STDERR.puts 'MASTER_TEST_TARGET environment variable is not set' - STDERR.puts 'setting to default value of "redhat7-64mdcl"' - master_target = 'redhat7-64mdcl' - end - - targets = "#{master_target}-#{agent_target}" - cli = BeakerHostGenerator::CLI.new([targets]) - nodeset_dir = "tmp/nodesets" - nodeset = "#{nodeset_dir}/#{targets}-#{SecureRandom.uuid}.yaml" - FileUtils.mkdir_p(nodeset_dir) - File.open(nodeset, 'w') do |fh| - fh.print(cli.execute) - end - puts nodeset -end diff --git a/modules/apache/checksums.json b/modules/apache/checksums.json deleted file mode 100644 index 6814667..0000000 --- a/modules/apache/checksums.json +++ /dev/null @@ -1,359 +0,0 @@ -{ - "CHANGELOG.md": "c30a462436efd27c26f51e9234f52351", - "CONTRIBUTING.md": "4d17f3c942e7c93d1577cc4438a231e4", - "Gemfile": "99e30e5e231f5f2b460b812c37d084f7", - "LICENSE": "3b83ef96387f14655fc854ddc3c6bd57", - "MAINTAINERS.md": "6508b1d302b38186425992a66186c060", - "NOTICE": "b7760cf49f58b80b31df83244cc0fbd0", - "README.md": "05fa80ab9ec843691b31196bee0d482d", - "Rakefile": "a49b6653243c678ed33c8870db467d89", - "examples/apache.pp": "41e97262421ea5734fac16a338701a78", - "examples/dev.pp": "8da0d50d9d06834dd06329b8945f06d5", - "examples/init.pp": "d27415f33028c26d4031d30305eec5e0", - "examples/mod_load_params.pp": "e8d1c1b1b96d560c8288c51a76bffc87", - "examples/mods.pp": "78a25c9e226265353eabefd3ddfd4218", - "examples/mods_custom.pp": "bc9e6959c282984cf9cdd93869c89499", - "examples/php.pp": "afa0871b94040e3ae91fce9c375fb725", - "examples/vhost.pp": "27d808964b43d157de5ce8f47b441b46", - "examples/vhost_directories.pp": "95aa446a2fccf9f3561581a5d71c61a7", - "examples/vhost_filter.pp": "62c5af7868af9887b7d71769c319c1e5", - "examples/vhost_ip_based.pp": "7a4d4c1c00147c45e4534f58d2fbf4ed", - "examples/vhost_proxypass.pp": "2f0bd33b34a48554adcdf20d6d31a4c2", - "examples/vhost_ssl.pp": "ddd3c45964df56837d6c051a7d692378", - "examples/vhosts_without_listen.pp": "226afb3e87129a56fc9add21b120feb2", - "files/httpd": "295f5e924afe6f752d29327e73fe6d0a", - "lib/facter/apache_version.rb": "0157bc56c83ae870d5b9d015ec9663f4", - "lib/puppet/parser/functions/apache_pw_hash.rb": "d9ce29a8885b921772f5e7786553ba64", - "lib/puppet/parser/functions/bool2httpd.rb": "05d5deeb6e0c31acee7c55b249ec8e06", - "lib/puppet/parser/functions/validate_apache_log_level.rb": "d75bc4ef17ff5c9a1f94dd3948e733d1", - "lib/puppet/provider/a2mod/a2mod.rb": "d986d8e8373f3f31c97359381c180628", - "lib/puppet/provider/a2mod/gentoo.rb": "2492d446adbb68f678e86a75eb7ff3bd", - "lib/puppet/provider/a2mod/modfix.rb": "b689a1c83c9ccd8590399c67f3e588e5", - "lib/puppet/provider/a2mod/redhat.rb": "c39b80e75e7d0666def31c2a6cdedb0b", - "lib/puppet/provider/a2mod.rb": "03ed73d680787dd126ea37a03be0b236", - "lib/puppet/type/a2mod.rb": "9042ccc045bfeecca28bebb834114f05", - "locales/config.yaml": "5097a0a36a08ac68835001a96b376b46", - "locales/ja/puppetlabs-apache.po": "709261183cc8d4fed57edee36ea843a5", - "locales/puppetlabs-apache.pot": "4bd09a821333cf6c272a64e944ef4e01", - "manifests/balancer.pp": "b444ff1415ba0bd6c8ec1497bcc9cfb3", - "manifests/balancermember.pp": "d74ab23d74fa198853b13ad837df925c", - "manifests/confd/no_accf.pp": "406d0ca41c3b90f83740ca218dc3f484", - "manifests/custom_config.pp": "357badc11586c8bb726f2a36364c0932", - "manifests/default_confd_files.pp": "86fdbe5773abb7c2da26db096973865c", - "manifests/default_mods/load.pp": "bc0b3b65edd1ba6178c09672352f9bce", - "manifests/default_mods.pp": "e4a7aa787443fce2e76c37e8fec99012", - "manifests/dev.pp": "8a7ead42f991e5dfdd364ba1aa1304e0", - "manifests/fastcgi/server.pp": "646b7c685921edc2316fe3515c705d7d", - "manifests/init.pp": "56c60d9ccfd2d136ef561c55f3411a94", - "manifests/listen.pp": "6e44a9f49376cefb5694d52be5bc5a88", - "manifests/mod/actions.pp": "ec2a5d1cf54790204750f9b67938d230", - "manifests/mod/alias.pp": "1ef0d98a941bd796d428297b74acc8c4", - "manifests/mod/auth_basic.pp": "dffef6ff10145393cb78fcaa27220c53", - "manifests/mod/auth_cas.pp": "f2e61e67393a998a19f8b34506e07e0d", - "manifests/mod/auth_kerb.pp": "8759cab3dc12d6ba4cc12fcdbb699418", - "manifests/mod/auth_mellon.pp": "5bfbc604dd79923bdb65ecab02353059", - "manifests/mod/authn_core.pp": "4db773ddbc0d875230085782d4521951", - "manifests/mod/authn_dbd.pp": "8f03863a483184ca53b9bc3a45b2297f", - "manifests/mod/authn_file.pp": "eeb11513490beee901574746faaeabdf", - "manifests/mod/authnz_ldap.pp": "c64f544ce5aacc549663200feae2c7ad", - "manifests/mod/authnz_pam.pp": "9f99d93e289a2db42c74046c8ae1889f", - "manifests/mod/authz_default.pp": "b7c94cfa4e008155fffd241d35834064", - "manifests/mod/authz_user.pp": "d446c90c44304594206bd2a0112be625", - "manifests/mod/autoindex.pp": "3b50dc082dba420c3d564309601fd419", - "manifests/mod/cache.pp": "b56d68b9401ba3e02a1f2fe55cdfbcca", - "manifests/mod/cgi.pp": "731ed7bce75628afeb78afd3fa2fd793", - "manifests/mod/cgid.pp": "fb9ae9b5012d41e22cb85c0b50e17361", - "manifests/mod/cluster.pp": "8b67026e9a6a4bdc6a2481613896ded1", - "manifests/mod/dav.pp": "9df80d36dd609be9032a8260aa9d10c1", - "manifests/mod/dav_fs.pp": "9ad2359d64b0b6f219bd8a338917d114", - "manifests/mod/dav_svn.pp": "abc1ba954033b0b0187c079f310eb0e2", - "manifests/mod/dbd.pp": "4471dbd9fd67d0db885d4ba2a47a194a", - "manifests/mod/deflate.pp": "20231a22aba12eb905f1d7f1853e383e", - "manifests/mod/dev.pp": "42673bab60b6fc0f3aa6e2357ec0a27c", - "manifests/mod/dir.pp": "75039bc8c77b9b82fa12fc5aa1061291", - "manifests/mod/disk_cache.pp": "da18cbefced9bb32fc009e999c5b76e2", - "manifests/mod/dumpio.pp": "5492a7249450a7fdf335ecb0c3b948f4", - "manifests/mod/env.pp": "2a0321180a59161565b2b5f1b79d6b15", - "manifests/mod/event.pp": "a82a7ab979cc351eb660576bdc91d0e8", - "manifests/mod/expires.pp": "6f12edcf6863958af832db73b56e5f08", - "manifests/mod/ext_filter.pp": "287966c2c0fd450c72a1c9ef88a0e155", - "manifests/mod/fastcgi.pp": "a650c68bfa5e26cfa89c89a62ebd9cdf", - "manifests/mod/fcgid.pp": "96e0a5f09c2d1ba21b2209a6e21b6847", - "manifests/mod/filter.pp": "b0039f3ae932b1204994ef2180dd76d2", - "manifests/mod/geoip.pp": "41762c637ab45dac05e564d1b3d03c3e", - "manifests/mod/headers.pp": "ef3de538a0a4c9406236faf43eb89710", - "manifests/mod/include.pp": "a3b66eda88e38d90825c16b834bacd8d", - "manifests/mod/info.pp": "c3e815ed9912bb9147805f7274508489", - "manifests/mod/intercept_form_submit.pp": "b3e55433272082bac1e7a5334df3b01f", - "manifests/mod/itk.pp": "f631157ebdff68b6fc2bb6dbd5b8e8c4", - "manifests/mod/jk.pp": "d95bff839364ae93f060561ffbee2ddd", - "manifests/mod/ldap.pp": "319e62a24e30221e691b9cf85a6288e1", - "manifests/mod/lookup_identity.pp": "a3fd01d395ea09ec1488494fd077dd7b", - "manifests/mod/macro.pp": "af7db43b0244664f14397b8ea4549d48", - "manifests/mod/mime.pp": "24fe99c65367a3f606441605a2ff26dd", - "manifests/mod/mime_magic.pp": "d31702cee9007c2e65c8d3ccbed1fda3", - "manifests/mod/negotiation.pp": "2ccabe3f6788961feab3c54e100c48c2", - "manifests/mod/nss.pp": "3cc69b59bba579181b0ceb1dfd2976d0", - "manifests/mod/pagespeed.pp": "1fcf4c30084bd1e4fa3006b4d3265c1a", - "manifests/mod/passenger.pp": "f1a4609f61e30fc839ad7f4b668a750b", - "manifests/mod/perl.pp": "b8180ca0e1e7f8d60030321f52c28d6d", - "manifests/mod/peruser.pp": "13761222709094653bca7bad4435fcdb", - "manifests/mod/php.pp": "b6d383242b3c52a2543f8f477ff308a0", - "manifests/mod/prefork.pp": "12c6e1b7780de88bf332b608f7ef2279", - "manifests/mod/proxy.pp": "a65065f0c7705b7b75b1dd6fc2222e27", - "manifests/mod/proxy_ajp.pp": "073e2406aea7822750d4c21f02d8ac80", - "manifests/mod/proxy_balancer.pp": "c717e51517043084854b26c89d7b99d9", - "manifests/mod/proxy_connect.pp": "7cd9b4b61ec6feb020f753ee74910a48", - "manifests/mod/proxy_fcgi.pp": "8c7fd559419b159e27218a17463d850d", - "manifests/mod/proxy_html.pp": "aa012e927e20d3f7734fdc026491fd20", - "manifests/mod/proxy_http.pp": "0db1b26f8b4036b0d46ba86b7eaac561", - "manifests/mod/proxy_wstunnel.pp": "88ee88d6d56a70f0000e690f80f64acb", - "manifests/mod/python.pp": "6f65b22271cf356832fe7a1949163861", - "manifests/mod/remoteip.pp": "9ad1d5712477f11ae2643f209bb08ce3", - "manifests/mod/reqtimeout.pp": "17b245b5d14f3f7b8c1d5fa07e5c159e", - "manifests/mod/rewrite.pp": "292f2d6ce2078fa9df7f686105ea7b95", - "manifests/mod/rpaf.pp": "54991f51a06e2b4171956e6ce1caf3a3", - "manifests/mod/security.pp": "b5ed320cbcce30b79557dd38941d339b", - "manifests/mod/setenvif.pp": "fa3b3e5f3a7e029f9db5b66ae499c6c8", - "manifests/mod/shib.pp": "8b75f8818fe9dc5728a478fc27962447", - "manifests/mod/socache_shmcb.pp": "c94ae23ab8cce744acad2f7e33dbfa9c", - "manifests/mod/speling.pp": "b6971e10caf22837e410b94910b66b1a", - "manifests/mod/ssl.pp": "043ee8354cacece8e4cba158acbb3dea", - "manifests/mod/status.pp": "75d19ef4dde3529359d080c6607926f0", - "manifests/mod/suexec.pp": "2a8671856a0ece597e9b57867dc35e76", - "manifests/mod/suphp.pp": "5a7390ef0a0ceaa2d7e684bcb6300587", - "manifests/mod/userdir.pp": "8cce2ae6536eab6b809c63cb6ed59c55", - "manifests/mod/version.pp": "6cb31057ebffa796f95642cc95f9499d", - "manifests/mod/vhost_alias.pp": "ee1225a748daaf50aca39a6d93fb8470", - "manifests/mod/worker.pp": "41137580c48b89f2795c1295d87962c0", - "manifests/mod/wsgi.pp": "adcaac9e490512a58d0e6070904c85d2", - "manifests/mod/xsendfile.pp": "fba06f05a19c466654aca5ecaa705bf0", - "manifests/mod.pp": "405f340daea9c50913904818ca4041d7", - "manifests/mpm.pp": "d4bfe77df34110cb253557104b2e6310", - "manifests/namevirtualhost.pp": "5ad54a441ff26a55cc536069d8fad238", - "manifests/package.pp": "ebd1e1e815ef744ebd4e9d8a6c94a07a", - "manifests/params.pp": "29b4fa2e347c8c0cbf726eb62eb965ce", - "manifests/peruser/multiplexer.pp": "0ea75341b7a93e55bcfb431a93b1a6c9", - "manifests/peruser/processor.pp": "62f0ad5ed2ec36dadc7f40ad2a9e1bb9", - "manifests/php.pp": "9c9d07e12bf5d112b0b54f5bd69046fc", - "manifests/proxy.pp": "7c8515b88406922e148322ee15044b29", - "manifests/python.pp": "ddef4cd73850fdc2dc126d4579c30adf", - "manifests/security/rule_link.pp": "9c879ecfd7534347ccc8cf3ea77fa859", - "manifests/service.pp": "9984fd2cfd49cea0b8db61f7cc3c1c4b", - "manifests/ssl.pp": "173f3d6a7fd2b5f4100c4ff03d84e13b", - "manifests/version.pp": "3388b1978b04cba63ed7fc8e2ec3f692", - "manifests/vhost/custom.pp": "421081f6c4f33e1aca07ff789e53345e", - "manifests/vhost.pp": "1d0384eb5d32bac1b97c229e49eb30ba", - "manifests/vhosts.pp": "d5cd9e6b701b7b2948c011546bc55497", - "metadata.json": "276cab41794f653d36ebf610a2d48837", - "readmes/README_ja_JP.md": "1ae5a83d360b6bca0b3b114605232f06", - "spec/acceptance/apache_parameters_spec.rb": "d8d8f53c76a65558f189a33ef063976a", - "spec/acceptance/apache_ssl_spec.rb": "c57e800714173f00a1bba07c13f7c10e", - "spec/acceptance/class_spec.rb": "9d77ee23b734dd48ecea4353dee3d616", - "spec/acceptance/custom_config_spec.rb": "61e03d814d0671d194dd40e6b1ad5c9b", - "spec/acceptance/default_mods_spec.rb": "2481bfa99dd34e15f2b4c7eed194635f", - "spec/acceptance/init_task_spec.rb": "d7dc22f337db5a71648edf2ba16bef65", - "spec/acceptance/itk_spec.rb": "812c855013c08ebb13e642dc5199b41a", - "spec/acceptance/mod_dav_svn_spec.rb": "e792a6d585026dd7bded38e62c8786f6", - "spec/acceptance/mod_deflate_spec.rb": "dd39bfb069e0233bf134caaeb1dc6fe6", - "spec/acceptance/mod_fcgid_spec.rb": "ef0e3368ea14247c05ff43217b5856ee", - "spec/acceptance/mod_mime_spec.rb": "0869792d98c1b2577f02d97c92f1765e", - "spec/acceptance/mod_negotiation_spec.rb": "017f6b0cc1496c25aa9b8a33ef8dbbb3", - "spec/acceptance/mod_pagespeed_spec.rb": "23256a41b700fc92a96edf34a16be499", - "spec/acceptance/mod_passenger_spec.rb": "a66264ef73ad6c5396a06ab9b5444c7c", - "spec/acceptance/mod_php_spec.rb": "98bc1ff97a36de86d5a1b800b2afd7a6", - "spec/acceptance/mod_proxy_html_spec.rb": "34478fc2f12a23cd5a95d424f85da150", - "spec/acceptance/mod_security_spec.rb": "c783d44cf3ccba2fa6a3c14de0e486a0", - "spec/acceptance/mod_suphp_spec.rb": "f5c1f21e4c5323b81afc354c82e7ceb9", - "spec/acceptance/nodesets/centos-7-x64.yml": "a713f3abd3657f0ae2878829badd23cd", - "spec/acceptance/nodesets/debian-8-x64.yml": "d2d2977900989f30086ad251a14a1f39", - "spec/acceptance/nodesets/default.yml": "b42da5a1ea0c964567ba7495574b8808", - "spec/acceptance/nodesets/docker/centos-7.yml": "8a3892807bdd62306ae4774f41ba11ae", - "spec/acceptance/nodesets/docker/debian-8.yml": "ac8e871d1068c96de5e85a89daaec6df", - "spec/acceptance/nodesets/docker/ubuntu-14.04.yml": "dc42ee922a96908d85b8f0f08203ce58", - "spec/acceptance/nodesets/suse.yml": "eff62186e4de2ffed45a72a375380338", - "spec/acceptance/prefork_worker_spec.rb": "1570eefe61d667a1b43824adc0b2bb78", - "spec/acceptance/service_spec.rb": "341f157cb33fa48d5166d2274ad3bc65", - "spec/acceptance/version.rb": "6a1f2db3e369f3dc2b5bd76f4921891a", - "spec/acceptance/vhost_spec.rb": "ac0e99a6dfbe8faa2837bf2356fdda7d", - "spec/acceptance/vhosts_spec.rb": "c9635037681d569a053da6eb7ae5f4f4", - "spec/classes/apache_spec.rb": "7e404edbc5ca3f83303b685246e0308e", - "spec/classes/dev_spec.rb": "6bc9ff7cffb77aac52c5bd3acc157d2d", - "spec/classes/mod/alias_spec.rb": "e62706d9925b0dc1821db78d01986a7e", - "spec/classes/mod/auth_cas_spec.rb": "46a7ba3fe31d3fc6175b8dce5105326e", - "spec/classes/mod/auth_kerb_spec.rb": "d281ff13b8989d759bd7fcdb599a882a", - "spec/classes/mod/auth_mellon_spec.rb": "81d3ea4b7567718ca810b625fd36d231", - "spec/classes/mod/authn_dbd_spec.rb": "8c794faaa5244e16f432c76679cb12d7", - "spec/classes/mod/authnz_ldap_spec.rb": "bef6980f85489c5fd7388511cb65b644", - "spec/classes/mod/authnz_pam_spec.rb": "71759e9ab2dd8aeefeb4d79e3349e67e", - "spec/classes/mod/cluster_spec.rb": "c1d01cc4a4f9ce10d692294019791e2f", - "spec/classes/mod/dav_svn_spec.rb": "6b3c4123a067e249f6c78c5b0cbcbcc7", - "spec/classes/mod/deflate_spec.rb": "adf6e41357fefe4ff1128e8fea4d3057", - "spec/classes/mod/dev_spec.rb": "1a30ef5fb18073fd2bf6f7923ff9c57f", - "spec/classes/mod/dir_spec.rb": "9e25507c094cb3b2fe6eb1106668b484", - "spec/classes/mod/disk_cache_spec.rb": "e821fa50ace7ab3398c43b16034748e9", - "spec/classes/mod/dumpio_spec.rb": "689d167b05e669c29709fc36940e7b05", - "spec/classes/mod/event_spec.rb": "46a304c796ac3928be0a67bec1f46b4f", - "spec/classes/mod/expires_spec.rb": "0d27e3438627f2ad34abacf582fb8b0b", - "spec/classes/mod/ext_filter_spec.rb": "7af18fdf1376f17e68dc99e5627ba067", - "spec/classes/mod/fastcgi_spec.rb": "59f7ea857b0fa614e8808270c529300f", - "spec/classes/mod/fcgid_spec.rb": "bda06cc347a8da8d7c7374add2654248", - "spec/classes/mod/info_spec.rb": "d51c6a9e6ae4d944488a43c8c15b95c0", - "spec/classes/mod/intercept_form_submit_spec.rb": "2e7087360a57f6ccf88b80239ca5056e", - "spec/classes/mod/itk_spec.rb": "622f23a1346383846cbc98e38388034d", - "spec/classes/mod/jk_spec.rb": "bb78569e1c4bcc537dec6414b3c88d55", - "spec/classes/mod/ldap_spec.rb": "12863d495558fbe9f6cb7a50ab37688c", - "spec/classes/mod/lookup_identity.rb": "97997c0a2e7a1b717426b5845df604ee", - "spec/classes/mod/mime_magic_spec.rb": "259304a80e92e4ba15e7cd719fe25c17", - "spec/classes/mod/mime_spec.rb": "d946fb96659b67bf7117ad7ed4b25cce", - "spec/classes/mod/negotiation_spec.rb": "44d50f7e6ef8c6388baa4c7cfc07be43", - "spec/classes/mod/pagespeed_spec.rb": "56bd7d82920cb734ea8139c9fed97de7", - "spec/classes/mod/passenger_spec.rb": "e8daaeafddd8b8ac33800c04a93b5c03", - "spec/classes/mod/perl_spec.rb": "1daa227f563ac19ff8dcdea0d0005ec4", - "spec/classes/mod/peruser_spec.rb": "c379ce85a997789856b12c27957bf994", - "spec/classes/mod/php_spec.rb": "2cc1a1d5d097be26eef3139b4e8eafaf", - "spec/classes/mod/prefork_spec.rb": "ce5a5a2a0909ea0748ae190e29485578", - "spec/classes/mod/proxy_balancer_spec.rb": "c0bd0c3ebf39d7c66120b3837551f6b1", - "spec/classes/mod/proxy_connect_spec.rb": "baef920356c839b698c2adb865e79b5f", - "spec/classes/mod/proxy_html_spec.rb": "c6fc0e6b0cbcd3d5f9e65d533366ee32", - "spec/classes/mod/proxy_wstunnel.rb": "69bcef5e88aeb115290d8428186c80ec", - "spec/classes/mod/python_spec.rb": "5ca2dd0829b7baa1022c551b66548b20", - "spec/classes/mod/remoteip_spec.rb": "f9bf0bc64fef6d570f7b798ceef0d598", - "spec/classes/mod/reqtimeout_spec.rb": "2af2919e8253100fbc2e001d30a5cd15", - "spec/classes/mod/rpaf_spec.rb": "5c4725a4bcab9339d7309765390aaed1", - "spec/classes/mod/security_spec.rb": "f2e41f16ff5e8aa8f4709cab68a7cf5e", - "spec/classes/mod/shib_spec.rb": "b4ec345e387f8d7186048f5d286bb71d", - "spec/classes/mod/speling_spec.rb": "96919b9fbd1e894fcfd649044c3dafb5", - "spec/classes/mod/ssl_spec.rb": "9c9fe05b815405d4e7fbb095e01d7d2a", - "spec/classes/mod/status_spec.rb": "1eeaf906baf6ca82bf24c4e23494c71c", - "spec/classes/mod/suphp_spec.rb": "cc7c02c42e985aa133f9d868e14d9435", - "spec/classes/mod/userdir_spec.rb": "fc18dedd8204d369142cef3a1644a725", - "spec/classes/mod/worker_spec.rb": "c326e36fbcfe9f0c59dc1db389a33926", - "spec/classes/mod/wsgi_spec.rb": "902251d74d6d3c821f460b620158295b", - "spec/classes/params_spec.rb": "adbd9f0dee677ea9439b9ce0d620894f", - "spec/classes/service_spec.rb": "0709833b94c1a3fbd13b73042fa84967", - "spec/classes/vhosts_spec.rb": "9baf23eb534e944a1bd593e72dd3050e", - "spec/defines/balancer_spec.rb": "8793815eb22b5190977b154fcd97e85e", - "spec/defines/balancermember_spec.rb": "e93ded8b51cc1d73e52f453880b3576e", - "spec/defines/custom_config_spec.rb": "cd4ee6803b79a844442107ac385cc833", - "spec/defines/fastcgi_server_spec.rb": "3311ba056a331208ba3511c9b7b5c8a8", - "spec/defines/mod_spec.rb": "a10e5b2570419737c03cd0f6347cc985", - "spec/defines/modsec_link_spec.rb": "3421b21f8234637dd1c32ebcf89e44c3", - "spec/defines/vhost_custom_spec.rb": "d5596a7a0c239d4c0ed8bebbb6a124ab", - "spec/defines/vhost_spec.rb": "3c20daaf362422924396642e66c73763", - "spec/fixtures/files/negotiation.conf": "9c11872e26327ec880749b5dfdea25d6", - "spec/fixtures/files/spec": "e964ecac35c35baa9b4c57dac4ff5b3e", - "spec/fixtures/site_apache/templates/fake.conf.erb": "6b0431dd0b9a0bf803eb0684300c2cff", - "spec/fixtures/templates/negotiation.conf.erb": "c838e612ce6f82a5efd12871ad562011", - "spec/spec_helper.rb": "b2db3bc02b4ac2fd5142a6621c641b07", - "spec/spec_helper_acceptance.rb": "2648111f88162eab93968fea4564b917", - "spec/spec_helper_local.rb": "1b6ccd9b2f6946b81560239881774e94", - "spec/unit/apache_version_spec.rb": "c9d7b8ab46fb21d370702f02088281a2", - "spec/unit/provider/a2mod/gentoo_spec.rb": "02f7510cbf4945c5e1094ebcb967c8e0", - "spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb": "7d17c7053d976f4426deafdd8b2b2472", - "spec/unit/puppet/parser/functions/bool2httpd_spec.rb": "0c9bca53eb43b5fc888126514b2a174c", - "spec/unit/puppet/parser/functions/validate_apache_log_level.rb": "8f558fd81d1655e9ab20896152eca512", - "tasks/init.json": "579d305196fe3a467697d8d808037984", - "tasks/init.rb": "bce50c9d2dac88972c5b893a3012a468", - "templates/confd/no-accf.conf.erb": "a614f28c4b54370e4fa88403dfe93eb0", - "templates/fastcgi/server.erb": "30cdd04393bdb4f68678d00e2930721b", - "templates/httpd.conf.erb": "a657c21476173ea4f669e3a9607f433c", - "templates/listen.erb": "6286aa08f9e28caee54b1e1ee031b9d6", - "templates/mod/alias.conf.erb": "370e9d394dd462d3ebc0dd345ab68f6f", - "templates/mod/auth_cas.conf.erb": "35e1291a5fa05067d7623c02bafb0ada", - "templates/mod/auth_mellon.conf.erb": "4e17d22a8f1bc312e976e8513199c945", - "templates/mod/authn_dbd.conf.erb": "7a84f5d3b3a4b92a88fe052b13376f8e", - "templates/mod/authnz_ldap.conf.erb": "2262e6d90ae81f2b732bbf0163006c59", - "templates/mod/autoindex.conf.erb": "2421a3c6df32c7e38c2a7a22afdf5728", - "templates/mod/cgid.conf.erb": "f8ce27d60bc495bab16de2696ebb2fd0", - "templates/mod/cluster.conf.erb": "9e92178f1d45193868e41e7fe1a06976", - "templates/mod/dav_fs.conf.erb": "10c1131168e35319e22b3fbfe51aebfd", - "templates/mod/deflate.conf.erb": "e866ecf2bfe8e42ea984267f569723db", - "templates/mod/dir.conf.erb": "2485da78a2506c14bf51dde38dd03360", - "templates/mod/disk_cache.conf.erb": "48d1b54ec1dedea7f68451bc0774790e", - "templates/mod/dumpio.conf.erb": "260a03d5f5b450095a5374690fbb34b2", - "templates/mod/event.conf.erb": "5e4095242d8e5dd99fe0823cfa2f1434", - "templates/mod/expires.conf.erb": "7a77f8b1d50c53ee77a6cb798c51a2b9", - "templates/mod/ext_filter.conf.erb": "4e4e4143ab402a9f9d51301b1a192202", - "templates/mod/fastcgi.conf.erb": "2404caa7d91dea083fc4f8b6f18acd24", - "templates/mod/fcgid.conf.erb": "1780c7808bb3811deaf0007c890df4dc", - "templates/mod/geoip.conf.erb": "93b95f44ec733ee8231be82381e02782", - "templates/mod/info.conf.erb": "c8580f35594e8f76da9c961def618739", - "templates/mod/itk.conf.erb": "eff84b78e4f2f8c5c3a2e9fc4b8aad16", - "templates/mod/jk/uriworkermap.properties.erb": "7c1bf568b51f40caa9959fa5e6867367", - "templates/mod/jk/workers.properties.erb": "ba29ac62816a1d44f4a1f82dcf7db2ca", - "templates/mod/jk.conf.erb": "d9b7538cac21ad34e868b181ea5231c2", - "templates/mod/ldap.conf.erb": "03ef6f461e4778342e6b94b8b4f3cd3a", - "templates/mod/load.erb": "01132434e6101080c41548b0ba7e57d8", - "templates/mod/mime.conf.erb": "2fa5a10d06ff979de1d5d2544586ab45", - "templates/mod/mime_magic.conf.erb": "067c3180b4216439b039822114144e78", - "templates/mod/mpm_event.conf.erb": "80097a19d063a4f973465d9ef5c0c0bf", - "templates/mod/negotiation.conf.erb": "a2f0fb40cd038cb17bedc2b84d9f48ea", - "templates/mod/nss.conf.erb": "03a7a3721b19706e00df00e457c5df69", - "templates/mod/pagespeed.conf.erb": "d1d8dfb00e528aab10a24518c7f148a6", - "templates/mod/passenger.conf.erb": "81512838f2fb7f01bf7fd674f023d086", - "templates/mod/peruser.conf.erb": "c4f4054aee899249ea6fef5a9e5c14ff", - "templates/mod/php.conf.erb": "c535da6adea16bdcb0586260eedf8c93", - "templates/mod/prefork.conf.erb": "2cc5a811633744a53c7346623b957755", - "templates/mod/proxy.conf.erb": "33a6a57edd324ba56e879a7b077ecf08", - "templates/mod/proxy_balancer.conf.erb": "a9f8d51a2a7169e5fd0c8415a3f9c662", - "templates/mod/proxy_html.conf.erb": "1236e21e77bcc077dd71dbef98c911c7", - "templates/mod/remoteip.conf.erb": "ad58e174410e3ff46ff93d4ad1e7b8a0", - "templates/mod/reqtimeout.conf.erb": "314ef068b786ae5afded290a8b6eab15", - "templates/mod/rpaf.conf.erb": "5447539c083ae54f3a9e93c1ac8c988b", - "templates/mod/security.conf.erb": "e309716298ed8709df5496c27d47fe36", - "templates/mod/security_crs.conf.erb": "5c7bc134c0675d75b66a5c8faaf11eb6", - "templates/mod/setenvif.conf.erb": "c7ede4173da1915b7ec088201f030c28", - "templates/mod/ssl.conf.erb": "f88b0d03bbbc9b0773475434a2ef0f93", - "templates/mod/status.conf.erb": "574ecc6f74e8b75d84710a44c4260210", - "templates/mod/suphp.conf.erb": "05bb7b3ea23976b032ce405bfd4edd18", - "templates/mod/userdir.conf.erb": "d05d417868378466d213f51506d987be", - "templates/mod/worker.conf.erb": "dc4c7049af7312f5e82b3e72e8fccdfd", - "templates/mod/wsgi.conf.erb": "ba2ba5a5699889626f4bc7f5604070b0", - "templates/namevirtualhost.erb": "fbfca19a639e18e6c477e191344ac8ae", - "templates/ports_header.erb": "afe35cb5747574b700ebaa0f0b3a626e", - "templates/vhost/_access_log.erb": "522414033856b19a50a7ebb1c729438a", - "templates/vhost/_action.erb": "a004dfcac2e63cef65cf8aa0e270b636", - "templates/vhost/_additional_includes.erb": "10e9c0056e962c49459839a1576b082e", - "templates/vhost/_aliases.erb": "6412f695e911feac18986da38f290dae", - "templates/vhost/_allow_encoded_slashes.erb": "37dee0b6fe9287342a10b533955dff81", - "templates/vhost/_auth_cas.erb": "96fb19c558e7e187fe9160f00f39061c", - "templates/vhost/_auth_kerb.erb": "3d0de0c3066440dffcbc75215174705b", - "templates/vhost/_block.erb": "8fa2f970222dbc0a38898b5a0ab80411", - "templates/vhost/_charsets.erb": "d152b6a7815e9edc0fe9bf9acbe2f1ec", - "templates/vhost/_custom_fragment.erb": "325ff48cefc06db035daa3491c391a88", - "templates/vhost/_directories.erb": "9d4527c579d4835c94743eaf61d8f2b7", - "templates/vhost/_docroot.erb": "65d882a3c9d6b6bdd2f9b771f378035a", - "templates/vhost/_error_document.erb": "81d3007c1301a5c5f244c082cfee9de2", - "templates/vhost/_fallbackresource.erb": "e6c103bee7f6f76b10f244fc9fd1cd3b", - "templates/vhost/_fastcgi.erb": "e6d743e11b776e155dc4f80c602fb7e1", - "templates/vhost/_file_footer.erb": "e27b2525783e590ca1820f1e2118285d", - "templates/vhost/_file_header.erb": "7c3c04eb4ac67403604113e2628696cf", - "templates/vhost/_filters.erb": "597b9de5ae210af9182a1c95172115e7", - "templates/vhost/_header.erb": "9eb9d4075f288183d8224ddec5b2f126", - "templates/vhost/_http_protocol_options.erb": "9df9dec592fdb8fb4ab4abf7227cef9c", - "templates/vhost/_itk.erb": "8bf90b9855a9277f7a665b10f6c57fe9", - "templates/vhost/_jk_mounts.erb": "ce997ee7b5602af04062cd5f785da345", - "templates/vhost/_keepalive_options.erb": "16876858bac1e55b13545866b0428d90", - "templates/vhost/_logging.erb": "5bc4cbb1bc8a292acc0ba0420f96ca4e", - "templates/vhost/_passenger.erb": "14b352c466310d8312aef10b67b3b2e4", - "templates/vhost/_passenger_base_uris.erb": "c8d7f4da1434078e856c72671942dcd8", - "templates/vhost/_php.erb": "a16a9f3e146ce463481205e083d4bf79", - "templates/vhost/_php_admin.erb": "107a57e9e7b3f86d1abcf743f672a292", - "templates/vhost/_proxy.erb": "18b9bbb791d248179a08eb36ab895e12", - "templates/vhost/_rack.erb": "ebe187c1bdc81eec9c8e0d9026120b18", - "templates/vhost/_redirect.erb": "2d40ece74203cc00b861a058db91962c", - "templates/vhost/_requestheader.erb": "db1b0cdda069ae809b5b83b0871ef991", - "templates/vhost/_require.erb": "932106f2c9ea604bba4ace78d22bdfee", - "templates/vhost/_rewrite.erb": "b7858eac95352744196006b57d4091df", - "templates/vhost/_scriptalias.erb": "98713f33cca15b22c749bd35ea9a7b41", - "templates/vhost/_security.erb": "0ade536a9d25342e7128996add04be56", - "templates/vhost/_serveralias.erb": "95fed45853629924467aefc271d5b396", - "templates/vhost/_serversignature.erb": "9bf5a458783ab459e5043e1cdf671fa7", - "templates/vhost/_setenv.erb": "6e6a7efb1b168da9673c9e6d00eadec5", - "templates/vhost/_ssl.erb": "92444768ba2ea36ee0cbc3c690b6a154", - "templates/vhost/_sslproxy.erb": "8ab477ac3aa325e46f07b3fbf188303f", - "templates/vhost/_suexec.erb": "f2b3f9b9ff8fbac4e468e02cd824675a", - "templates/vhost/_suphp.erb": "a1c4a5e4461adbfce870df0abd158b59", - "templates/vhost/_wsgi.erb": "7939532279d7655896ce1a5942116ca7" -} \ No newline at end of file diff --git a/modules/apache/examples/apache.pp b/modules/apache/examples/apache.pp deleted file mode 100644 index 18ec553..0000000 --- a/modules/apache/examples/apache.pp +++ /dev/null @@ -1,6 +0,0 @@ -include ::apache -include ::apache::mod::php -include ::apache::mod::cgi -include ::apache::mod::userdir -include ::apache::mod::disk_cache -include ::apache::mod::proxy_http diff --git a/modules/apache/examples/dev.pp b/modules/apache/examples/dev.pp deleted file mode 100644 index 5616e32..0000000 --- a/modules/apache/examples/dev.pp +++ /dev/null @@ -1 +0,0 @@ -include ::apache::mod::dev diff --git a/modules/apache/examples/init.pp b/modules/apache/examples/init.pp deleted file mode 100644 index 3391107..0000000 --- a/modules/apache/examples/init.pp +++ /dev/null @@ -1 +0,0 @@ -include ::apache diff --git a/modules/apache/examples/mod_load_params.pp b/modules/apache/examples/mod_load_params.pp deleted file mode 100644 index fa43132..0000000 --- a/modules/apache/examples/mod_load_params.pp +++ /dev/null @@ -1,11 +0,0 @@ -# Tests the path and identifier parameters for the apache::mod class - -# Base class for clarity: -class { '::apache': } - - -# Exaple parameter usage: -apache::mod { 'testmod': - path => '/usr/some/path/mod_testmod.so', - id => 'testmod_custom_name', -} diff --git a/modules/apache/examples/mods.pp b/modules/apache/examples/mods.pp deleted file mode 100644 index 6996382..0000000 --- a/modules/apache/examples/mods.pp +++ /dev/null @@ -1,9 +0,0 @@ -## Default mods - -# Base class. Declares default vhost on port 80 and default ssl -# vhost on port 443 listening on all interfaces and serving -# $apache::docroot, and declaring our default set of modules. -class { '::apache': - default_mods => true, -} - diff --git a/modules/apache/examples/mods_custom.pp b/modules/apache/examples/mods_custom.pp deleted file mode 100644 index 4098c83..0000000 --- a/modules/apache/examples/mods_custom.pp +++ /dev/null @@ -1,16 +0,0 @@ -## custom mods - -# Base class. Declares default vhost on port 80 and default ssl -# vhost on port 443 listening on all interfaces and serving -# $apache::docroot, and declaring a custom set of modules. -class { '::apache': - default_mods => [ - 'info', - 'alias', - 'mime', - 'env', - 'setenv', - 'expires', - ], -} - diff --git a/modules/apache/examples/php.pp b/modules/apache/examples/php.pp deleted file mode 100644 index ee18771..0000000 --- a/modules/apache/examples/php.pp +++ /dev/null @@ -1,4 +0,0 @@ -class { '::apache': - mpm_module => 'prefork', -} -include ::apache::mod::php diff --git a/modules/apache/examples/vhost.pp b/modules/apache/examples/vhost.pp deleted file mode 100644 index 440a56d..0000000 --- a/modules/apache/examples/vhost.pp +++ /dev/null @@ -1,261 +0,0 @@ -## Default vhosts, and custom vhosts -# NB: Please see the other vhost_*.pp example files for further -# examples. - -# Base class. Declares default vhost on port 80 and default ssl -# vhost on port 443 listening on all interfaces and serving -# $apache::docroot -class { '::apache': } - -# Most basic vhost -apache::vhost { 'first.example.com': - port => '80', - docroot => '/var/www/first', -} - -# Vhost with different docroot owner/group/mode -apache::vhost { 'second.example.com': - port => '80', - docroot => '/var/www/second', - docroot_owner => 'third', - docroot_group => 'third', - docroot_mode => '0770', -} - -# Vhost with serveradmin -apache::vhost { 'third.example.com': - port => '80', - docroot => '/var/www/third', - serveradmin => 'admin@example.com', -} - -# Vhost with ssl (uses default ssl certs) -apache::vhost { 'ssl.example.com': - port => '443', - docroot => '/var/www/ssl', - ssl => true, -} - -# Vhost with ssl and specific ssl certs -apache::vhost { 'fourth.example.com': - port => '443', - docroot => '/var/www/fourth', - ssl => true, - ssl_cert => '/etc/ssl/fourth.example.com.cert', - ssl_key => '/etc/ssl/fourth.example.com.key', -} - -# Vhost with english title and servername parameter -apache::vhost { 'The fifth vhost': - servername => 'fifth.example.com', - port => '80', - docroot => '/var/www/fifth', -} - -# Vhost with server aliases -apache::vhost { 'sixth.example.com': - serveraliases => [ - 'sixth.example.org', - 'sixth.example.net', - ], - port => '80', - docroot => '/var/www/fifth', -} - -# Vhost with alternate options -apache::vhost { 'seventh.example.com': - port => '80', - docroot => '/var/www/seventh', - options => [ - 'Indexes', - 'MultiViews', - ], -} - -# Vhost with AllowOverride for .htaccess -apache::vhost { 'eighth.example.com': - port => '80', - docroot => '/var/www/eighth', - override => 'All', -} - -# Vhost with access and error logs disabled -apache::vhost { 'ninth.example.com': - port => '80', - docroot => '/var/www/ninth', - access_log => false, - error_log => false, -} - -# Vhost with custom access and error logs and logroot -apache::vhost { 'tenth.example.com': - port => '80', - docroot => '/var/www/tenth', - access_log_file => 'tenth_vhost.log', - error_log_file => 'tenth_vhost_error.log', - logroot => '/var/log', -} - -# Vhost with a cgi-bin -apache::vhost { 'eleventh.example.com': - port => '80', - docroot => '/var/www/eleventh', - scriptalias => '/usr/lib/cgi-bin', -} - -# Vhost with a proxypass configuration -apache::vhost { 'twelfth.example.com': - port => '80', - docroot => '/var/www/twelfth', - proxy_dest => 'http://internal.example.com:8080/twelfth', - no_proxy_uris => ['/login','/logout'], -} - -# Vhost to redirect /login and /logout -apache::vhost { 'thirteenth.example.com': - port => '80', - docroot => '/var/www/thirteenth', - redirect_source => [ - '/login', - '/logout', - ], - redirect_dest => [ - 'http://10.0.0.10/login', - 'http://10.0.0.10/logout', - ], -} - -# Vhost to permamently redirect -apache::vhost { 'fourteenth.example.com': - port => '80', - docroot => '/var/www/fourteenth', - redirect_source => '/blog', - redirect_dest => 'http://blog.example.com', - redirect_status => 'permanent', -} - -# Vhost with a rack configuration -apache::vhost { 'fifteenth.example.com': - port => '80', - docroot => '/var/www/fifteenth', - rack_base_uris => ['/rackapp1', '/rackapp2'], -} - - -# Vhost to redirect non-ssl to ssl -apache::vhost { 'sixteenth.example.com non-ssl': - servername => 'sixteenth.example.com', - port => '80', - docroot => '/var/www/sixteenth', - rewrites => [ - { - comment => 'redirect non-SSL traffic to SSL site', - rewrite_cond => ['%{HTTPS} off'], - rewrite_rule => ['(.*) https://%{HTTP_HOST}%{REQUEST_URI}'], - } - ], -} - -# Rewrite a URL to lower case -apache::vhost { 'sixteenth.example.com non-ssl': - servername => 'sixteenth.example.com', - port => '80', - docroot => '/var/www/sixteenth', - rewrites => [ - { comment => 'Rewrite to lower case', - rewrite_cond => ['%{REQUEST_URI} [A-Z]'], - rewrite_map => ['lc int:tolower'], - rewrite_rule => ["(.*) \${lc:\$1} [R=301,L]"], - } - ], -} - -apache::vhost { 'sixteenth.example.com ssl': - servername => 'sixteenth.example.com', - port => '443', - docroot => '/var/www/sixteenth', - ssl => true, -} - -# Vhost to redirect non-ssl to ssl using old rewrite method -apache::vhost { 'sixteenth.example.com non-ssl old rewrite': - servername => 'sixteenth.example.com', - port => '80', - docroot => '/var/www/sixteenth', - rewrite_cond => '%{HTTPS} off', - rewrite_rule => '(.*) https://%{HTTP_HOST}%{REQUEST_URI}', -} -apache::vhost { 'sixteenth.example.com ssl old rewrite': - servername => 'sixteenth.example.com', - port => '443', - docroot => '/var/www/sixteenth', - ssl => true, -} - -# Vhost to block repository files -apache::vhost { 'seventeenth.example.com': - port => '80', - docroot => '/var/www/seventeenth', - block => 'scm', -} - -# Vhost with special environment variables -apache::vhost { 'eighteenth.example.com': - port => '80', - docroot => '/var/www/eighteenth', - setenv => ['SPECIAL_PATH /foo/bin','KILROY was_here'], -} - -apache::vhost { 'nineteenth.example.com': - port => '80', - docroot => '/var/www/nineteenth', - setenvif => 'Host "^([^\.]*)\.website\.com$" CLIENT_NAME=$1', -} - -# Vhost with additional include files -apache::vhost { 'twentyieth.example.com': - port => '80', - docroot => '/var/www/twelfth', - additional_includes => ['/tmp/proxy_group_a','/tmp/proxy_group_b'], -} - -# Vhost with alias for subdomain mapped to same named directory -# http://example.com.loc => /var/www/example.com -apache::vhost { 'subdomain.loc': - vhost_name => '*', - port => '80', - virtual_docroot => '/var/www/%-2+', - docroot => '/var/www', - serveraliases => ['*.loc',], -} - -# Vhost with SSLProtocol,SSLCipherSuite, SSLHonorCipherOrder -apache::vhost { 'securedomain.com': - priority => '10', - vhost_name => 'www.securedomain.com', - port => '443', - docroot => '/var/www/secure', - ssl => true, - ssl_cert => '/etc/ssl/securedomain.cert', - ssl_key => '/etc/ssl/securedomain.key', - ssl_chain => '/etc/ssl/securedomain.crt', - ssl_protocol => '-ALL +TLSv1', - ssl_cipher => 'ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM', - ssl_honorcipherorder => 'On', - add_listen => false, -} - -# Vhost with access log environment variables writing control -apache::vhost { 'twentyfirst.example.com': - port => '80', - docroot => '/var/www/twentyfirst', - access_log_env_var => 'admin', -} - -# Vhost with a passenger_base configuration -apache::vhost { 'twentysecond.example.com': - port => '80', - docroot => '/var/www/twentysecond', - rack_base_uris => ['/passengerapp1', '/passengerapp2'], -} - diff --git a/modules/apache/examples/vhost_directories.pp b/modules/apache/examples/vhost_directories.pp deleted file mode 100644 index df5a2d5..0000000 --- a/modules/apache/examples/vhost_directories.pp +++ /dev/null @@ -1,44 +0,0 @@ -# Base class. Declares default vhost on port 80 and default ssl -# vhost on port 443 listening on all interfaces and serving -# $apache::docroot -class { '::apache': } - -# Example from README adapted. -apache::vhost { 'readme.example.net': - docroot => '/var/www/readme', - directories => [ - { - 'path' => '/var/www/readme', - 'ServerTokens' => 'prod' , - }, - { - 'path' => '/usr/share/empty', - 'allow' => 'from all', - }, - ], -} - -# location test -apache::vhost { 'location.example.net': - docroot => '/var/www/location', - directories => [ - { - 'path' => '/location', - 'provider' => 'location', - 'ServerTokens' => 'prod' - }, - ], -} - -# files test, curedly disable access to accidental backup files. -apache::vhost { 'files.example.net': - docroot => '/var/www/files', - directories => [ - { - 'path' => '(\.swp|\.bak|~)$', - 'provider' => 'filesmatch', - 'deny' => 'from all' - }, - ], -} - diff --git a/modules/apache/examples/vhost_filter.pp b/modules/apache/examples/vhost_filter.pp deleted file mode 100644 index 1a66b85..0000000 --- a/modules/apache/examples/vhost_filter.pp +++ /dev/null @@ -1,17 +0,0 @@ -# Base class. Declares default vhost on port 80 with filters. -class { '::apache': } - -# Example from README adapted. -apache::vhost { 'readme.example.net': - docroot => '/var/www/html', - filters => [ - 'FilterDeclare COMPRESS', - 'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/html', - 'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/css', - 'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/plain', - 'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/xml', - 'FilterChain COMPRESS', - 'FilterProtocol COMPRESS DEFLATE change=yes;byteranges=no', - ], -} - diff --git a/modules/apache/examples/vhost_ip_based.pp b/modules/apache/examples/vhost_ip_based.pp deleted file mode 100644 index 249c419..0000000 --- a/modules/apache/examples/vhost_ip_based.pp +++ /dev/null @@ -1,25 +0,0 @@ -## IP-based vhosts on any listen port -# IP-based vhosts respond to requests on specific IP addresses. - -# Base class. Turn off the default vhosts; we will be declaring -# all vhosts below. -class { '::apache': - default_vhost => false, -} - -# Listen on port 80 and 81; required because the following vhosts -# are not declared with a port parameter. -apache::listen { '80': } -apache::listen { '81': } - -# IP-based vhosts -apache::vhost { 'first.example.com': - ip => '10.0.0.10', - docroot => '/var/www/first', - ip_based => true, -} -apache::vhost { 'second.example.com': - ip => '10.0.0.11', - docroot => '/var/www/second', - ip_based => true, -} diff --git a/modules/apache/examples/vhost_proxypass.pp b/modules/apache/examples/vhost_proxypass.pp deleted file mode 100644 index 8edd0de..0000000 --- a/modules/apache/examples/vhost_proxypass.pp +++ /dev/null @@ -1,66 +0,0 @@ -## vhost with proxyPass directive -# NB: Please see the other vhost_*.pp example files for further -# examples. - -# Base class. Declares default vhost on port 80 and default ssl -# vhost on port 443 listening on all interfaces and serving -# $apache::docroot -class { '::apache': } - -# Most basic vhost with proxy_pass -apache::vhost { 'first.example.com': - port => 80, - docroot => '/var/www/first', - proxy_pass => [ - { - 'path' => '/first', - 'url' => 'http://localhost:8080/first' - }, - ], -} - -# vhost with proxy_pass and parameters -apache::vhost { 'second.example.com': - port => 80, - docroot => '/var/www/second', - proxy_pass => [ - { - 'path' => '/second', - 'url' => 'http://localhost:8080/second', - 'params' => { - 'retry' => '0', - 'timeout' => '5', - } - }, - ], -} - -# vhost with proxy_pass and keywords -apache::vhost { 'third.example.com': - port => 80, - docroot => '/var/www/third', - proxy_pass => [ - { - 'path' => '/third', - 'url' => 'http://localhost:8080/third', - 'keywords' => ['noquery', 'interpolate'] - }, - ], -} - -# vhost with proxy_pass, parameters and keywords -apache::vhost { 'fourth.example.com': - port => 80, - docroot => '/var/www/fourth', - proxy_pass => [ - { - 'path' => '/fourth', - 'url' => 'http://localhost:8080/fourth', - 'params' => { - 'retry' => '0', - 'timeout' => '5', - }, - 'keywords' => ['noquery', 'interpolate'] - }, - ], -} diff --git a/modules/apache/examples/vhost_ssl.pp b/modules/apache/examples/vhost_ssl.pp deleted file mode 100644 index 53989ff..0000000 --- a/modules/apache/examples/vhost_ssl.pp +++ /dev/null @@ -1,23 +0,0 @@ -## SSL-enabled vhosts -# SSL-enabled vhosts respond only to HTTPS queries. - -# Base class. Turn off the default vhosts; we will be declaring -# all vhosts below. -class { '::apache': - default_vhost => false, -} - -# Non-ssl vhost -apache::vhost { 'first.example.com non-ssl': - servername => 'first.example.com', - port => '80', - docroot => '/var/www/first', -} - -# SSL vhost at the same domain -apache::vhost { 'first.example.com ssl': - servername => 'first.example.com', - port => '443', - docroot => '/var/www/first', - ssl => true, -} diff --git a/modules/apache/examples/vhosts_without_listen.pp b/modules/apache/examples/vhosts_without_listen.pp deleted file mode 100644 index 0e97a02..0000000 --- a/modules/apache/examples/vhosts_without_listen.pp +++ /dev/null @@ -1,53 +0,0 @@ -## Declare ip-based and name-based vhosts -# Mixing Name-based vhost with IP-specific vhosts requires `add_listen => -# 'false'` on the non-IP vhosts - -# Base class. Turn off the default vhosts; we will be declaring -# all vhosts below. -class { '::apache': - default_vhost => false, -} - - -# Add two an IP-based vhost on 10.0.0.10, ssl and non-ssl -apache::vhost { 'The first IP-based vhost, non-ssl': - servername => 'first.example.com', - ip => '10.0.0.10', - port => '80', - ip_based => true, - docroot => '/var/www/first', -} -apache::vhost { 'The first IP-based vhost, ssl': - servername => 'first.example.com', - ip => '10.0.0.10', - port => '443', - ip_based => true, - docroot => '/var/www/first-ssl', - ssl => true, -} - -# Two name-based vhost listening on 10.0.0.20 -apache::vhost { 'second.example.com': - ip => '10.0.0.20', - port => '80', - docroot => '/var/www/second', -} -apache::vhost { 'third.example.com': - ip => '10.0.0.20', - port => '80', - docroot => '/var/www/third', -} - -# Two name-based vhosts without IPs specified, so that they will answer on either 10.0.0.10 or 10.0.0.20 . It is requried to declare -# `add_listen => 'false'` to disable declaring "Listen 80" which will conflict -# with the IP-based preceeding vhosts. -apache::vhost { 'fourth.example.com': - port => '80', - docroot => '/var/www/fourth', - add_listen => false, -} -apache::vhost { 'fifth.example.com': - port => '80', - docroot => '/var/www/fifth', - add_listen => false, -} diff --git a/modules/apache/files/httpd b/modules/apache/files/httpd deleted file mode 100644 index d65a8d4..0000000 --- a/modules/apache/files/httpd +++ /dev/null @@ -1,24 +0,0 @@ -# Configuration file for the httpd service. - -# -# The default processing model (MPM) is the process-based -# 'prefork' model. A thread-based model, 'worker', is also -# available, but does not work with some modules (such as PHP). -# The service must be stopped before changing this variable. -# -#HTTPD=/usr/sbin/httpd.worker - -# -# To pass additional options (for instance, -D definitions) to the -# httpd binary at startup, set OPTIONS here. -# -#OPTIONS= -#OPTIONS=-DDOWN - -# -# By default, the httpd process is started in the C locale; to -# change the locale in which the server runs, the HTTPD_LANG -# variable can be set. -# -#HTTPD_LANG=C -export SHORTHOST=`hostname -s` diff --git a/modules/apache/lib/facter/apache_version.rb b/modules/apache/lib/facter/apache_version.rb deleted file mode 100644 index 4bd7337..0000000 --- a/modules/apache/lib/facter/apache_version.rb +++ /dev/null @@ -1,13 +0,0 @@ -Facter.add(:apache_version) do - setcode do - if Facter::Util::Resolution.which('apachectl') - apache_version = Facter::Util::Resolution.exec('apachectl -v 2>&1') - Facter.debug "Matching apachectl '#{apache_version}'" - %r{^Server version: Apache/(\d+\.\d+(\.\d+)?)}.match(apache_version)[1] - elsif Facter::Util::Resolution.which('apache2ctl') - apache_version = Facter::Util::Resolution.exec('apache2ctl -v 2>&1') - Facter.debug "Matching apache2ctl '#{apache_version}'" - %r{^Server version: Apache/(\d+\.\d+(\.\d+)?)}.match(apache_version)[1] - end - end -end diff --git a/modules/apache/lib/puppet/parser/functions/apache_pw_hash.rb b/modules/apache/lib/puppet/parser/functions/apache_pw_hash.rb deleted file mode 100644 index 29d4b5e..0000000 --- a/modules/apache/lib/puppet/parser/functions/apache_pw_hash.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'base64' - -Puppet::Parser::Functions::newfunction(:apache_pw_hash, :type => :rvalue, :doc => <<-EOS -Hashes a password in a format suitable for htpasswd files read by apache. - -Currently uses SHA-hashes, because although this format is considered insecure, its the -most secure format supported by the most platforms. -EOS -) do |args| - raise(Puppet::ParseError, "apache_pw_hash() wrong number of arguments. Given: #{args.size} for 1)") if args.size != 1 - raise(Puppet::ParseError, "apache_pw_hash(): first argument must be a string") unless args[0].is_a? String - raise(Puppet::ParseError, "apache_pw_hash(): first argument must not be empty") if args[0].empty? - - password = args[0] - return '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(password)) -end diff --git a/modules/apache/lib/puppet/parser/functions/bool2httpd.rb b/modules/apache/lib/puppet/parser/functions/bool2httpd.rb deleted file mode 100644 index 5fb79f6..0000000 --- a/modules/apache/lib/puppet/parser/functions/bool2httpd.rb +++ /dev/null @@ -1,30 +0,0 @@ -Puppet::Parser::Functions::newfunction(:bool2httpd, :type => :rvalue, :doc => <<-EOS -Transform a supposed boolean to On or Off. Pass all other values through. -Given a nil value (undef), bool2httpd will return 'Off' - -Example: - - $trace_enable = false - $server_signature = 'mail' - - bool2httpd($trace_enable) - # => 'Off' - bool2httpd($server_signature) - # => 'mail' - bool2httpd(undef) - # => 'Off' - -EOS -) do |args| - raise(Puppet::ParseError, "bool2httpd() wrong number of arguments. Given: #{args.size} for 1)") if args.size != 1 - - arg = args[0] - - if arg.nil? or arg == false or arg =~ /false/i or arg == :undef - return 'Off' - elsif arg == true or arg =~ /true/i - return 'On' - end - - return arg.to_s -end diff --git a/modules/apache/lib/puppet/parser/functions/validate_apache_log_level.rb b/modules/apache/lib/puppet/parser/functions/validate_apache_log_level.rb deleted file mode 100644 index 8a1ade0..0000000 --- a/modules/apache/lib/puppet/parser/functions/validate_apache_log_level.rb +++ /dev/null @@ -1,27 +0,0 @@ -module Puppet::Parser::Functions - newfunction(:validate_apache_log_level, :doc => <<-'ENDHEREDOC') do |args| - Perform simple validation of a string against the list of known log - levels as per http://httpd.apache.org/docs/current/mod/core.html#loglevel - validate_apache_loglevel('info') - - Modules maybe specified with their own levels like these: - validate_apache_loglevel('warn ssl:info') - validate_apache_loglevel('warn mod_ssl.c:info') - validate_apache_loglevel('warn ssl_module:info') - - Expected to be used from the main or vhost. - - Might be used from directory too later as apaceh supports that - - ENDHEREDOC - if (args.size != 1) then - raise Puppet::ParseError, ("validate_apache_loglevel(): wrong number of arguments (#{args.length}; must be 1)") - end - - log_level = args[0] - msg = "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels." - - raise Puppet::ParseError, (msg) unless log_level =~ Regexp.compile('(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])') - - end -end diff --git a/modules/apache/lib/puppet/provider/a2mod.rb b/modules/apache/lib/puppet/provider/a2mod.rb deleted file mode 100644 index 670aca3..0000000 --- a/modules/apache/lib/puppet/provider/a2mod.rb +++ /dev/null @@ -1,34 +0,0 @@ -class Puppet::Provider::A2mod < Puppet::Provider - def self.prefetch(mods) - instances.each do |prov| - if mod = mods[prov.name] - mod.provider = prov - end - end - end - - def flush - @property_hash.clear - end - - def properties - if @property_hash.empty? - @property_hash = query || {:ensure => :absent} - @property_hash[:ensure] = :absent if @property_hash.empty? - end - @property_hash.dup - end - - def query - self.class.instances.each do |mod| - if mod.name == self.name or mod.name.downcase == self.name - return mod.properties - end - end - nil - end - - def exists? - properties[:ensure] != :absent - end -end diff --git a/modules/apache/lib/puppet/provider/a2mod/a2mod.rb b/modules/apache/lib/puppet/provider/a2mod/a2mod.rb deleted file mode 100644 index e257a57..0000000 --- a/modules/apache/lib/puppet/provider/a2mod/a2mod.rb +++ /dev/null @@ -1,35 +0,0 @@ -require 'puppet/provider/a2mod' - -Puppet::Type.type(:a2mod).provide(:a2mod, :parent => Puppet::Provider::A2mod) do - desc "Manage Apache 2 modules on Debian and Ubuntu" - - optional_commands :encmd => "a2enmod" - optional_commands :discmd => "a2dismod" - commands :apache2ctl => "apache2ctl" - - confine :osfamily => :debian - defaultfor :operatingsystem => [:debian, :ubuntu] - - def self.instances - modules = apache2ctl("-M").lines.collect { |line| - m = line.match(/(\w+)_module \(shared\)$/) - m[1] if m - }.compact - - modules.map do |mod| - new( - :name => mod, - :ensure => :present, - :provider => :a2mod - ) - end - end - - def create - encmd resource[:name] - end - - def destroy - discmd resource[:name] - end -end diff --git a/modules/apache/lib/puppet/provider/a2mod/gentoo.rb b/modules/apache/lib/puppet/provider/a2mod/gentoo.rb deleted file mode 100644 index 07319df..0000000 --- a/modules/apache/lib/puppet/provider/a2mod/gentoo.rb +++ /dev/null @@ -1,116 +0,0 @@ -require 'puppet/util/filetype' -Puppet::Type.type(:a2mod).provide(:gentoo, :parent => Puppet::Provider) do - desc "Manage Apache 2 modules on Gentoo" - - confine :operatingsystem => :gentoo - defaultfor :operatingsystem => :gentoo - - attr_accessor :property_hash - - def create - @property_hash[:ensure] = :present - end - - def exists? - (!(@property_hash[:ensure].nil?) and @property_hash[:ensure] == :present) - end - - def destroy - @property_hash[:ensure] = :absent - end - - def flush - self.class.flush - end - - class << self - attr_reader :conf_file - end - - def self.clear - @mod_resources = [] - @modules = [] - @other_args = "" - end - - def self.initvars - @conf_file = "/etc/conf.d/apache2" - @filetype = Puppet::Util::FileType.filetype(:flat).new(conf_file) - @mod_resources = [] - @modules = [] - @other_args = "" - end - - self.initvars - - # Retrieve an array of all existing modules - def self.modules - if @modules.length <= 0 - # Locate the APACHE_OPTS variable - records = filetype.read.split(/\n/) - apache2_opts = records.grep(/^\s*APACHE2_OPTS=/).first - - # Extract all defines - while apache2_opts.sub!(/-D\s+(\w+)/, '') - @modules << $1.downcase - end - - # Hang on to any remaining options. - if apache2_opts.match(/APACHE2_OPTS="(.+)"/) - @other_args = $1.strip - end - - @modules.sort!.uniq! - end - - @modules - end - - def self.prefetch(resources={}) - # Match resources with existing providers - instances.each do |provider| - if resource = resources[provider.name] - resource.provider = provider - end - end - - # Store all resources using this provider for flushing - resources.each do |name, resource| - @mod_resources << resource - end - end - - def self.instances - modules.map {|mod| new(:name => mod, :provider => :gentoo, :ensure => :present)} - end - - def self.flush - - mod_list = modules - mods_to_remove = @mod_resources.select {|mod| mod.should(:ensure) == :absent}.map {|mod| mod[:name]} - mods_to_add = @mod_resources.select {|mod| mod.should(:ensure) == :present}.map {|mod| mod[:name]} - - mod_list -= mods_to_remove - mod_list += mods_to_add - mod_list.sort!.uniq! - - if modules != mod_list - opts = @other_args + " " - opts << mod_list.map {|mod| "-D #{mod.upcase}"}.join(" ") - opts.strip! - opts.gsub!(/\s+/, ' ') - - apache2_opts = %Q{APACHE2_OPTS="#{opts}"} - Puppet.debug("Writing back \"#{apache2_opts}\" to #{conf_file}") - - records = filetype.read.split(/\n/) - - opts_index = records.find_index {|i| i.match(/^\s*APACHE2_OPTS/)} - records[opts_index] = apache2_opts - - filetype.backup - filetype.write(records.join("\n")) - @modules = mod_list - end - end -end diff --git a/modules/apache/lib/puppet/provider/a2mod/modfix.rb b/modules/apache/lib/puppet/provider/a2mod/modfix.rb deleted file mode 100644 index 8f35b2e..0000000 --- a/modules/apache/lib/puppet/provider/a2mod/modfix.rb +++ /dev/null @@ -1,12 +0,0 @@ -Puppet::Type.type(:a2mod).provide :modfix do - desc "Dummy provider for A2mod. - - Fake nil resources when there is no crontab binary available. Allows - puppetd to run on a bootstrapped machine before a Cron package has been - installed. Workaround for: http://projects.puppetlabs.com/issues/2384 - " - - def self.instances - [] - end -end \ No newline at end of file diff --git a/modules/apache/lib/puppet/provider/a2mod/redhat.rb b/modules/apache/lib/puppet/provider/a2mod/redhat.rb deleted file mode 100644 index ea5494c..0000000 --- a/modules/apache/lib/puppet/provider/a2mod/redhat.rb +++ /dev/null @@ -1,60 +0,0 @@ -require 'puppet/provider/a2mod' - -Puppet::Type.type(:a2mod).provide(:redhat, :parent => Puppet::Provider::A2mod) do - desc "Manage Apache 2 modules on RedHat family OSs" - - commands :apachectl => "apachectl" - - confine :osfamily => :redhat - defaultfor :osfamily => :redhat - - require 'pathname' - - # modpath: Path to default apache modules directory /etc/httpd/mod.d - # modfile: Path to module load configuration file; Default: resides under modpath directory - # libfile: Path to actual apache module library. Added in modfile LoadModule - - attr_accessor :modfile, :libfile - class << self - attr_accessor :modpath - def preinit - @modpath = "/etc/httpd/mod.d" - end - end - - self.preinit - - def create - File.open(modfile,'w') do |f| - f.puts "LoadModule #{resource[:identifier]} #{libfile}" - end - end - - def destroy - File.delete(modfile) - end - - def self.instances - modules = apachectl("-M").lines.collect { |line| - m = line.match(/(\w+)_module \(shared\)$/) - m[1] if m - }.compact - - modules.map do |mod| - new( - :name => mod, - :ensure => :present, - :provider => :redhat - ) - end - end - - def modfile - modfile ||= "#{self.class.modpath}/#{resource[:name]}.load" - end - - # Set libfile path: If absolute path is passed, then maintain it. Else, make it default from 'modules' dir. - def libfile - libfile = Pathname.new(resource[:lib]).absolute? ? resource[:lib] : "modules/#{resource[:lib]}" - end -end diff --git a/modules/apache/lib/puppet/type/a2mod.rb b/modules/apache/lib/puppet/type/a2mod.rb deleted file mode 100644 index 07a911e..0000000 --- a/modules/apache/lib/puppet/type/a2mod.rb +++ /dev/null @@ -1,30 +0,0 @@ -Puppet::Type.newtype(:a2mod) do - @doc = "Manage Apache 2 modules" - - ensurable - - newparam(:name) do - Puppet.warning "The a2mod provider is deprecated, please use apache::mod instead" - desc "The name of the module to be managed" - - isnamevar - - end - - newparam(:lib) do - desc "The name of the .so library to be loaded" - - defaultto { "mod_#{@resource[:name]}.so" } - end - - newparam(:identifier) do - desc "Module identifier string used by LoadModule. Default: module-name_module" - - # http://httpd.apache.org/docs/2.2/mod/module-dict.html#ModuleIdentifier - - defaultto { "#{resource[:name]}_module" } - end - - autorequire(:package) { catalog.resource(:package, 'httpd')} - -end diff --git a/modules/apache/locales/config.yaml b/modules/apache/locales/config.yaml deleted file mode 100644 index c837de7..0000000 --- a/modules/apache/locales/config.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# This is the project-specific configuration file for setting up -# fast_gettext for your project. -gettext: - # This is used for the name of the .pot and .po files; they will be - # called .pot? - project_name: puppetlabs-apache - # This is used in comments in the .pot and .po files to indicate what - # project the files belong to and should bea little more desctiptive than - # - package_name: puppetlabs-apache - # The locale that the default messages in the .pot file are in - default_locale: en - # The email used for sending bug reports. - bugs_address: docs@puppet.com - # The holder of the copyright. - copyright_holder: Puppet, Inc. - # This determines which comments in code should be eligible for translation. - # Any comments that start with this string will be externalized. (Leave - # empty to include all.) - comments_tag: TRANSLATOR - # Patterns for +Dir.glob+ used to find all files that might contain - # translatable content, relative to the project root directory - source_files: - - './lib/**/*.rb' - diff --git a/modules/apache/locales/ja/puppetlabs-apache.po b/modules/apache/locales/ja/puppetlabs-apache.po deleted file mode 100644 index 1d61c89..0000000 --- a/modules/apache/locales/ja/puppetlabs-apache.po +++ /dev/null @@ -1,28 +0,0 @@ -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-21 14:19+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: 梅田智世 , 2017\n" -"Language-Team: Japanese (Japan) (https://www.transifex.com/puppet/teams/29089/ja_JP/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ja_JP\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Translate Toolkit 2.0.0\n" - -#. metadata.json -#: .summary -msgid "" -"Installs, configures, and manages Apache virtual hosts, web services, and " -"modules." -msgstr "Apacheバーチャルホスト、Webサービス、モジュールのインストール、設定、管理。" - -#. metadata.json -#: .description -msgid "Module for Apache configuration" -msgstr "Apache設定用のモジュール。" diff --git a/modules/apache/locales/puppetlabs-apache.pot b/modules/apache/locales/puppetlabs-apache.pot deleted file mode 100644 index 7602dd8..0000000 --- a/modules/apache/locales/puppetlabs-apache.pot +++ /dev/null @@ -1,25 +0,0 @@ -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-21 14:19+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 2.0.0\n" - -#. metadata.json -#: .summary -msgid "" -"Installs, configures, and manages Apache virtual hosts, web services, and " -"modules." -msgstr "" - -#. metadata.json -#: .description -msgid "Module for Apache configuration" -msgstr "" diff --git a/modules/apache/manifests/balancer.pp b/modules/apache/manifests/balancer.pp deleted file mode 100644 index 41db8a8..0000000 --- a/modules/apache/manifests/balancer.pp +++ /dev/null @@ -1,97 +0,0 @@ -# == Define Resource Type: apache::balancer -# -# This type will create an apache balancer cluster file inside the conf.d -# directory. Each balancer cluster needs one or more balancer members (that can -# be declared with the apache::balancermember defined resource type). Using -# storeconfigs, you can export the apache::balancermember resources on all -# balancer members, and then collect them on a single apache load balancer -# server. -# -# === Requirement/Dependencies: -# -# Currently requires the puppetlabs/concat module on the Puppet Forge and uses -# storeconfigs on the Puppet Master to export/collect resources from all -# balancer members. -# -# === Parameters -# -# [*name*] -# The namevar of the defined resource type is the balancer clusters name. -# This name is also used in the name of the conf.d file -# -# [*proxy_set*] -# Hash, default empty. If given, each key-value pair will be used as a ProxySet -# line in the configuration. -# -# [*target*] -# String, default undef. If given, path to the file the balancer definition will -# be written. -# -# [*collect_exported*] -# Boolean, default 'true'. True means 'collect exported @@balancermember -# resources' (for the case when every balancermember node exports itself), -# false means 'rely on the existing declared balancermember resources' (for the -# case when you know the full set of balancermembers in advance and use -# apache::balancermember with array arguments, which allows you to deploy -# everything in 1 run) -# -# -# === Examples -# -# Exporting the resource for a balancer member: -# -# apache::balancer { 'puppet00': } -# -define apache::balancer ( - $proxy_set = {}, - $collect_exported = true, - $target = undef, -) { - include ::apache::mod::proxy_balancer - - if versioncmp($apache::mod::proxy_balancer::apache_version, '2.4') >= 0 { - $lbmethod = $proxy_set['lbmethod'] ? { - undef => 'byrequests', - default => $proxy_set['lbmethod'], - } - ensure_resource('apache::mod', "lbmethod_${lbmethod}") - } - - if $target { - $_target = $target - } else { - $_target = "${::apache::confd_dir}/balancer_${name}.conf" - } - - concat { "apache_balancer_${name}": - owner => '0', - group => '0', - path => $_target, - mode => $::apache::file_mode, - notify => Class['Apache::Service'], - } - - concat::fragment { "00-${name}-header": - target => "apache_balancer_${name}", - order => '01', - content => "\n", - } - - if $collect_exported { - Apache::Balancermember <<| balancer_cluster == $name |>> - } - # else: the resources have been created and they introduced their - # concat fragments. We don't have to do anything about them. - - concat::fragment { "01-${name}-proxyset": - target => "apache_balancer_${name}", - order => '19', - content => inline_template("<% @proxy_set.keys.sort.each do |key| %> Proxyset <%= key %>=<%= @proxy_set[key] %>\n<% end %>"), - } - - concat::fragment { "01-${name}-footer": - target => "apache_balancer_${name}", - order => '20', - content => "\n", - } -} diff --git a/modules/apache/manifests/balancermember.pp b/modules/apache/manifests/balancermember.pp deleted file mode 100644 index 6e8b29f..0000000 --- a/modules/apache/manifests/balancermember.pp +++ /dev/null @@ -1,52 +0,0 @@ -# == Define Resource Type: apache::balancermember -# -# This type will setup a balancer member inside a listening service -# configuration block in /etc/apache/apache.cfg on the load balancer. -# currently it only has the ability to specify the instance name, url and an -# array of options. More features can be added as needed. The best way to -# implement this is to export this resource for all apache balancer member -# servers, and then collect them on the main apache load balancer. -# -# === Requirement/Dependencies: -# -# Currently requires the puppetlabs/concat module on the Puppet Forge and -# uses storeconfigs on the Puppet Master to export/collect resources -# from all balancer members. -# -# === Parameters -# -# [*name*] -# The title of the resource is arbitrary and only utilized in the concat -# fragment name. -# -# [*balancer_cluster*] -# The apache service's instance name (or, the title of the apache::balancer -# resource). This must match up with a declared apache::balancer resource. -# -# [*url*] -# The url used to contact the balancer member server. -# -# [*options*] -# An array of options to be specified after the url. -# -# === Examples -# -# Exporting the resource for a balancer member: -# -# @@apache::balancermember { 'apache': -# balancer_cluster => 'puppet00', -# url => "ajp://${::fqdn}:8009" -# options => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'], -# } -# -define apache::balancermember( - $balancer_cluster, - $url = "http://${::fqdn}/", - $options = [], -) { - - concat::fragment { "BalancerMember ${name}": - target => "apache_balancer_${balancer_cluster}", - content => inline_template(" BalancerMember ${url} <%= @options.join ' ' %>\n"), - } -} diff --git a/modules/apache/manifests/confd/no_accf.pp b/modules/apache/manifests/confd/no_accf.pp deleted file mode 100644 index f35c0c8..0000000 --- a/modules/apache/manifests/confd/no_accf.pp +++ /dev/null @@ -1,10 +0,0 @@ -class apache::confd::no_accf { - # Template uses no variables - file { 'no-accf.conf': - ensure => 'file', - path => "${::apache::confd_dir}/no-accf.conf", - content => template('apache/confd/no-accf.conf.erb'), - require => Exec["mkdir ${::apache::confd_dir}"], - before => File[$::apache::confd_dir], - } -} diff --git a/modules/apache/manifests/custom_config.pp b/modules/apache/manifests/custom_config.pp deleted file mode 100644 index 6bffa05..0000000 --- a/modules/apache/manifests/custom_config.pp +++ /dev/null @@ -1,67 +0,0 @@ -# See README.md for usage information -define apache::custom_config ( - Enum['absent', 'present'] $ensure = 'present', - $confdir = $::apache::confd_dir, - $content = undef, - $priority = '25', - $source = undef, - $verify_command = $::apache::params::verify_command, - Boolean $verify_config = true, - $filename = undef, -) { - - if $content and $source { - fail('Only one of $content and $source can be specified.') - } - - if $ensure == 'present' and ! $content and ! $source { - fail('One of $content and $source must be specified.') - } - - if $filename { - $_filename = $filename - } else { - if $priority { - $priority_prefix = "${priority}-" - } else { - $priority_prefix = '' - } - - ## Apache include does not always work with spaces in the filename - $filename_middle = regsubst($name, ' ', '_', 'G') - $_filename = "${priority_prefix}${filename_middle}.conf" - } - - if ! $verify_config or $ensure == 'absent' { - $notifies = Class['Apache::Service'] - } else { - $notifies = undef - } - - file { "apache_${name}": - ensure => $ensure, - path => "${confdir}/${_filename}", - content => $content, - source => $source, - require => Package['httpd'], - notify => $notifies, - } - - if $ensure == 'present' and $verify_config { - exec { "syntax verification for ${name}": - command => $verify_command, - subscribe => File["apache_${name}"], - refreshonly => true, - notify => Class['Apache::Service'], - before => Exec["remove ${name} if invalid"], - require => Anchor['::apache::modules_set_up'], - } - - exec { "remove ${name} if invalid": - command => "/bin/rm ${confdir}/${_filename}", - unless => $verify_command, - subscribe => File["apache_${name}"], - refreshonly => true, - } - } -} diff --git a/modules/apache/manifests/default_confd_files.pp b/modules/apache/manifests/default_confd_files.pp deleted file mode 100644 index c06b30c..0000000 --- a/modules/apache/manifests/default_confd_files.pp +++ /dev/null @@ -1,15 +0,0 @@ -class apache::default_confd_files ( - $all = true, -) { - # The rest of the conf.d/* files only get loaded if we want them - if $all { - case $::osfamily { - 'freebsd': { - include ::apache::confd::no_accf - } - default: { - # do nothing - } - } - } -} diff --git a/modules/apache/manifests/default_mods.pp b/modules/apache/manifests/default_mods.pp deleted file mode 100644 index 879df59..0000000 --- a/modules/apache/manifests/default_mods.pp +++ /dev/null @@ -1,179 +0,0 @@ -class apache::default_mods ( - $all = true, - $mods = undef, - $apache_version = $::apache::apache_version, - $use_systemd = $::apache::use_systemd, -) { - # These are modules required to run the default configuration. - # They are not configurable at this time, so we just include - # them to make sure it works. - case $::osfamily { - 'redhat': { - ::apache::mod { 'log_config': } - if versioncmp($apache_version, '2.4') >= 0 { - # Lets fork it - # Do not try to load mod_systemd on RHEL/CentOS 6 SCL. - if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) and !($::operatingsystem == 'Amazon') ) { - if ($use_systemd) { - ::apache::mod { 'systemd': } - } - } - ::apache::mod { 'unixd': } - } - } - 'freebsd': { - ::apache::mod { 'log_config': } - ::apache::mod { 'unixd': } - } - 'Suse': { - ::apache::mod { 'log_config': } - } - default: {} - } - case $::osfamily { - 'gentoo': {} - default: { - ::apache::mod { 'authz_host': } - } - } - # The rest of the modules only get loaded if we want all modules enabled - if $all { - case $::osfamily { - 'debian': { - include ::apache::mod::authn_core - include ::apache::mod::reqtimeout - if versioncmp($apache_version, '2.4') < 0 { - ::apache::mod { 'authn_alias': } - } - } - 'redhat': { - include ::apache::mod::actions - include ::apache::mod::authn_core - include ::apache::mod::cache - include ::apache::mod::ext_filter - include ::apache::mod::mime - include ::apache::mod::mime_magic - include ::apache::mod::rewrite - include ::apache::mod::speling - include ::apache::mod::suexec - include ::apache::mod::version - include ::apache::mod::vhost_alias - ::apache::mod { 'auth_digest': } - ::apache::mod { 'authn_anon': } - ::apache::mod { 'authn_dbm': } - ::apache::mod { 'authz_dbm': } - ::apache::mod { 'authz_owner': } - ::apache::mod { 'expires': } - ::apache::mod { 'include': } - ::apache::mod { 'logio': } - ::apache::mod { 'substitute': } - ::apache::mod { 'usertrack': } - - if versioncmp($apache_version, '2.4') < 0 { - ::apache::mod { 'authn_alias': } - ::apache::mod { 'authn_default': } - } - } - 'freebsd': { - include ::apache::mod::actions - include ::apache::mod::authn_core - include ::apache::mod::cache - include ::apache::mod::disk_cache - include ::apache::mod::headers - include ::apache::mod::info - include ::apache::mod::mime_magic - include ::apache::mod::reqtimeout - include ::apache::mod::rewrite - include ::apache::mod::userdir - include ::apache::mod::version - include ::apache::mod::vhost_alias - include ::apache::mod::speling - include ::apache::mod::filter - - ::apache::mod { 'asis': } - ::apache::mod { 'auth_digest': } - ::apache::mod { 'auth_form': } - ::apache::mod { 'authn_anon': } - ::apache::mod { 'authn_dbm': } - ::apache::mod { 'authn_socache': } - ::apache::mod { 'authz_dbd': } - ::apache::mod { 'authz_dbm': } - ::apache::mod { 'authz_owner': } - ::apache::mod { 'dumpio': } - ::apache::mod { 'expires': } - ::apache::mod { 'file_cache': } - ::apache::mod { 'imagemap':} - ::apache::mod { 'include': } - ::apache::mod { 'logio': } - ::apache::mod { 'request': } - ::apache::mod { 'session': } - ::apache::mod { 'unique_id': } - } - default: {} - } - case $::apache::mpm_module { - 'prefork': { - include ::apache::mod::cgi - } - 'worker': { - include ::apache::mod::cgid - } - default: { - # do nothing - } - } - include ::apache::mod::alias - include ::apache::mod::authn_file - include ::apache::mod::autoindex - include ::apache::mod::dav - include ::apache::mod::dav_fs - include ::apache::mod::deflate - include ::apache::mod::dir - include ::apache::mod::mime - include ::apache::mod::negotiation - include ::apache::mod::setenvif - ::apache::mod { 'auth_basic': } - - if versioncmp($apache_version, '2.4') >= 0 { - # filter is needed by mod_deflate - include ::apache::mod::filter - - # authz_core is needed for 'Require' directive - ::apache::mod { 'authz_core': - id => 'authz_core_module', - } - - # lots of stuff seems to break without access_compat - ::apache::mod { 'access_compat': } - } else { - include ::apache::mod::authz_default - } - - include ::apache::mod::authz_user - - ::apache::mod { 'authz_groupfile': } - include ::apache::mod::env - } elsif $mods { - ::apache::default_mods::load { $mods: } - - if versioncmp($apache_version, '2.4') >= 0 { - # authz_core is needed for 'Require' directive - ::apache::mod { 'authz_core': - id => 'authz_core_module', - } - - # filter is needed by mod_deflate - include ::apache::mod::filter - } - } else { - if versioncmp($apache_version, '2.4') >= 0 { - # authz_core is needed for 'Require' directive - ::apache::mod { 'authz_core': - id => 'authz_core_module', - } - - # filter is needed by mod_deflate - include ::apache::mod::filter - } - } -} diff --git a/modules/apache/manifests/default_mods/load.pp b/modules/apache/manifests/default_mods/load.pp deleted file mode 100644 index 356e9fa..0000000 --- a/modules/apache/manifests/default_mods/load.pp +++ /dev/null @@ -1,8 +0,0 @@ -# private define -define apache::default_mods::load ($module = $title) { - if defined("apache::mod::${module}") { - include "::apache::mod::${module}" - } else { - ::apache::mod { $module: } - } -} diff --git a/modules/apache/manifests/dev.pp b/modules/apache/manifests/dev.pp deleted file mode 100644 index d4a25a7..0000000 --- a/modules/apache/manifests/dev.pp +++ /dev/null @@ -1,14 +0,0 @@ -class apache::dev { - - if ! defined(Class['apache']) { - fail('You must include the apache base class before using any apache defined resources') - } - - $packages = $::apache::dev_packages - if $packages { # FreeBSD doesn't have dev packages to install - package { $packages: - ensure => present, - require => Package['httpd'], - } - } -} diff --git a/modules/apache/manifests/fastcgi/server.pp b/modules/apache/manifests/fastcgi/server.pp deleted file mode 100644 index df53556..0000000 --- a/modules/apache/manifests/fastcgi/server.pp +++ /dev/null @@ -1,29 +0,0 @@ -define apache::fastcgi::server ( - $host = '127.0.0.1:9000', - $timeout = 15, - $flush = false, - $faux_path = "/var/www/${name}.fcgi", - $fcgi_alias = "/${name}.fcgi", - $file_type = 'application/x-httpd-php', - $pass_header = undef, -) { - include ::apache::mod::fastcgi - - Apache::Mod['fastcgi'] -> Apache::Fastcgi::Server[$title] - - if $host =~ Stdlib::Absolutepath { - $socket = $host - } - - file { "fastcgi-pool-${name}.conf": - ensure => file, - path => "${::apache::confd_dir}/fastcgi-pool-${name}.conf", - owner => 'root', - group => $::apache::params::root_group, - mode => $::apache::file_mode, - content => template('apache/fastcgi/server.erb'), - require => Exec["mkdir ${::apache::confd_dir}"], - before => File[$::apache::confd_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp deleted file mode 100755 index 39dc593..0000000 --- a/modules/apache/manifests/init.pp +++ /dev/null @@ -1,398 +0,0 @@ -# Class: apache -# -# This class installs Apache -# -# Parameters: -# -# Actions: -# - Install Apache -# - Manage Apache service -# -# Requires: -# -# Sample Usage: -# -class apache ( - $apache_name = $::apache::params::apache_name, - $service_name = $::apache::params::service_name, - $default_mods = true, - Boolean $default_vhost = true, - $default_charset = undef, - Boolean $default_confd_files = true, - Boolean $default_ssl_vhost = false, - $default_ssl_cert = $::apache::params::default_ssl_cert, - $default_ssl_key = $::apache::params::default_ssl_key, - $default_ssl_chain = undef, - $default_ssl_ca = undef, - $default_ssl_crl_path = undef, - $default_ssl_crl = undef, - $default_ssl_crl_check = undef, - $default_type = 'none', - $dev_packages = $::apache::params::dev_packages, - $ip = undef, - Boolean $service_enable = true, - Boolean $service_manage = true, - $service_ensure = 'running', - $service_restart = undef, - $purge_configs = true, - $purge_vhost_dir = undef, - $purge_vdir = false, - $serveradmin = 'root@localhost', - Enum['On', 'Off', 'on', 'off'] $sendfile = 'On', - $error_documents = false, - $timeout = '120', - $httpd_dir = $::apache::params::httpd_dir, - $server_root = $::apache::params::server_root, - $conf_dir = $::apache::params::conf_dir, - $confd_dir = $::apache::params::confd_dir, - $vhost_dir = $::apache::params::vhost_dir, - $vhost_enable_dir = $::apache::params::vhost_enable_dir, - $mod_packages = $::apache::params::mod_packages, - $vhost_include_pattern = $::apache::params::vhost_include_pattern, - $mod_dir = $::apache::params::mod_dir, - $mod_enable_dir = $::apache::params::mod_enable_dir, - $mpm_module = $::apache::params::mpm_module, - $lib_path = $::apache::params::lib_path, - $conf_template = $::apache::params::conf_template, - $servername = $::apache::params::servername, - $pidfile = $::apache::params::pidfile, - Optional[Stdlib::Absolutepath] $rewrite_lock = undef, - Boolean $manage_user = true, - Boolean $manage_group = true, - $user = $::apache::params::user, - $group = $::apache::params::group, - $http_protocol_options = $::apache::params::http_protocol_options, - $supplementary_groups = [], - $keepalive = $::apache::params::keepalive, - $keepalive_timeout = $::apache::params::keepalive_timeout, - $max_keepalive_requests = $::apache::params::max_keepalive_requests, - $limitreqfieldsize = '8190', - $logroot = $::apache::params::logroot, - $logroot_mode = $::apache::params::logroot_mode, - $log_level = $::apache::params::log_level, - $log_formats = {}, - $ssl_file = undef, - $ports_file = $::apache::params::ports_file, - $docroot = $::apache::params::docroot, - $apache_version = $::apache::version::default, - $server_tokens = 'OS', - $server_signature = 'On', - $trace_enable = 'On', - Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes = undef, - $file_e_tag = undef, - $package_ensure = 'installed', - Boolean $use_optional_includes = $::apache::params::use_optional_includes, - $use_systemd = $::apache::params::use_systemd, - $mime_types_additional = $::apache::params::mime_types_additional, - $file_mode = $::apache::params::file_mode, - $root_directory_options = $::apache::params::root_directory_options, - Boolean $root_directory_secured = false, - $error_log = $::apache::params::error_log, - $scriptalias = $::apache::params::scriptalias, - $access_log_file = $::apache::params::access_log_file, -) inherits ::apache::params { - - $valid_mpms_re = $apache_version ? { - '2.4' => '(event|itk|peruser|prefork|worker)', - default => '(event|itk|prefork|worker)' - } - - if $::osfamily == 'RedHat' and $::apache::version::distrelease == '7' { - # On redhat 7 the ssl.conf lives in /etc/httpd/conf.d (the confd_dir) - # when all other module configs live in /etc/httpd/conf.modules.d (the - # mod_dir). On all other platforms and versions, ssl.conf lives in the - # mod_dir. This should maintain the expected location of ssl.conf - $_ssl_file = $ssl_file ? { - undef => "${apache::confd_dir}/ssl.conf", - default => $ssl_file - } - } else { - $_ssl_file = $ssl_file ? { - undef => "${apache::mod_dir}/ssl.conf", - default => $ssl_file - } - } - - if $mpm_module and $mpm_module != 'false' { # lint:ignore:quoted_booleans - assert_type(Pattern[$valid_mpms_re], $mpm_module) - } - - # NOTE: on FreeBSD it's mpm module's responsibility to install httpd package. - # NOTE: the same strategy may be introduced for other OSes. For this, you - # should delete the 'if' block below and modify all MPM modules' manifests - # such that they include apache::package class (currently event.pp, itk.pp, - # peruser.pp, prefork.pp, worker.pp). - if $::osfamily != 'FreeBSD' { - package { 'httpd': - ensure => $package_ensure, - name => $apache_name, - notify => Class['Apache::Service'], - } - } - - # declare the web server user and group - # Note: requiring the package means the package ought to create them and not puppet - if $manage_user { - user { $user: - ensure => present, - gid => $group, - groups => $supplementary_groups, - require => Package['httpd'], - } - } - if $manage_group { - group { $group: - ensure => present, - require => Package['httpd'], - } - } - - validate_apache_log_level($log_level) - - class { '::apache::service': - service_name => $service_name, - service_enable => $service_enable, - service_manage => $service_manage, - service_ensure => $service_ensure, - service_restart => $service_restart, - } - - # Deprecated backwards-compatibility - if $purge_vdir { - warning('Class[\'apache\'] parameter purge_vdir is deprecated in favor of purge_configs') - $purge_confd = $purge_vdir - } else { - $purge_confd = $purge_configs - } - - # Set purge vhostd appropriately - if $purge_vhost_dir == undef { - $purge_vhostd = $purge_confd - } else { - $purge_vhostd = $purge_vhost_dir - } - - Exec { - path => '/bin:/sbin:/usr/bin:/usr/sbin', - } - - exec { "mkdir ${confd_dir}": - creates => $confd_dir, - require => Package['httpd'], - } - file { $confd_dir: - ensure => directory, - recurse => true, - purge => $purge_confd, - force => $purge_confd, - notify => Class['Apache::Service'], - require => Package['httpd'], - } - - if ! defined(File[$mod_dir]) { - exec { "mkdir ${mod_dir}": - creates => $mod_dir, - require => Package['httpd'], - } - # Don't purge available modules if an enable dir is used - $purge_mod_dir = $purge_configs and !$mod_enable_dir - file { $mod_dir: - ensure => directory, - recurse => true, - purge => $purge_mod_dir, - notify => Class['Apache::Service'], - require => Package['httpd'], - before => Anchor['::apache::modules_set_up'], - } - } - - if $mod_enable_dir and ! defined(File[$mod_enable_dir]) { - $mod_load_dir = $mod_enable_dir - exec { "mkdir ${mod_enable_dir}": - creates => $mod_enable_dir, - require => Package['httpd'], - } - file { $mod_enable_dir: - ensure => directory, - recurse => true, - purge => $purge_configs, - notify => Class['Apache::Service'], - require => Package['httpd'], - } - } else { - $mod_load_dir = $mod_dir - } - - if ! defined(File[$vhost_dir]) { - exec { "mkdir ${vhost_dir}": - creates => $vhost_dir, - require => Package['httpd'], - } - file { $vhost_dir: - ensure => directory, - recurse => true, - purge => $purge_vhostd, - notify => Class['Apache::Service'], - require => Package['httpd'], - } - } - - if $vhost_enable_dir and ! defined(File[$vhost_enable_dir]) { - $vhost_load_dir = $vhost_enable_dir - exec { "mkdir ${vhost_load_dir}": - creates => $vhost_load_dir, - require => Package['httpd'], - } - file { $vhost_enable_dir: - ensure => directory, - recurse => true, - purge => $purge_vhostd, - notify => Class['Apache::Service'], - require => Package['httpd'], - } - } else { - $vhost_load_dir = $vhost_dir - } - - concat { $ports_file: - ensure => present, - owner => 'root', - group => $::apache::params::root_group, - mode => $::apache::file_mode, - notify => Class['Apache::Service'], - require => Package['httpd'], - } - concat::fragment { 'Apache ports header': - target => $ports_file, - content => template('apache/ports_header.erb'), - } - - if $::apache::conf_dir and $::apache::params::conf_file { - if $::osfamily == 'gentoo' { - $error_documents_path = '/usr/share/apache2/error' - if $default_mods =~ Array { - if versioncmp($apache_version, '2.4') >= 0 { - if defined('apache::mod::ssl') { - ::portage::makeconf { 'apache2_modules': - content => concat($default_mods, [ 'authz_core', 'socache_shmcb' ]), - } - } else { - ::portage::makeconf { 'apache2_modules': - content => concat($default_mods, 'authz_core'), - } - } - } else { - ::portage::makeconf { 'apache2_modules': - content => $default_mods, - } - } - } - - file { [ - '/etc/apache2/modules.d/.keep_www-servers_apache-2', - '/etc/apache2/vhosts.d/.keep_www-servers_apache-2', - ]: - ensure => absent, - require => Package['httpd'], - } - } - - $apxs_workaround = $::osfamily ? { - 'freebsd' => true, - default => false - } - - # Template uses: - # - $pidfile - # - $user - # - $group - # - $logroot - # - $error_log - # - $sendfile - # - $mod_dir - # - $ports_file - # - $confd_dir - # - $vhost_dir - # - $error_documents - # - $error_documents_path - # - $apxs_workaround - # - $http_protocol_options - # - $keepalive - # - $keepalive_timeout - # - $max_keepalive_requests - # - $server_root - # - $server_tokens - # - $server_signature - # - $trace_enable - # - $rewrite_lock - # - $root_directory_secured - file { "${::apache::conf_dir}/${::apache::params::conf_file}": - ensure => file, - content => template($conf_template), - notify => Class['Apache::Service'], - require => [Package['httpd'], Concat[$ports_file]], - } - - # preserve back-wards compatibility to the times when default_mods was - # only a boolean value. Now it can be an array (too) - if $default_mods =~ Array { - class { '::apache::default_mods': - all => false, - mods => $default_mods, - } - } else { - class { '::apache::default_mods': - all => $default_mods, - } - } - class { '::apache::default_confd_files': - all => $default_confd_files, - } - if $mpm_module and $mpm_module != 'false' { # lint:ignore:quoted_booleans - include "::apache::mod::${mpm_module}" - } - - $default_vhost_ensure = $default_vhost ? { - true => 'present', - false => 'absent' - } - $default_ssl_vhost_ensure = $default_ssl_vhost ? { - true => 'present', - false => 'absent' - } - - ::apache::vhost { 'default': - ensure => $default_vhost_ensure, - port => '80', - docroot => $docroot, - scriptalias => $scriptalias, - serveradmin => $serveradmin, - access_log_file => $access_log_file, - priority => '15', - ip => $ip, - logroot_mode => $logroot_mode, - manage_docroot => $default_vhost, - } - $ssl_access_log_file = $::osfamily ? { - 'freebsd' => $access_log_file, - default => "ssl_${access_log_file}", - } - ::apache::vhost { 'default-ssl': - ensure => $default_ssl_vhost_ensure, - port => '443', - ssl => true, - docroot => $docroot, - scriptalias => $scriptalias, - serveradmin => $serveradmin, - access_log_file => $ssl_access_log_file, - priority => '15', - ip => $ip, - logroot_mode => $logroot_mode, - manage_docroot => $default_ssl_vhost, - } - } - - # This anchor can be used as a reference point for things that need to happen *after* - # all modules have been put in place. - anchor { '::apache::modules_set_up': } -} diff --git a/modules/apache/manifests/listen.pp b/modules/apache/manifests/listen.pp deleted file mode 100644 index 503ee88..0000000 --- a/modules/apache/manifests/listen.pp +++ /dev/null @@ -1,9 +0,0 @@ -define apache::listen { - $listen_addr_port = $name - - # Template uses: $listen_addr_port - concat::fragment { "Listen ${listen_addr_port}": - target => $::apache::ports_file, - content => template('apache/listen.erb'), - } -} diff --git a/modules/apache/manifests/mod.pp b/modules/apache/manifests/mod.pp deleted file mode 100644 index ddef130..0000000 --- a/modules/apache/manifests/mod.pp +++ /dev/null @@ -1,176 +0,0 @@ -define apache::mod ( - $package = undef, - $package_ensure = 'present', - $lib = undef, - $lib_path = $::apache::lib_path, - $id = undef, - $path = undef, - $loadfile_name = undef, - $loadfiles = undef, -) { - if ! defined(Class['apache']) { - fail('You must include the apache base class before using any apache defined resources') - } - - $mod = $name - #include apache #This creates duplicate resources in rspec-puppet - $mod_dir = $::apache::mod_dir - - # Determine if we have special lib - $mod_libs = $::apache::params::mod_libs - if $lib { - $_lib = $lib - } elsif has_key($mod_libs, $mod) { # 2.6 compatibility hack - $_lib = $mod_libs[$mod] - } else { - $_lib = "mod_${mod}.so" - } - - # Determine if declaration specified a path to the module - if $path { - $_path = $path - } else { - $_path = "${lib_path}/${_lib}" - } - - if $id { - $_id = $id - } else { - $_id = "${mod}_module" - } - - if $loadfile_name { - $_loadfile_name = $loadfile_name - } else { - $_loadfile_name = "${mod}.load" - } - - # Determine if we have a package - $mod_packages = $::apache::mod_packages - if $package { - $_package = $package - } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack - if ($::apache::apache_version == '2.4' and $::operatingsystem =~ /^[Aa]mazon$/) { - # On amazon linux we need to prefix our package name with mod24 instead of mod to support apache 2.4 - $_package = regsubst($mod_packages[$mod],'^(mod_)?(.*)','mod24_\2') - } else { - $_package = $mod_packages[$mod] - } - } else { - $_package = undef - } - if $_package and ! defined(Package[$_package]) { - # note: FreeBSD/ports uses apxs tool to activate modules; apxs clutters - # httpd.conf with 'LoadModule' directives; here, by proper resource - # ordering, we ensure that our version of httpd.conf is reverted after - # the module gets installed. - $package_before = $::osfamily ? { - 'freebsd' => [ - File[$_loadfile_name], - File["${::apache::conf_dir}/${::apache::params::conf_file}"] - ], - default => [ - File[$_loadfile_name], - File[$::apache::confd_dir], - ], - } - # if there are any packages, they should be installed before the associated conf file - Package[$_package] -> File<| title == "${mod}.conf" |> - # $_package may be an array - package { $_package: - ensure => $package_ensure, - require => Package['httpd'], - before => $package_before, - notify => Class['apache::service'], - } - } - - file { $_loadfile_name: - ensure => file, - path => "${mod_dir}/${_loadfile_name}", - owner => 'root', - group => $::apache::params::root_group, - mode => $::apache::file_mode, - content => template('apache/mod/load.erb'), - require => [ - Package['httpd'], - Exec["mkdir ${mod_dir}"], - ], - before => File[$mod_dir], - notify => Class['apache::service'], - } - - if $::osfamily == 'Debian' { - $enable_dir = $::apache::mod_enable_dir - file{ "${_loadfile_name} symlink": - ensure => link, - path => "${enable_dir}/${_loadfile_name}", - target => "${mod_dir}/${_loadfile_name}", - owner => 'root', - group => $::apache::params::root_group, - mode => $::apache::file_mode, - require => [ - File[$_loadfile_name], - Exec["mkdir ${enable_dir}"], - ], - before => File[$enable_dir], - notify => Class['apache::service'], - } - # Each module may have a .conf file as well, which should be - # defined in the class apache::mod::module - # Some modules do not require this file. - if defined(File["${mod}.conf"]) { - file{ "${mod}.conf symlink": - ensure => link, - path => "${enable_dir}/${mod}.conf", - target => "${mod_dir}/${mod}.conf", - owner => 'root', - group => $::apache::params::root_group, - mode => $::apache::file_mode, - require => [ - File["${mod}.conf"], - Exec["mkdir ${enable_dir}"], - ], - before => File[$enable_dir], - notify => Class['apache::service'], - } - } - } elsif $::osfamily == 'Suse' { - $enable_dir = $::apache::mod_enable_dir - file{ "${_loadfile_name} symlink": - ensure => link, - path => "${enable_dir}/${_loadfile_name}", - target => "${mod_dir}/${_loadfile_name}", - owner => 'root', - group => $::apache::params::root_group, - mode => $::apache::file_mode, - require => [ - File[$_loadfile_name], - Exec["mkdir ${enable_dir}"], - ], - before => File[$enable_dir], - notify => Class['apache::service'], - } - # Each module may have a .conf file as well, which should be - # defined in the class apache::mod::module - # Some modules do not require this file. - if defined(File["${mod}.conf"]) { - file{ "${mod}.conf symlink": - ensure => link, - path => "${enable_dir}/${mod}.conf", - target => "${mod_dir}/${mod}.conf", - owner => 'root', - group => $::apache::params::root_group, - mode => $::apache::file_mode, - require => [ - File["${mod}.conf"], - Exec["mkdir ${enable_dir}"], - ], - before => File[$enable_dir], - notify => Class['apache::service'], - } - } - } - - Apache::Mod[$name] -> Anchor['::apache::modules_set_up'] -} diff --git a/modules/apache/manifests/mod/actions.pp b/modules/apache/manifests/mod/actions.pp deleted file mode 100644 index 3b60f29..0000000 --- a/modules/apache/manifests/mod/actions.pp +++ /dev/null @@ -1,3 +0,0 @@ -class apache::mod::actions { - apache::mod { 'actions': } -} diff --git a/modules/apache/manifests/mod/alias.pp b/modules/apache/manifests/mod/alias.pp deleted file mode 100644 index 4eb42ac..0000000 --- a/modules/apache/manifests/mod/alias.pp +++ /dev/null @@ -1,23 +0,0 @@ -class apache::mod::alias( - $apache_version = undef, - $icons_options = 'Indexes MultiViews', - # set icons_path to false to disable the alias - $icons_path = $::apache::params::alias_icons_path, -) inherits ::apache::params { - include ::apache - $_apache_version = pick($apache_version, $apache::apache_version) - apache::mod { 'alias': } - - # Template uses $icons_path, $_apache_version - if $icons_path { - file { 'alias.conf': - ensure => file, - path => "${::apache::mod_dir}/alias.conf", - mode => $::apache::file_mode, - content => template('apache/mod/alias.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } - } -} diff --git a/modules/apache/manifests/mod/auth_basic.pp b/modules/apache/manifests/mod/auth_basic.pp deleted file mode 100644 index cacfafa..0000000 --- a/modules/apache/manifests/mod/auth_basic.pp +++ /dev/null @@ -1,3 +0,0 @@ -class apache::mod::auth_basic { - ::apache::mod { 'auth_basic': } -} diff --git a/modules/apache/manifests/mod/auth_cas.pp b/modules/apache/manifests/mod/auth_cas.pp deleted file mode 100644 index 00de622..0000000 --- a/modules/apache/manifests/mod/auth_cas.pp +++ /dev/null @@ -1,55 +0,0 @@ -class apache::mod::auth_cas ( - String $cas_login_url, - String $cas_validate_url, - String $cas_cookie_path = $::apache::params::cas_cookie_path, - $cas_cookie_path_mode = '0750', - $cas_version = 2, - $cas_debug = 'Off', - $cas_validate_server = undef, - $cas_validate_depth = undef, - $cas_certificate_path = undef, - $cas_proxy_validate_url = undef, - $cas_root_proxied_as = undef, - $cas_cookie_entropy = undef, - $cas_timeout = undef, - $cas_idle_timeout = undef, - $cas_cache_clean_interval = undef, - $cas_cookie_domain = undef, - $cas_cookie_http_only = undef, - $cas_authoritative = undef, - $cas_validate_saml = undef, - $cas_sso_enabled = undef, - $cas_attribute_prefix = undef, - $cas_attribute_delimiter = undef, - $cas_scrub_request_headers = undef, - $suppress_warning = false, -) inherits ::apache::params { - - if $::osfamily == 'RedHat' and ! $suppress_warning { - warning('RedHat distributions do not have Apache mod_auth_cas in their default package repositories.') - } - - include ::apache - ::apache::mod { 'auth_cas': } - - file { $cas_cookie_path: - ensure => directory, - before => File['auth_cas.conf'], - mode => $cas_cookie_path_mode, - owner => $apache::user, - group => $apache::group, - } - - # Template uses - # - All variables beginning with cas_ - file { 'auth_cas.conf': - ensure => file, - path => "${::apache::mod_dir}/auth_cas.conf", - mode => $::apache::file_mode, - content => template('apache/mod/auth_cas.conf.erb'), - require => [ Exec["mkdir ${::apache::mod_dir}"], ], - before => File[$::apache::mod_dir], - notify => Class['Apache::Service'], - } - -} diff --git a/modules/apache/manifests/mod/auth_kerb.pp b/modules/apache/manifests/mod/auth_kerb.pp deleted file mode 100644 index 4b4887f..0000000 --- a/modules/apache/manifests/mod/auth_kerb.pp +++ /dev/null @@ -1,7 +0,0 @@ -class apache::mod::auth_kerb { - include ::apache - include ::apache::mod::authn_core - ::apache::mod { 'auth_kerb': } -} - - diff --git a/modules/apache/manifests/mod/auth_mellon.pp b/modules/apache/manifests/mod/auth_mellon.pp deleted file mode 100644 index 5dbb6b5..0000000 --- a/modules/apache/manifests/mod/auth_mellon.pp +++ /dev/null @@ -1,26 +0,0 @@ -class apache::mod::auth_mellon ( - $mellon_cache_size = $::apache::params::mellon_cache_size, - $mellon_lock_file = $::apache::params::mellon_lock_file, - $mellon_post_directory = $::apache::params::mellon_post_directory, - $mellon_cache_entry_size = undef, - $mellon_post_ttl = undef, - $mellon_post_size = undef, - $mellon_post_count = undef -) inherits ::apache::params { - - include ::apache - ::apache::mod { 'auth_mellon': } - - # Template uses - # - All variables beginning with mellon_ - file { 'auth_mellon.conf': - ensure => file, - path => "${::apache::mod_dir}/auth_mellon.conf", - mode => $::apache::file_mode, - content => template('apache/mod/auth_mellon.conf.erb'), - require => [ Exec["mkdir ${::apache::mod_dir}"], ], - before => File[$::apache::mod_dir], - notify => Class['Apache::Service'], - } - -} diff --git a/modules/apache/manifests/mod/authn_core.pp b/modules/apache/manifests/mod/authn_core.pp deleted file mode 100644 index c5ce5b1..0000000 --- a/modules/apache/manifests/mod/authn_core.pp +++ /dev/null @@ -1,7 +0,0 @@ -class apache::mod::authn_core( - $apache_version = $::apache::apache_version -) { - if versioncmp($apache_version, '2.4') >= 0 { - ::apache::mod { 'authn_core': } - } -} diff --git a/modules/apache/manifests/mod/authn_dbd.pp b/modules/apache/manifests/mod/authn_dbd.pp deleted file mode 100644 index be6ff3e..0000000 --- a/modules/apache/manifests/mod/authn_dbd.pp +++ /dev/null @@ -1,30 +0,0 @@ -class apache::mod::authn_dbd ( - $authn_dbd_params, - $authn_dbd_dbdriver = 'mysql', - $authn_dbd_query = undef, - $authn_dbd_min = '4', - $authn_dbd_max = '20', - $authn_dbd_keep = '8', - $authn_dbd_exptime = '300', - $authn_dbd_alias = undef, -) inherits ::apache::params { - include ::apache - include ::apache::mod::dbd - ::apache::mod { 'authn_dbd': } - - if $authn_dbd_alias { - include ::apache::mod::authn_core - } - - # Template uses - # - All variables beginning with authn_dbd - file { 'authn_dbd.conf': - ensure => file, - path => "${::apache::mod_dir}/authn_dbd.conf", - mode => $::apache::file_mode, - content => template('apache/mod/authn_dbd.conf.erb'), - require => [ Exec["mkdir ${::apache::mod_dir}"], ], - before => File[$::apache::mod_dir], - notify => Class['Apache::Service'], - } -} diff --git a/modules/apache/manifests/mod/authn_file.pp b/modules/apache/manifests/mod/authn_file.pp deleted file mode 100644 index bc78724..0000000 --- a/modules/apache/manifests/mod/authn_file.pp +++ /dev/null @@ -1,3 +0,0 @@ -class apache::mod::authn_file { - ::apache::mod { 'authn_file': } -} diff --git a/modules/apache/manifests/mod/authnz_ldap.pp b/modules/apache/manifests/mod/authnz_ldap.pp deleted file mode 100644 index 560909f..0000000 --- a/modules/apache/manifests/mod/authnz_ldap.pp +++ /dev/null @@ -1,23 +0,0 @@ -class apache::mod::authnz_ldap ( - Boolean $verify_server_cert = true, - $package_name = undef, -) { - - include ::apache - include '::apache::mod::ldap' - ::apache::mod { 'authnz_ldap': - package => $package_name, - } - - # Template uses: - # - $verify_server_cert - file { 'authnz_ldap.conf': - ensure => file, - path => "${::apache::mod_dir}/authnz_ldap.conf", - mode => $::apache::file_mode, - content => template('apache/mod/authnz_ldap.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/authnz_pam.pp b/modules/apache/manifests/mod/authnz_pam.pp deleted file mode 100644 index c267212..0000000 --- a/modules/apache/manifests/mod/authnz_pam.pp +++ /dev/null @@ -1,4 +0,0 @@ -class apache::mod::authnz_pam { - include ::apache - ::apache::mod { 'authnz_pam': } -} diff --git a/modules/apache/manifests/mod/authz_default.pp b/modules/apache/manifests/mod/authz_default.pp deleted file mode 100644 index e457774..0000000 --- a/modules/apache/manifests/mod/authz_default.pp +++ /dev/null @@ -1,9 +0,0 @@ -class apache::mod::authz_default( - $apache_version = $::apache::apache_version -) { - if versioncmp($apache_version, '2.4') >= 0 { - warning('apache::mod::authz_default has been removed in Apache 2.4') - } else { - ::apache::mod { 'authz_default': } - } -} diff --git a/modules/apache/manifests/mod/authz_user.pp b/modules/apache/manifests/mod/authz_user.pp deleted file mode 100644 index 948a3e2..0000000 --- a/modules/apache/manifests/mod/authz_user.pp +++ /dev/null @@ -1,3 +0,0 @@ -class apache::mod::authz_user { - ::apache::mod { 'authz_user': } -} diff --git a/modules/apache/manifests/mod/autoindex.pp b/modules/apache/manifests/mod/autoindex.pp deleted file mode 100644 index 67c7580..0000000 --- a/modules/apache/manifests/mod/autoindex.pp +++ /dev/null @@ -1,14 +0,0 @@ -class apache::mod::autoindex { - include ::apache - ::apache::mod { 'autoindex': } - # Template uses no variables - file { 'autoindex.conf': - ensure => file, - path => "${::apache::mod_dir}/autoindex.conf", - mode => $::apache::file_mode, - content => template('apache/mod/autoindex.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/cache.pp b/modules/apache/manifests/mod/cache.pp deleted file mode 100644 index 4ab9f44..0000000 --- a/modules/apache/manifests/mod/cache.pp +++ /dev/null @@ -1,3 +0,0 @@ -class apache::mod::cache { - ::apache::mod { 'cache': } -} diff --git a/modules/apache/manifests/mod/cgi.pp b/modules/apache/manifests/mod/cgi.pp deleted file mode 100644 index 272f0cc..0000000 --- a/modules/apache/manifests/mod/cgi.pp +++ /dev/null @@ -1,19 +0,0 @@ -class apache::mod::cgi { - case $::osfamily { - 'FreeBSD': {} - default: { - if $::apache::mpm_module =~ /^(itk|peruser|prefork)$/ { - Class["::apache::mod::${::apache::mpm_module}"] -> Class['::apache::mod::cgi'] - } - } - } - - if $::osfamily == 'Suse' { - ::apache::mod { 'cgi': - lib_path => '/usr/lib64/apache2-prefork', - } - } else { - ::apache::mod { 'cgi': } - } - -} diff --git a/modules/apache/manifests/mod/cgid.pp b/modules/apache/manifests/mod/cgid.pp deleted file mode 100644 index b2cb016..0000000 --- a/modules/apache/manifests/mod/cgid.pp +++ /dev/null @@ -1,42 +0,0 @@ -class apache::mod::cgid { - include ::apache - case $::osfamily { - 'FreeBSD': {} - default: { - if defined(Class['::apache::mod::event']) { - Class['::apache::mod::event'] -> Class['::apache::mod::cgid'] - } else { - Class['::apache::mod::worker'] -> Class['::apache::mod::cgid'] - } - } - } - - # Debian specifies it's cgid sock path, but RedHat uses the default value - # with no config file - $cgisock_path = $::osfamily ? { - 'debian' => "\${APACHE_RUN_DIR}/cgisock", - 'freebsd' => 'cgisock', - default => undef, - } - - if $::osfamily == 'Suse' { - ::apache::mod { 'cgid': - lib_path => '/usr/lib64/apache2-worker', - } - } else { - ::apache::mod { 'cgid': } - } - - if $cgisock_path { - # Template uses $cgisock_path - file { 'cgid.conf': - ensure => file, - path => "${::apache::mod_dir}/cgid.conf", - mode => $::apache::file_mode, - content => template('apache/mod/cgid.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } - } -} diff --git a/modules/apache/manifests/mod/cluster.pp b/modules/apache/manifests/mod/cluster.pp deleted file mode 100644 index 442b583..0000000 --- a/modules/apache/manifests/mod/cluster.pp +++ /dev/null @@ -1,39 +0,0 @@ -class apache::mod::cluster ( - $allowed_network, - $balancer_name, - $ip, - $version, - $enable_mcpm_receive = true, - $port = '6666', - $keep_alive_timeout = 60, - $manager_allowed_network = '127.0.0.1', - $max_keep_alive_requests = 0, - $server_advertise = true, - $advertise_frequency = undef, -) { - - include ::apache - - ::apache::mod { 'proxy': } - ::apache::mod { 'proxy_ajp': } - ::apache::mod { 'manager': } - ::apache::mod { 'proxy_cluster': } - ::apache::mod { 'advertise': } - - if (versioncmp($version, '1.3.0') >= 0 ) { - ::apache::mod { 'cluster_slotmem': } - } else { - ::apache::mod { 'slotmem': } - } - - file {'cluster.conf': - ensure => file, - path => "${::apache::mod_dir}/cluster.conf", - mode => $::apache::file_mode, - content => template('apache/mod/cluster.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } - -} diff --git a/modules/apache/manifests/mod/dav.pp b/modules/apache/manifests/mod/dav.pp deleted file mode 100644 index ade9c08..0000000 --- a/modules/apache/manifests/mod/dav.pp +++ /dev/null @@ -1,3 +0,0 @@ -class apache::mod::dav { - ::apache::mod { 'dav': } -} diff --git a/modules/apache/manifests/mod/dav_fs.pp b/modules/apache/manifests/mod/dav_fs.pp deleted file mode 100644 index 60127e3..0000000 --- a/modules/apache/manifests/mod/dav_fs.pp +++ /dev/null @@ -1,22 +0,0 @@ -class apache::mod::dav_fs { - include ::apache - $dav_lock = $::osfamily ? { - 'debian' => "\${APACHE_LOCK_DIR}/DAVLock", - 'freebsd' => '/usr/local/var/DavLock', - default => '/var/lib/dav/lockdb', - } - - Class['::apache::mod::dav'] -> Class['::apache::mod::dav_fs'] - ::apache::mod { 'dav_fs': } - - # Template uses: $dav_lock - file { 'dav_fs.conf': - ensure => file, - path => "${::apache::mod_dir}/dav_fs.conf", - mode => $::apache::file_mode, - content => template('apache/mod/dav_fs.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/dav_svn.pp b/modules/apache/manifests/mod/dav_svn.pp deleted file mode 100644 index 35d5417..0000000 --- a/modules/apache/manifests/mod/dav_svn.pp +++ /dev/null @@ -1,28 +0,0 @@ -class apache::mod::dav_svn ( - $authz_svn_enabled = false, -) { - Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn'] - include ::apache - include ::apache::mod::dav - if($::operatingsystem == 'SLES' and $::operatingsystemmajrelease < '12'){ - package { 'subversion-server': - ensure => 'installed', - provider => 'zypper', - } - } - - ::apache::mod { 'dav_svn': } - - if $::osfamily == 'Debian' and ($::operatingsystemmajrelease != '6' and $::operatingsystemmajrelease != '10.04' and $::operatingsystemrelease != '10.04' and $::operatingsystemmajrelease != '16.04') { - $loadfile_name = undef - } else { - $loadfile_name = 'dav_svn_authz_svn.load' - } - - if $authz_svn_enabled { - ::apache::mod { 'authz_svn': - loadfile_name => $loadfile_name, - require => Apache::Mod['dav_svn'], - } - } -} diff --git a/modules/apache/manifests/mod/dbd.pp b/modules/apache/manifests/mod/dbd.pp deleted file mode 100644 index 547acc7..0000000 --- a/modules/apache/manifests/mod/dbd.pp +++ /dev/null @@ -1,3 +0,0 @@ -class apache::mod::dbd { - ::apache::mod { 'dbd': } -} diff --git a/modules/apache/manifests/mod/deflate.pp b/modules/apache/manifests/mod/deflate.pp deleted file mode 100644 index 70ac5be..0000000 --- a/modules/apache/manifests/mod/deflate.pp +++ /dev/null @@ -1,27 +0,0 @@ -class apache::mod::deflate ( - $types = [ - 'text/html text/plain text/xml', - 'text/css', - 'application/x-javascript application/javascript application/ecmascript', - 'application/rss+xml', - 'application/json', - ], - $notes = { - 'Input' => 'instream', - 'Output' => 'outstream', - 'Ratio' => 'ratio', - } -) { - include ::apache - ::apache::mod { 'deflate': } - - file { 'deflate.conf': - ensure => file, - path => "${::apache::mod_dir}/deflate.conf", - mode => $::apache::file_mode, - content => template('apache/mod/deflate.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/dev.pp b/modules/apache/manifests/mod/dev.pp deleted file mode 100644 index 5abdedd..0000000 --- a/modules/apache/manifests/mod/dev.pp +++ /dev/null @@ -1,5 +0,0 @@ -class apache::mod::dev { - # Development packages are not apache modules - warning('apache::mod::dev is deprecated; please use apache::dev') - include ::apache::dev -} diff --git a/modules/apache/manifests/mod/dir.pp b/modules/apache/manifests/mod/dir.pp deleted file mode 100644 index 3c994d3..0000000 --- a/modules/apache/manifests/mod/dir.pp +++ /dev/null @@ -1,23 +0,0 @@ -# Note: this sets the global DirectoryIndex directive, it may be necessary to consider being able to modify the apache::vhost to declare DirectoryIndex statements in a vhost configuration -# Parameters: -# - $indexes provides a string for the DirectoryIndex directive http://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex -class apache::mod::dir ( - $dir = 'public_html', - Array[String] $indexes = ['index.html','index.html.var','index.cgi','index.pl','index.php','index.xhtml'], -) { - - include ::apache - ::apache::mod { 'dir': } - - # Template uses - # - $indexes - file { 'dir.conf': - ensure => file, - path => "${::apache::mod_dir}/dir.conf", - mode => $::apache::file_mode, - content => template('apache/mod/dir.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/disk_cache.pp b/modules/apache/manifests/mod/disk_cache.pp deleted file mode 100644 index 7cd7270..0000000 --- a/modules/apache/manifests/mod/disk_cache.pp +++ /dev/null @@ -1,42 +0,0 @@ -class apache::mod::disk_cache ( - $cache_root = undef, -) { - include ::apache - if $cache_root { - $_cache_root = $cache_root - } - elsif versioncmp($::apache::apache_version, '2.4') >= 0 { - $_cache_root = $::osfamily ? { - 'debian' => '/var/cache/apache2/mod_cache_disk', - 'redhat' => '/var/cache/httpd/proxy', - 'freebsd' => '/var/cache/mod_cache_disk', - } - } - else { - $_cache_root = $::osfamily ? { - 'debian' => '/var/cache/apache2/mod_disk_cache', - 'redhat' => '/var/cache/mod_proxy', - 'freebsd' => '/var/cache/mod_disk_cache', - } - } - - if versioncmp($::apache::apache_version, '2.4') >= 0 { - apache::mod { 'cache_disk': } - } - else { - apache::mod { 'disk_cache': } - } - - Class['::apache::mod::cache'] -> Class['::apache::mod::disk_cache'] - - # Template uses $_cache_root - file { 'disk_cache.conf': - ensure => file, - path => "${::apache::mod_dir}/disk_cache.conf", - mode => $::apache::file_mode, - content => template('apache/mod/disk_cache.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/dumpio.pp b/modules/apache/manifests/mod/dumpio.pp deleted file mode 100644 index c79f6da..0000000 --- a/modules/apache/manifests/mod/dumpio.pp +++ /dev/null @@ -1,18 +0,0 @@ -class apache::mod::dumpio( - Enum['Off', 'On', 'off', 'on'] $dump_io_input = 'Off', - Enum['Off', 'On', 'off', 'on'] $dump_io_output = 'Off', -) { - include ::apache - - ::apache::mod { 'dumpio': } - file{'dumpio.conf': - ensure => file, - path => "${::apache::mod_dir}/dumpio.conf", - mode => $::apache::file_mode, - content => template('apache/mod/dumpio.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } - -} diff --git a/modules/apache/manifests/mod/env.pp b/modules/apache/manifests/mod/env.pp deleted file mode 100644 index b973005..0000000 --- a/modules/apache/manifests/mod/env.pp +++ /dev/null @@ -1,3 +0,0 @@ -class apache::mod::env { - ::apache::mod { 'env': } -} diff --git a/modules/apache/manifests/mod/event.pp b/modules/apache/manifests/mod/event.pp deleted file mode 100644 index a873959..0000000 --- a/modules/apache/manifests/mod/event.pp +++ /dev/null @@ -1,76 +0,0 @@ -class apache::mod::event ( - $startservers = '2', - $maxclients = '150', - $maxrequestworkers = undef, - $minsparethreads = '25', - $maxsparethreads = '75', - $threadsperchild = '25', - $maxrequestsperchild = '0', - $maxconnectionsperchild = undef, - $serverlimit = '25', - $apache_version = undef, - $threadlimit = '64', - $listenbacklog = '511', -) { - include ::apache - - $_apache_version = pick($apache_version, $apache::apache_version) - - if defined(Class['apache::mod::itk']) { - fail('May not include both apache::mod::event and apache::mod::itk on the same node') - } - if defined(Class['apache::mod::peruser']) { - fail('May not include both apache::mod::event and apache::mod::peruser on the same node') - } - if defined(Class['apache::mod::prefork']) { - fail('May not include both apache::mod::event and apache::mod::prefork on the same node') - } - if defined(Class['apache::mod::worker']) { - fail('May not include both apache::mod::event and apache::mod::worker on the same node') - } - File { - owner => 'root', - group => $::apache::params::root_group, - mode => $::apache::file_mode, - } - - # Template uses: - # - $startservers - # - $maxclients - # - $minsparethreads - # - $maxsparethreads - # - $threadsperchild - # - $maxrequestsperchild - # - $serverlimit - file { "${::apache::mod_dir}/event.conf": - ensure => file, - mode => $::apache::file_mode, - content => template('apache/mod/event.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } - - case $::osfamily { - 'redhat': { - if versioncmp($_apache_version, '2.4') >= 0 { - apache::mpm{ 'event': - apache_version => $_apache_version, - } - } - } - 'debian','freebsd' : { - apache::mpm{ 'event': - apache_version => $_apache_version, - } - } - 'gentoo': { - ::portage::makeconf { 'apache2_mpms': - content => 'event', - } - } - default: { - fail("Unsupported osfamily ${::osfamily}") - } - } -} diff --git a/modules/apache/manifests/mod/expires.pp b/modules/apache/manifests/mod/expires.pp deleted file mode 100644 index 07ec82e..0000000 --- a/modules/apache/manifests/mod/expires.pp +++ /dev/null @@ -1,22 +0,0 @@ -class apache::mod::expires ( - $expires_active = true, - $expires_default = undef, - $expires_by_type = undef, -) { - include ::apache - ::apache::mod { 'expires': } - - # Template uses - # $expires_active - # $expires_default - # $expires_by_type - file { 'expires.conf': - ensure => file, - path => "${::apache::mod_dir}/expires.conf", - mode => $::apache::file_mode, - content => template('apache/mod/expires.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/ext_filter.pp b/modules/apache/manifests/mod/ext_filter.pp deleted file mode 100644 index 1155032..0000000 --- a/modules/apache/manifests/mod/ext_filter.pp +++ /dev/null @@ -1,22 +0,0 @@ -class apache::mod::ext_filter( - Optional[Hash] $ext_filter_define = undef -) { - include ::apache - - ::apache::mod { 'ext_filter': } - - # Template uses - # -$ext_filter_define - - if $ext_filter_define { - file { 'ext_filter.conf': - ensure => file, - path => "${::apache::mod_dir}/ext_filter.conf", - mode => $::apache::file_mode, - content => template('apache/mod/ext_filter.conf.erb'), - require => [ Exec["mkdir ${::apache::mod_dir}"], ], - before => File[$::apache::mod_dir], - notify => Class['Apache::Service'], - } - } -} diff --git a/modules/apache/manifests/mod/fastcgi.pp b/modules/apache/manifests/mod/fastcgi.pp deleted file mode 100644 index 399d93a..0000000 --- a/modules/apache/manifests/mod/fastcgi.pp +++ /dev/null @@ -1,28 +0,0 @@ -class apache::mod::fastcgi { - include ::apache - if ($::osfamily == 'Redhat' and versioncmp($::operatingsystemrelease, '7.0') >= 0) { - fail('mod_fastcgi is no longer supported on el7 and above.') - } - # Debian specifies it's fastcgi lib path, but RedHat uses the default value - # with no config file - $fastcgi_lib_path = $::apache::params::fastcgi_lib_path - - ::apache::mod { 'fastcgi': } - - if $fastcgi_lib_path { - # Template uses: - # - $fastcgi_server - # - $fastcgi_socket - # - $fastcgi_dir - file { 'fastcgi.conf': - ensure => file, - path => "${::apache::mod_dir}/fastcgi.conf", - mode => $::apache::file_mode, - content => template('apache/mod/fastcgi.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } - } - -} diff --git a/modules/apache/manifests/mod/fcgid.pp b/modules/apache/manifests/mod/fcgid.pp deleted file mode 100644 index 0e99a9b..0000000 --- a/modules/apache/manifests/mod/fcgid.pp +++ /dev/null @@ -1,28 +0,0 @@ -class apache::mod::fcgid( - $options = {}, -) { - include ::apache - if ($::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7') or $::osfamily == 'FreeBSD' { - $loadfile_name = 'unixd_fcgid.load' - $conf_name = 'unixd_fcgid.conf' - } else { - $loadfile_name = undef - $conf_name = 'fcgid.conf' - } - - ::apache::mod { 'fcgid': - loadfile_name => $loadfile_name, - } - - # Template uses: - # - $options - file { $conf_name: - ensure => file, - path => "${::apache::mod_dir}/${conf_name}", - mode => $::apache::file_mode, - content => template('apache/mod/fcgid.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/filter.pp b/modules/apache/manifests/mod/filter.pp deleted file mode 100644 index 26dc488..0000000 --- a/modules/apache/manifests/mod/filter.pp +++ /dev/null @@ -1,3 +0,0 @@ -class apache::mod::filter { - ::apache::mod { 'filter': } -} diff --git a/modules/apache/manifests/mod/geoip.pp b/modules/apache/manifests/mod/geoip.pp deleted file mode 100644 index 66ae887..0000000 --- a/modules/apache/manifests/mod/geoip.pp +++ /dev/null @@ -1,33 +0,0 @@ -class apache::mod::geoip ( - $enable = false, - $db_file = '/usr/share/GeoIP/GeoIP.dat', - $flag = 'Standard', - $output = 'All', - $enable_utf8 = undef, - $scan_proxy_headers = undef, - $scan_proxy_header_field = undef, - $use_last_xforwarededfor_ip = undef, -) { - include ::apache - ::apache::mod { 'geoip': } - - # Template uses: - # - enable - # - db_file - # - flag - # - output - # - enable_utf8 - # - scan_proxy_headers - # - scan_proxy_header_field - # - use_last_xforwarededfor_ip - file { 'geoip.conf': - ensure => file, - path => "${::apache::mod_dir}/geoip.conf", - mode => $::apache::file_mode, - content => template('apache/mod/geoip.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } - -} diff --git a/modules/apache/manifests/mod/headers.pp b/modules/apache/manifests/mod/headers.pp deleted file mode 100644 index d18c5e2..0000000 --- a/modules/apache/manifests/mod/headers.pp +++ /dev/null @@ -1,3 +0,0 @@ -class apache::mod::headers { - ::apache::mod { 'headers': } -} diff --git a/modules/apache/manifests/mod/include.pp b/modules/apache/manifests/mod/include.pp deleted file mode 100644 index edbe81f..0000000 --- a/modules/apache/manifests/mod/include.pp +++ /dev/null @@ -1,3 +0,0 @@ -class apache::mod::include { - ::apache::mod { 'include': } -} diff --git a/modules/apache/manifests/mod/info.pp b/modules/apache/manifests/mod/info.pp deleted file mode 100644 index c6f1355..0000000 --- a/modules/apache/manifests/mod/info.pp +++ /dev/null @@ -1,33 +0,0 @@ -class apache::mod::info ( - $allow_from = ['127.0.0.1','::1'], - $apache_version = undef, - $restrict_access = true, - $info_path = '/server-info', -){ - include ::apache - $_apache_version = pick($apache_version, $apache::apache_version) - - if $::osfamily == 'Suse' { - if defined(Class['::apache::mod::worker']){ - $suse_path = '/usr/lib64/apache2-worker' - } else { - $suse_path = '/usr/lib64/apache2-prefork' - } - ::apache::mod { 'info': - lib_path => $suse_path, - } - } else { - ::apache::mod { 'info': } - } - - # Template uses $allow_from, $_apache_version - file { 'info.conf': - ensure => file, - path => "${::apache::mod_dir}/info.conf", - mode => $::apache::file_mode, - content => template('apache/mod/info.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/intercept_form_submit.pp b/modules/apache/manifests/mod/intercept_form_submit.pp deleted file mode 100644 index 39f1f5e..0000000 --- a/modules/apache/manifests/mod/intercept_form_submit.pp +++ /dev/null @@ -1,4 +0,0 @@ -class apache::mod::intercept_form_submit { - include ::apache - ::apache::mod { 'intercept_form_submit': } -} diff --git a/modules/apache/manifests/mod/itk.pp b/modules/apache/manifests/mod/itk.pp deleted file mode 100644 index 8ceb56d..0000000 --- a/modules/apache/manifests/mod/itk.pp +++ /dev/null @@ -1,96 +0,0 @@ -class apache::mod::itk ( - $startservers = '8', - $minspareservers = '5', - $maxspareservers = '20', - $serverlimit = '256', - $maxclients = '256', - $maxrequestsperchild = '4000', - $apache_version = undef, -) { - include ::apache - - $_apache_version = pick($apache_version, $apache::apache_version) - - if defined(Class['apache::mod::event']) { - fail('May not include both apache::mod::itk and apache::mod::event on the same node') - } - if defined(Class['apache::mod::peruser']) { - fail('May not include both apache::mod::itk and apache::mod::peruser on the same node') - } - if versioncmp($_apache_version, '2.4') < 0 { - if defined(Class['apache::mod::prefork']) { - fail('May not include both apache::mod::itk and apache::mod::prefork on the same node') - } - } else { - # prefork is a requirement for itk in 2.4; except on FreeBSD and Gentoo, which are special - if $::osfamily =~ /^(FreeBSD|Gentoo)/ { - if defined(Class['apache::mod::prefork']) { - fail('May not include both apache::mod::itk and apache::mod::prefork on the same node') - } - } else { - if ! defined(Class['apache::mod::prefork']) { - include ::apache::mod::prefork - } - } - } - if defined(Class['apache::mod::worker']) { - fail('May not include both apache::mod::itk and apache::mod::worker on the same node') - } - File { - owner => 'root', - group => $::apache::params::root_group, - mode => $::apache::file_mode, - } - - # Template uses: - # - $startservers - # - $minspareservers - # - $maxspareservers - # - $serverlimit - # - $maxclients - # - $maxrequestsperchild - file { "${::apache::mod_dir}/itk.conf": - ensure => file, - mode => $::apache::file_mode, - content => template('apache/mod/itk.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } - - case $::osfamily { - 'redhat': { - package { 'httpd-itk': - ensure => present, - } - if versioncmp($_apache_version, '2.4') >= 0 { - ::apache::mpm{ 'itk': - apache_version => $_apache_version, - } - } - else { - file_line { '/etc/sysconfig/httpd itk enable': - ensure => present, - path => '/etc/sysconfig/httpd', - line => 'HTTPD=/usr/sbin/httpd.itk', - match => '#?HTTPD=/usr/sbin/httpd.itk', - require => Package['httpd'], - notify => Class['apache::service'], - } - } - } - 'debian', 'freebsd': { - apache::mpm{ 'itk': - apache_version => $_apache_version, - } - } - 'gentoo': { - ::portage::makeconf { 'apache2_mpms': - content => 'itk', - } - } - default: { - fail("Unsupported osfamily ${::osfamily}") - } - } -} diff --git a/modules/apache/manifests/mod/jk.pp b/modules/apache/manifests/mod/jk.pp deleted file mode 100644 index eebfd2c..0000000 --- a/modules/apache/manifests/mod/jk.pp +++ /dev/null @@ -1,141 +0,0 @@ -# Class apache::mod::jk -# -# Manages mod_jk connector -# -# All parameters are optional. When undefined, some receive default values, -# while others cause an optional directive to be absent -# -# For help on parameters, pls see official reference at: -# https://tomcat.apache.org/connectors-doc/reference/apache.html -# -class apache::mod::jk ( - # Binding to mod_jk - Optional[String] $ip = undef, - Integer $port = 80, - Boolean $add_listen = true, - # Conf file content - $workers_file = undef, - $worker_property = {}, - $logroot = undef, - $shm_file = 'jk-runtime-status', - $shm_size = undef, - $mount_file = undef, - $mount_file_reload = undef, - $mount = {}, - $un_mount = {}, - $auto_alias = undef, - $mount_copy = undef, - $worker_indicator = undef, - $watchdog_interval = undef, - $log_file = 'mod_jk.log', - $log_level = undef, - $log_stamp_format = undef, - $request_log_format = undef, - $extract_ssl = undef, - $https_indicator = undef, - $sslprotocol_indicator = undef, - $certs_indicator = undef, - $cipher_indicator = undef, - $certchain_prefix = undef, - $session_indicator = undef, - $keysize_indicator = undef, - $local_name_indicator = undef, - $ignore_cl_indicator = undef, - $local_addr_indicator = undef, - $local_port_indicator = undef, - $remote_host_indicator = undef, - $remote_addr_indicator = undef, - $remote_port_indicator = undef, - $remote_user_indicator = undef, - $auth_type_indicator = undef, - $options = [], - $env_var = {}, - $strip_session = undef, - # Location list - # See comments in template mod/jk.conf.erb - $location_list = [], - # Workers file content - # See comments in template mod/jk/workers.properties.erb - $workers_file_content = {}, - # Mount file content - # See comments in template mod/jk/uriworkermap.properties.erb - $mount_file_content = {}, -){ - - # Provides important variables - include ::apache - # Manages basic module config - ::apache::mod { 'jk': } - - # Binding to mod_jk - if $add_listen { - $_ip = $ip ? { - undef => $facts['ipaddress'], - default => $ip, - } - ensure_resource('apache::listen', "${_ip}:${port}", {}) - } - - # File resource common parameters - File { - ensure => file, - mode => $::apache::file_mode, - notify => Class['apache::service'], - } - - # Shared memory and log paths - # If logroot unspecified, use default - $log_dir = $logroot ? { - undef => $::apache::logroot, - default => $logroot, - } - # If absolute path or pipe, use as-is - # If relative path, prepend with log directory - # If unspecified, use default - $shm_path = $shm_file ? { - undef => "${log_dir}/jk-runtime-status", - /^\"?[|\/]/ => $shm_file, - default => "${log_dir}/${shm_file}", - } - $log_path = $log_file ? { - undef => "${log_dir}/mod_jk.log", - /^\"?[|\/]/ => $log_file, - default => "${log_dir}/${log_file}", - } - - # Main config file - $mod_dir = $::apache::mod_dir - file {'jk.conf': - path => "${mod_dir}/jk.conf", - content => template('apache/mod/jk.conf.erb'), - require => [ - Exec["mkdir ${mod_dir}"], - File[$mod_dir], - ], - } - - # Workers file - if $workers_file != undef { - $workers_path = $workers_file ? { - /^\// => $workers_file, - default => "${apache::httpd_dir}/${workers_file}", - } - file { $workers_path: - content => template('apache/mod/jk/workers.properties.erb'), - require => Package['httpd'], - } - } - - # Mount file - if $mount_file != undef { - $mount_path = $mount_file ? { - /^\// => $mount_file, - default => "${apache::httpd_dir}/${mount_file}", - } - file { $mount_path: - content => template('apache/mod/jk/uriworkermap.properties.erb'), - require => Package['httpd'], - } - } - -} diff --git a/modules/apache/manifests/mod/ldap.pp b/modules/apache/manifests/mod/ldap.pp deleted file mode 100644 index 3e51592..0000000 --- a/modules/apache/manifests/mod/ldap.pp +++ /dev/null @@ -1,28 +0,0 @@ -class apache::mod::ldap ( - $apache_version = undef, - $package_name = undef, - $ldap_trusted_global_cert_file = undef, - Optional[String] $ldap_trusted_global_cert_type = 'CA_BASE64', - $ldap_shared_cache_size = undef, - $ldap_cache_entries = undef, - $ldap_cache_ttl = undef, - $ldap_opcache_entries = undef, - $ldap_opcache_ttl = undef, -){ - - include ::apache - $_apache_version = pick($apache_version, $apache::apache_version) - ::apache::mod { 'ldap': - package => $package_name, - } - # Template uses $_apache_version - file { 'ldap.conf': - ensure => file, - path => "${::apache::mod_dir}/ldap.conf", - mode => $::apache::file_mode, - content => template('apache/mod/ldap.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/lookup_identity.pp b/modules/apache/manifests/mod/lookup_identity.pp deleted file mode 100644 index 445c60e..0000000 --- a/modules/apache/manifests/mod/lookup_identity.pp +++ /dev/null @@ -1,4 +0,0 @@ -class apache::mod::lookup_identity { - include ::apache - ::apache::mod { 'lookup_identity': } -} diff --git a/modules/apache/manifests/mod/macro.pp b/modules/apache/manifests/mod/macro.pp deleted file mode 100644 index 2a1218b..0000000 --- a/modules/apache/manifests/mod/macro.pp +++ /dev/null @@ -1,4 +0,0 @@ -class apache::mod::macro { - include ::apache - ::apache::mod { 'macro': } -} diff --git a/modules/apache/manifests/mod/mime.pp b/modules/apache/manifests/mod/mime.pp deleted file mode 100644 index f686930..0000000 --- a/modules/apache/manifests/mod/mime.pp +++ /dev/null @@ -1,25 +0,0 @@ -class apache::mod::mime ( - $mime_support_package = $::apache::params::mime_support_package, - $mime_types_config = $::apache::params::mime_types_config, - $mime_types_additional = undef, -) inherits ::apache::params { - include ::apache - $_mime_types_additional = pick($mime_types_additional, $apache::mime_types_additional) - apache::mod { 'mime': } - # Template uses $_mime_types_config - file { 'mime.conf': - ensure => file, - path => "${::apache::mod_dir}/mime.conf", - mode => $::apache::file_mode, - content => template('apache/mod/mime.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } - if $mime_support_package { - package { $mime_support_package: - ensure => 'installed', - before => File['mime.conf'], - } - } -} diff --git a/modules/apache/manifests/mod/mime_magic.pp b/modules/apache/manifests/mod/mime_magic.pp deleted file mode 100644 index ecc74cf..0000000 --- a/modules/apache/manifests/mod/mime_magic.pp +++ /dev/null @@ -1,17 +0,0 @@ -class apache::mod::mime_magic ( - $magic_file = undef, -) { - include ::apache - $_magic_file = pick($magic_file, "${::apache::conf_dir}/magic") - apache::mod { 'mime_magic': } - # Template uses $magic_file - file { 'mime_magic.conf': - ensure => file, - path => "${::apache::mod_dir}/mime_magic.conf", - mode => $::apache::file_mode, - content => template('apache/mod/mime_magic.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/negotiation.pp b/modules/apache/manifests/mod/negotiation.pp deleted file mode 100644 index 1bdea6b..0000000 --- a/modules/apache/manifests/mod/negotiation.pp +++ /dev/null @@ -1,21 +0,0 @@ -class apache::mod::negotiation ( - Variant[Array[String], String] $force_language_priority = 'Prefer Fallback', - Variant[Array[String], String] $language_priority = [ 'en', 'ca', 'cs', 'da', 'de', 'el', 'eo', 'es', 'et', - 'fr', 'he', 'hr', 'it', 'ja', 'ko', 'ltz', 'nl', 'nn', - 'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN', - 'zh-TW' ], -) { - include ::apache - - ::apache::mod { 'negotiation': } - # Template uses no variables - file { 'negotiation.conf': - ensure => file, - mode => $::apache::file_mode, - path => "${::apache::mod_dir}/negotiation.conf", - content => template('apache/mod/negotiation.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/nss.pp b/modules/apache/manifests/mod/nss.pp deleted file mode 100644 index 8814c93..0000000 --- a/modules/apache/manifests/mod/nss.pp +++ /dev/null @@ -1,28 +0,0 @@ -class apache::mod::nss ( - $transfer_log = "${::apache::params::logroot}/access.log", - $error_log = "${::apache::params::logroot}/error.log", - $passwd_file = undef, - $port = 8443, -) { - include ::apache - include ::apache::mod::mime - - apache::mod { 'nss': } - - $httpd_dir = $::apache::httpd_dir - - # Template uses: - # $transfer_log - # $error_log - # $http_dir - # passwd_file - file { 'nss.conf': - ensure => file, - path => "${::apache::mod_dir}/nss.conf", - mode => $::apache::file_mode, - content => template('apache/mod/nss.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/pagespeed.pp b/modules/apache/manifests/mod/pagespeed.pp deleted file mode 100644 index 052dad0..0000000 --- a/modules/apache/manifests/mod/pagespeed.pp +++ /dev/null @@ -1,60 +0,0 @@ -class apache::mod::pagespeed ( - $inherit_vhost_config = 'on', - $filter_xhtml = false, - $cache_path = '/var/cache/mod_pagespeed/', - $log_dir = '/var/log/pagespeed', - $memcache_servers = [], - $rewrite_level = 'CoreFilters', - $disable_filters = [], - $enable_filters = [], - $forbid_filters = [], - $rewrite_deadline_per_flush_ms = 10, - $additional_domains = undef, - $file_cache_size_kb = 102400, - $file_cache_clean_interval_ms = 3600000, - $lru_cache_per_process = 1024, - $lru_cache_byte_limit = 16384, - $css_flatten_max_bytes = 2048, - $css_inline_max_bytes = 2048, - $css_image_inline_max_bytes = 2048, - $image_inline_max_bytes = 2048, - $js_inline_max_bytes = 2048, - $css_outline_min_bytes = 3000, - $js_outline_min_bytes = 3000, - $inode_limit = 500000, - $image_max_rewrites_at_once = 8, - $num_rewrite_threads = 4, - $num_expensive_rewrite_threads = 4, - $collect_statistics = 'on', - $statistics_logging = 'on', - $allow_view_stats = [], - $allow_pagespeed_console = [], - $allow_pagespeed_message = [], - $message_buffer_size = 100000, - $additional_configuration = {}, - $apache_version = undef, - $package_ensure = undef, -){ - include ::apache - $_apache_version = pick($apache_version, $apache::apache_version) - $_lib = $_apache_version ? { - '2.4' => 'mod_pagespeed_ap24.so', - default => undef - } - - apache::mod { 'pagespeed': - lib => $_lib, - package_ensure => $package_ensure, - } - - # Template uses $_apache_version - file { 'pagespeed.conf': - ensure => file, - path => "${::apache::mod_dir}/pagespeed.conf", - mode => $::apache::file_mode, - content => template('apache/mod/pagespeed.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/passenger.pp b/modules/apache/manifests/mod/passenger.pp deleted file mode 100644 index 3b17d3d..0000000 --- a/modules/apache/manifests/mod/passenger.pp +++ /dev/null @@ -1,115 +0,0 @@ -class apache::mod::passenger ( - $passenger_conf_file = $::apache::params::passenger_conf_file, - $passenger_conf_package_file = $::apache::params::passenger_conf_package_file, - $passenger_high_performance = undef, - $passenger_pool_idle_time = undef, - $passenger_max_request_queue_size = undef, - $passenger_max_requests = undef, - Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']] $passenger_spawn_method = undef, - $passenger_stat_throttle_rate = undef, - $rack_autodetect = undef, - $rails_autodetect = undef, - $passenger_root = $::apache::params::passenger_root, - $passenger_ruby = $::apache::params::passenger_ruby, - $passenger_default_ruby = $::apache::params::passenger_default_ruby, - $passenger_max_pool_size = undef, - $passenger_min_instances = undef, - $passenger_max_instances_per_app = undef, - $passenger_use_global_queue = undef, - $passenger_app_env = undef, - Optional[Stdlib::Absolutepath] $passenger_log_file = undef, - $passenger_log_level = undef, - $passenger_data_buffer_dir = undef, - $manage_repo = true, - $mod_package = undef, - $mod_package_ensure = undef, - $mod_lib = undef, - $mod_lib_path = undef, - $mod_id = undef, - $mod_path = undef, -) inherits ::apache::params { - - include ::apache - - # Managed by the package, but declare it to avoid purging - if $passenger_conf_package_file { - file { 'passenger_package.conf': - path => "${::apache::confd_dir}/${passenger_conf_package_file}", - } - } - - $_package = $mod_package - $_package_ensure = $mod_package_ensure - $_lib = $mod_lib - if $::osfamily == 'FreeBSD' { - if $mod_lib_path { - $_lib_path = $mod_lib_path - } else { - $_lib_path = "${passenger_root}/buildout/apache2" - } - } else { - $_lib_path = $mod_lib_path - } - - if $::osfamily == 'RedHat' and $manage_repo { - if $::operatingsystem == 'Amazon' { - $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/6Server/$basearch' - } else { - $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch' - } - - yumrepo { 'passenger': - ensure => 'present', - baseurl => $baseurl, - descr => 'passenger', - enabled => '1', - gpgcheck => '0', - gpgkey => 'https://packagecloud.io/gpg.key', - repo_gpgcheck => '1', - sslcacert => '/etc/pki/tls/certs/ca-bundle.crt', - sslverify => '1', - before => Apache::Mod['passenger'], - } - } - - unless ($::operatingsystem == 'SLES') { - $_id = $mod_id - $_path = $mod_path - ::apache::mod { 'passenger': - package => $_package, - package_ensure => $_package_ensure, - lib => $_lib, - lib_path => $_lib_path, - id => $_id, - path => $_path, - loadfile_name => 'zpassenger.load', - } - } - - # Template uses: - # - $passenger_root - # - $passenger_ruby - # - $passenger_default_ruby - # - $passenger_max_pool_size - # - $passenger_min_instances - # - $passenger_max_instances_per_app - # - $passenger_high_performance - # - $passenger_max_requests - # - $passenger_spawn_method - # - $passenger_stat_throttle_rate - # - $passenger_use_global_queue - # - $passenger_log_file - # - $passenger_log_level - # - $passenger_app_env - # - $passenger_data_buffer_dir - # - $rack_autodetect - # - $rails_autodetect - file { 'passenger.conf': - ensure => file, - path => "${::apache::mod_dir}/${passenger_conf_file}", - content => template('apache/mod/passenger.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/perl.pp b/modules/apache/manifests/mod/perl.pp deleted file mode 100644 index 3bfeac9..0000000 --- a/modules/apache/manifests/mod/perl.pp +++ /dev/null @@ -1,4 +0,0 @@ -class apache::mod::perl { - include ::apache - ::apache::mod { 'perl': } -} diff --git a/modules/apache/manifests/mod/peruser.pp b/modules/apache/manifests/mod/peruser.pp deleted file mode 100644 index 5683dd6..0000000 --- a/modules/apache/manifests/mod/peruser.pp +++ /dev/null @@ -1,77 +0,0 @@ -class apache::mod::peruser ( - $minspareprocessors = '2', - $minprocessors = '2', - $maxprocessors = '10', - $maxclients = '150', - $maxrequestsperchild = '1000', - $idletimeout = '120', - $expiretimeout = '120', - $keepalive = 'Off', -) { - include ::apache - case $::osfamily { - 'freebsd' : { - fail("Unsupported osfamily ${::osfamily}") - } - default: { - if $::osfamily == 'gentoo' { - ::portage::makeconf { 'apache2_mpms': - content => 'peruser', - } - } - - if defined(Class['apache::mod::event']) { - fail('May not include both apache::mod::peruser and apache::mod::event on the same node') - } - if defined(Class['apache::mod::itk']) { - fail('May not include both apache::mod::peruser and apache::mod::itk on the same node') - } - if defined(Class['apache::mod::prefork']) { - fail('May not include both apache::mod::peruser and apache::mod::prefork on the same node') - } - if defined(Class['apache::mod::worker']) { - fail('May not include both apache::mod::peruser and apache::mod::worker on the same node') - } - File { - owner => 'root', - group => $::apache::params::root_group, - mode => $::apache::file_mode, - } - - $mod_dir = $::apache::mod_dir - - # Template uses: - # - $minspareprocessors - # - $minprocessors - # - $maxprocessors - # - $maxclients - # - $maxrequestsperchild - # - $idletimeout - # - $expiretimeout - # - $keepalive - # - $mod_dir - file { "${::apache::mod_dir}/peruser.conf": - ensure => file, - mode => $::apache::file_mode, - content => template('apache/mod/peruser.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } - file { "${::apache::mod_dir}/peruser": - ensure => directory, - require => File[$::apache::mod_dir], - } - file { "${::apache::mod_dir}/peruser/multiplexers": - ensure => directory, - require => File["${::apache::mod_dir}/peruser"], - } - file { "${::apache::mod_dir}/peruser/processors": - ensure => directory, - require => File["${::apache::mod_dir}/peruser"], - } - - ::apache::peruser::multiplexer { '01-default': } - } - } -} diff --git a/modules/apache/manifests/mod/php.pp b/modules/apache/manifests/mod/php.pp deleted file mode 100644 index c7c0048..0000000 --- a/modules/apache/manifests/mod/php.pp +++ /dev/null @@ -1,94 +0,0 @@ -class apache::mod::php ( - $package_name = undef, - $package_ensure = 'present', - $path = undef, - Array $extensions = ['.php'], - $content = undef, - $template = 'apache/mod/php.conf.erb', - $source = undef, - $root_group = $::apache::params::root_group, - $php_version = $::apache::params::php_version, -) inherits apache::params { - - include ::apache - $mod = "php${php_version}" - - if defined(Class['::apache::mod::prefork']) { - Class['::apache::mod::prefork']->File["${mod}.conf"] - } - elsif defined(Class['::apache::mod::itk']) { - Class['::apache::mod::itk']->File["${mod}.conf"] - } - else { - fail('apache::mod::php requires apache::mod::prefork or apache::mod::itk; please enable mpm_module => \'prefork\' or mpm_module => \'itk\' on Class[\'apache\']') - } - - if $source and ($content or $template != 'apache/mod/php.conf.erb') { - warning('source and content or template parameters are provided. source parameter will be used') - } elsif $content and $template != 'apache/mod/php.conf.erb' { - warning('content and template parameters are provided. content parameter will be used') - } - - $manage_content = $source ? { - undef => $content ? { - undef => template($template), - default => $content, - }, - default => undef, - } - - # Determine if we have a package - $mod_packages = $::apache::mod_packages - if $package_name { - $_package_name = $package_name - } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack - $_package_name = $mod_packages[$mod] - } elsif has_key($mod_packages, 'phpXXX') { # 2.6 compatibility hack - $_package_name = regsubst($mod_packages['phpXXX'], 'XXX', $php_version) - } else { - $_package_name = undef - } - - $_lib = "libphp${php_version}.so" - $_php_major = regsubst($php_version, '^(\d+)\..*$', '\1') - - if $::operatingsystem == 'SLES' { - ::apache::mod { $mod: - package => $_package_name, - package_ensure => $package_ensure, - lib => 'mod_php5.so', - id => "php${_php_major}_module", - path => "${::apache::lib_path}/mod_php5.so", - } - } else { - ::apache::mod { $mod: - package => $_package_name, - package_ensure => $package_ensure, - lib => $_lib, - id => "php${_php_major}_module", - path => $path, - } - - } - - - include ::apache::mod::mime - include ::apache::mod::dir - Class['::apache::mod::mime'] -> Class['::apache::mod::dir'] -> Class['::apache::mod::php'] - - # Template uses $extensions - file { "${mod}.conf": - ensure => file, - path => "${::apache::mod_dir}/${mod}.conf", - owner => 'root', - group => $root_group, - mode => $::apache::file_mode, - content => $manage_content, - source => $source, - require => [ - Exec["mkdir ${::apache::mod_dir}"], - ], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/prefork.pp b/modules/apache/manifests/mod/prefork.pp deleted file mode 100644 index 989de6e..0000000 --- a/modules/apache/manifests/mod/prefork.pp +++ /dev/null @@ -1,98 +0,0 @@ -class apache::mod::prefork ( - $startservers = '8', - $minspareservers = '5', - $maxspareservers = '20', - $serverlimit = '256', - $maxclients = '256', - $maxrequestworkers = undef, - $maxrequestsperchild = '4000', - $maxconnectionsperchild = undef, - $apache_version = undef, -) { - include ::apache - $_apache_version = pick($apache_version, $apache::apache_version) - if defined(Class['apache::mod::event']) { - fail('May not include both apache::mod::prefork and apache::mod::event on the same node') - } - if versioncmp($_apache_version, '2.4') < 0 { - if defined(Class['apache::mod::itk']) { - fail('May not include both apache::mod::prefork and apache::mod::itk on the same node') - } - } - if defined(Class['apache::mod::peruser']) { - fail('May not include both apache::mod::prefork and apache::mod::peruser on the same node') - } - if defined(Class['apache::mod::worker']) { - fail('May not include both apache::mod::prefork and apache::mod::worker on the same node') - } - - if versioncmp($_apache_version, '2.3.13') < 0 { - if $maxrequestworkers == undef { - warning("For newer versions of Apache, \$maxclients is deprecated, please use \$maxrequestworkers.") - } elsif $maxconnectionsperchild == undef { - warning("For newer versions of Apache, \$maxrequestsperchild is deprecated, please use \$maxconnectionsperchild.") - } - } - - File { - owner => 'root', - group => $::apache::params::root_group, - mode => $::apache::file_mode, - } - - # Template uses: - # - $startservers - # - $minspareservers - # - $maxspareservers - # - $serverlimit - # - $maxclients - # - $maxrequestworkers - # - $maxrequestsperchild - # - $maxconnectionsperchild - file { "${::apache::mod_dir}/prefork.conf": - ensure => file, - content => template('apache/mod/prefork.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } - - case $::osfamily { - 'redhat': { - if versioncmp($_apache_version, '2.4') >= 0 { - ::apache::mpm{ 'prefork': - apache_version => $_apache_version, - } - } - else { - file_line { '/etc/sysconfig/httpd prefork enable': - ensure => present, - path => '/etc/sysconfig/httpd', - line => '#HTTPD=/usr/sbin/httpd.worker', - match => '#?HTTPD=/usr/sbin/httpd.worker', - require => Package['httpd'], - notify => Class['apache::service'], - } - } - } - 'debian', 'freebsd': { - ::apache::mpm{ 'prefork': - apache_version => $_apache_version, - } - } - 'Suse': { - ::apache::mpm{ 'prefork': - apache_version => $apache_version, - lib_path => '/usr/lib64/apache2-prefork', - } - } - 'gentoo': { - ::portage::makeconf { 'apache2_mpms': - content => 'prefork', - } - } - default: { - fail("Unsupported osfamily ${::osfamily}") - } - } -} diff --git a/modules/apache/manifests/mod/proxy.pp b/modules/apache/manifests/mod/proxy.pp deleted file mode 100644 index ce82cb3..0000000 --- a/modules/apache/manifests/mod/proxy.pp +++ /dev/null @@ -1,23 +0,0 @@ -class apache::mod::proxy ( - $proxy_requests = 'Off', - $allow_from = undef, - $apache_version = undef, - $package_name = undef, - $proxy_via = 'On', -) { - include ::apache - $_apache_version = pick($apache_version, $apache::apache_version) - ::apache::mod { 'proxy': - package => $package_name, - } - # Template uses $proxy_requests, $_apache_version - file { 'proxy.conf': - ensure => file, - path => "${::apache::mod_dir}/proxy.conf", - mode => $::apache::file_mode, - content => template('apache/mod/proxy.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/proxy_ajp.pp b/modules/apache/manifests/mod/proxy_ajp.pp deleted file mode 100644 index a011a17..0000000 --- a/modules/apache/manifests/mod/proxy_ajp.pp +++ /dev/null @@ -1,4 +0,0 @@ -class apache::mod::proxy_ajp { - Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_ajp'] - ::apache::mod { 'proxy_ajp': } -} diff --git a/modules/apache/manifests/mod/proxy_balancer.pp b/modules/apache/manifests/mod/proxy_balancer.pp deleted file mode 100644 index dbc86df..0000000 --- a/modules/apache/manifests/mod/proxy_balancer.pp +++ /dev/null @@ -1,29 +0,0 @@ -class apache::mod::proxy_balancer( - Boolean $manager = false, - Stdlib::Absolutepath $manager_path = '/balancer-manager', - Array $allow_from = ['127.0.0.1','::1'], - $apache_version = $::apache::apache_version, -) { - - include ::apache::mod::proxy - include ::apache::mod::proxy_http - if versioncmp($apache_version, '2.4') >= 0 { - ::apache::mod { 'slotmem_shm': } - } - - Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_balancer'] - Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_balancer'] - ::apache::mod { 'proxy_balancer': } - if $manager { - include ::apache::mod::status - file { 'proxy_balancer.conf': - ensure => file, - path => "${::apache::mod_dir}/proxy_balancer.conf", - mode => $::apache::file_mode, - content => template('apache/mod/proxy_balancer.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } - } -} diff --git a/modules/apache/manifests/mod/proxy_connect.pp b/modules/apache/manifests/mod/proxy_connect.pp deleted file mode 100644 index cda5b89..0000000 --- a/modules/apache/manifests/mod/proxy_connect.pp +++ /dev/null @@ -1,10 +0,0 @@ -class apache::mod::proxy_connect ( - $apache_version = undef, -) { - include ::apache - $_apache_version = pick($apache_version, $apache::apache_version) - if versioncmp($_apache_version, '2.2') >= 0 { - Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_connect'] - ::apache::mod { 'proxy_connect': } - } -} diff --git a/modules/apache/manifests/mod/proxy_fcgi.pp b/modules/apache/manifests/mod/proxy_fcgi.pp deleted file mode 100644 index 21473eb..0000000 --- a/modules/apache/manifests/mod/proxy_fcgi.pp +++ /dev/null @@ -1,4 +0,0 @@ -class apache::mod::proxy_fcgi { - Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_fcgi'] - ::apache::mod { 'proxy_fcgi': } -} diff --git a/modules/apache/manifests/mod/proxy_html.pp b/modules/apache/manifests/mod/proxy_html.pp deleted file mode 100644 index 94259bd..0000000 --- a/modules/apache/manifests/mod/proxy_html.pp +++ /dev/null @@ -1,42 +0,0 @@ -class apache::mod::proxy_html { - include ::apache - Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_html'] - Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_html'] - - # Add libxml2 - case $::osfamily { - /RedHat|FreeBSD|Gentoo|Suse/: { - ::apache::mod { 'xml2enc': } - $loadfiles = undef - } - 'Debian': { - $gnu_path = $::hardwaremodel ? { - 'i686' => 'i386', - default => $::hardwaremodel, - } - $loadfiles = $::apache::params::distrelease ? { - '6' => ['/usr/lib/libxml2.so.2'], - '10' => ['/usr/lib/libxml2.so.2'], - default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"], - } - if versioncmp($::apache::apache_version, '2.4') >= 0 { - ::apache::mod { 'xml2enc': } - } - } - } - - ::apache::mod { 'proxy_html': - loadfiles => $loadfiles, - } - - # Template uses $icons_path - file { 'proxy_html.conf': - ensure => file, - path => "${::apache::mod_dir}/proxy_html.conf", - mode => $::apache::file_mode, - content => template('apache/mod/proxy_html.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/proxy_http.pp b/modules/apache/manifests/mod/proxy_http.pp deleted file mode 100644 index 1579e68..0000000 --- a/modules/apache/manifests/mod/proxy_http.pp +++ /dev/null @@ -1,4 +0,0 @@ -class apache::mod::proxy_http { - Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_http'] - ::apache::mod { 'proxy_http': } -} diff --git a/modules/apache/manifests/mod/proxy_wstunnel.pp b/modules/apache/manifests/mod/proxy_wstunnel.pp deleted file mode 100644 index 290954b..0000000 --- a/modules/apache/manifests/mod/proxy_wstunnel.pp +++ /dev/null @@ -1,5 +0,0 @@ -class apache::mod::proxy_wstunnel { - include ::apache, ::apache::mod::proxy - Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_wstunnel'] - ::apache::mod { 'proxy_wstunnel': } -} diff --git a/modules/apache/manifests/mod/python.pp b/modules/apache/manifests/mod/python.pp deleted file mode 100644 index 75af350..0000000 --- a/modules/apache/manifests/mod/python.pp +++ /dev/null @@ -1,6 +0,0 @@ -class apache::mod::python { - include ::apache - ::apache::mod { 'python': } -} - - diff --git a/modules/apache/manifests/mod/remoteip.pp b/modules/apache/manifests/mod/remoteip.pp deleted file mode 100644 index 92010cf..0000000 --- a/modules/apache/manifests/mod/remoteip.pp +++ /dev/null @@ -1,30 +0,0 @@ -class apache::mod::remoteip ( - $header = 'X-Forwarded-For', - $proxy_ips = [ '127.0.0.1' ], - $proxies_header = undef, - $trusted_proxy_ips = undef, - $apache_version = undef, -) { - include ::apache - $_apache_version = pick($apache_version, $apache::apache_version) - if versioncmp($_apache_version, '2.4') < 0 { - fail('mod_remoteip is only available in Apache 2.4') - } - - ::apache::mod { 'remoteip': } - - # Template uses: - # - $header - # - $proxy_ips - # - $proxies_header - # - $trusted_proxy_ips - file { 'remoteip.conf': - ensure => file, - path => "${::apache::mod_dir}/remoteip.conf", - mode => $::apache::file_mode, - content => template('apache/mod/remoteip.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Service['httpd'], - } -} diff --git a/modules/apache/manifests/mod/reqtimeout.pp b/modules/apache/manifests/mod/reqtimeout.pp deleted file mode 100644 index f166f6d..0000000 --- a/modules/apache/manifests/mod/reqtimeout.pp +++ /dev/null @@ -1,15 +0,0 @@ -class apache::mod::reqtimeout ( - $timeouts = ['header=20-40,minrate=500', 'body=10,minrate=500'] -){ - include ::apache - ::apache::mod { 'reqtimeout': } - # Template uses no variables - file { 'reqtimeout.conf': - ensure => file, - path => "${::apache::mod_dir}/reqtimeout.conf", - content => template('apache/mod/reqtimeout.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/rewrite.pp b/modules/apache/manifests/mod/rewrite.pp deleted file mode 100644 index 694f0b6..0000000 --- a/modules/apache/manifests/mod/rewrite.pp +++ /dev/null @@ -1,4 +0,0 @@ -class apache::mod::rewrite { - include ::apache::params - ::apache::mod { 'rewrite': } -} diff --git a/modules/apache/manifests/mod/rpaf.pp b/modules/apache/manifests/mod/rpaf.pp deleted file mode 100644 index b9afa14..0000000 --- a/modules/apache/manifests/mod/rpaf.pp +++ /dev/null @@ -1,23 +0,0 @@ -class apache::mod::rpaf ( - $sethostname = true, - $proxy_ips = [ '127.0.0.1' ], - $header = 'X-Forwarded-For', - $template = 'apache/mod/rpaf.conf.erb' -) { - include ::apache - ::apache::mod { 'rpaf': } - - # Template uses: - # - $sethostname - # - $proxy_ips - # - $header - file { 'rpaf.conf': - ensure => file, - path => "${::apache::mod_dir}/rpaf.conf", - mode => $::apache::file_mode, - content => template($template), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/security.pp b/modules/apache/manifests/mod/security.pp deleted file mode 100644 index 95c58a0..0000000 --- a/modules/apache/manifests/mod/security.pp +++ /dev/null @@ -1,133 +0,0 @@ -class apache::mod::security ( - $logroot = $::apache::params::logroot, - $crs_package = $::apache::params::modsec_crs_package, - $activated_rules = $::apache::params::modsec_default_rules, - $modsec_dir = $::apache::params::modsec_dir, - $modsec_secruleengine = $::apache::params::modsec_secruleengine, - $audit_log_relevant_status = '^(?:5|4(?!04))', - $audit_log_parts = $::apache::params::modsec_audit_log_parts, - $secpcrematchlimit = $::apache::params::secpcrematchlimit, - $secpcrematchlimitrecursion = $::apache::params::secpcrematchlimitrecursion, - $allowed_methods = 'GET HEAD POST OPTIONS', - $content_types = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf', - $restricted_extensions = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/', - $restricted_headers = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/', - $secdefaultaction = 'deny', - $anomaly_score_blocking = 'off', - $inbound_anomaly_threshold = '5', - $outbound_anomaly_threshold = '4', - $critical_anomaly_score = '5', - $error_anomaly_score = '4', - $warning_anomaly_score = '3', - $notice_anomaly_score = '2', - $secrequestmaxnumargs = '255', - $secrequestbodylimit = '13107200', - $secrequestbodynofileslimit = '131072', - $secrequestbodyinmemorylimit = '131072', - $manage_security_crs = true, -) inherits ::apache::params { - include ::apache - - $_secdefaultaction = $secdefaultaction ? { - /log/ => $secdefaultaction, # it has log or nolog,auditlog or log,noauditlog - default => "${secdefaultaction},log", - } - - if $::osfamily == 'FreeBSD' { - fail('FreeBSD is not currently supported') - } - - if ($::osfamily == 'Suse' and $::operatingsystemrelease < '11') { - fail('SLES 10 is not currently supported.') - } - - ::apache::mod { 'security': - id => 'security2_module', - lib => 'mod_security2.so', - } - - - ::apache::mod { 'unique_id_module': - id => 'unique_id_module', - lib => 'mod_unique_id.so', - } - - if $crs_package { - package { $crs_package: - ensure => 'installed', - before => [ - File[$::apache::confd_dir], - File[$modsec_dir], - ], - } - } - - # Template uses: - # - logroot - # - $modsec_dir - # - $audit_log_parts - # - secpcrematchlimit - # - secpcrematchlimitrecursion - # - secrequestbodylimit - # - secrequestbodynofileslimit - # - secrequestbodyinmemorylimit - file { 'security.conf': - ensure => file, - content => template('apache/mod/security.conf.erb'), - mode => $::apache::file_mode, - path => "${::apache::mod_dir}/security.conf", - owner => $::apache::params::user, - group => $::apache::params::group, - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } - - file { $modsec_dir: - ensure => directory, - owner => 'root', - group => 'root', - mode => '0755', - purge => true, - force => true, - recurse => true, - require => Package['httpd'], - } - - file { "${modsec_dir}/activated_rules": - ensure => directory, - owner => $::apache::params::user, - group => $::apache::params::group, - mode => '0555', - purge => true, - force => true, - recurse => true, - notify => Class['apache::service'], - } - - if $manage_security_crs { - # Template uses: - # - $_secdefaultaction - # - $critical_anomaly_score - # - $error_anomaly_score - # - $warning_anomaly_score - # - $notice_anomaly_score - # - $inbound_anomaly_threshold - # - $outbound_anomaly_threshold - # - $anomaly_score_blocking - # - $allowed_methods - # - $content_types - # - $restricted_extensions - # - $restricted_headers - # - $secrequestmaxnumargs - file { "${modsec_dir}/security_crs.conf": - ensure => file, - content => template('apache/mod/security_crs.conf.erb'), - require => File[$modsec_dir], - notify => Class['apache::service'], - } - } - - unless $::operatingsystem == 'SLES' { apache::security::rule_link { $activated_rules: } } - -} diff --git a/modules/apache/manifests/mod/setenvif.pp b/modules/apache/manifests/mod/setenvif.pp deleted file mode 100644 index d7baf58..0000000 --- a/modules/apache/manifests/mod/setenvif.pp +++ /dev/null @@ -1,14 +0,0 @@ -class apache::mod::setenvif { - include ::apache - ::apache::mod { 'setenvif': } - # Template uses no variables - file { 'setenvif.conf': - ensure => file, - path => "${::apache::mod_dir}/setenvif.conf", - mode => $::apache::file_mode, - content => template('apache/mod/setenvif.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/shib.pp b/modules/apache/manifests/mod/shib.pp deleted file mode 100644 index 318a3a3..0000000 --- a/modules/apache/manifests/mod/shib.pp +++ /dev/null @@ -1,20 +0,0 @@ -class apache::mod::shib ( - $suppress_warning = false, - $mod_full_path = undef, - $package_name = undef, - $mod_lib = undef, -) { - include ::apache - if $::osfamily == 'RedHat' and ! $suppress_warning { - warning('RedHat distributions do not have Apache mod_shib in their default package repositories.') - } - - $mod_shib = 'shib2' - - apache::mod {$mod_shib: - id => 'mod_shib', - path => $mod_full_path, - package => $package_name, - lib => $mod_lib, - } -} diff --git a/modules/apache/manifests/mod/socache_shmcb.pp b/modules/apache/manifests/mod/socache_shmcb.pp deleted file mode 100644 index 7bfb4c6..0000000 --- a/modules/apache/manifests/mod/socache_shmcb.pp +++ /dev/null @@ -1,3 +0,0 @@ -class apache::mod::socache_shmcb { - ::apache::mod { 'socache_shmcb': } -} \ No newline at end of file diff --git a/modules/apache/manifests/mod/speling.pp b/modules/apache/manifests/mod/speling.pp deleted file mode 100644 index fbd19d3..0000000 --- a/modules/apache/manifests/mod/speling.pp +++ /dev/null @@ -1,4 +0,0 @@ -class apache::mod::speling { - include ::apache - ::apache::mod { 'speling': } -} diff --git a/modules/apache/manifests/mod/ssl.pp b/modules/apache/manifests/mod/ssl.pp deleted file mode 100644 index 76726b8..0000000 --- a/modules/apache/manifests/mod/ssl.pp +++ /dev/null @@ -1,118 +0,0 @@ -class apache::mod::ssl ( - Boolean $ssl_compression = false, - $ssl_cryptodevice = 'builtin', - $ssl_options = [ 'StdEnvVars' ], - $ssl_openssl_conf_cmd = undef, - $ssl_ca = undef, - $ssl_cipher = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES', - Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true, - $ssl_protocol = [ 'all', '-SSLv2', '-SSLv3' ], - Array $ssl_proxy_protocol = [], - $ssl_pass_phrase_dialog = 'builtin', - $ssl_random_seed_bytes = '512', - String $ssl_sessioncache = $::apache::params::ssl_sessioncache, - $ssl_sessioncachetimeout = '300', - Boolean $ssl_stapling = false, - Optional[Boolean] $ssl_stapling_return_errors = undef, - $ssl_mutex = undef, - $apache_version = undef, - $package_name = undef, -) inherits ::apache::params { - - include ::apache - include ::apache::mod::mime - $_apache_version = pick($apache_version, $apache::apache_version) - if $ssl_mutex { - $_ssl_mutex = $ssl_mutex - } else { - case $::osfamily { - 'debian': { - if versioncmp($_apache_version, '2.4') >= 0 { - $_ssl_mutex = 'default' - } elsif $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '10.04' { - $_ssl_mutex = 'file:/var/run/apache2/ssl_mutex' - } else { - $_ssl_mutex = "file:\${APACHE_RUN_DIR}/ssl_mutex" - } - } - 'redhat': { - $_ssl_mutex = 'default' - } - 'freebsd': { - $_ssl_mutex = 'default' - } - 'gentoo': { - $_ssl_mutex = 'default' - } - 'Suse': { - $_ssl_mutex = 'default' - } - default: { - fail("Unsupported osfamily ${::osfamily}, please explicitly pass in \$ssl_mutex") - } - } - } - - if $ssl_honorcipherorder =~ Boolean { - $_ssl_honorcipherorder = $ssl_honorcipherorder - } else { - $_ssl_honorcipherorder = $ssl_honorcipherorder ? { - 'on' => true, - 'off' => false, - default => true, - } - } - - $stapling_cache = $::osfamily ? { - 'debian' => "\${APACHE_RUN_DIR}/ocsp(32768)", - 'redhat' => '/run/httpd/ssl_stapling(32768)', - 'freebsd' => '/var/run/ssl_stapling(32768)', - 'gentoo' => '/var/run/ssl_stapling(32768)', - 'Suse' => '/var/lib/apache2/ssl_stapling(32768)', - } - - if $::osfamily == 'Suse' { - if defined(Class['::apache::mod::worker']){ - $suse_path = '/usr/lib64/apache2-worker' - } else { - $suse_path = '/usr/lib64/apache2-worker' - } - ::apache::mod { 'ssl': - package => $package_name, - lib_path => $suse_path, - } - } else { - ::apache::mod { 'ssl': - package => $package_name, - } - } - - if versioncmp($_apache_version, '2.4') >= 0 { - include ::apache::mod::socache_shmcb - } - - # Template uses - # - # $ssl_compression - # $ssl_cryptodevice - # $ssl_ca - # $ssl_cipher - # $ssl_honorcipherorder - # $ssl_options - # $ssl_openssl_conf_cmd - # $ssl_sessioncache - # $stapling_cache - # $ssl_mutex - # $ssl_random_seed_bytes - # $ssl_sessioncachetimeout - # $_apache_version - file { 'ssl.conf': - ensure => file, - path => $::apache::_ssl_file, - mode => $::apache::file_mode, - content => template('apache/mod/ssl.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/status.pp b/modules/apache/manifests/mod/status.pp deleted file mode 100644 index 54d0d88..0000000 --- a/modules/apache/manifests/mod/status.pp +++ /dev/null @@ -1,48 +0,0 @@ -# Class: apache::mod::status -# -# This class enables and configures Apache mod_status -# See: http://httpd.apache.org/docs/current/mod/mod_status.html -# -# Parameters: -# - $allow_from is an array of hosts, ip addresses, partial network numbers -# or networks in CIDR notation specifying what hosts can view the special -# /server-status URL. Defaults to ['127.0.0.1', '::1']. -# - $extended_status track and display extended status information. Valid -# values are 'On' or 'Off'. Defaults to 'On'. -# - $status_path is the path assigned to the Location directive which -# defines the URL to access the server status. Defaults to '/server-status'. -# -# Actions: -# - Enable and configure Apache mod_status -# -# Requires: -# - The apache class -# -# Sample Usage: -# -# # Simple usage allowing access from localhost and a private subnet -# class { 'apache::mod::status': -# $allow_from => ['127.0.0.1', '10.10.10.10/24'], -# } -# -class apache::mod::status ( - Array $allow_from = ['127.0.0.1','::1'], - Enum['On', 'Off', 'on', 'off'] $extended_status = 'On', - $apache_version = undef, - $status_path = '/server-status', -) inherits ::apache::params { - - include ::apache - $_apache_version = pick($apache_version, $apache::apache_version) - ::apache::mod { 'status': } - # Template uses $allow_from, $extended_status, $_apache_version, $status_path - file { 'status.conf': - ensure => file, - path => "${::apache::mod_dir}/status.conf", - mode => $::apache::file_mode, - content => template('apache/mod/status.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/suexec.pp b/modules/apache/manifests/mod/suexec.pp deleted file mode 100644 index ded013d..0000000 --- a/modules/apache/manifests/mod/suexec.pp +++ /dev/null @@ -1,3 +0,0 @@ -class apache::mod::suexec { - ::apache::mod { 'suexec': } -} diff --git a/modules/apache/manifests/mod/suphp.pp b/modules/apache/manifests/mod/suphp.pp deleted file mode 100644 index 955bba3..0000000 --- a/modules/apache/manifests/mod/suphp.pp +++ /dev/null @@ -1,16 +0,0 @@ -class apache::mod::suphp ( -){ - include ::apache - ::apache::mod { 'suphp': } - - file {'suphp.conf': - ensure => file, - path => "${::apache::mod_dir}/suphp.conf", - mode => $::apache::file_mode, - content => template('apache/mod/suphp.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} - diff --git a/modules/apache/manifests/mod/userdir.pp b/modules/apache/manifests/mod/userdir.pp deleted file mode 100644 index 203b93d..0000000 --- a/modules/apache/manifests/mod/userdir.pp +++ /dev/null @@ -1,40 +0,0 @@ -class apache::mod::userdir ( - $home = undef, - $dir = undef, - $disable_root = true, - $apache_version = undef, - $path = '/home/*/public_html', - $overrides = [ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ], - $options = [ 'MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec' ], -) { - include ::apache - $_apache_version = pick($apache_version, $apache::apache_version) - - if $home or $dir { - $_home = $home ? { - undef => '/home', - default => $home, - } - $_dir = $dir ? { - undef => 'public_html', - default => $dir, - } - warning('home and dir are deprecated; use path instead') - $_path = "${_home}/*/${_dir}" - } else { - $_path = $path - } - - ::apache::mod { 'userdir': } - - # Template uses $home, $dir, $disable_root, $_apache_version - file { 'userdir.conf': - ensure => file, - path => "${::apache::mod_dir}/userdir.conf", - mode => $::apache::file_mode, - content => template('apache/mod/userdir.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/mod/version.pp b/modules/apache/manifests/mod/version.pp deleted file mode 100644 index 1cc4412..0000000 --- a/modules/apache/manifests/mod/version.pp +++ /dev/null @@ -1,10 +0,0 @@ -class apache::mod::version( - $apache_version = $::apache::apache_version -) { - - if ($::osfamily == 'debian' and versioncmp($apache_version, '2.4') >= 0) { - warning("${module_name}: module version_module is built-in and can't be loaded") - } else { - ::apache::mod { 'version': } - } -} diff --git a/modules/apache/manifests/mod/vhost_alias.pp b/modules/apache/manifests/mod/vhost_alias.pp deleted file mode 100644 index 30ae122..0000000 --- a/modules/apache/manifests/mod/vhost_alias.pp +++ /dev/null @@ -1,3 +0,0 @@ -class apache::mod::vhost_alias { - ::apache::mod { 'vhost_alias': } -} diff --git a/modules/apache/manifests/mod/worker.pp b/modules/apache/manifests/mod/worker.pp deleted file mode 100644 index 00a9439..0000000 --- a/modules/apache/manifests/mod/worker.pp +++ /dev/null @@ -1,147 +0,0 @@ -# == Class: apache::mod::worker -# -# -# === Parameters -# -# [*startservers*] -# (optional) The number of child server processes created on startup -# Defaults is '2' -# -# [*maxclients*] -# (optional) The max number of simultaneous requests that will be served. -# This is the old name and is still supported. The new name is -# MaxRequestWorkers as of 2.3.13. -# Default is '150' -# -# [*minsparethreads*] -# (optional) Minimum number of idle threads to handle request spikes. -# Default is '25' -# -# [*maxsparethreads*] -# (optional) Maximum number of idle threads. -# Default is '75' -# -# [*threadsperchild*] -# (optional) The number of threads created by each child process. -# Default is '25' -# -# [*maxrequestsperchild*] -# (optional) Limit on the number of connectiojns an individual child server -# process will handle. This is the old name and is still supported. The new -# name is MaxConnectionsPerChild as of 2.3.9+. -# Default is '0' -# -# [*serverlimit*] -# (optional) With worker, use this directive only if your MaxRequestWorkers -# and ThreadsPerChild settings require more than 16 server processes -# (default). Do not set the value of this directive any higher than the -# number of server processes required by what you may want for -# MaxRequestWorkers and ThreadsPerChild. -# Default is '25' -# -# [*threadlimit*] -# (optional) This directive sets the maximum configured value for -# ThreadsPerChild for the lifetime of the Apache httpd process. -# Default is '64' -# -# [*listenbacklog*] -# (optional) Maximum length of the queue of pending connections. -# Defaults is '511' -# -# [*apache_version*] -# (optional) -# Default is $::apache::apache_version -# -class apache::mod::worker ( - $startservers = '2', - $maxclients = '150', - $minsparethreads = '25', - $maxsparethreads = '75', - $threadsperchild = '25', - $maxrequestsperchild = '0', - $serverlimit = '25', - $threadlimit = '64', - $listenbacklog = '511', - $apache_version = undef, -) { - include ::apache - $_apache_version = pick($apache_version, $apache::apache_version) - - if defined(Class['apache::mod::event']) { - fail('May not include both apache::mod::worker and apache::mod::event on the same node') - } - if defined(Class['apache::mod::itk']) { - fail('May not include both apache::mod::worker and apache::mod::itk on the same node') - } - if defined(Class['apache::mod::peruser']) { - fail('May not include both apache::mod::worker and apache::mod::peruser on the same node') - } - if defined(Class['apache::mod::prefork']) { - fail('May not include both apache::mod::worker and apache::mod::prefork on the same node') - } - File { - owner => 'root', - group => $::apache::params::root_group, - mode => $::apache::file_mode, - } - - # Template uses: - # - $startservers - # - $maxclients - # - $minsparethreads - # - $maxsparethreads - # - $threadsperchild - # - $maxrequestsperchild - # - $serverlimit - # - $threadLimit - # - $listenbacklog - file { "${::apache::mod_dir}/worker.conf": - ensure => file, - content => template('apache/mod/worker.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } - - case $::osfamily { - 'redhat': { - - if versioncmp($_apache_version, '2.4') >= 0 { - ::apache::mpm{ 'worker': - apache_version => $_apache_version, - } - } - else { - file_line { '/etc/sysconfig/httpd worker enable': - ensure => present, - path => '/etc/sysconfig/httpd', - line => 'HTTPD=/usr/sbin/httpd.worker', - match => '#?HTTPD=/usr/sbin/httpd.worker', - require => Package['httpd'], - notify => Class['apache::service'], - } - } - } - - 'debian', 'freebsd': { - ::apache::mpm{ 'worker': - apache_version => $_apache_version, - } - } - 'Suse': { - ::apache::mpm { 'worker': - apache_version => $apache_version, - lib_path => '/usr/lib64/apache2-worker', - } - } - - 'gentoo': { - ::portage::makeconf { 'apache2_mpms': - content => 'worker', - } - } - default: { - fail("Unsupported osfamily ${::osfamily}") - } - } -} diff --git a/modules/apache/manifests/mod/wsgi.pp b/modules/apache/manifests/mod/wsgi.pp deleted file mode 100644 index 6f9d437..0000000 --- a/modules/apache/manifests/mod/wsgi.pp +++ /dev/null @@ -1,44 +0,0 @@ -class apache::mod::wsgi ( - $wsgi_restrict_embedded = undef, - $wsgi_socket_prefix = $::apache::params::wsgi_socket_prefix, - $wsgi_python_path = undef, - $wsgi_python_home = undef, - $package_name = undef, - $mod_path = undef, -) inherits ::apache::params { - include ::apache - if ($package_name != undef and $mod_path == undef) or ($package_name == undef and $mod_path != undef) { - fail('apache::mod::wsgi - both package_name and mod_path must be specified!') - } - - if $package_name != undef { - if $mod_path =~ /\// { - $_mod_path = $mod_path - } else { - $_mod_path = "${::apache::lib_path}/${mod_path}" - } - ::apache::mod { 'wsgi': - package => $package_name, - path => $_mod_path, - } - } - else { - ::apache::mod { 'wsgi': } - } - - # Template uses: - # - $wsgi_restrict_embedded - # - $wsgi_socket_prefix - # - $wsgi_python_path - # - $wsgi_python_home - file {'wsgi.conf': - ensure => file, - path => "${::apache::mod_dir}/wsgi.conf", - mode => $::apache::file_mode, - content => template('apache/mod/wsgi.conf.erb'), - require => Exec["mkdir ${::apache::mod_dir}"], - before => File[$::apache::mod_dir], - notify => Class['apache::service'], - } -} - diff --git a/modules/apache/manifests/mod/xsendfile.pp b/modules/apache/manifests/mod/xsendfile.pp deleted file mode 100644 index 7c5e884..0000000 --- a/modules/apache/manifests/mod/xsendfile.pp +++ /dev/null @@ -1,4 +0,0 @@ -class apache::mod::xsendfile { - include ::apache::params - ::apache::mod { 'xsendfile': } -} diff --git a/modules/apache/manifests/mpm.pp b/modules/apache/manifests/mpm.pp deleted file mode 100644 index 119fedf..0000000 --- a/modules/apache/manifests/mpm.pp +++ /dev/null @@ -1,148 +0,0 @@ -define apache::mpm ( - $lib_path = $::apache::lib_path, - $apache_version = $::apache::apache_version, -) { - if ! defined(Class['apache']) { - fail('You must include the apache base class before using any apache defined resources') - } - - $mpm = $name - $mod_dir = $::apache::mod_dir - - $_lib = "mod_mpm_${mpm}.so" - $_path = "${lib_path}/${_lib}" - $_id = "mpm_${mpm}_module" - - if $::osfamily == 'Suse' { - #mpms on Suse 12 don't use .so libraries so create a placeholder load file - if versioncmp($apache_version, '2.4') >= 0 { - file { "${mod_dir}/${mpm}.load": - ensure => file, - path => "${mod_dir}/${mpm}.load", - content => '', - require => [ - Package['httpd'], - Exec["mkdir ${mod_dir}"], - ], - before => File[$mod_dir], - notify => Class['apache::service'], - } - } - } else { - if versioncmp($apache_version, '2.4') >= 0 { - file { "${mod_dir}/${mpm}.load": - ensure => file, - path => "${mod_dir}/${mpm}.load", - content => "LoadModule ${_id} ${_path}\n", - require => [ - Package['httpd'], - Exec["mkdir ${mod_dir}"], - ], - before => File[$mod_dir], - notify => Class['apache::service'], - } - } - } - - case $::osfamily { - 'debian': { - file { "${::apache::mod_enable_dir}/${mpm}.conf": - ensure => link, - target => "${::apache::mod_dir}/${mpm}.conf", - require => Exec["mkdir ${::apache::mod_enable_dir}"], - before => File[$::apache::mod_enable_dir], - notify => Class['apache::service'], - } - - if versioncmp($apache_version, '2.4') >= 0 { - file { "${::apache::mod_enable_dir}/${mpm}.load": - ensure => link, - target => "${::apache::mod_dir}/${mpm}.load", - require => Exec["mkdir ${::apache::mod_enable_dir}"], - before => File[$::apache::mod_enable_dir], - notify => Class['apache::service'], - } - - if $mpm == 'itk' { - file { "${lib_path}/mod_mpm_itk.so": - ensure => link, - target => "${lib_path}/mpm_itk.so", - require => Package['httpd'], - before => Class['apache::service'], - } - } - } - - if $mpm == 'itk' and $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '14.04' { - # workaround https://bugs.launchpad.net/ubuntu/+source/mpm-itk/+bug/1286882 - exec { - '/usr/sbin/a2dismod mpm_event': - onlyif => '/usr/bin/test -e /etc/apache2/mods-enabled/mpm_event.load', - require => Package['httpd'], - before => Package['apache2-mpm-itk'], - } - } - - if $mpm == 'itk' and $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '16.04' { - $packagename = 'libapache2-mpm-itk' - } else { - $packagename = "apache2-mpm-${mpm}" - } - - if versioncmp($apache_version, '2.4') < 0 or $mpm == 'itk' { - package { $packagename: - ensure => present, - } - if $::apache::mod_enable_dir { - Package[$packagename] { - before => File[$::apache::mod_enable_dir], - } - } - } - } - 'freebsd': { - class { '::apache::package': - mpm_module => $mpm, - } - } - 'gentoo': { - # so we don't fail - } - 'redhat': { - # so we don't fail - } - 'Suse': { - file { "${::apache::mod_enable_dir}/${mpm}.conf": - ensure => link, - target => "${::apache::mod_dir}/${mpm}.conf", - require => Exec["mkdir ${::apache::mod_enable_dir}"], - before => File[$::apache::mod_enable_dir], - notify => Class['apache::service'], - } - - if versioncmp($apache_version, '2.4') >= 0 { - file { "${::apache::mod_enable_dir}/${mpm}.load": - ensure => link, - target => "${::apache::mod_dir}/${mpm}.load", - require => Exec["mkdir ${::apache::mod_enable_dir}"], - before => File[$::apache::mod_enable_dir], - notify => Class['apache::service'], - } - - if $mpm == 'itk' { - file { "${lib_path}/mod_mpm_itk.so": - ensure => link, - target => "${lib_path}/mpm_itk.so", - } - } - } - - package { "apache2-${mpm}": - ensure => present, - } - } - default: { - fail("Unsupported osfamily ${::osfamily}") - } - } -} diff --git a/modules/apache/manifests/namevirtualhost.pp b/modules/apache/manifests/namevirtualhost.pp deleted file mode 100644 index 4fa8795..0000000 --- a/modules/apache/manifests/namevirtualhost.pp +++ /dev/null @@ -1,9 +0,0 @@ -define apache::namevirtualhost { - $addr_port = $name - - # Template uses: $addr_port - concat::fragment { "NameVirtualHost ${addr_port}": - target => $::apache::ports_file, - content => template('apache/namevirtualhost.erb'), - } -} diff --git a/modules/apache/manifests/package.pp b/modules/apache/manifests/package.pp deleted file mode 100644 index 7c95f99..0000000 --- a/modules/apache/manifests/package.pp +++ /dev/null @@ -1,37 +0,0 @@ -class apache::package ( - $ensure = 'present', - $mpm_module = $::apache::params::mpm_module, -) inherits ::apache::params { - - # The base class must be included first because it is used by parameter defaults - if ! defined(Class['apache']) { - fail('You must include the apache base class before using any apache defined resources') - } - - case $::osfamily { - 'FreeBSD': { - case $mpm_module { - 'prefork': { - } - 'worker': { - } - 'event': { - } - 'itk': { - package { 'www/mod_mpm_itk': - ensure => installed, - } - } - default: { fail("MPM module ${mpm_module} not supported on FreeBSD") } - } - } - default: { - } - } - - package { 'httpd': - ensure => $ensure, - name => $::apache::apache_name, - notify => Class['Apache::Service'], - } -} diff --git a/modules/apache/manifests/params.pp b/modules/apache/manifests/params.pp deleted file mode 100644 index bca827d..0000000 --- a/modules/apache/manifests/params.pp +++ /dev/null @@ -1,603 +0,0 @@ -# Class: apache::params -# -# This class manages Apache parameters -# -# Parameters: -# - The $user that Apache runs as -# - The $group that Apache runs as -# - The $apache_name is the name of the package and service on the relevant -# distribution -# - The $php_package is the name of the package that provided PHP -# - The $ssl_package is the name of the Apache SSL package -# - The $apache_dev is the name of the Apache development libraries package -# - The $conf_contents is the contents of the Apache configuration file -# -# Actions: -# -# Requires: -# -# Sample Usage: -# -class apache::params inherits ::apache::version { - if($::fqdn) { - $servername = $::fqdn - } else { - $servername = $::hostname - } - - # The default error log level - $log_level = 'warn' - $use_optional_includes = false - - # Default mime types settings - $mime_types_additional = { - 'AddHandler' => { 'type-map' => 'var', }, - 'AddType' => { 'text/html' => '.shtml', }, - 'AddOutputFilter' => { 'INCLUDES' => '.shtml', }, - } - - # should we use systemd module? - $use_systemd = true - - # Default mode for files - $file_mode = '0644' - - # Default options for / directory - $root_directory_options = ['FollowSymLinks'] - - $vhost_include_pattern = '*' - - $modsec_audit_log_parts = 'ABIJDEFHZ' - - # no client certs should be trusted for auth by default. - $ssl_certs_dir = undef - - if ($::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04') or ($::operatingsystem == 'SLES') { - $verify_command = '/usr/sbin/apache2ctl -t' - } elsif $::operatingsystem == 'FreeBSD' { - $verify_command = '/usr/local/sbin/apachectl -t' - } else { - $verify_command = '/usr/sbin/apachectl -t' - } - if $::osfamily == 'RedHat' or $::operatingsystem =~ /^[Aa]mazon$/ { - $user = 'apache' - $group = 'apache' - $root_group = 'root' - $apache_name = 'httpd' - $service_name = 'httpd' - $httpd_dir = '/etc/httpd' - $server_root = '/etc/httpd' - $conf_dir = "${httpd_dir}/conf" - $confd_dir = "${httpd_dir}/conf.d" - $mod_dir = $::apache::version::distrelease ? { - '7' => "${httpd_dir}/conf.modules.d", - default => "${httpd_dir}/conf.d", - } - $mod_enable_dir = undef - $vhost_dir = "${httpd_dir}/conf.d" - $vhost_enable_dir = undef - $conf_file = 'httpd.conf' - $ports_file = "${conf_dir}/ports.conf" - $pidfile = 'run/httpd.pid' - $logroot = '/var/log/httpd' - $logroot_mode = undef - $lib_path = 'modules' - $mpm_module = 'prefork' - $dev_packages = 'httpd-devel' - $default_ssl_cert = '/etc/pki/tls/certs/localhost.crt' - $default_ssl_key = '/etc/pki/tls/private/localhost.key' - $ssl_sessioncache = '/var/cache/mod_ssl/scache(512000)' - $passenger_conf_file = 'passenger_extra.conf' - $passenger_conf_package_file = 'passenger.conf' - $passenger_root = undef - $passenger_ruby = undef - $passenger_default_ruby = undef - $suphp_addhandler = 'php5-script' - $suphp_engine = 'off' - $suphp_configpath = undef - $php_version = '5' - $mod_packages = { - # NOTE: The auth_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL. - 'auth_cas' => 'mod_auth_cas', - 'auth_kerb' => 'mod_auth_kerb', - 'auth_mellon' => 'mod_auth_mellon', - 'authnz_ldap' => $::apache::version::distrelease ? { - '7' => 'mod_ldap', - default => 'mod_authz_ldap', - }, - 'authnz_pam' => 'mod_authnz_pam', - 'fastcgi' => $::apache::version::distrelease ? { - '5' => 'mod_fastcgi', - '6' => 'mod_fastcgi', - default => undef, - }, - 'fcgid' => 'mod_fcgid', - 'geoip' => 'mod_geoip', - 'intercept_form_submit' => 'mod_intercept_form_submit', - 'ldap' => $::apache::version::distrelease ? { - '7' => 'mod_ldap', - default => undef, - }, - 'lookup_identity' => 'mod_lookup_identity', - 'pagespeed' => 'mod-pagespeed-stable', - # NOTE: The passenger module isn't available on RH/CentOS without - # providing dependency packages provided by EPEL and passenger - # repositories. See - # https://www.phusionpassenger.com/library/install/apache/install/oss/el7/ - 'passenger' => 'mod_passenger', - 'perl' => 'mod_perl', - 'php5' => $::apache::version::distrelease ? { - '5' => 'php53', - default => 'php', - }, - 'phpXXX' => 'php', - 'proxy_html' => 'mod_proxy_html', - 'python' => 'mod_python', - 'security' => 'mod_security', - # NOTE: The module for Shibboleth is not available on RH/CentOS without - # providing dependency packages provided by Shibboleth's repositories. - # See http://wiki.aaf.edu.au/tech-info/sp-install-guide - 'shibboleth' => 'shibboleth', - 'ssl' => 'mod_ssl', - 'wsgi' => 'mod_wsgi', - 'dav_svn' => 'mod_dav_svn', - 'suphp' => 'mod_suphp', - 'xsendfile' => 'mod_xsendfile', - 'nss' => 'mod_nss', - 'shib2' => 'shibboleth', - } - $mod_libs = { - 'nss' => 'libmodnss.so', - } - $conf_template = 'apache/httpd.conf.erb' - $http_protocol_options = undef - $keepalive = 'On' - $keepalive_timeout = 15 - $max_keepalive_requests = 100 - $fastcgi_lib_path = undef - $mime_support_package = 'mailcap' - $mime_types_config = '/etc/mime.types' - $docroot = '/var/www/html' - $alias_icons_path = $::apache::version::distrelease ? { - '7' => '/usr/share/httpd/icons', - default => '/var/www/icons', - } - $error_documents_path = $::apache::version::distrelease ? { - '7' => '/usr/share/httpd/error', - default => '/var/www/error' - } - if $::osfamily == 'RedHat' { - $wsgi_socket_prefix = '/var/run/wsgi' - } else { - $wsgi_socket_prefix = undef - } - $cas_cookie_path = '/var/cache/mod_auth_cas/' - $mellon_lock_file = '/run/mod_auth_mellon/lock' - $mellon_cache_size = 100 - $mellon_post_directory = undef - $modsec_crs_package = 'mod_security_crs' - $modsec_crs_path = '/usr/lib/modsecurity.d' - $modsec_dir = '/etc/httpd/modsecurity.d' - $secpcrematchlimit = 1500 - $secpcrematchlimitrecursion = 1500 - $modsec_secruleengine = 'On' - $modsec_default_rules = [ - 'base_rules/modsecurity_35_bad_robots.data', - 'base_rules/modsecurity_35_scanners.data', - 'base_rules/modsecurity_40_generic_attacks.data', - 'base_rules/modsecurity_50_outbound.data', - 'base_rules/modsecurity_50_outbound_malware.data', - 'base_rules/modsecurity_crs_20_protocol_violations.conf', - 'base_rules/modsecurity_crs_21_protocol_anomalies.conf', - 'base_rules/modsecurity_crs_23_request_limits.conf', - 'base_rules/modsecurity_crs_30_http_policy.conf', - 'base_rules/modsecurity_crs_35_bad_robots.conf', - 'base_rules/modsecurity_crs_40_generic_attacks.conf', - 'base_rules/modsecurity_crs_41_sql_injection_attacks.conf', - 'base_rules/modsecurity_crs_41_xss_attacks.conf', - 'base_rules/modsecurity_crs_42_tight_security.conf', - 'base_rules/modsecurity_crs_45_trojans.conf', - 'base_rules/modsecurity_crs_47_common_exceptions.conf', - 'base_rules/modsecurity_crs_49_inbound_blocking.conf', - 'base_rules/modsecurity_crs_50_outbound.conf', - 'base_rules/modsecurity_crs_59_outbound_blocking.conf', - 'base_rules/modsecurity_crs_60_correlation.conf', - ] - $error_log = 'error_log' - $scriptalias = '/var/www/cgi-bin' - $access_log_file = 'access_log' - } elsif $::osfamily == 'Debian' { - $user = 'www-data' - $group = 'www-data' - $root_group = 'root' - $apache_name = 'apache2' - $service_name = 'apache2' - $httpd_dir = '/etc/apache2' - $server_root = '/etc/apache2' - $conf_dir = $httpd_dir - $confd_dir = "${httpd_dir}/conf.d" - $mod_dir = "${httpd_dir}/mods-available" - $mod_enable_dir = "${httpd_dir}/mods-enabled" - $vhost_dir = "${httpd_dir}/sites-available" - $vhost_enable_dir = "${httpd_dir}/sites-enabled" - $conf_file = 'apache2.conf' - $ports_file = "${conf_dir}/ports.conf" - $pidfile = "\${APACHE_PID_FILE}" - $logroot = '/var/log/apache2' - $logroot_mode = undef - $lib_path = '/usr/lib/apache2/modules' - $mpm_module = 'worker' - $default_ssl_cert = '/etc/ssl/certs/ssl-cert-snakeoil.pem' - $default_ssl_key = '/etc/ssl/private/ssl-cert-snakeoil.key' - $ssl_sessioncache = "\${APACHE_RUN_DIR}/ssl_scache(512000)" - $suphp_addhandler = 'x-httpd-php' - $suphp_engine = 'off' - $suphp_configpath = '/etc/php5/apache2' - if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') < 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') < 0) { - # Only the major version is used here - $php_version = '5' - $mod_packages = { - 'auth_cas' => 'libapache2-mod-auth-cas', - 'auth_kerb' => 'libapache2-mod-auth-kerb', - 'auth_mellon' => 'libapache2-mod-auth-mellon', - 'authnz_pam' => 'libapache2-mod-authnz-pam', - 'dav_svn' => 'libapache2-svn', - 'fastcgi' => 'libapache2-mod-fastcgi', - 'fcgid' => 'libapache2-mod-fcgid', - 'geoip' => 'libapache2-mod-geoip', - 'intercept_form_submit' => 'libapache2-mod-intercept-form-submit', - 'lookup_identity' => 'libapache2-mod-lookup-identity', - 'nss' => 'libapache2-mod-nss', - 'pagespeed' => 'mod-pagespeed-stable', - 'passenger' => 'libapache2-mod-passenger', - 'perl' => 'libapache2-mod-perl2', - 'phpXXX' => 'libapache2-mod-phpXXX', - 'proxy_html' => 'libapache2-mod-proxy-html', - 'python' => 'libapache2-mod-python', - 'rpaf' => 'libapache2-mod-rpaf', - 'security' => 'libapache2-modsecurity', - 'shib2' => 'libapache2-mod-shib2', - 'suphp' => 'libapache2-mod-suphp', - 'wsgi' => 'libapache2-mod-wsgi', - 'xsendfile' => 'libapache2-mod-xsendfile', - } - } else { - # major.minor version used since Debian stretch and Ubuntu Xenial - $php_version = '7.0' - $mod_packages = { - 'auth_cas' => 'libapache2-mod-auth-cas', - 'auth_kerb' => 'libapache2-mod-auth-kerb', - 'auth_mellon' => 'libapache2-mod-auth-mellon', - 'authnz_pam' => 'libapache2-mod-authnz-pam', - 'dav_svn' => 'libapache2-svn', - 'fastcgi' => 'libapache2-mod-fastcgi', - 'fcgid' => 'libapache2-mod-fcgid', - 'geoip' => 'libapache2-mod-geoip', - 'intercept_form_submit' => 'libapache2-mod-intercept-form-submit', - 'lookup_identity' => 'libapache2-mod-lookup-identity', - 'nss' => 'libapache2-mod-nss', - 'pagespeed' => 'mod-pagespeed-stable', - 'passenger' => 'libapache2-mod-passenger', - 'perl' => 'libapache2-mod-perl2', - 'phpXXX' => 'libapache2-mod-phpXXX', - 'python' => 'libapache2-mod-python', - 'rpaf' => 'libapache2-mod-rpaf', - 'security' => 'libapache2-modsecurity', - 'shib2' => 'libapache2-mod-shib2', - 'suphp' => 'libapache2-mod-suphp', - 'wsgi' => 'libapache2-mod-wsgi', - 'xsendfile' => 'libapache2-mod-xsendfile', - } - } - $error_log = 'error.log' - $scriptalias = '/usr/lib/cgi-bin' - $access_log_file = 'access.log' - if $::osfamily == 'Debian' and versioncmp($::operatingsystemrelease, '8') < 0 { - $shib2_lib = 'mod_shib_22.so' - } else { - $shib2_lib = 'mod_shib2.so' - } - $mod_libs = { - 'shib2' => $shib2_lib, - } - $conf_template = 'apache/httpd.conf.erb' - $http_protocol_options = undef - $keepalive = 'Off' - $keepalive_timeout = 15 - $max_keepalive_requests = 100 - $fastcgi_lib_path = '/var/lib/apache2/fastcgi' - $mime_support_package = 'mime-support' - $mime_types_config = '/etc/mime.types' - if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8') >= 0) { - $docroot = '/var/www/html' - } else { - $docroot = '/var/www' - } - $cas_cookie_path = '/var/cache/apache2/mod_auth_cas/' - $mellon_lock_file = undef - $mellon_cache_size = undef - $mellon_post_directory = '/var/cache/apache2/mod_auth_mellon/' - $modsec_crs_package = 'modsecurity-crs' - $modsec_crs_path = '/usr/share/modsecurity-crs' - $modsec_dir = '/etc/modsecurity' - $secpcrematchlimit = 1500 - $secpcrematchlimitrecursion = 1500 - $modsec_secruleengine = 'On' - $modsec_default_rules = [ - 'base_rules/modsecurity_35_bad_robots.data', - 'base_rules/modsecurity_35_scanners.data', - 'base_rules/modsecurity_40_generic_attacks.data', - 'base_rules/modsecurity_50_outbound.data', - 'base_rules/modsecurity_50_outbound_malware.data', - 'base_rules/modsecurity_crs_20_protocol_violations.conf', - 'base_rules/modsecurity_crs_21_protocol_anomalies.conf', - 'base_rules/modsecurity_crs_23_request_limits.conf', - 'base_rules/modsecurity_crs_30_http_policy.conf', - 'base_rules/modsecurity_crs_35_bad_robots.conf', - 'base_rules/modsecurity_crs_40_generic_attacks.conf', - 'base_rules/modsecurity_crs_41_sql_injection_attacks.conf', - 'base_rules/modsecurity_crs_41_xss_attacks.conf', - 'base_rules/modsecurity_crs_42_tight_security.conf', - 'base_rules/modsecurity_crs_45_trojans.conf', - 'base_rules/modsecurity_crs_47_common_exceptions.conf', - 'base_rules/modsecurity_crs_49_inbound_blocking.conf', - 'base_rules/modsecurity_crs_50_outbound.conf', - 'base_rules/modsecurity_crs_59_outbound_blocking.conf', - 'base_rules/modsecurity_crs_60_correlation.conf', - ] - $alias_icons_path = '/usr/share/apache2/icons' - $error_documents_path = '/usr/share/apache2/error' - if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8') >= 0) { - $dev_packages = ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev'] - } else { - $dev_packages = ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev'] - } - - # - # Passenger-specific settings - # - - $passenger_conf_file = 'passenger.conf' - $passenger_conf_package_file = undef - - if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '14.04') < 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8') < 0) { - $passenger_root = '/usr' - $passenger_ruby = '/usr/bin/ruby' - $passenger_default_ruby = undef - } else { - $passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini' - $passenger_ruby = undef - $passenger_default_ruby = '/usr/bin/ruby' - } - $wsgi_socket_prefix = undef - } elsif $::osfamily == 'FreeBSD' { - $user = 'www' - $group = 'www' - $root_group = 'wheel' - $apache_name = 'apache24' - $service_name = 'apache24' - $httpd_dir = '/usr/local/etc/apache24' - $server_root = '/usr/local' - $conf_dir = $httpd_dir - $confd_dir = "${httpd_dir}/Includes" - $mod_dir = "${httpd_dir}/Modules" - $mod_enable_dir = undef - $vhost_dir = "${httpd_dir}/Vhosts" - $vhost_enable_dir = undef - $conf_file = 'httpd.conf' - $ports_file = "${conf_dir}/ports.conf" - $pidfile = '/var/run/httpd.pid' - $logroot = '/var/log/apache24' - $logroot_mode = undef - $lib_path = '/usr/local/libexec/apache24' - $mpm_module = 'prefork' - $dev_packages = undef - $default_ssl_cert = '/usr/local/etc/apache24/server.crt' - $default_ssl_key = '/usr/local/etc/apache24/server.key' - $ssl_sessioncache = '/var/run/ssl_scache(512000)' - $passenger_conf_file = 'passenger.conf' - $passenger_conf_package_file = undef - $passenger_root = '/usr/local/lib/ruby/gems/2.0/gems/passenger-4.0.58' - $passenger_ruby = '/usr/local/bin/ruby' - $passenger_default_ruby = undef - $suphp_addhandler = 'php5-script' - $suphp_engine = 'off' - $suphp_configpath = undef - $php_version = '5' - $mod_packages = { - # NOTE: I list here only modules that are not included in www/apache24 - # NOTE: 'passenger' needs to enable APACHE_SUPPORT in make config - # NOTE: 'php' needs to enable APACHE option in make config - # NOTE: 'dav_svn' needs to enable MOD_DAV_SVN make config - # NOTE: not sure where the shibboleth should come from - 'auth_kerb' => 'www/mod_auth_kerb2', - 'fcgid' => 'www/mod_fcgid', - 'passenger' => 'www/rubygem-passenger', - 'perl' => 'www/mod_perl2', - 'phpXXX' => 'www/mod_phpXXX', - 'proxy_html' => 'www/mod_proxy_html', - 'python' => 'www/mod_python3', - 'wsgi' => 'www/mod_wsgi', - 'dav_svn' => 'devel/subversion', - 'xsendfile' => 'www/mod_xsendfile', - 'rpaf' => 'www/mod_rpaf2', - 'shib2' => 'security/shibboleth2-sp', - } - $mod_libs = { - } - $conf_template = 'apache/httpd.conf.erb' - $http_protocol_options = undef - $keepalive = 'Off' - $keepalive_timeout = 15 - $max_keepalive_requests = 100 - $fastcgi_lib_path = undef # TODO: revisit - $mime_support_package = 'misc/mime-support' - $mime_types_config = '/usr/local/etc/mime.types' - $wsgi_socket_prefix = undef - $docroot = '/usr/local/www/apache24/data' - $alias_icons_path = '/usr/local/www/apache24/icons' - $error_documents_path = '/usr/local/www/apache24/error' - $error_log = 'httpd-error.log' - $scriptalias = '/usr/local/www/apache24/cgi-bin' - $access_log_file = 'httpd-access.log' - } elsif $::osfamily == 'Gentoo' { - $user = 'apache' - $group = 'apache' - $root_group = 'wheel' - $apache_name = 'www-servers/apache' - $service_name = 'apache2' - $httpd_dir = '/etc/apache2' - $server_root = '/var/www' - $conf_dir = $httpd_dir - $confd_dir = "${httpd_dir}/conf.d" - $mod_dir = "${httpd_dir}/modules.d" - $mod_enable_dir = undef - $vhost_dir = "${httpd_dir}/vhosts.d" - $vhost_enable_dir = undef - $conf_file = 'httpd.conf' - $ports_file = "${conf_dir}/ports.conf" - $logroot = '/var/log/apache2' - $logroot_mode = undef - $lib_path = '/usr/lib/apache2/modules' - $mpm_module = 'prefork' - $dev_packages = undef - $default_ssl_cert = '/etc/ssl/apache2/server.crt' - $default_ssl_key = '/etc/ssl/apache2/server.key' - $ssl_sessioncache = '/var/run/ssl_scache(512000)' - $passenger_root = '/usr' - $passenger_ruby = '/usr/bin/ruby' - $passenger_conf_file = 'passenger.conf' - $passenger_conf_package_file = undef - $passenger_default_ruby = undef - $suphp_addhandler = 'x-httpd-php' - $suphp_engine = 'off' - $suphp_configpath = '/etc/php5/apache2' - $php_version = '5' - $mod_packages = { - # NOTE: I list here only modules that are not included in www-servers/apache - 'auth_kerb' => 'www-apache/mod_auth_kerb', - 'authnz_external' => 'www-apache/mod_authnz_external', - 'fcgid' => 'www-apache/mod_fcgid', - 'passenger' => 'www-apache/passenger', - 'perl' => 'www-apache/mod_perl', - 'phpXXX' => 'dev-lang/php', - 'proxy_html' => 'www-apache/mod_proxy_html', - 'proxy_fcgi' => 'www-apache/mod_proxy_fcgi', - 'python' => 'www-apache/mod_python', - 'wsgi' => 'www-apache/mod_wsgi', - 'dav_svn' => 'dev-vcs/subversion', - 'xsendfile' => 'www-apache/mod_xsendfile', - 'rpaf' => 'www-apache/mod_rpaf', - 'xml2enc' => 'www-apache/mod_xml2enc', - } - $mod_libs = { - } - $conf_template = 'apache/httpd.conf.erb' - $http_protocol_options = undef - $keepalive = 'Off' - $keepalive_timeout = 15 - $max_keepalive_requests = 100 - $fastcgi_lib_path = undef # TODO: revisit - $mime_support_package = 'app-misc/mime-types' - $mime_types_config = '/etc/mime.types' - $wsgi_socket_prefix = undef - $docroot = '/var/www/localhost/htdocs' - $alias_icons_path = '/usr/share/apache2/icons' - $error_documents_path = '/usr/share/apache2/error' - $pidfile = '/var/run/apache2.pid' - $error_log = 'error.log' - $scriptalias = '/var/www/localhost/cgi-bin' - $access_log_file = 'access.log' - } elsif $::osfamily == 'Suse' { - $user = 'wwwrun' - $group = 'www' - $root_group = 'root' - $apache_name = 'apache2' - $service_name = 'apache2' - $httpd_dir = '/etc/apache2' - $server_root = '/etc/apache2' - $conf_dir = $httpd_dir - $confd_dir = "${httpd_dir}/conf.d" - $mod_dir = "${httpd_dir}/mods-available" - $mod_enable_dir = "${httpd_dir}/mods-enabled" - $vhost_dir = "${httpd_dir}/sites-available" - $vhost_enable_dir = "${httpd_dir}/sites-enabled" - $conf_file = 'httpd.conf' - $ports_file = "${conf_dir}/ports.conf" - $pidfile = '/var/run/httpd2.pid' - $logroot = '/var/log/apache2' - $logroot_mode = undef - $lib_path = '/usr/lib64/apache2' #changes for some modules based on mpm - $mpm_module = 'prefork' - $default_ssl_cert = '/etc/apache2/ssl.crt/server.crt' - $default_ssl_key = '/etc/apache2/ssl.key/server.key' - $ssl_sessioncache = '/var/lib/apache2/ssl_scache(512000)' - $suphp_addhandler = 'x-httpd-php' - $suphp_engine = 'off' - $suphp_configpath = '/etc/php5/apache2' - $php_version = '5' - if $::operatingsystemrelease < '11' or $::operatingsystemrelease >= '12' { - $mod_packages = { - 'auth_kerb' => 'apache2-mod_auth_kerb', - 'perl' => 'apache2-mod_perl', - 'php5' => 'apache2-mod_php5', - 'python' => 'apache2-mod_python', - 'security' => 'apache2-mod_security2', - 'worker' => 'apache2-worker', - } - } else { - $mod_packages = { - 'auth_kerb' => 'apache2-mod_auth_kerb', - 'perl' => 'apache2-mod_perl', - 'php5' => 'apache2-mod_php53', - 'python' => 'apache2-mod_python', - 'security' => 'apache2-mod_security2', - } - } - $mod_libs = { - 'security' => '/usr/lib64/apache2/mod_security2.so', - 'php53' => '/usr/lib64/apache2/mod_php5.so', - } - $conf_template = 'apache/httpd.conf.erb' - $http_protocol_options = undef - $keepalive = 'Off' - $keepalive_timeout = 15 - $max_keepalive_requests = 100 - $fastcgi_lib_path = '/var/lib/apache2/fastcgi' - $mime_support_package = 'aaa_base' - $mime_types_config = '/etc/mime.types' - $docroot = '/srv/www' - $cas_cookie_path = '/var/cache/apache2/mod_auth_cas/' - $mellon_lock_file = undef - $mellon_cache_size = undef - $mellon_post_directory = undef - $alias_icons_path = '/usr/share/apache2/icons' - $error_documents_path = '/usr/share/apache2/error' - $dev_packages = ['libapr-util1-devel', 'libapr1-devel', 'libcurl-devel'] - $modsec_crs_package = undef - $modsec_crs_path = undef - $modsec_default_rules = undef - $modsec_dir = '/etc/apache2/modsecurity' - $secpcrematchlimit = 1500 - $secpcrematchlimitrecursion = 1500 - $modsec_secruleengine = 'On' - $error_log = 'error.log' - $scriptalias = '/usr/lib/cgi-bin' - $access_log_file = 'access.log' - - # - # Passenger-specific settings - # - - $passenger_conf_file = 'passenger.conf' - $passenger_conf_package_file = undef - - $passenger_root = '/usr/lib64/ruby/gems/1.8/gems/passenger-5.0.30' - $passenger_ruby = '/usr/bin/ruby' - $passenger_default_ruby = '/usr/bin/ruby' - $wsgi_socket_prefix = undef - - } else { - fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}") - } -} diff --git a/modules/apache/manifests/peruser/multiplexer.pp b/modules/apache/manifests/peruser/multiplexer.pp deleted file mode 100644 index 97143a1..0000000 --- a/modules/apache/manifests/peruser/multiplexer.pp +++ /dev/null @@ -1,17 +0,0 @@ -define apache::peruser::multiplexer ( - $user = $::apache::user, - $group = $::apache::group, - $file = undef, -) { - if ! $file { - $filename = "${name}.conf" - } else { - $filename = $file - } - file { "${::apache::mod_dir}/peruser/multiplexers/${filename}": - ensure => file, - content => "Multiplexer ${user} ${group}\n", - require => File["${::apache::mod_dir}/peruser/multiplexers"], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/peruser/processor.pp b/modules/apache/manifests/peruser/processor.pp deleted file mode 100644 index 30de61d..0000000 --- a/modules/apache/manifests/peruser/processor.pp +++ /dev/null @@ -1,17 +0,0 @@ -define apache::peruser::processor ( - $user, - $group, - $file = undef, -) { - if ! $file { - $filename = "${name}.conf" - } else { - $filename = $file - } - file { "${::apache::mod_dir}/peruser/processors/${filename}": - ensure => file, - content => "Processor ${user} ${group}\n", - require => File["${::apache::mod_dir}/peruser/processors"], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/php.pp b/modules/apache/manifests/php.pp deleted file mode 100644 index 9fa9c68..0000000 --- a/modules/apache/manifests/php.pp +++ /dev/null @@ -1,18 +0,0 @@ -# Class: apache::php -# -# This class installs PHP for Apache -# -# Parameters: -# - $php_package -# -# Actions: -# - Install Apache PHP package -# -# Requires: -# -# Sample Usage: -# -class apache::php { - warning('apache::php is deprecated; please use apache::mod::php') - include ::apache::mod::php -} diff --git a/modules/apache/manifests/proxy.pp b/modules/apache/manifests/proxy.pp deleted file mode 100644 index 050f36c..0000000 --- a/modules/apache/manifests/proxy.pp +++ /dev/null @@ -1,15 +0,0 @@ -# Class: apache::proxy -# -# This class enabled the proxy module for Apache -# -# Actions: -# - Enables Apache Proxy module -# -# Requires: -# -# Sample Usage: -# -class apache::proxy { - warning('apache::proxy is deprecated; please use apache::mod::proxy') - include ::apache::mod::proxy -} diff --git a/modules/apache/manifests/python.pp b/modules/apache/manifests/python.pp deleted file mode 100644 index 723a753..0000000 --- a/modules/apache/manifests/python.pp +++ /dev/null @@ -1,18 +0,0 @@ -# Class: apache::python -# -# This class installs Python for Apache -# -# Parameters: -# - $php_package -# -# Actions: -# - Install Apache Python package -# -# Requires: -# -# Sample Usage: -# -class apache::python { - warning('apache::python is deprecated; please use apache::mod::python') - include ::apache::mod::python -} diff --git a/modules/apache/manifests/security/rule_link.pp b/modules/apache/manifests/security/rule_link.pp deleted file mode 100644 index 7edb1f4..0000000 --- a/modules/apache/manifests/security/rule_link.pp +++ /dev/null @@ -1,18 +0,0 @@ -define apache::security::rule_link () { - - $parts = split($title, '/') - $filename = $parts[-1] - - $target = $title ? { - /^\// => $title, - default => "${::apache::params::modsec_crs_path}/${title}", - } - - file { $filename: - ensure => 'link', - path => "${::apache::mod::security::modsec_dir}/activated_rules/${filename}", - target => $target , - require => File["${::apache::mod::security::modsec_dir}/activated_rules"], - notify => Class['apache::service'], - } -} diff --git a/modules/apache/manifests/service.pp b/modules/apache/manifests/service.pp deleted file mode 100644 index ff082dc..0000000 --- a/modules/apache/manifests/service.pp +++ /dev/null @@ -1,51 +0,0 @@ -# Class: apache::service -# -# Manages the Apache daemon -# -# Parameters: -# -# Actions: -# - Manage Apache service -# -# Requires: -# -# Sample Usage: -# -# sometype { 'foo': -# notify => Class['apache::service'], -# } -# -# -class apache::service ( - $service_name = $::apache::params::service_name, - Boolean $service_enable = true, - $service_ensure = 'running', - Boolean $service_manage = true, - $service_restart = undef -) { - - # The base class must be included first because parameter defaults depend on it - if ! defined(Class['apache::params']) { - fail('You must include the apache::params class before using any apache defined resources') - } - case $service_ensure { - true, false, 'running', 'stopped': { - $_service_ensure = $service_ensure - } - default: { - $_service_ensure = undef - } - } - - $service_hasrestart = $service_restart == undef - - if $service_manage { - service { 'httpd': - ensure => $_service_ensure, - name => $service_name, - enable => $service_enable, - restart => $service_restart, - hasrestart => $service_hasrestart, - } - } -} diff --git a/modules/apache/manifests/ssl.pp b/modules/apache/manifests/ssl.pp deleted file mode 100644 index d0b3659..0000000 --- a/modules/apache/manifests/ssl.pp +++ /dev/null @@ -1,18 +0,0 @@ -# Class: apache::ssl -# -# This class installs Apache SSL capabilities -# -# Parameters: -# - The $ssl_package name from the apache::params class -# -# Actions: -# - Install Apache SSL capabilities -# -# Requires: -# -# Sample Usage: -# -class apache::ssl { - warning('apache::ssl is deprecated; please use apache::mod::ssl') - include ::apache::mod::ssl -} diff --git a/modules/apache/manifests/version.pp b/modules/apache/manifests/version.pp deleted file mode 100644 index 2d33a5f..0000000 --- a/modules/apache/manifests/version.pp +++ /dev/null @@ -1,49 +0,0 @@ -# Class: apache::version -# -# Try to automatically detect the version by OS -# -class apache::version { - # This will be 5 or 6 on RedHat, 6 or wheezy on Debian, 12 or quantal on Ubuntu, etc. - $osr_array = split($::operatingsystemrelease,'[\/\.]') - $distrelease = $osr_array[0] - if ! $distrelease { - fail("Class['apache::version']: Unparsable \$::operatingsystemrelease: ${::operatingsystemrelease}") - } - - case $::osfamily { - 'RedHat': { - if ($::operatingsystem == 'Amazon') { - $default = '2.2' - } elsif ($::operatingsystem == 'Fedora' and versioncmp($distrelease, '18') >= 0) or ($::operatingsystem != 'Fedora' and versioncmp($distrelease, '7') >= 0) { - $default = '2.4' - } else { - $default = '2.2' - } - } - 'Debian': { - if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0 { - $default = '2.4' - } elsif $::operatingsystem == 'Debian' and versioncmp($distrelease, '8') >= 0 { - $default = '2.4' - } else { - $default = '2.2' - } - } - 'FreeBSD': { - $default = '2.4' - } - 'Gentoo': { - $default = '2.4' - } - 'Suse': { - if $::operatingsystem == 'SLES' and $::operatingsystemrelease >= '12' { - $default = '2.4' - } else { - $default = '2.2' - } - } - default: { - fail("Class['apache::version']: Unsupported osfamily: ${::osfamily}") - } - } -} diff --git a/modules/apache/manifests/vhost.pp b/modules/apache/manifests/vhost.pp deleted file mode 100644 index 8d423bb..0000000 --- a/modules/apache/manifests/vhost.pp +++ /dev/null @@ -1,1076 +0,0 @@ -# See README.md for usage information -define apache::vhost( - Variant[Boolean,String] $docroot, - $manage_docroot = true, - $virtual_docroot = false, - $port = undef, - $ip = undef, - Boolean $ip_based = false, - $add_listen = true, - $docroot_owner = 'root', - $docroot_group = $::apache::params::root_group, - $docroot_mode = undef, - $serveradmin = undef, - Boolean $ssl = false, - $ssl_cert = $::apache::default_ssl_cert, - $ssl_key = $::apache::default_ssl_key, - $ssl_chain = $::apache::default_ssl_chain, - $ssl_ca = $::apache::default_ssl_ca, - $ssl_crl_path = $::apache::default_ssl_crl_path, - $ssl_crl = $::apache::default_ssl_crl, - $ssl_crl_check = $::apache::default_ssl_crl_check, - $ssl_certs_dir = $::apache::params::ssl_certs_dir, - $ssl_protocol = undef, - $ssl_cipher = undef, - $ssl_honorcipherorder = undef, - $ssl_verify_client = undef, - $ssl_verify_depth = undef, - Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_proxy_verify = undef, - Optional[Integer[0]] $ssl_proxy_verify_depth = undef, - $ssl_proxy_ca_cert = undef, - Optional[Enum['on', 'off']] $ssl_proxy_check_peer_cn = undef, - Optional[Enum['on', 'off']] $ssl_proxy_check_peer_name = undef, - Optional[Enum['on', 'off']] $ssl_proxy_check_peer_expire = undef, - $ssl_proxy_machine_cert = undef, - $ssl_proxy_protocol = undef, - $ssl_options = undef, - $ssl_openssl_conf_cmd = undef, - Boolean $ssl_proxyengine = false, - Optional[Boolean] $ssl_stapling = undef, - $ssl_stapling_timeout = undef, - $ssl_stapling_return_errors = undef, - $priority = undef, - Boolean $default_vhost = false, - $servername = $name, - $serveraliases = [], - $options = ['Indexes','FollowSymLinks','MultiViews'], - $override = ['None'], - $directoryindex = '', - $vhost_name = '*', - $logroot = $::apache::logroot, - Enum['directory', 'absent'] $logroot_ensure = 'directory', - $logroot_mode = undef, - $logroot_owner = undef, - $logroot_group = undef, - $log_level = undef, - Boolean $access_log = true, - $access_log_file = false, - $access_log_pipe = false, - $access_log_syslog = false, - $access_log_format = false, - $access_log_env_var = false, - Optional[Array] $access_logs = undef, - $aliases = undef, - Optional[Variant[Hash, Array[Variant[Array,Hash]]]] $directories = undef, - Boolean $error_log = true, - $error_log_file = undef, - $error_log_pipe = undef, - $error_log_syslog = undef, - Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]] $http_protocol_options = undef, - $modsec_audit_log = undef, - $modsec_audit_log_file = undef, - $modsec_audit_log_pipe = undef, - $error_documents = [], - Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]] $fallbackresource = undef, - $scriptalias = undef, - $scriptaliases = [], - $proxy_dest = undef, - $proxy_dest_match = undef, - $proxy_dest_reverse_match = undef, - $proxy_pass = undef, - $proxy_pass_match = undef, - $suphp_addhandler = $::apache::params::suphp_addhandler, - Enum['on', 'off'] $suphp_engine = $::apache::params::suphp_engine, - $suphp_configpath = $::apache::params::suphp_configpath, - $php_flags = {}, - $php_values = {}, - $php_admin_flags = {}, - $php_admin_values = {}, - $no_proxy_uris = [], - $no_proxy_uris_match = [], - $proxy_preserve_host = false, - $proxy_add_headers = undef, - $proxy_error_override = false, - $redirect_source = '/', - $redirect_dest = undef, - $redirect_status = undef, - $redirectmatch_status = undef, - $redirectmatch_regexp = undef, - $redirectmatch_dest = undef, - $rack_base_uris = undef, - $passenger_base_uris = undef, - $headers = undef, - $request_headers = undef, - $filters = undef, - Optional[Array] $rewrites = undef, - $rewrite_base = undef, - $rewrite_rule = undef, - $rewrite_cond = undef, - $rewrite_inherit = false, - $setenv = [], - $setenvif = [], - $setenvifnocase = [], - $block = [], - Enum['absent', 'present'] $ensure = 'present', - $wsgi_application_group = undef, - $wsgi_daemon_process = undef, - Optional[Hash] $wsgi_daemon_process_options = undef, - $wsgi_import_script = undef, - Optional[Hash] $wsgi_import_script_options = undef, - $wsgi_process_group = undef, - Optional[Hash] $wsgi_script_aliases_match = undef, - Optional[Hash] $wsgi_script_aliases = undef, - Optional[Enum['on', 'off', 'On', 'Off']] $wsgi_pass_authorization = undef, - $wsgi_chunked_request = undef, - Optional[String] $custom_fragment = undef, - Optional[Hash] $itk = undef, - $action = undef, - $fastcgi_server = undef, - $fastcgi_socket = undef, - $fastcgi_dir = undef, - $fastcgi_idle_timeout = undef, - $additional_includes = [], - $use_optional_includes = $::apache::use_optional_includes, - $apache_version = $::apache::apache_version, - Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes = undef, - Optional[Pattern[/^[\w-]+ [\w-]+$/]] $suexec_user_group = undef, - $passenger_spawn_method = undef, - $passenger_app_root = undef, - $passenger_app_env = undef, - $passenger_ruby = undef, - $passenger_min_instances = undef, - $passenger_max_requests = undef, - $passenger_start_timeout = undef, - $passenger_pre_start = undef, - $passenger_user = undef, - $passenger_high_performance = undef, - $passenger_nodejs = undef, - Optional[Boolean] $passenger_sticky_sessions = undef, - $passenger_startup_file = undef, - $add_default_charset = undef, - $modsec_disable_vhost = undef, - Optional[Variant[Hash, Array]] $modsec_disable_ids = undef, - $modsec_disable_ips = undef, - Optional[Variant[Hash, Array]] $modsec_disable_msgs = undef, - Optional[Variant[Hash, Array]] $modsec_disable_tags = undef, - $modsec_body_limit = undef, - $jk_mounts = undef, - Boolean $auth_kerb = false, - $krb_method_negotiate = 'on', - $krb_method_k5passwd = 'on', - $krb_authoritative = 'on', - $krb_auth_realms = [], - $krb_5keytab = undef, - $krb_local_user_mapping = undef, - $krb_verify_kdc = 'on', - $krb_servicename = 'HTTP', - $krb_save_credentials = 'off', - Optional[Enum['on', 'off']] $keepalive = undef, - $keepalive_timeout = undef, - $max_keepalive_requests = undef, - $cas_attribute_prefix = undef, - $cas_attribute_delimiter = undef, - $cas_scrub_request_headers = undef, - $cas_sso_enabled = undef, - $cas_login_url = undef, - $cas_validate_url = undef, - $cas_validate_saml = undef, -) { - - # The base class must be included first because it is used by parameter defaults - if ! defined(Class['apache']) { - fail('You must include the apache base class before using any apache defined resources') - } - - $apache_name = $::apache::apache_name - - if $rewrites { - unless empty($rewrites) { - $rewrites_flattened = delete_undef_values(flatten([$rewrites])) - assert_type(Array[Hash], $rewrites_flattened) - } - } - - # Input validation begins - - if $log_level { - validate_apache_log_level($log_level) - } - - if $access_log_file and $access_log_pipe { - fail("Apache::Vhost[${name}]: 'access_log_file' and 'access_log_pipe' cannot be defined at the same time") - } - - if $error_log_file and $error_log_pipe { - fail("Apache::Vhost[${name}]: 'error_log_file' and 'error_log_pipe' cannot be defined at the same time") - } - - if $modsec_audit_log_file and $modsec_audit_log_pipe { - fail("Apache::Vhost[${name}]: 'modsec_audit_log_file' and 'modsec_audit_log_pipe' cannot be defined at the same time") - } - - # Input validation ends - - if $ssl and $ensure == 'present' { - include ::apache::mod::ssl - # Required for the AddType lines. - include ::apache::mod::mime - } - - if $auth_kerb and $ensure == 'present' { - include ::apache::mod::auth_kerb - } - - if $virtual_docroot { - include ::apache::mod::vhost_alias - } - - if $wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization { - include ::apache::mod::wsgi - } - - if $suexec_user_group { - include ::apache::mod::suexec - } - - if $passenger_spawn_method or $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_max_requests or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_high_performance or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file { - include ::apache::mod::passenger - } - - # Configure the defaultness of a vhost - if $priority { - $priority_real = "${priority}-" - } elsif $priority == false { - $priority_real = '' - } elsif $default_vhost { - $priority_real = '10-' - } else { - $priority_real = '25-' - } - - ## Apache include does not always work with spaces in the filename - $filename = regsubst($name, ' ', '_', 'G') - - # This ensures that the docroot exists - # But enables it to be specified across multiple vhost resources - if $manage_docroot and $docroot and ! defined(File[$docroot]) { - file { $docroot: - ensure => directory, - owner => $docroot_owner, - group => $docroot_group, - mode => $docroot_mode, - require => Package['httpd'], - before => Concat["${priority_real}${filename}.conf"], - } - } - - # Same as above, but for logroot - if ! defined(File[$logroot]) { - file { $logroot: - ensure => $logroot_ensure, - owner => $logroot_owner, - group => $logroot_group, - mode => $logroot_mode, - require => Package['httpd'], - before => Concat["${priority_real}${filename}.conf"], - } - } - - - # Is apache::mod::passenger enabled (or apache::mod['passenger']) - $passenger_enabled = defined(Apache::Mod['passenger']) - - # Is apache::mod::shib enabled (or apache::mod['shib2']) - $shibboleth_enabled = defined(Apache::Mod['shib2']) - - # Is apache::mod::cas enabled (or apache::mod['cas']) - $cas_enabled = defined(Apache::Mod['auth_cas']) - - if $access_log and !$access_logs { - if $access_log_file { - if $access_log_file =~ /^\// { - # Absolute path provided - don't prepend $logroot - $_logs_dest = $access_log_file - } else { - $_logs_dest = "${logroot}/${access_log_file}" - } - } elsif $access_log_pipe { - $_logs_dest = $access_log_pipe - } elsif $access_log_syslog { - $_logs_dest = $access_log_syslog - } else { - $_logs_dest = undef - } - $_access_logs = [{ - 'file' => $access_log_file, - 'pipe' => $access_log_pipe, - 'syslog' => $access_log_syslog, - 'format' => $access_log_format, - 'env' => $access_log_env_var - }] - } elsif $access_logs { - $_access_logs = $access_logs - } - - if $error_log_file { - if $error_log_file =~ /^\// { - # Absolute path provided - don't prepend $logroot - $error_log_destination = $error_log_file - } else { - $error_log_destination = "${logroot}/${error_log_file}" - } - } elsif $error_log_pipe { - $error_log_destination = $error_log_pipe - } elsif $error_log_syslog { - $error_log_destination = $error_log_syslog - } else { - if $ssl { - $error_log_destination = "${logroot}/${name}_error_ssl.log" - } else { - $error_log_destination = "${logroot}/${name}_error.log" - } - } - - if $modsec_audit_log == false { - $modsec_audit_log_destination = undef - } elsif $modsec_audit_log_file { - $modsec_audit_log_destination = "${logroot}/${modsec_audit_log_file}" - } elsif $modsec_audit_log_pipe { - $modsec_audit_log_destination = $modsec_audit_log_pipe - } elsif $modsec_audit_log { - if $ssl { - $modsec_audit_log_destination = "${logroot}/${name}_security_ssl.log" - } else { - $modsec_audit_log_destination = "${logroot}/${name}_security.log" - } - } else { - $modsec_audit_log_destination = undef - } - - - if $ip { - $_ip = any2array(enclose_ipv6($ip)) - if $port { - $_port = any2array($port) - $listen_addr_port = split(inline_template("<%= @_ip.product(@_port).map {|x| x.join(':') }.join(',')%>"), ',') - $nvh_addr_port = split(inline_template("<%= @_ip.product(@_port).map {|x| x.join(':') }.join(',')%>"), ',') - } else { - $listen_addr_port = undef - $nvh_addr_port = $_ip - if ! $servername and ! $ip_based { - fail("Apache::Vhost[${name}]: must pass 'ip' and/or 'port' parameters for name-based vhosts") - } - } - } else { - if $port { - $listen_addr_port = $port - $nvh_addr_port = prefix(any2array($port),"${vhost_name}:") - } else { - $listen_addr_port = undef - $nvh_addr_port = $name - if ! $servername and $servername != '' { - fail("Apache::Vhost[${name}]: must pass 'ip' and/or 'port' parameters, and/or 'servername' parameter") - } - } - } - if $add_listen { - if $ip and defined(Apache::Listen["${port}"]) { - fail("Apache::Vhost[${name}]: Mixing IP and non-IP Listen directives is not possible; check the add_listen parameter of the apache::vhost define to disable this") - } - if $listen_addr_port and $ensure == 'present' { - ensure_resource('apache::listen', $listen_addr_port) - } - } - if ! $ip_based { - if $ensure == 'present' and (versioncmp($apache_version, '2.4') < 0) { - ensure_resource('apache::namevirtualhost', $nvh_addr_port) - } - } - - # Load mod_rewrite if needed and not yet loaded - if $rewrites or $rewrite_cond { - if ! defined(Class['apache::mod::rewrite']) { - include ::apache::mod::rewrite - } - } - - # Load mod_alias if needed and not yet loaded - if ($scriptalias or $scriptaliases != []) - or ($aliases and $aliases != []) - or ($redirect_source and $redirect_dest) - or ($redirectmatch_regexp or $redirectmatch_status or $redirectmatch_dest){ - if ! defined(Class['apache::mod::alias']) and ($ensure == 'present') { - include ::apache::mod::alias - } - } - - # Load mod_proxy if needed and not yet loaded - if ($proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match) { - if ! defined(Class['apache::mod::proxy']) { - include ::apache::mod::proxy - } - if ! defined(Class['apache::mod::proxy_http']) { - include ::apache::mod::proxy_http - } - } - - # Load mod_passenger if needed and not yet loaded - if $rack_base_uris { - if ! defined(Class['apache::mod::passenger']) { - include ::apache::mod::passenger - } - } - - # Load mod_passenger if needed and not yet loaded - if $passenger_base_uris { - include ::apache::mod::passenger - } - - # Load mod_fastci if needed and not yet loaded - if $fastcgi_server and $fastcgi_socket { - if ! defined(Class['apache::mod::fastcgi']) { - include ::apache::mod::fastcgi - } - } - - # Check if mod_headers is required to process $headers/$request_headers - if $headers or $request_headers { - if ! defined(Class['apache::mod::headers']) { - include ::apache::mod::headers - } - } - - # Check if mod_filter is required to process $filters - if $filters { - if ! defined(Class['apache::mod::filter']) { - include ::apache::mod::filter - } - } - - # Check if mod_env is required and not yet loaded. - # create an expression to simplify the conditional check - $use_env_mod = $setenv and ! empty($setenv) - if ($use_env_mod) { - if ! defined(Class['apache::mod::env']) { - include ::apache::mod::env - } - } - # Check if mod_setenvif is required and not yet loaded. - # create an expression to simplify the conditional check - $use_setenvif_mod = ($setenvif and ! empty($setenvif)) or ($setenvifnocase and ! empty($setenvifnocase)) - - if ($use_setenvif_mod) { - if ! defined(Class['apache::mod::setenvif']) { - include ::apache::mod::setenvif - } - } - - ## Create a default directory list if none defined - if $directories { - $_directories = $directories - } elsif $docroot { - $_directory = { - provider => 'directory', - path => $docroot, - options => $options, - allow_override => $override, - directoryindex => $directoryindex, - } - - if versioncmp($apache_version, '2.4') >= 0 { - $_directory_version = { - require => 'all granted', - } - } else { - $_directory_version = { - order => 'allow,deny', - allow => 'from all', - } - } - - $_directories = [ merge($_directory, $_directory_version) ] - } else { - $_directories = undef - } - - ## Create a global LocationMatch if locations aren't defined - if $modsec_disable_ids { - if $modsec_disable_ids =~ Array { - $_modsec_disable_ids = { '.*' => $modsec_disable_ids } - } else { - $_modsec_disable_ids = $modsec_disable_ids - } - } - - if $modsec_disable_msgs { - if $modsec_disable_msgs =~ Array { - $_modsec_disable_msgs = { '.*' => $modsec_disable_msgs } - } else { - $_modsec_disable_msgs = $modsec_disable_msgs - } - } - - if $modsec_disable_tags { - if $modsec_disable_tags =~ Array { - $_modsec_disable_tags = { '.*' => $modsec_disable_tags } - } else { - $_modsec_disable_tags = $modsec_disable_tags - } - } - - concat { "${priority_real}${filename}.conf": - ensure => $ensure, - path => "${::apache::vhost_dir}/${priority_real}${filename}.conf", - owner => 'root', - group => $::apache::params::root_group, - mode => $::apache::file_mode, - order => 'numeric', - require => Package['httpd'], - notify => Class['apache::service'], - } - # NOTE(pabelanger): This code is duplicated in ::apache::vhost::custom and - # needs to be converted into something generic. - if $::apache::vhost_enable_dir { - $vhost_enable_dir = $::apache::vhost_enable_dir - $vhost_symlink_ensure = $ensure ? { - present => link, - default => $ensure, - } - file{ "${priority_real}${filename}.conf symlink": - ensure => $vhost_symlink_ensure, - path => "${vhost_enable_dir}/${priority_real}${filename}.conf", - target => "${::apache::vhost_dir}/${priority_real}${filename}.conf", - owner => 'root', - group => $::apache::params::root_group, - mode => $::apache::file_mode, - require => Concat["${priority_real}${filename}.conf"], - notify => Class['apache::service'], - } - } - - # Template uses: - # - $nvh_addr_port - # - $servername - # - $serveradmin - concat::fragment { "${name}-apache-header": - target => "${priority_real}${filename}.conf", - order => 0, - content => template('apache/vhost/_file_header.erb'), - } - - # Template uses: - # - $virtual_docroot - # - $docroot - if $docroot { - concat::fragment { "${name}-docroot": - target => "${priority_real}${filename}.conf", - order => 10, - content => template('apache/vhost/_docroot.erb'), - } - } - - # Template uses: - # - $aliases - if $aliases and ! empty($aliases) { - concat::fragment { "${name}-aliases": - target => "${priority_real}${filename}.conf", - order => 20, - content => template('apache/vhost/_aliases.erb'), - } - } - - # Template uses: - # - $itk - # - $::kernelversion - if $itk and ! empty($itk) { - concat::fragment { "${name}-itk": - target => "${priority_real}${filename}.conf", - order => 30, - content => template('apache/vhost/_itk.erb'), - } - } - - # Template uses: - # - $fallbackresource - if $fallbackresource { - concat::fragment { "${name}-fallbackresource": - target => "${priority_real}${filename}.conf", - order => 40, - content => template('apache/vhost/_fallbackresource.erb'), - } - } - - # Template uses: - # - $allow_encoded_slashes - if $allow_encoded_slashes { - concat::fragment { "${name}-allow_encoded_slashes": - target => "${priority_real}${filename}.conf", - order => 50, - content => template('apache/vhost/_allow_encoded_slashes.erb'), - } - } - - # Template uses: - # - $_directories - # - $docroot - # - $apache_version - # - $suphp_engine - # - $shibboleth_enabled - if $_directories and ! empty($_directories) { - concat::fragment { "${name}-directories": - target => "${priority_real}${filename}.conf", - order => 60, - content => template('apache/vhost/_directories.erb'), - } - } - - # Template uses: - # - $additional_includes - if $additional_includes and ! empty($additional_includes) { - concat::fragment { "${name}-additional_includes": - target => "${priority_real}${filename}.conf", - order => 70, - content => template('apache/vhost/_additional_includes.erb'), - } - } - - # Template uses: - # - $error_log - # - $log_level - # - $error_log_destination - # - $log_level - if $error_log or $log_level { - concat::fragment { "${name}-logging": - target => "${priority_real}${filename}.conf", - order => 80, - content => template('apache/vhost/_logging.erb'), - } - } - - # Template uses no variables - concat::fragment { "${name}-serversignature": - target => "${priority_real}${filename}.conf", - order => 90, - content => template('apache/vhost/_serversignature.erb'), - } - - # Template uses: - # - $access_log - # - $_access_log_env_var - # - $access_log_destination - # - $_access_log_format - # - $_access_log_env_var - # - $access_logs - if $access_log or $access_logs { - concat::fragment { "${name}-access_log": - target => "${priority_real}${filename}.conf", - order => 100, - content => template('apache/vhost/_access_log.erb'), - } - } - - # Template uses: - # - $action - if $action { - concat::fragment { "${name}-action": - target => "${priority_real}${filename}.conf", - order => 110, - content => template('apache/vhost/_action.erb'), - } - } - - # Template uses: - # - $block - # - $apache_version - if $block and ! empty($block) { - concat::fragment { "${name}-block": - target => "${priority_real}${filename}.conf", - order => 120, - content => template('apache/vhost/_block.erb'), - } - } - - # Template uses: - # - $error_documents - if $error_documents and ! empty($error_documents) { - concat::fragment { "${name}-error_document": - target => "${priority_real}${filename}.conf", - order => 130, - content => template('apache/vhost/_error_document.erb'), - } - } - - # Template uses: - # - $headers - if $headers and ! empty($headers) { - concat::fragment { "${name}-header": - target => "${priority_real}${filename}.conf", - order => 140, - content => template('apache/vhost/_header.erb'), - } - } - - # Template uses: - # - $request_headers - if $request_headers and ! empty($request_headers) { - concat::fragment { "${name}-requestheader": - target => "${priority_real}${filename}.conf", - order => 150, - content => template('apache/vhost/_requestheader.erb'), - } - } - - # Template uses: - # - $proxy_dest - # - $proxy_pass - # - $proxy_pass_match - # - $proxy_preserve_host - # - $proxy_add_headers - # - $no_proxy_uris - if $proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match or $proxy_preserve_host { - concat::fragment { "${name}-proxy": - target => "${priority_real}${filename}.conf", - order => 160, - content => template('apache/vhost/_proxy.erb'), - } - } - - # Template uses: - # - $rack_base_uris - if $rack_base_uris { - concat::fragment { "${name}-rack": - target => "${priority_real}${filename}.conf", - order => 170, - content => template('apache/vhost/_rack.erb'), - } - } - - # Template uses: - # - $passenger_base_uris - if $passenger_base_uris { - concat::fragment { "${name}-passenger_uris": - target => "${priority_real}${filename}.conf", - order => 175, - content => template('apache/vhost/_passenger_base_uris.erb'), - } - } - - # Template uses: - # - $redirect_source - # - $redirect_dest - # - $redirect_status - # - $redirect_dest_a - # - $redirect_source_a - # - $redirect_status_a - # - $redirectmatch_status - # - $redirectmatch_regexp - # - $redirectmatch_dest - # - $redirectmatch_status_a - # - $redirectmatch_regexp_a - # - $redirectmatch_dest - if ($redirect_source and $redirect_dest) or ($redirectmatch_regexp and $redirectmatch_dest) { - concat::fragment { "${name}-redirect": - target => "${priority_real}${filename}.conf", - order => 180, - content => template('apache/vhost/_redirect.erb'), - } - } - - # Template uses: - # - $rewrites - # - $rewrite_base - # - $rewrite_rule - # - $rewrite_cond - # - $rewrite_map - if $rewrites or $rewrite_rule { - concat::fragment { "${name}-rewrite": - target => "${priority_real}${filename}.conf", - order => 190, - content => template('apache/vhost/_rewrite.erb'), - } - } - - # Template uses: - # - $scriptaliases - # - $scriptalias - if ( $scriptalias or $scriptaliases != [] ) { - concat::fragment { "${name}-scriptalias": - target => "${priority_real}${filename}.conf", - order => 200, - content => template('apache/vhost/_scriptalias.erb'), - } - } - - # Template uses: - # - $serveraliases - if $serveraliases and ! empty($serveraliases) { - concat::fragment { "${name}-serveralias": - target => "${priority_real}${filename}.conf", - order => 210, - content => template('apache/vhost/_serveralias.erb'), - } - } - - # Template uses: - # - $setenv - # - $setenvif - if ($use_env_mod or $use_setenvif_mod) { - concat::fragment { "${name}-setenv": - target => "${priority_real}${filename}.conf", - order => 220, - content => template('apache/vhost/_setenv.erb'), - } - } - - # Template uses: - # - $ssl - # - $ssl_cert - # - $ssl_key - # - $ssl_chain - # - $ssl_certs_dir - # - $ssl_ca - # - $ssl_crl_path - # - $ssl_crl - # - $ssl_crl_check - # - $ssl_protocol - # - $ssl_cipher - # - $ssl_honorcipherorder - # - $ssl_verify_client - # - $ssl_verify_depth - # - $ssl_options - # - $ssl_openssl_conf_cmd - # - $ssl_stapling - # - $apache_version - if $ssl { - concat::fragment { "${name}-ssl": - target => "${priority_real}${filename}.conf", - order => 230, - content => template('apache/vhost/_ssl.erb'), - } - } - - # Template uses: - # - $ssl_proxyengine - # - $ssl_proxy_verify - # - $ssl_proxy_verify_depth - # - $ssl_proxy_ca_cert - # - $ssl_proxy_check_peer_cn - # - $ssl_proxy_check_peer_name - # - $ssl_proxy_check_peer_expire - # - $ssl_proxy_machine_cert - # - $ssl_proxy_protocol - if $ssl_proxyengine { - concat::fragment { "${name}-sslproxy": - target => "${priority_real}${filename}.conf", - order => 230, - content => template('apache/vhost/_sslproxy.erb'), - } - } - - # Template uses: - # - $auth_kerb - # - $krb_method_negotiate - # - $krb_method_k5passwd - # - $krb_authoritative - # - $krb_auth_realms - # - $krb_5keytab - # - $krb_local_user_mapping - if $auth_kerb { - concat::fragment { "${name}-auth_kerb": - target => "${priority_real}${filename}.conf", - order => 230, - content => template('apache/vhost/_auth_kerb.erb'), - } - } - - # Template uses: - # - $suphp_engine - # - $suphp_addhandler - # - $suphp_configpath - if $suphp_engine == 'on' { - concat::fragment { "${name}-suphp": - target => "${priority_real}${filename}.conf", - order => 240, - content => template('apache/vhost/_suphp.erb'), - } - } - - # Template uses: - # - $php_values - # - $php_flags - if ($php_values and ! empty($php_values)) or ($php_flags and ! empty($php_flags)) { - concat::fragment { "${name}-php": - target => "${priority_real}${filename}.conf", - order => 240, - content => template('apache/vhost/_php.erb'), - } - } - - # Template uses: - # - $php_admin_values - # - $php_admin_flags - if ($php_admin_values and ! empty($php_admin_values)) or ($php_admin_flags and ! empty($php_admin_flags)) { - concat::fragment { "${name}-php_admin": - target => "${priority_real}${filename}.conf", - order => 250, - content => template('apache/vhost/_php_admin.erb'), - } - } - - # Template uses: - # - $wsgi_application_group - # - $wsgi_daemon_process - # - $wsgi_daemon_process_options - # - $wsgi_import_script - # - $wsgi_import_script_options - # - $wsgi_process_group - # - $wsgi_script_aliases - # - $wsgi_pass_authorization - if $wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization { - concat::fragment { "${name}-wsgi": - target => "${priority_real}${filename}.conf", - order => 260, - content => template('apache/vhost/_wsgi.erb'), - } - } - - # Template uses: - # - $custom_fragment - if $custom_fragment { - concat::fragment { "${name}-custom_fragment": - target => "${priority_real}${filename}.conf", - order => 270, - content => template('apache/vhost/_custom_fragment.erb'), - } - } - - # Template uses: - # - $fastcgi_server - # - $fastcgi_socket - # - $fastcgi_dir - # - $fastcgi_idle_timeout - # - $apache_version - if $fastcgi_server or $fastcgi_dir { - concat::fragment { "${name}-fastcgi": - target => "${priority_real}${filename}.conf", - order => 280, - content => template('apache/vhost/_fastcgi.erb'), - } - } - - # Template uses: - # - $suexec_user_group - if $suexec_user_group { - concat::fragment { "${name}-suexec": - target => "${priority_real}${filename}.conf", - order => 290, - content => template('apache/vhost/_suexec.erb'), - } - } - - # Template uses: - # - $passenger_spawn_method - # - $passenger_app_root - # - $passenger_app_env - # - $passenger_ruby - # - $passenger_min_instances - # - $passenger_max_requests - # - $passenger_start_timeout - # - $passenger_pre_start - # - $passenger_user - # - $passenger_nodejs - # - $passenger_sticky_sessions - # - $passenger_startup_file - if $passenger_spawn_method or $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start or $passenger_user or $passenger_nodejs or $passenger_sticky_sessions or $passenger_startup_file{ - concat::fragment { "${name}-passenger": - target => "${priority_real}${filename}.conf", - order => 300, - content => template('apache/vhost/_passenger.erb'), - } - } - - # Template uses: - # - $add_default_charset - if $add_default_charset { - concat::fragment { "${name}-charsets": - target => "${priority_real}${filename}.conf", - order => 310, - content => template('apache/vhost/_charsets.erb'), - } - } - - # Template uses: - # - $modsec_disable_vhost - # - $modsec_disable_ids - # - $modsec_disable_ips - # - $modsec_disable_msgs - # - $modsec_disable_tags - # - $modsec_body_limit - # - $modsec_audit_log_destination - if $modsec_disable_vhost or $modsec_disable_ids or $modsec_disable_ips or $modsec_disable_msgs or $modsec_disable_tags or $modsec_audit_log_destination { - concat::fragment { "${name}-security": - target => "${priority_real}${filename}.conf", - order => 320, - content => template('apache/vhost/_security.erb'), - } - } - - # Template uses: - # - $filters - if $filters and ! empty($filters) { - concat::fragment { "${name}-filters": - target => "${priority_real}${filename}.conf", - order => 330, - content => template('apache/vhost/_filters.erb'), - } - } - - # Template uses: - # - $jk_mounts - if $jk_mounts and ! empty($jk_mounts) { - concat::fragment { "${name}-jk_mounts": - target => "${priority_real}${filename}.conf", - order => 340, - content => template('apache/vhost/_jk_mounts.erb'), - } - } - - # Template uses: - # - $keepalive - # - $keepalive_timeout - # - $max_keepalive_requests - if $keepalive or $keepalive_timeout or $max_keepalive_requests { - concat::fragment { "${name}-keepalive_options": - target => "${priority_real}${filename}.conf", - order => 350, - content => template('apache/vhost/_keepalive_options.erb'), - } - } - - # Template uses: - # - $cas_* - if $cas_enabled { - concat::fragment { "${name}-auth_cas": - target => "${priority_real}${filename}.conf", - order => 350, - content => template('apache/vhost/_auth_cas.erb'), - } - } - - # Template uses: - # - $http_protocol_options - if $http_protocol_options { - concat::fragment { "${name}-http_protocol_options": - target => "${priority_real}${filename}.conf", - order => 350, - content => template('apache/vhost/_http_protocol_options.erb'), - } - } - - # Template uses no variables - concat::fragment { "${name}-file_footer": - target => "${priority_real}${filename}.conf", - order => 999, - content => template('apache/vhost/_file_footer.erb'), - } -} diff --git a/modules/apache/manifests/vhost/custom.pp b/modules/apache/manifests/vhost/custom.pp deleted file mode 100644 index cfb06c2..0000000 --- a/modules/apache/manifests/vhost/custom.pp +++ /dev/null @@ -1,40 +0,0 @@ -# See README.md for usage information -define apache::vhost::custom( - $content, - $ensure = 'present', - $priority = '25', - $verify_config = true, -) { - include ::apache - - ## Apache include does not always work with spaces in the filename - $filename = regsubst($name, ' ', '_', 'G') - - ::apache::custom_config { $filename: - ensure => $ensure, - confdir => $::apache::vhost_dir, - content => $content, - priority => $priority, - verify_config => $verify_config, - } - - # NOTE(pabelanger): This code is duplicated in ::apache::vhost and needs to - # converted into something generic. - if $::apache::vhost_enable_dir { - $vhost_symlink_ensure = $ensure ? { - present => link, - default => $ensure, - } - - file { "${priority}-${filename}.conf symlink": - ensure => $vhost_symlink_ensure, - path => "${::apache::vhost_enable_dir}/${priority}-${filename}.conf", - target => "${::apache::vhost_dir}/${priority}-${filename}.conf", - owner => 'root', - group => $::apache::params::root_group, - mode => $::apache::file_mode, - require => Apache::Custom_config[$filename], - notify => Class['apache::service'], - } - } -} diff --git a/modules/apache/manifests/vhosts.pp b/modules/apache/manifests/vhosts.pp deleted file mode 100644 index cf212c4..0000000 --- a/modules/apache/manifests/vhosts.pp +++ /dev/null @@ -1,6 +0,0 @@ -class apache::vhosts ( - $vhosts = {}, -) { - include ::apache - create_resources('apache::vhost', $vhosts) -} diff --git a/modules/apache/metadata.json b/modules/apache/metadata.json deleted file mode 100644 index 826e709..0000000 --- a/modules/apache/metadata.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "name": "puppetlabs-apache", - "version": "2.3.0", - "author": "puppet", - "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.", - "license": "Apache-2.0", - "source": "git://github.com/puppetlabs/puppetlabs-apache.git", - "project_page": "https://github.com/puppetlabs/puppetlabs-apache", - "issues_url": "https://tickets.puppetlabs.com/browse/MODULES", - "dependencies": [ - { - "name": "puppetlabs/stdlib", - "version_requirement": ">= 4.13.1 < 5.0.0" - }, - { - "name": "puppetlabs/concat", - "version_requirement": ">= 2.2.1 < 5.0.0" - } - ], - "data_provider": null, - "operatingsystem_support": [ - { - "operatingsystem": "RedHat", - "operatingsystemrelease": [ - "5", - "6", - "7" - ] - }, - { - "operatingsystem": "CentOS", - "operatingsystemrelease": [ - "5", - "6", - "7" - ] - }, - { - "operatingsystem": "OracleLinux", - "operatingsystemrelease": [ - "6", - "7" - ] - }, - { - "operatingsystem": "Scientific", - "operatingsystemrelease": [ - "5", - "6", - "7" - ] - }, - { - "operatingsystem": "Debian", - "operatingsystemrelease": [ - "7", - "8" - ] - }, - { - "operatingsystem": "SLES", - "operatingsystemrelease": [ - "11 SP1", - "12" - ] - }, - { - "operatingsystem": "Ubuntu", - "operatingsystemrelease": [ - "14.04", - "16.04" - ] - } - ], - "requirements": [ - { - "name": "puppet", - "version_requirement": ">= 4.7.0 < 6.0.0" - } - ], - "description": "Module for Apache configuration" -} diff --git a/modules/apache/readmes/README_ja_JP.md b/modules/apache/readmes/README_ja_JP.md deleted file mode 100644 index c8293c6..0000000 --- a/modules/apache/readmes/README_ja_JP.md +++ /dev/null @@ -1,5436 +0,0 @@ -# apache - -[モジュールの概要]: #module-description - -[セットアップ]: #setup -[Apacheの使用を始める]: #beginning-with-apache - -[使用方法]: #usage -[バーチャルホストの設定]: #configuring-virtual-hosts -[SSLを使ったバーチャルホストの設定]: #configuring-virtual-hosts-with-ssl -[バーチャルホストのポートおよびアドレスのバインディング設定]: #configuring-virtual-host-port-and-address-bindings -[アプリおよびプロセッサのバーチャルホストの設定]: #configuring-virtual-hosts-for-apps-and-processors -[IPベースのバーチャルホストの設定]: #configuring-ip-based-virtual-hosts -[Apacheモジュールのインストール]: #installing-apache-modules -[任意モジュールのインストール]: #installing-arbitrary-modules -[固有モジュールのインストール]: #installing-specific-modules -[FastCGIサーバの設定]: #configuring-fastcgi-servers-to-handle-php-files -[ロードバランシングの例]: #load-balancing-examples -[apacheの影響]: #what-the-apache-module-affects - -[リファレンス]: #reference -[パブリッククラス]: #public-classes -[プライベートクラス]: #private-classes -[パブリック定義タイプ]: #public-defined-types -[プライベート定義タイプ]: #private-defined-types -[テンプレート]: #templates - -[制約事項]: #limitations - -[開発]: #development -[貢献]: #contributing - -[`AddDefaultCharset`]: https://httpd.apache.org/docs/current/mod/core.html#adddefaultcharset -[`add_listen`]: #add_listen -[`Alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#alias -[`AliasMatch`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#aliasmatch -[エイリアスサーバ]: https://httpd.apache.org/docs/current/urlmapping.html -[`AllowEncodedSlashes`]: https://httpd.apache.org/docs/current/mod/core.html#allowencodedslashes -[`apache`]: #class-apache -[`apache_version`]: #apache_version -[`apache::balancer`]: #defined-type-apachebalancer -[`apache::balancermember`]: #defined-type-apachebalancermember -[`apache::fastcgi::server`]: #defined-type-apachefastcgiserver -[`apache::mod`]: #defined-type-apachemod -[`apache::mod::`]: #classes-apachemodmodule-name -[`apache::mod::alias`]: #class-apachemodalias -[`apache::mod::auth_cas`]: #class-apachemodauth_cas -[`apache::mod::auth_mellon`]: #class-apachemodauth_mellon -[`apache::mod::authn_dbd`]: #class-apachemodauthn_dbd -[`apache::mod::authnz_ldap`]: #class-apachemodauthnz_ldap -[`apache::mod::cluster`]: #class-apachemodcluster -[`apache::mod::disk_cache`]: #class-apachemoddisk_cache -[`apache::mod::dumpio`]: #class-apachemoddumpio -[`apache::mod::event`]: #class-apachemodevent -[`apache::mod::ext_filter`]: #class-apachemodext_filter -[`apache::mod::geoip`]: #class-apachemodgeoip -[`apache::mod::itk`]: #class-apachemoditk -[`apache::mod::jk`]: #class-apachemodjk -[`apache::mod::ldap`]: #class-apachemodldap -[`apache::mod::passenger`]: #class-apachemodpassenger -[`apache::mod::peruser`]: #class-apachemodperuser -[`apache::mod::prefork`]: #class-apachemodprefork -[`apache::mod::proxy`]: #class-apachemodproxy -[`apache::mod::proxy_balancer`]: #class-apachemodproxybalancer -[`apache::mod::proxy_fcgi`]: #class-apachemodproxy_fcgi -[`apache::mod::proxy_html`]: #class-apachemodproxy_html -[`apache::mod::security`]: #class-apachemodsecurity -[`apache::mod::shib`]: #class-apachemodshib -[`apache::mod::ssl`]: #class-apachemodssl -[`apache::mod::status`]: #class-apachemodstatus -[`apache::mod::userdir`]: #class-apachemoduserdir -[`apache::mod::worker`]: #class-apachemodworker -[`apache::mod::wsgi`]: #class-apachemodwsgi -[`apache::params`]: #class-apacheparams -[`apache::version`]: #class-apacheversion -[`apache::vhost`]: #defined-type-apachevhost -[`apache::vhost::custom`]: #defined-type-apachevhostcustom -[`apache::vhost::WSGIImportScript`]: #wsgiimportscript -[Apache HTTPサーバ]: https://httpd.apache.org -[Apacheモジュール]: https://httpd.apache.org/docs/current/mod/ -[配列]: https://docs.puppet.com/puppet/latest/reference/lang_data_array.html - -[オーディットログ]: https://github.com/SpiderLabs/ModSecurity/wiki/ModSecurity-2-Data-Formats#audit-log - -[beaker-rspec]: https://github.com/puppetlabs/beaker-rspec - -[証明書失効リスト]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationfile -[証明書失効リストパス]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationpath -[コモンゲートウェイインターフェース]: https://httpd.apache.org/docs/current/howto/cgi.html -[`confd_dir`]: #confd_dir -[`content`]: #content -[CONTRIBUTING.md]: CONTRIBUTING.md -[カスタムエラードキュメント]: https://httpd.apache.org/docs/current/custom-error.html -[`custom_fragment`]: #custom_fragment - -[`default_mods`]: #default_mods -[`default_ssl_crl`]: #default_ssl_crl -[`default_ssl_crl_path`]: #default_ssl_crl_path -[`default_ssl_vhost`]: #default_ssl_vhost -[`dev_packages`]: #dev_packages -[`directory`]: #directory -[`directories`]: #parameter-directories-for-apachevhost -[`DirectoryIndex`]: https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex -[`docroot`]: #docroot -[`docroot_owner`]: #docroot_owner -[`docroot_group`]: #docroot_group -[`DocumentRoot`]: https://httpd.apache.org/docs/current/mod/core.html#documentroot - -[`EnableSendfile`]: https://httpd.apache.org/docs/current/mod/core.html#enablesendfile -[適用モード]: http://selinuxproject.org/page/Guide/Mode -[`ensure`]: https://docs.puppet.com/latest/type.html#package-attribute-ensure -[`error_log_file`]: #error_log_file -[`error_log_syslog`]: #error_log_syslog -[`error_log_pipe`]: #error_log_pipe -[`ExpiresByType`]: https://httpd.apache.org/docs/current/mod/mod_expires.html#expiresbytype -[エクスポートリソース]: http://docs.puppet.com/latest/reference/lang_exported.md -[`ExtendedStatus`]: https://httpd.apache.org/docs/current/mod/core.html#extendedstatus - -[Facter]: http://docs.puppet.com/facter/ -[FastCGI]: http://www.fastcgi.com/ -[FallbackResource]: https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource -[`fallbackresource`]: #fallbackresource -[`FileETag`]: https://httpd.apache.org/docs/current/mod/core.html#fileetag -[フィルタルール]: https://httpd.apache.org/docs/current/filter.html -[`filters`]: #filters -[`ForceType`]: https://httpd.apache.org/docs/current/mod/core.html#forcetype - -[GeoIPScanProxyHeaders]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Proxy-Related_Directives -[`gentoo/puppet-portage`]: https://github.com/gentoo/puppet-portage - -[ハッシュ]: https://docs.puppet.com/puppet/latest/reference/lang_data_hash.html -[`HttpProtocolOptions`]: http://httpd.apache.org/docs/current/mod/core.html#httpprotocoloptions - -[`IncludeOptional`]: https://httpd.apache.org/docs/current/mod/core.html#includeoptional -[`Include`]: https://httpd.apache.org/docs/current/mod/core.html#include -[インターバル構文]: https://httpd.apache.org/docs/current/mod/mod_expires.html#AltSyn -[`ip`]: #ip -[`ip_based`]: #ip_based -[IPベースのバーチャルホスト]: https://httpd.apache.org/docs/current/vhosts/ip-based.html - -[`KeepAlive`]: https://httpd.apache.org/docs/current/mod/core.html#keepalive -[`KeepAliveTimeout`]: https://httpd.apache.org/docs/current/mod/core.html#keepalivetimeout -[`keepalive`パラメータ]: #keepalive -[`keepalive_timeout`]: #keepalive_timeout -[`limitreqfieldsize`]: https://httpd.apache.org/docs/current/mod/core.html#limitrequestfieldsize - -[`lib`]: #lib -[`lib_path`]: #lib_path -[`Listen`]: https://httpd.apache.org/docs/current/bind.html -[`ListenBackLog`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#listenbacklog -[`LoadFile`]: https://httpd.apache.org/docs/current/mod/mod_so.html#loadfile -[`LogFormat`]: https://httpd.apache.org/docs/current/mod/mod_log_config.html#logformat -[`logroot`]: #logroot -[ログセキュリティ]: https://httpd.apache.org/docs/current/logs.html#security - -[`manage_docroot`]: #manage_docroot -[`manage_user`]: #manage_user -[`manage_group`]: #manage_group -[`supplementary_groups`]: #supplementary_groups -[`MaxConnectionsPerChild`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxconnectionsperchild -[`max_keepalive_requests`]: #max_keepalive_requests -[`MaxRequestWorkers`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxrequestworkers -[`MaxSpareThreads`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxsparethreads -[MIME `content-type`]: https://www.iana.org/assignments/media-types/media-types.xhtml -[`MinSpareThreads`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#minsparethreads -[`mod_alias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html -[`mod_auth_cas`]: https://github.com/Jasig/mod_auth_cas -[`mod_auth_kerb`]: http://modauthkerb.sourceforge.net/configure.html -[`mod_authnz_external`]: https://github.com/phokz/mod-auth-external -[`mod_auth_dbd`]: http://httpd.apache.org/docs/current/mod/mod_authn_dbd.html -[`mod_auth_mellon`]: https://github.com/UNINETT/mod_auth_mellon -[`mod_dbd`]: http://httpd.apache.org/docs/current/mod/mod_dbd.html -[`mod_disk_cache`]: https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html -[`mod_dumpio`]: https://httpd.apache.org/docs/2.4/mod/mod_dumpio.html -[`mod_env`]: http://httpd.apache.org/docs/current/mod/mod_env.html -[`mod_expires`]: https://httpd.apache.org/docs/current/mod/mod_expires.html -[`mod_ext_filter`]: https://httpd.apache.org/docs/current/mod/mod_ext_filter.html -[`mod_fcgid`]: https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html -[`mod_geoip`]: http://dev.maxmind.com/geoip/legacy/mod_geoip2/ -[`mod_info`]: https://httpd.apache.org/docs/current/mod/mod_info.html -[`mod_ldap`]: https://httpd.apache.org/docs/2.2/mod/mod_ldap.html -[`mod_mpm_event`]: https://httpd.apache.org/docs/current/mod/event.html -[`mod_negotiation`]: https://httpd.apache.org/docs/current/mod/mod_negotiation.html -[`mod_pagespeed`]: https://developers.google.com/speed/pagespeed/module/?hl=en -[`mod_passenger`]: https://www.phusionpassenger.com/library/config/apache/reference/ -[`mod_php`]: http://php.net/manual/en/book.apache.php -[`mod_proxy`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html -[`mod_proxy_balancer`]: https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html -[`mod_reqtimeout`]: https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html -[`mod_rewrite`]: https://httpd.apache.org/docs/current/mod/mod_rewrite.html -[`mod_security`]: https://www.modsecurity.org/ -[`mod_ssl`]: https://httpd.apache.org/docs/current/mod/mod_ssl.html -[`mod_status`]: https://httpd.apache.org/docs/current/mod/mod_status.html -[`mod_version`]: https://httpd.apache.org/docs/current/mod/mod_version.html -[`mod_wsgi`]: https://modwsgi.readthedocs.org/en/latest/ -[モジュール貢献ガイド]: https://docs.puppet.com/forge/contributing.html -[`mpm_module`]: #mpm_module -[マルチプロセッシングモジュール]: https://httpd.apache.org/docs/current/mpm.html - -[名前ベースのバーチャルホスト]: https://httpd.apache.org/docs/current/vhosts/name-based.html -[`no_proxy_uris`]: #no_proxy_uris - -[オープンソース版Puppet]: https://docs.puppet.com/puppet/ -[`Options`]: https://httpd.apache.org/docs/current/mod/core.html#options - -[`path`]: #path -[`Peruser`]: https://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr -[`port`]: #port -[`priority`]: #defined-types-apachevhost -[`proxy_dest`]: #proxy_dest -[`proxy_dest_match`]: #proxy_dest_match -[`proxy_pass`]: #proxy_pass -[`ProxyPass`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass -[`ProxySet`]: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset -[Puppet Enterprise]: https://docs.puppet.com/pe/ -[Puppet Forge]: https://forge.puppet.com -[Puppet]: https://puppet.com -[Puppetモジュール]: https://docs.puppet.com/puppet/latest/reference/modules_fundamentals.html -[Puppetモジュールのコード]: https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp -[`purge_configs`]: #purge_configs -[`purge_vhost_dir`]: #purge_vhost_dir -[Python]: https://www.python.org/ - -[Rack]: http://rack.github.io/ -[`rack_base_uris`]: #rack_base_uris -[RFC 2616]: https://www.ietf.org/rfc/rfc2616.txt -[`RequestReadTimeout`]: https://httpd.apache.org/docs/current/mod/mod_reqtimeout.html#requestreadtimeout -[rspec-puppet]: http://rspec-puppet.com/ - -[`ScriptAlias`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#scriptalias -[`ScriptAliasMatch`]: https://httpd.apache.org/docs/current/mod/mod_alias.html#scriptaliasmatch -[`scriptalias`]: #scriptalias -[SELinux]: http://selinuxproject.org/ -[`ServerAdmin`]: https://httpd.apache.org/docs/current/mod/core.html#serveradmin -[`serveraliases`]: #serveraliases -[`ServerLimit`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#serverlimit -[`ServerName`]: https://httpd.apache.org/docs/current/mod/core.html#servername -[`ServerRoot`]: https://httpd.apache.org/docs/current/mod/core.html#serverroot -[`ServerTokens`]: https://httpd.apache.org/docs/current/mod/core.html#servertokens -[`ServerSignature`]: https://httpd.apache.org/docs/current/mod/core.html#serversignature -[サービス属性リスタート]: http://docs.puppet.com/latest/type.html#service-attribute-restart -[`source`]: #source -[`SSLCARevocationCheck`]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck -[SSL証明書のキーファイル]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatekeyfile -[SSLチェーン]: https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatechainfile -[SSL暗号化]: https://httpd.apache.org/docs/current/ssl/index.html -[`ssl`]: #ssl -[`ssl_cert`]: #ssl_cert -[`ssl_compression`]: #ssl_compression -[`ssl_key`]: #ssl_key -[`StartServers`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#startservers -[suPHP]: http://www.suphp.org/Home.html -[`suphp_addhandler`]: #suphp_addhandler -[`suphp_configpath`]: #suphp_configpath -[`suphp_engine`]: #suphp_engine -[対応するオペレーティングシステム]: https://forge.puppet.com/supported#puppet-supported-modules-compatibility-matrix - -[`ThreadLimit`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#threadlimit -[`ThreadsPerChild`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#threadsperchild -[`TimeOut`]: https://httpd.apache.org/docs/current/mod/core.html#timeout -[テンプレート]: http://docs.puppet.com/puppet/latest/reference/lang_template.html -[`TraceEnable`]: https://httpd.apache.org/docs/current/mod/core.html#traceenable - -[`verify_config`]: #verify_config -[`vhost`]: #defined-type-apachevhost -[`vhost_dir`]: #vhost_dir -[`virtual_docroot`]: #virtual_docroot - -[Webサーバゲートウェイインターフェース ]: https://www.python.org/dev/peps/pep-3333/#abstract -[`WSGIRestrictEmbedded`]: http://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIRestrictEmbedded.html -[`WSGIPythonPath`]: http://modwsgi.readthedocs.org/en/develop/configuration-directives/WSGIPythonPath.html -[`WSGIPythonHome`]: http://modwsgi.readthedocs.org/en/develop/configuration-directives/WSGIPythonHome.html - -#### 目次 - -1. [モジュールの概要 - apacheモジュールとは？　何をするためのもの？][モジュールの概要] -2. [セットアップ - apacheの使用を開始するにあたっての基礎][セットアップ] - - [apacheモジュールが影響を与えるもの][apacheの影響] - - [Apacheの使用を始める - インストール][Apacheの使用を始める] -3. [使用方法 - 設定に使用できるクラスと定義タイプ][使用方法] - - [バーチャルホストの設定 - 使用開始に役立つ例][バーチャルホストの設定] - - [PHPファイルを処理するFastCGIサーバの設定][FastCGIサーバの設定] - - [エクスポートおよび非エクスポートリソースのロードバランシング][ロードバランシングの例] -4. [リファレンス - モジュールの機能と動作について][リファレンス] - - [パブリッククラス][] - - [プライベートクラス][] - - [パブリック定義タイプ][] - - [プライベート定義タイプ][] - - [テンプレート][] -5. [制約事項 - OSの互換性など][制約事項] -6. [開発 - モジュールへの貢献方法][開発] - - [apacheモジュールへの貢献][貢献] - - [テストの実施 - クイックガイド][テストの実施] - -## モジュールの概要 - -[Apache HTTPサーバ][] (Apache HTTPD、あるいは単にApacheとも呼ばれます)は、広く使用されているWebサーバです。この[Puppetモジュール][]によって、インフラ内でApacheを管理するための設定がシンプルなものになります。幅広いバーチャルホストセットアップを設定および管理し、[Apacheモジュール][]を効率的にインストールして設定することができます。 - -## セットアップ - -### apacheモジュールが影響を与えるもの: - -- (作成し、書き込みを行う)設定ファイルおよびディレクトリ - - **警告**: Puppetにより管理*されていない*設定はパージされます。 -- Apacheのパッケージ/サービス/設定ファイル -- Apacheモジュール -- バーチャルホスト -- リッスンするポート -- FreeBSDおよびGentooの`/etc/make.conf` - -Gentooでは、このモジュールは [`gentoo/puppet-portage`][] Puppetモジュールに依存します。Gentooについては、いくつかのオプションが適用され、一部の機能や設定が有効になりますが、このモジュールに[対応するオペレーティングシステム][]ではない点に留意してください。 - -> **警告**: このモジュールにより、Apache設定ファイルおよびディレクトリが修正され、Puppetで管理されていない設定がパージされます。Apache設定はPuppetで管理する必要があります。これは、管理されていない設定ファイルにより、予期せぬ不具合が生じる可能性があるためです。 -> ->全面的なPuppet管理を一時的に無効にするには、[`apache`][]クラス宣言の[`purge_configs`][]パラメータをfalseに設定します。この手順は、カスタマイズした設定を保存し、リロケーションするための一時的な対策としてのみ推奨されます。 - -### Apacheの使用を始める - -デフォルトパラメータを用いてPuppetでApacheをインストールするには、[`apache`][]クラスを宣言します。 - -``` puppet -class { 'apache': } -``` - -デフォルトオプションを用いてこのクラスを宣言すると、モジュールでは以下のことが実行されます。 - -- オペレーティングシステムに適したApacheソフトウェアパッケージおよび[必要なApacheモジュール](#default_mods)をインストールします。 -- オペレーティングシステムに応じた[デフォルトロケーション](#conf_dir)を用いて、ディレクトリ内に必要な設定ファイルを配置します。 -- デフォルトのバーチャルホストおよび標準的なポート('80')とアドレス('\*')のバインディングを用いてサーバを設定します。 -- ドキュメントルートディレクトリを作成します。オペレーティングシステムによって異なりますが、通常は`/var/www`です。 -- Apacheサービスを開始します。 - -Apacheのデフォルト設定は、オペレーティングシステムによって異なります。これらのデフォルトは、テスト環境では機能しますが、本稼働環境には推奨されません。実際のサイトに応じてクラスのパラメータをカスタマイズすることを推奨します。 - -例えば、以下の宣言では、apacheモジュールの[デフォルトのバーチャルホスト設定][バーチャルホストの設定]を使わずにApacheがインストールされるので、すべてのApacheバーチャルホストをカスタマイズすることができます。 - -``` puppet -class { 'apache': - default_vhost => false, -} -``` - -> **注意**: `default_vhost`を`false`に設定する場合、少なくとも1つの`apache::vhost`リソースを追加する必要があります。追加しなければ、Apacheは起動しません。デフォルトのバーチャルホストを設定するには、`apache`クラスで`default_vhost`を設定するか、[`apache::vhost`][]定義タイプを使用します。[`apache::vhost`][]定義タイプを用いて、追加の固有バーチャルホストを設定することもできます。 - -## 使用方法 - -### バーチャルホストの設定 - -デフォルトの[`apache`][]クラスは、ポート80にバーチャルホストを設定します。すべてのインターフェースをリッスンし、[`docroot`][]パラメータのデフォルトディレクトリ`/var/www`をサーブします。 - - -基本の[名前ベースのバーチャルホスト][]を設定するには、[`apache::vhost`][]定義タイプで[`port`][]および[`docroot`][]パラメータを指定します。 - -``` puppet -apache::vhost { 'vhost.example.com': - port => '80', - docroot => '/var/www/vhost', -} -``` - -すべてのバーチャルホストパラメータのリストについては、[`apache::vhost`][]定義タイプのリファレンスを参照してください。 - -> **注意**: Apacheはバーチャルホストをアルファベット順に処理します。サーバ管理者は、バーチャルホスト設定ファイル名の先頭に数字を付けることで、 Apacheバーチャルホスト処理の優先順位を設定できます。[`apache::vhost`][]定義タイプは、デフォルトの [`priority`][]である15を適用します。これはPuppetではバーチャルホストのファイル名の先頭に`15-`が付いていると解釈されます。そのため、優先順位が同じサイトが複数ある場合や、`priority`パラメータの値をfalseに設定して優先順位番号を無効にした場合でも、Apacheはバーチャルホストをアルファベット順に処理します。 - -`docroot`のユーザおよびグループのオーナーシップを設定するには、[`docroot_owner`][]および[`docroot_group`][]パラメータを使用します。 - -``` puppet -apache::vhost { 'user.example.com': - port => '80', - docroot => '/var/www/user', - docroot_owner => 'www-data', - docroot_group => 'www-data', -} -``` - -#### SSLを使ったバーチャルホストの設定 - -[SSL encryption][]およびデフォルトのSSL証明書を使うようにバーチャルホストを設定するには、[`ssl`][]パラメータを設定します。また、[`port`][]パラメータを指定する必要もあります。通常は、'443'という値がHTTPSリクエストに対応します。 - -``` puppet -apache::vhost { 'ssl.example.com': - port => '443', - docroot => '/var/www/ssl', - ssl => true, -} -``` - -SSLおよび固有SSL証明書を使うようにバーチャルホストを設定するには、[`ssl_cert`][]および[`ssl_key`][]パラメータで証明書およびキーへのパスを使用します。 - -``` puppet -apache::vhost { 'cert.example.com': - port => '443', - docroot => '/var/www/cert', - ssl => true, - ssl_cert => '/etc/ssl/fourth.example.com.cert', - ssl_key => '/etc/ssl/fourth.example.com.key', -} -``` - -同じドメインでSSLと暗号化されていないバーチャルホストを混ぜて設定するには、それぞれを個別の[`apache::vhost`][]定義タイプで宣言します。 - -``` puppet -# The non-ssl virtual host -apache::vhost { 'mix.example.com non-ssl': - servername => 'mix.example.com', - port => '80', - docroot => '/var/www/mix', -} - -# The SSL virtual host at the same domain -apache::vhost { 'mix.example.com ssl': - servername => 'mix.example.com', - port => '443', - docroot => '/var/www/mix', - ssl => true, -} -``` - -暗号化されていない接続をSSLにリダイレクトするようにバーチャルホストを設定するには、それぞれを個別の[`apache::vhost`][]定義タイプで宣言し、SSLが有効化されているバーチャルホストに、暗号化されていないリクエストをリダイレクトします。 - -``` puppet -apache::vhost { 'redirect.example.com non-ssl': - servername => 'redirect.example.com', - port => '80', - docroot => '/var/www/redirect', - redirect_status => 'permanent', - redirect_dest => 'https://redirect.example.com/' -} - -apache::vhost { 'redirect.example.com ssl': - servername => 'redirect.example.com', - port => '443', - docroot => '/var/www/redirect', - ssl => true, -} -``` - -#### バーチャルホストのポートおよびアドレスのバインディング設定　 - -バーチャルホストはデフォルトですべてのIPアドレス('\*')をリッスンします。特定のIPアドレスをリッスンするようにバーチャルホストを設定するには、[`ip`][]パラメータを使用します。 - -``` puppet -apache::vhost { 'ip.example.com': - ip => '127.0.0.1', - port => '80', - docroot => '/var/www/ip', -} -``` - -[`ip`][]パラメータにIPアドレスの配列を使えば、1つのバーチャルホストに複数のIPアドレスを設定することもできます。 - -``` puppet -apache::vhost { 'ip.example.com': - ip => ['127.0.0.1','169.254.1.1'], - port => '80', - docroot => '/var/www/ip', -} -``` - -[`port`][]パラメータにポートの配列を使えば、1つのバーチャルホストに複数のポートを設定することができます。 - -``` puppet -apache::vhost { 'ip.example.com': - ip => ['127.0.0.1'], - port => ['80','8080'] - docroot => '/var/www/ip', -} -``` - -[エイリアスサーバ][]を使ってバーチャルホストを設定するには、[`serveraliases`][]パラメータを使ってエイリアスを指定します。 - -``` puppet -apache::vhost { 'aliases.example.com': - serveraliases => [ - 'aliases.example.org', - 'aliases.example.net', - ], - port => '80', - docroot => '/var/www/aliases', -} -``` - -`/var/www/example.com`に'http://example.com.loc'をマッピングするケースのように、 同じ名前のディレクトリにマッピングされたサブドメイン用にワイルドカードエイリアスを使ってバーチャルホストを設定するには、[`serveraliases`][]パラメータを使ってワイルドカードエイリアスを、[`virtual_docroot`][]パラメータを使ってドキュメントルートを定義します。 - -``` puppet -apache::vhost { 'subdomain.loc': - vhost_name => '*', - port => '80', - virtual_docroot => '/var/www/%-2+', - docroot => '/var/www', - serveraliases => ['*.loc',], -} -``` - -[フィルタルール][]を使ってバーチャルホストを設定するには、[`filters`][]パラメータを使って、フィルタディレクティブを[array][]として渡します。 - -``` puppet -apache::vhost { 'subdomain.loc': - port => '80', - filters => [ - 'FilterDeclare COMPRESS', - 'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/html', - 'FilterChain COMPRESS', - 'FilterProtocol COMPRESS DEFLATE change=yes;byteranges=no', - ], - docroot => '/var/www/html', -} -``` - -#### アプリおよびプロセッサのバーチャルホストの設定　 - -[suPHP][]を使ってバーチャルホストを設定するには、以下のパラメータを使用します。 - -* [`suphp_engine`][]、suPHPエンジンを有効にします。 -* [`suphp_addhandler`][]、MIMEタイプを定義します。 -* [`suphp_configpath`][]、suPHPがPHPインタープリタに渡すパスを設定します。 -* [`directory`][]、ディレクトリ、ファイル、ロケーションの各ディレクティブブロックを設定します。 - -例:　 - -``` puppet -apache::vhost { 'suphp.example.com': - port => '80', - docroot => '/home/appuser/myphpapp', - suphp_addhandler => 'x-httpd-php', - suphp_engine => 'on', - suphp_configpath => '/etc/php5/apache2', - directories => [ - { 'path' => '/home/appuser/myphpapp', - 'suphp' => { - user => 'myappuser', - group => 'myappgroup', - }, - }, - ], -} -``` - -[Python][]アプリケーション用の[Webサーバゲートウェイインターフェース][] (WSGI)を使ってバーチャルホストを設定するには、`wsgi`パラメータセットを使用します。 - -``` puppet -apache::vhost { 'wsgi.example.com': - port => '80', - docroot => '/var/www/pythonapp', - wsgi_application_group => '%{GLOBAL}', - wsgi_daemon_process => 'wsgi', - wsgi_daemon_process_options => { - processes => '2', - threads => '15', - display-name => '%{GROUP}', - }, - wsgi_import_script => '/var/www/demo.wsgi', - wsgi_import_script_options => { - process-group => 'wsgi', - application-group => '%{GLOBAL}', - }, - wsgi_process_group => 'wsgi', - wsgi_script_aliases => { '/' => '/var/www/demo.wsgi' }, -} -``` - -Apache 2.2.16の時点では、Apacheは[FallbackResource][]をサポートしています。これは、一般的なRewriteRulesに代わるシンプルなディレクティブです。[`fallbackresource`][]パラメータを使えば、FallbackResourceを設定できます。 - -``` puppet -apache::vhost { 'wordpress.example.com': - port => '80', - docroot => '/var/www/wordpress', - fallbackresource => '/index.php', -} -``` - -> **注意**: Apache 2.2.24以降では、`fallbackresource`パラメータがサポートするのは'disabled'値のみです。 - -[コモンゲートウェイインターフェース][] (CGI)ファイル用の指定ディレクトリを使ってバーチャルホストを設定するには、[`scriptalias`][]パラメータを使って`cgi-bin`パスを定義します。 - -``` puppet -apache::vhost { 'cgi.example.com': - port => '80', - docroot => '/var/www/cgi', - scriptalias => '/usr/lib/cgi-bin', -} -``` - -[Rack][]用のバーチャルホストを設定するには、[`rack_base_uris`][]パラメータを使用します。 - -``` puppet -apache::vhost { 'rack.example.com': - port => '80', - docroot => '/var/www/rack', - rack_base_uris => ['/rackapp1', '/rackapp2'], -} -``` - -#### IPベースのバーチャルホストの設定　 - -任意のポートをリッスンし、固有IPアドレスのリクエストに応答する[IPベースのバーチャルホスト][]を設定することができます。この例では、サーバはポート80および81をリッスンします。これは、この例のバーチャルホストが[`port`][]パラメータにより宣言されて_いない_ ためです。 - -``` puppet -apache::listen { '80': } - -apache::listen { '81': } -``` - -[`ip_based`][]パラメータを使ってIPベースのバーチャルホストを設定します。 - -``` puppet -apache::vhost { 'first.example.com': - ip => '10.0.0.10', - docroot => '/var/www/first', - ip_based => true, -} - -apache::vhost { 'second.example.com': - ip => '10.0.0.11', - docroot => '/var/www/second', - ip_based => true, -} -``` - -任意の[SSL][SSL暗号化]構成と暗号化されていない構成を組み合わせ、IPベースと[名前ベースのバーチャルホスト][]を混ぜて設定することもできます。 - -この例では、1つのIPアドレス(この例では、10.0.0.10)に2つのIPベースのバーチャルホストを追加します。一方はSSLを使用するもの、もう一方は暗号化されていないものです。 - -``` puppet -apache::vhost { 'The first IP-based virtual host, non-ssl': - servername => 'first.example.com', - ip => '10.0.0.10', - port => '80', - ip_based => true, - docroot => '/var/www/first', -} - -apache::vhost { 'The first IP-based vhost, ssl': - servername => 'first.example.com', - ip => '10.0.0.10', - port => '443', - ip_based => true, - docroot => '/var/www/first-ssl', - ssl => true, -} -``` - -次に、第2のIPアドレス(10.0.0.20)に2つの名前ベースのバーチャルホストを追加します。 - -``` puppet -apache::vhost { 'second.example.com': - ip => '10.0.0.20', - port => '80', - docroot => '/var/www/second', -} - -apache::vhost { 'third.example.com': - ip => '10.0.0.20', - port => '80', - docroot => '/var/www/third', -} -``` - -10.0.0.10または10.0.0.20のいずれかで応答する名前ベースのバーチャルホストを追加するには、Apacheのデフォルトの`Listen 80`を無効にする**必要があります**。これは、前述のIPベースのバーチャルホストとコンフリクトするためです。無効にするには、[`add_listen`][]パラメータを`false`に設定します。 - -``` puppet -apache::vhost { 'fourth.example.com': - port => '80', - docroot => '/var/www/fourth', - add_listen => false, -} - -apache::vhost { 'fifth.example.com': - port => '80', - docroot => '/var/www/fifth', - add_listen => false, -} -``` - -### Apacheモジュールのインストール　 - -Puppet apacheモジュールを使って[Apacheモジュール][]をインストールするには、2つの方法があります。 - -- [`apache::mod::`][] クラスを使って、[パラメータを伴う固有のApacheモジュールをインストール][固有モジュールのインストール]する方法 -- [`apache::mod`][]定義タイプを使って、[任意のApacheモジュールをインストール][任意モジュールのインストール]する方法 - -#### 固有モジュールのインストール - -Puppet apacheモジュールは、多くの一般的な[Apacheモジュール][]のインストールをサポートしており、多くの場合、パラメータ化された設定オプションがあります。サポートされるApacheモジュールのリストについては、[`apache::mod::`][]クラスリファレンスを参照してください。 - -例えば、[`apache::mod::ssl`][]クラスを宣言すれば、デフォルト設定で`mod_ssl` Apacheモジュールをインストールすることができます。 - -``` puppet -class { 'apache::mod::ssl': } -``` - -[`apache::mod::ssl`][]には複数のパラメータ化されたオプションがあり、宣言する際に設定することができます。たとえば、圧縮を有効にして`mod_ssl`を有効化するには、[`ssl_compression`][]パラメータをtrueに設定します。 - -``` puppet -class { 'apache::mod::ssl': - ssl_compression => true, -} -``` - -一部のモジュールには必須条件があります。[`apache::mod::`][]のリファレンスを参照してください。 - -#### 任意モジュールのインストール - -オペレーティングシステムのパッケージマネージャでインストール可能な任意のモジュールの名前を[`apache::mod`][]定義タイプに渡し、それをインストールすることができます。固有モジュールクラスとは異なり、 [`apache::mod`][]定義タイプでは、インストールされている他のモジュールや固有のパラメータに基づいてインストールが調整されることはありません。Puppetはモジュールのパッケージを取得し、インストールするだけです。詳細な設定はユーザが必要に応じて行います。 - -例えば、[`mod_authnz_external`][] Apacheモジュールをインストールするには、'mod_authnz_external'の名前を使って定義タイプを宣言します。 - -``` puppet -apache::mod { 'mod_authnz_external': } -``` - -この方法でApacheモジュールを定義する際には、いくつかのオプションパラメータを指定できます。詳細については、[定義タイプのリファレンス][`apache::mod`]を参照してください。 - -### PHPファイルを処理するFastCGIサーバの設定 - -[`apache::fastcgi::server`][]定義タイプを追加すれば、 [FastCGI][]サーバで特定のファイルに関するリクエストを処理することができます。以下の例では、PHPリクエストを処理するFastCGIサーバをポート9000の127.0.0.1 (ローカルホスト)で定義しています。 - -``` puppet -apache::fastcgi::server { 'php': - host => '127.0.0.1:9000', - timeout => 15, - flush => false, - faux_path => '/var/www/php.fcgi', - fcgi_alias => '/php.fcgi', - file_type => 'application/x-httpd-php' -} -``` - -[`custom_fragment`][]パラメータを使えば、指定したファイルタイプがFastCGIサーバで処理されるように、バーチャルホストを設定することができます。 - -``` puppet -apache::vhost { 'www': - ... - custom_fragment => 'AddType application/x-httpd-php .php' - ... -} -``` - -### ロードバランシングの例 - -Apacheは、[`mod_proxy`][] Apacheモジュールを通じて、複数のグループのサーバにわたるロードバランシングをサポートしています。Puppetでは、[`apache::balancer`][]および[`apache::balancermember`][]定義タイプにより、Apacheロードバランシンググループ(バランサクラスタとも呼ばれます)をサポートしています。 - -[エクスポートリソース][]でロードバランシングを有効にするには、[`apache::balancermember`][]定義タイプをロードバランサメンバーサーバからエクスポートします。 - -``` puppet -@@apache::balancermember { "${::fqdn}-puppet00": - balancer_cluster => 'puppet00', - url => "ajp://${::fqdn}:8009", - options => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'], -} -``` - -次に、プロキシサーバでロードバランシンググループを作成します。 - -``` puppet -apache::balancer { 'puppet00': } -``` - -リソースをエクスポートせずにロードバランシングを有効にするには、プロキシサーバで以下を宣言します。 - -``` puppet -apache::balancer { 'puppet00': } - -apache::balancermember { "${::fqdn}-puppet00": - balancer_cluster => 'puppet00', - url => "ajp://${::fqdn}:8009", - options => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'], -} -``` - -次に、プロキシサーバで`apache::balancer`および`apache::balancermember`定義タイプを宣言します。 - -バランサで[ProxySet](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset)ディレクティブを使うには、`apache::balancer`の[`proxy_set`](#proxy_set)パラメータを使用します。 - -``` puppet -apache::balancer { 'puppet01': - proxy_set => { - 'stickysession' => 'JSESSIONID', - 'lbmethod' => 'bytraffic', - }, -} -``` - -ロードバランシングのスケジューラのアルゴリズム(`lbmethod`)は、[mod_proxy_balancerドキュメント](https://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html)に記載されています。 - -## リファレンス - -- [**パブリッククラス**](#public-classes) - - [クラス: apache](#class-apache) - - [クラス: apache::dev](#class-apachedev) - - [クラス: apache::vhosts](#class-apachevhosts) - - [クラス: apache::mod::\*](#classes-apachemodname) -- [**プライベートクラス**](#private-classes) - - [クラス: apache::confd::no_accf](#class-apacheconfdno_accf) - - [クラス: apache::default_confd_files](#class-apachedefault_confd_files) - - [クラス: apache::default_mods](#class-apachedefault_mods) - - [クラス: apache::package](#class-apachepackage) - - [クラス: apache::params](#class-apacheparams) - - [クラス: apache::service](#class-apacheservice) - - [クラス: apache::version](#class-apacheversion) -- [**パブリック定義タイプ**](#public-defined-types) - - [定義タイプ: apache::balancer](#defined-type-apachebalancer) - - [定義タイプ: apache::balancermember](#defined-type-apachebalancermember) - - [定義タイプ: apache::custom_config](#defined-type-apachecustom_config) - - [定義タイプ: apache::fastcgi::server](#defined-type-fastcgi-server) - - [定義タイプ: apache::listen](#defined-type-apachelisten) - - [定義タイプ: apache::mod](#defined-type-apachemod) - - [定義タイプ: apache::namevirtualhost](#defined-type-apachenamevirtualhost) - - [定義タイプ: apache::vhost](#defined-type-apachevhost) - - [定義タイプ: apache::vhost::custom](#defined-type-apachevhostcustom) -- [**プライベート定義タイプ**](#private-defined-types) - - [定義タイプ: apache::default_mods::load](#defined-type-default_mods-load) - - [定義タイプ: apache::peruser::multiplexer](#defined-type-apacheperusermultiplexer) - - [定義タイプ: apache::peruser::processor](#defined-type-apacheperuserprocessor) - - [定義タイプ: apache::security::file_link](#defined-type-apachesecurityfile_link) -- [**テンプレート**](#templates) - -### パブリッククラス - -#### クラス: `apache` - -システムでのApacheの基本的な設定とインストールをガイドします。 - -デフォルトオプションを用いてこのクラスを宣言すると、Puppetでは以下が実行されます。 - -- オペレーティングシステムに適したApacheソフトウェアパッケージおよび[必要なApacheモジュール](#default_mods)をインストールします。 -- [デフォルトロケーション](#conf_dir)を用いて、ディレクトリ内に必要な設定ファイルを配置します。デフォルトロケーションは、オペレーティングシステムによって異なります。 -- デフォルトのバーチャルホストおよび標準的なポート('80')とアドレス('\*')のバインディングを用いてサーバを設定します。 -- ドキュメントルートディレクトリを作成します。オペレーティングシステムによって異なりますが、通常は`/var/www`です。 -- Apacheサービスを開始します。 - -ここでは、デフォルトの`apache`クラスを宣言するだけです。 - -``` puppet -class { 'apache': } -``` - -##### `allow_encoded_slashes` - -[`AllowEncodedSlashes`][]宣言のサーバデフォルトを設定します。これにより、'\'および'/'を含むURLに対する応答が変更されます。このパラメータを指定しない場合、サーバの設定でこの宣言が省かれ、Apacheのデフォルト設定'off'が使用されます。 - -値: 'on'、'off'、'nodecode'。 - -デフォルト値: `undef`。 - -##### `apache_version` - -使用するApacheのバージョンを定義し、モジュールテンプレートの挙動、パッケージ名、デフォルトのApacheモジュールを設定します。このパラメータを理由なく手動で設定することは、推奨していません。 - -デフォルト値: [`apache::version`][]クラスにより検出されたオペレーティングシステムとリリースバージョンによって異なります。 - -##### `conf_dir` - -Apacheサーバのメイン設定ファイルを置くディレクトリを設定します。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian**: `/etc/apache2` -- **FreeBSD**: `/usr/local/etc/apache22` -- **Gentoo**: `/etc/apache2` -- **Red Hat**: `/etc/httpd/conf` - -##### `conf_template` - -メインのApache設定ファイルで使用される[テンプレート][]を定義します。apacheモジュールは、`conf.d`エントリによりカスタマイズされた最小限の設定ファイルを使用するように設計されているため、このパラメータの変更には潜在的なリスクが伴います。 - -デフォルト値: `apache/httpd.conf.erb`。 - -##### `confd_dir` - -Apacheサーバのカスタム設定ディレクトリの場所を設定します。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian**: `/etc/apache2/conf.d` -- **FreeBSD**: `/usr/local/etc/apache22` -- **Gentoo**: `/etc/apache2/conf.d` -- **Red Hat**: `/etc/httpd/conf.d` - -##### `default_charset` - -メイン設定ファイルで[`AddDefaultCharset`][]ディレクティブとして使用されます。 - -デフォルト値: `undef`。 - -##### `default_confd_files` - -[`confd_dir`][]パラメータにより定義されるディレクトリに、インクルード可能なApache設定ファイルのデフォルトセットを生成するかどうかを決定します。この設定ファイルは、サーバのオペレーティングシステムにApacheパッケージとともに通常インストールされるものに相当します。 - -ブーリアン。 - -デフォルト値: `true`。 - -##### `default_mods` - -オペレーティングシステムに応じたデフォルトの[Apacheモジュール][]のセットを設定して有効にするかどうかを決定します。 - -`false`の場合、Puppetはオペレーティングシステム上でHTTPデーモンを機能させるのに必要なApacheモジュールのみを含めます。[`apache::mod::`][]クラスまたは[`apache::mod`][]定義タイプを使えば、他のモジュールを個別に宣言することができます。 - -`true`の場合、Puppetはオペレーティングシステムと [`apache_version`][]および[`mpm_module`][]パラメータの値に応じて、その他のモジュールもインストールします。このモジュールリストは頻繁に変更されるので、最新のリストについては[Puppetモジュールのコード][]を参照してください。 - -このパラメータに配列が含まれる場合、Puppetは渡されたすべてのApacheモジュールを有効にします。 - -値: ブーリアンまたはApacheモジュール名の配列。 - -デフォルト値: `true`。 - -##### `default_ssl_ca` - -Apacheサーバのデフォルトの証明書認証局を設定します。 - -デフォルト値を使えばApacheサーバは機能しますが、本稼働環境にこのサーバをデプロイする前に、各自の認証局情報を用いてこのパラメータを更新する**必要があります**。 - -ブーリアン。 - -デフォルト値: `undef`。 - -##### `default_ssl_cert` - -[SSL暗号化][]証明書の保存場所を設定します。 - -デフォルト値を使えばApacheサーバは機能しますが、本稼働環境にこのサーバをデプロイする前に、各自の証明書ロケーション情報を用いてこのパラメータを更新する**必要があります**。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian**: `/etc/ssl/certs/ssl-cert-snakeoil.pem` -- **FreeBSD**: `/usr/local/etc/apache22/server.crt` -- **Gentoo**: `/etc/ssl/apache2/server.crt` -- **Red Hat**: `/etc/pki/tls/certs/localhost.crt` - -##### `default_ssl_chain` - -デフォルトの[SSLチェーン][]の保存場所を設定します。 - -デフォルト値を使えばApacheサーバは機能しますが、本稼働環境にこのサーバをデプロイする前に、各自のSSLチェーンを用いてこのパラメータを更新する**必要があります**。 - -デフォルト値: `undef`。 - -##### `default_ssl_crl` - -使用するデフォルトの[証明書失効リスト][] (CRL)ファイルのパスを設定します。 - -デフォルト値を使えばApacheサーバは機能しますが、本稼働環境にこのサーバをデプロイする前に、CRLファイルパスを用いてこのパラメータを更新する**必要があります**。このパラメータは、[`default_ssl_crl_path`][]とともに使用することも、その代わりに使用することもできます。 - -デフォルト値: `undef`。 - -##### `default_ssl_crl_path` - -サーバの[証明書失効リストパス][]を設定します。これにはCRLが含まれます。 - -デフォルト値を使えばApacheサーバは機能しますが、本稼働環境でこのサーバをデプロイする前に、CRLファイルパスを用いてこのパラメータを更新する**必要があります**。 - -デフォルト値: `undef`。 - -##### `default_ssl_crl_check` - -[`SSLCARevocationCheck`][]ディレクティブを通じてデフォルトの証明書失効チェックレベルを設定します。このパラメータはApache 2.4以上にのみ適用され、それ以前のバージョンでは無視されます。 - -デフォルト値を使えばApacheサーバは機能しますが、本稼働環境で証明書失効リストを使用する際には、このパラメータを指定する**必要があります**。 - -デフォルト値: `undef`。 - -##### `default_ssl_key` - -[SSL証明書キーファイル][]の保存場所を設定します。 - -デフォルト値を使えばApacheサーバは機能しますが、本稼働環境にこのサーバをデプロイする前に、各自のSSLキーのロケーションを用いてこのパラメータを更新する**必要があります**。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian**: `/etc/ssl/private/ssl-cert-snakeoil.key` -- **FreeBSD**: `/usr/local/etc/apache22/server.key` -- **Gentoo**: `/etc/ssl/apache2/server.key` -- **Red Hat**: `/etc/pki/tls/private/localhost.key` - - -##### `default_ssl_vhost` - -デフォルトの[SSL][SSL暗号化]バーチャルホストを設定します。 - -`true`の場合、Puppetは [`apache::vhost`][]定義タイプを用いて、以下のバーチャルホストを自動的に設定します。 - -```puppet -apache::vhost { 'default-ssl': - port => 443, - ssl => true, - docroot => $docroot, - scriptalias => $scriptalias, - serveradmin => $serveradmin, - access_log_file => "ssl_${access_log_file}", - } -``` - -> **注意**: SSLバーチャルホストはHTTPSクエリにのみ応答します。 - - -ブーリアン。 - -デフォルト値: `false`。 - -##### `default_type` - -_Apache 2.2のみ_。サーバが他の方法で適切な`content-type`を決定できない場合に送信される[MIME `content-type`][]を設定します。このディレクティブはApache 2.4以降では廃止予定になっており、設定ファイルの下位互換性確保の目的でのみ使われます。 - -デフォルト値: `undef`。 - -##### `default_vhost` - -クラスが宣言された際にデフォルトのバーチャルホストを設定します。 - -[カスタマイズしたバーチャルホスト][バーチャルホストの設定]を設定するには、このパラメータの値を`false`に設定します。 - -> **注意**: 少なくとも1つのバーチャルホストがなければ、Apacheは起動しません。このパラメータを`false`に設定する場合は、別の場所でバーチャルホストを設定する必要があります。 - -ブーリアン。 - -デフォルト値: `true`。 - -##### `dev_packages` - -使用する固有devパッケージを設定します。 - -値: 文字列または文字列の配列。 - -IUS yumリポジトリからhttpd 2.4を使用する例: - -``` puppet -include ::apache::dev -class { 'apache': - apache_name => 'httpd24u', - dev_packages => 'httpd24u-devel', -} -``` - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Red Hat:** 'httpd-devel' -- **Debian 8/Ubuntu 13.10以降:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev'] -- **それ以前のDebian/Ubuntuバージョン:** ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev'] -- **FreeBSD, Gentoo:** `undef` -- **Suse:** ['libapr-util1-devel', 'libapr1-devel'] - -##### `docroot` - -デフォルトの[`DocumentRoot`][]の場所を設定します。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian**: `/var/www/html` -- **FreeBSD**: `/usr/local/www/apache22/data` -- **Gentoo**: `/var/www/localhost/htdocs` -- **Red Hat**: `/var/www/html` - -##### `error_documents` - -Apacheサーバの[カスタムエラードキュメント][]を有効にするかどうかを決定します。 - -ブーリアン。 - -デフォルト値: `false`。 - -##### `group` - -リクエストに応答するために生成されるApacheプロセスを所有するグループIDを設定します。 - -デフォルトでは、Puppetはこのグループを`apache`クラスの下のリソースとして管理するよう試み、[`apache::params`][]クラスにより検出されたオペレーティングシステムに基づいてグループを決定します。このグループリソースを作成せずに、別のPuppetモジュールで作成されたグループを使用するには、[`manage_group`][]パラメータの値を`false`に設定します。 - -> **注意**: このパラメータを修正すると、Apacheが子プロセスを生成してリソースにアクセスする際に使用するグループIDのみが変更されます。親サーバプロセスを所有するユーザは変更されません。 - -##### `httpd_dir` - -Apacheサーバの基本設定ディレクトリを設定します。これは、特別に再パッケージされたApacheサーバビルドにおいて、デフォルトのディストリビューションパッケージと組み合わせると意図せぬ結果が生じる可能性がある場合に役立ちます。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian**: `/etc/apache2` -- **FreeBSD**: `/usr/local/etc/apache22` -- **Gentoo**: `/etc/apache2` -- **Red Hat**: `/etc/httpd` - -##### `http_protocol_options` - -HTTPプロトコルチェックの厳密さを指定します。 - -有効なオプション: 以下の値の選択肢のシーケンス: `Strict`または`Unsafe`、`RegisteredMethods`または`LenientMethods`、`Allow0.9`または`Require1.0`。 - -デフォルト '`Strict LenientMethods Allow0.9`'。 - -##### `keepalive` - -[`KeepAlive`][]ディレクティブによってHTTPの持続的接続を有効にするかどうかを決定します。 'On'に設定する場合は、[`keepalive_timeout`][]および[`max_keepalive_requests`][]パラメータを使って関連オプションを設定してください。 - -値: 'Off', 'On'。 - -デフォルト値: 'Off'。 - -##### `keepalive_timeout` - -[`KeepAliveTimeout`]ディレクティブによって、HTTPの持続的接続でApacheサーバが後続のリクエストを行うまでの待機時間を設定します。このパラメータが意味を持つのは、[`keepalive` parameter][]を有効にしている場合のみです。 - -デフォルト値: '15'。 - -##### `max_keepalive_requests` - -[`keepalive` parameter][]が有効の場合に、1回の接続で許可されるリクエストの数を制限します。 - -デフォルト値: '100'。 - -##### `lib_path` - -[Apacheモジュール][Apacheモジュール]ファイルの保存場所を指定します。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian**および**Gentoo**: `/usr/lib/apache2/modules` -- **FreeBSD**: `/usr/local/libexec/apache24` -- **Red Hat**: `modules` - -> **注意**: このパラメータは、特別な理由がない限り手動で設定しないでください。 - -##### `log_level` - -エラーログの詳細レベルを変更します。値: 'alert'、'crit'、'debug'、'emerg'、'error'、'info'、'notice'、'warn'。 - -デフォルト値: 'warn'。 - -##### `log_formats` - -追加の[`LogFormat`][]ディレクティブを定義します。値: [ハッシュ][]、例: - -``` puppet -$log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' } -``` - -Puppetの作成する`httpd.conf`には、以下のような複数の`LogFormats`が事前定義されています。 - -``` httpd -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %b" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent -LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded -``` - -定義した`log_formats`パラメータに上記のいずれかが含まれる場合は、**ユーザの**定義により上書きされます。 - -##### `logroot` - -バーチャルホストのApacheログファイルのディレクトリを変更します。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian**: `/var/log/apache2` -- **FreeBSD**: `/var/log/apache22` -- **Gentoo**: `/var/log/apache2` -- **Red Hat**: `/var/log/httpd` - -##### `logroot_mode` - -デフォルトの[`logroot`][]ディレクトリをオーバーライドします。 - -> **注意**: 影響を把握できない場合は、ログが保存されているディレクトリへの書き込みアクセス権限を付与_しないで_ください。詳細については、[Apacheドキュメント][ログセキュリティ]を参照してください。 - -デフォルト値: `undef`。 - -##### `manage_group` - -`false`の場合、Puppetではグループリソースは作成されません。 - -別のPuppetモジュールで作成されたグループをApacheの実行に使用する場合は、この値を`false`に設定してください。このパラメータを設定せずに過去に作成されたグループを使用しようとすると、重複リソースエラーが生じます。 - -ブーリアン。 - -デフォルト値: `true`。 - -##### `supplementary_groups` - -ユーザの所属するグループのリスト。主要グループに加えて設定する場合に使用します。 - -デフォルト値: 追加グループなし。 - -注意: このオプションは、`manage_user`がtrueに設定されている場合のみ有効です。 - -##### `manage_user` - -`false`の場合、Puppetではユーザリソースが作成されません。 - -このパラメータは、別のPuppetモジュールで作成されたユーザをApache実行に使用する場合などに使用します。このパラメータを設定せずに過去に作成されたユーザを使用しようとすると、重複リソースエラーが生じます。 - -ブーリアン。 - -デフォルト値: `true`。 - -##### `mod_dir` - -Puppetが[Apacheモジュール][]の設定ファイルを置く場所を設定します。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian**: `/etc/apache2/mods-available` -- **FreeBSD**: `/usr/local/etc/apache22/Modules` -- **Gentoo**: `/etc/apache2/modules.d` -- **Red Hat**: `/etc/httpd/conf.d` - -##### `mod_packages` - -デフォルトのモジュールパッケージ名をユーザがオーバーライドすることを許可します。 - -```puppet -include apache::params -class { 'apache': - mod_packages => merge($::apache::params::mod_packages, { - 'auth_kerb' => 'httpd24-mod_auth_kerb', - }) -} -``` - -ハッシュ。デフォルト値: `$apache::params::mod_packages`。 - -##### `mpm_module` - -HTTPDプロセスに関してロードおよび設定する[マルチプロセッシングモジュール][] (MPM)を決定します。値: 'event'、'itk'、'peruser'、'prefork'、'worker'、`false`。 - -カスタムパラメータを用いて以下のクラスを明示的に宣言するためには、このパラメータを`false`に設定する必要があります。 - -- [`apache::mod::event`][] -- [`apache::mod::itk`][] -- [`apache::mod::peruser`][] -- [`apache::mod::prefork`][] -- [`apache::mod::worker`][] - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian**: 'worker' -- **FreeBSD、Gentoo、Red Hat**: 'prefork' - -##### `package_ensure` - -`package`リソースの[`ensure`][]属性を制御します。値: 'absent'、'installed' (またはそれに相当する'present')、またはバージョン文字列。 - -デフォルト値: 'installed'。 - -##### `pidfile` - -pidファイルのカスタムロケーションの設定を許可します。カスタムビルトのApache rpmを使用する場合に役立ちます。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian:** '\${APACHE_PID_FILE}' -- **FreeBSD:** '/var/run/httpd.pid' -- **Red Hat:** 'run/httpd.pid' - -##### `ports_file` - -Apacheポート設定を含むファイルのパスを設定します。 - -デフォルト値: '{$conf_dir}/ports.conf'。 - -##### `purge_configs` - -他のすべてのApache設定およびバーチャルホストを削除します。 - -このパラメータを`false`に設定すると、一時的な対策として、既存の設定や管理されていない設定をApacheモジュールと共存させることができます。この場合、設定をこのモジュール内のリソースに移すことを推奨します。バーチャルホストの設定については、[`purge_vhost_dir`][]を参照してください。 - -ブーリアン。 - -デフォルト値: `true`。 - -##### `purge_vhost_dir` - -[`vhost_dir`][]パラメータの値が[`confd_dir`][]パラメータの値と異なる場合は、このパラメータにより、Puppetにより管理されて_いない_`vhost_dir`内の設定を削除するかどうかが決定されます。 - -`purge_vhost_dir`を`false`に設定すると、一時的な対策として、`vhost_dir`内の既存の設定や管理されていない設定をapacheモジュールと共存させることができます。 - -ブーリアン。 - -デフォルト値: [`purge_configs`][]と同じ。 - -##### `rewrite_lock` - -リライトロックのカスタムロケーションの設定を可能にします。これは、バーチャルホストの[`rewrites`][]パラメータでタイプprgのRewriteMapを使用している場合のベストプラクティスとされています。このパラメータは、Apacheバージョン2.2以前のみに適用され、それよりも新しいバージョンでは無視されます。 - -デフォルト値: `undef`。 - -##### `sendfile` - -[`EnableSendfile`][]ディレクティブで静的ファイルをサーブする際に、ApacheがLinuxカーネルの`sendfile`サポートを使用するようにします。値: 'On'、'Off'。 - -デフォルト値: 'On'。 - -##### `serveradmin` - -Apacheの[`ServerAdmin`][]ディレクティブでApacheサーバ管理者の連絡先情報を設定します。 - -デフォルト値: 'root@localhost'。 - -##### `servername` - -Apacheの[`ServerName`][]ディレクティブでApacheサーバ名を設定します。 - -`false`に設定すると、ServerNameは設定されません。 - -デフォルト値: [Facter][]により報告された'fqdn' fact。 - -##### `server_root` - -Apacheの[`ServerRoot`][]ディレクティブでApacheサーバのルートを設定します。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian**: `/etc/apache2` -- **FreeBSD**: `/usr/local` -- **Gentoo**: `/var/www` -- **Red Hat**: `/etc/httpd` - -##### `server_signature` - -Apacheの[`ServerSignature`][]ディレクティブで、エラードキュメントや一部の[Apacheモジュール][]のアウトプットなどの、サーバ生成ドキュメントの下部に表示される末尾のフッタの行を設定します。値: 'Off'、'On'。 - -デフォルト値: 'On'。 - -##### `server_tokens` - -Apacheの[`ServerTokens`][]ディレクティブで、Apacheからブラウザに送信される、Apacheやオペレーティングシステムに関する情報の量を制御します。 - -デフォルト値: 'OS'。 - -##### `service_enable` - -システムの起動時にPuppetがApache HTTPDサービスを有効にするかどうかを決定します。 - -ブーリアン。 - -デフォルト値: `true`。 - -##### `service_ensure` - -サービスが稼働していることをPuppetが確認するかどうかを決定します。値: `true` (または'running')、`false` (または'stopped')。 - -値を`false`または'stopped'にすると、'httpd'サービスリソースの`ensure`パラメータが`false`に設定されます。この設定は、Pacemakerなどの別のアプリケーションでサービスを管理する場合に役立ちます。 - -デフォルト値: 'running'。 - -##### `service_name` - -Apacheサービスの名前を設定します。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **DebianおよびGentoo**: 'apache2' -- **FreeBSD**: 'apache22' -- **Red Hat**: 'httpd' - -##### `service_manage` - -PuppetでHTTPDサービスの状態を管理するかどうかを決定します。 - -ブーリアン。 - -デフォルト値: `true`。 - -##### `service_restart` - -HTTPDサービスの再起動にあたり、Puppetが特定のコマンドを使用するかどうかを決定します。 - -値: Apacheサービスを再起動するためのコマンド。デフォルト設定では、 [デフォルトのPuppet挙動][サービス属性リスタート]が使われます。 - -デフォルト値: `undef`。 - -##### `ssl_ca` - -SSL証明書認証局を指定します。[SSLCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcacertificatefile)を使用してSSLクライアント認証で使用する証明書を確認します。 - -これはバーチャルホストレベルでオーバーライドすることが可能です。 - -デフォルト値: `undef`。 - - -##### `timeout` - -Apacheの[`TimeOut`][]ディレクティブを設定します。このディレクティブは、一部のイベントに関してリクエスト履行を止めるまでの Apacheの待機秒数を定義します。 - -デフォルト値: 120。 - -##### `trace_enable` - -[`TraceEnable`][]ディレクティブで、Apacheが`TRACE`リクエスト([RFC 2616][]ごと)をどのように処理するかを制御します。 - -値: 'Off', 'On'。 - -デフォルト値: 'On'。 - -##### `use_systemd` - -systemdモジュールをCentos 7サーバにインストールするかどうかを制御します。これは、カスタムビルトのRPMを使用している場合は特に役立ちます。 - -ブーリアン。 - -デフォルト値: `true`。 - -##### `file_mode` - -設定ファイルの許可モードを設定します。 - -値: 文字列、記号表記法または数字表記法での許可モード。 - -デフォルト値: '0644'。 - -##### `root_directory_options` - -httpd.confの/ディレクトリで指定するオプションの配列。 - -デフォルト値: 'FollowSymLinks'。 - -##### `root_directory_secured` - -httpd.confの/ディレクトリについて、デフォルトのアクセスポリシーを設定します。`false`にすると、特定のアクセスポリシーがないすべてのリソースへのアクセスが許可されます。 `true`にするとデフォルトですべてのリソースへのアクセスが拒否されます。`true`の場合、リソースへのアクセスを許可するには、具体的なルールを使用する必要があります([`directories`](#parameter-directories-for-apachevhost)パラメータを用いたディレクトリブロックなどで)。 - -ブーリアン。 - -デフォルト値: `false`。 - -##### `vhost_dir` - -バーチャルホストの設定ファイルの保存場所を変更します。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian**: `/etc/apache2/sites-available` -- **FreeBSD**: `/usr/local/etc/apache22/Vhosts` -- **Gentoo**: `/etc/apache2/vhosts.d` -- **Red Hat**: `/etc/httpd/conf.d` - -##### `vhost_include_pattern` - -`vhost_dir`に含まれるファイルのパターンを定義します。 - -`[^.#]\*.conf[^~]`などの値に設定すると、このディレクトリで偶発的に作成されたファイル(バージョン管理システムやエディタのバックアップにより作成されたファイルなど)がサーバ設定に*含まれなく*なります。 - -デフォルト値: '*'。 - -一部のオペレーティングシステムでは、`*.conf`の値が使用されます。デフォルトでは、このモジュールは`.conf`で終わる設定ファイルを作成します。 - -##### `user` - -Apacheがリクエストの応答に使用するユーザを変更します。Apacheの親プロセスは引き続きルートとして稼働しますが、子プロセスはこのパラメータで定義されたユーザとしてリソースにアクセスします。Puppetがこのユーザを管理しないようにするには、[`manage_user`][]パラメータを`false`に設定します。 - -デフォルト値: [`apache::params`][]クラスにより設定されたユーザに依存します。これはオペレーティングシステムによって異なります。 - -- **Debian**: 'www-data' -- **FreeBSD**: 'www' -- **Gentoo**および**Red Hat**: 'apache' - -Puppetがこのユーザを管理しないようにするには、[`manage_user`][]パラメータをfalseに設定します。 - -##### `apache_name` - -インストールするApacheパッケージの名前。Red Hatのソフトウェアコレクションのパッケージなど、標準的ではないApacheパッケージを使用している場合は、デフォルト設定をオーバーライドする必要があるかもしれません。 - -デフォルト値: [`apache::params`][]クラスにより設定されたユーザに依存します。これはオペレーティングシステムによって異なります。 - -- **Debian**: 'apache2' -- **FreeBSD**: 'apache24' -- **Gentoo**: 'www-servers/apache' -- **Red Hat**: 'httpd' - -##### `error_log` - -メインサーバインスタンスのエラーログファイルの名前。`/`、`|`、または`syslog`で始まる文字列の場合、フルパスが設定されます。それ以外の場合は、ファイル名の先頭に`$logroot`がつきます。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian**: 'error.log' -- **FreeBSD**: 'httpd-error.log' -- **Gentoo**: 'error.log' -- **Red Hat**: 'error_log' -- **Suse**: 'error.log' - -##### `scriptalias` - -グローバルスクリプトエイリアスに使用するディレクトリ。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian**: '/usr/lib/cgi-bin' -- **FreeBSD**: '/usr/local/www/apache24/cgi-bin' -- **Gentoo**: 'var/www/localhost/cgi-bin' -- **Red Hat**: '/var/www/cgi-bin' -- **Suse**: '/usr/lib/cgi-bin' - -##### `access_log_file` - -メインサーバインスタンスのアクセスログファイルの名前。 - -デフォルト値: オペレーティングシステムによって異なります。 - -- **Debian**: 'error.log' -- **FreeBSD**: 'httpd-access.log' -- **Gentoo**: 'access.log' -- **Red Hat**: 'access_log' -- **Suse**: 'access.log' - -#### クラス: `apache::dev` - -Apache開発ライブラリをインストールします。 - -デフォルト値: オペレーティングシステムによって異なります。使用するオペレーティングシステムに基づく、[`apache::params`][]クラスの[`dev_packages`][]パラメータ。 - -- **Debian**: Ubuntu 13.10およびDebian 8では'libaprutil1-dev'、'libapr1-dev'、'apache2-dev'。その他のバージョンでは'apache2-prefork-dev'。 -- **FreeBSD**: `undef`; FreeBSDでは、`apache::dev`を宣言する前に`apache::package`または`apache`クラスを宣言する必要があります。 -- **Gentoo**: `undef` -- **Red Hat**: 'httpd-devel' - -#### クラス: `apache::vhosts` - -[`apache::vhost`][]定義タイプを作成します。 - -**パラメータ**: - -* `vhosts`: [`apache::vhost`][]定義タイプのパラメータを指定します。 - - 値: [ハッシュ][]、キーは名前を表し、値は[`apache::vhost`][]定義タイプのパラメータの[ハッシュ][]を表します。 - - デフォルト値: '{}'。 - - > **注意**: すべてのバーチャルホストのパラメータのリストや[バーチャルホストの設定]については、[`apache::vhost`][]定義タイプのリファレンスを参照してください。 - - 例えば、[名前ベースのバーチャルホスト][名前ベースのバーチャルホスト]のcustom_vhost_1を作成するには、`vhosts`パラメータを'{ "custom_vhost_1" => { "docroot" => "/var/www/custom_vhost_1", "port" => "81" }'に設定し、このクラスを宣言します。 - -``` puppet -class { 'apache::vhosts': - vhosts => { - 'custom_vhost_1' => { - 'docroot' => '/var/www/custom_vhost_1', - 'port' => '81', - }, - }, -} -``` - -#### クラス: `apache::mod::` - -指定した[Apacheモジュール][]を有効にします。Apacheモジュールを有効にして設定するには、このクラスを宣言します。 - -例えば、アイコンなしで[`mod_alias`][]をインストールして有効にするには、`icons_options`パラメータをNone'に設定して[`apache::mod::alias`][]クラスを宣言します。 - -``` puppet -class { 'apache::mod::alias': - icons_options => 'None', -} -``` - -以下のApacheモジュールにはサポートするクラスがあり、その多くは、パラメータ化された設定が可能です。[`apache::mod`][]定義タイプを使えば、他のApacheモジュールをインストールできます。 - -* `actions` -* `alias` ([`apache::mod::alias`][]参照) -* `auth_basic` -* `auth_cas`\* ([`apache::mod::auth_cas`][]参照) -* `auth_mellon`\* ([`apache::mod::auth_mellon`][]参照) -* `auth_kerb` -* `authn_core` -* `authn_dbd`\* ([`apache::mod::authn_dbd`][]参照) -* `authn_file` -* `authnz_ldap`\* ([`apache::mod::authnz_ldap`][]参照) -* `authnz_pam` -* `authz_default` -* `authz_user` -* `autoindex` -* `cache` -* `cgi` -* `cgid` -* `cluster` ([`apache::mod::cluster`][]参照) -* `dav` -* `dav_fs` -* `dav_svn`\* -* `dbd` -* `deflate\` -* `dev` -* `dir`\* -* `disk_cache` ([`apache::mod::disk_cache`][]参照) -* `dumpio` ([`apache::mod::dumpio`][]参照) -* `env` -* `event` ([`apache::mod::event`][]参照) -* `expires` -* `ext_filter` ([`apache::mod::ext_filter`][]参照) -* `fastcgi` -* `fcgid` -* `filter` -* `geoip` ([`apache::mod::geoip`][]参照) -* `headers` -* `include` -* `info`\* -* `intercept_form_submit` -* `itk` -* `jk` ([`apache::mod::jk`]参照) -* `ldap` ([`apache::mod::ldap`][]参照) -* `lookup_identity` -* `macro` ([`apache:mod:macro`][]参照) -* `mime` -* `mime_magic`\* -* `negotiation` -* `nss`\* ([`apache::mod::nss`][]参照) -* `pagespeed` ([`apache::mod::pagespeed`][]参照) -* `passenger`\* ([`apache::mod::passenger`][]参照) -* `perl` -* `peruser` -* `php` ([`mpm_module`][]を`prefork`に設定する必要があります) -* `prefork`\* -* `proxy`\* ([`apache::mod::proxy`][]参照) -* `proxy_ajp` -* `proxy_balancer`\* ([`apache::mod::proxy_balancer`][]参照) -* `proxy_balancer` -* `proxy_html` ([`apache::mod::proxy_html`][]参照) -* `proxy_http` -* `python` -* `reqtimeout` -* `remoteip`\* -* `rewrite` -* `rpaf`\* -* `setenvif` -* `security` -* `shib`\* ([`apache::mod::shib`]参照) -* `speling` -* `ssl`\* ([`apache::mod::ssl`][]参照) -* `status`\* ([`apache::mod::status`][]参照) -* `suphp` -* `userdir`\* ([`apache::mod::userdir`][]参照) -* `version` -* `vhost_alias` -* `worker`\* -* `wsgi` ([`apache::mod::wsgi`][]参照) -* `xsendfile` - -モジュールに付いている*のマークは、設定やモジュールを設定するためのパラメータが含まれるテンプレートがあることを示しています。ほとんどのApacheモジュールクラスパラメータにはデフォルト値があり、設定は必要ありません。 テンプレートのあるモジュールについては、Puppetでモジュールとともにテンプレートファイルがインストールされます。これらのテンプレートファイルは、モジュールが機能するために必要です。 - -##### クラス: `apache::mod::alias` - -[`mod_alias`][]をインストールして管理します。 - -**パラメータ**:　 - -* `icons_options`: Apache [`Options`]ディレクティブにより、アイコンディレクトリのディレクトリリスティングを無効にします。 - - デフォルト値: 'Indexes MultiViews'。 - -* `icons_path`: `/icons/`エイリアスのローカルパスを設定します。 - - デフォルト値: オペレーティングシステムによって異なります。 - - * **Debian**: `/usr/share/apache2/icons` - * **FreeBSD**: `/usr/local/www/apache24/icons` - * **Gentoo**: `/var/www/icons` - * *Red Hat**: `/var/www/icons`、ただし、Apache 2.4は`/usr/share/httpd/icons` - -#### クラス: `apache::mod::disk_cache` - -Apache 2.2に[`mod_disk_cache`][]、またはApache 2.4に[`mod_cache_disk`][]をインストールして設定します。 - -デフォルト値: Apacheバージョンとオペレーティングシステムによって異なります。 - -- **Debian**: `/var/cache/apache2/mod_cache_disk` -- **FreeBSD**: `/var/cache/mod_cache_disk` -- **Red Hat、Apache 2.4**: `/var/cache/httpd/proxy` -- **Red Hat、Apache 2.2**: `/var/cache/mod_proxy` - -キャッシュルートを指定するには、パスを文字列として`cache_root`パラメータに渡します。 - -``` puppet -class {'::apache::mod::disk_cache': - cache_root => '/path/to/cache', -} -``` - -##### クラス: `apache::mod::diskio` - -[`mod_diskio`][]をインストールして設定します。 - -```puppet -class{'apache': - default_mods => `false`, - log_level => 'dumpio:trace7', -} -class{'apache::mod::diskio': - disk_io_input => 'On', - disk_io_output => 'Off', -} -``` - -**パラメータ**:　 - -* `dump_io_input`: すべての入力データをエラーログにダンプします。 - - 値: 'On'、'Off'。　 - - デフォルト値: 'Off'。 - -* `dump_io_output`: すべての出力データをエラーログにダンプします。 - - 値: 'On'、'Off'。　 - - デフォルト値: 'Off'。 - -##### クラス: `apache::mod::event` - -[`mod_mpm_event`][]をインストールして管理します。同じサーバ上に、`apache::mod::event`と一緒に[`apache::mod::itk`][]、[`apache::mod::peruser`][]、[`apache::mod::prefork`][]、[`apache::mod::worker`][]を含めることはできません。 - -**パラメータ**:　 - -* `listenbacklog`: モジュールの[`ListenBackLog`][]ディレクティブでペンディング接続キューの最大長を設定します。`false`に設定すると、このパラメータが削除されます。 - - デフォルト値: '511'。 - -* `maxrequestworkers` (_Apache 2.3.12以前_: `maxclients`): モジュールの[`MaxRequestWorkers`][]ディレクティブで、Apacheが同時に処理できる接続の最大数を設定します。`false`に設定すると、このパラメータが削除されます。 - - デフォルト値: '150'。 - -* `maxconnectionsperchild` (_Apache 2.3.8以前_: `maxrequestsperchild`): モジュールの[`MaxConnectionsPerChild`][]ディレクティブで、子サーバが稼働中に処理する接続の数を制限します。`false`に設定すると、このパラメータが削除されます。 - - デフォルト値: '0'。 - -* `maxsparethreads` and `minsparethreads`: [`MaxSpareThreads`][]および[`MinSpareThreads`][]ディレクティブで、待機スレッドの最大数と最小数を設定します。`false`に設定すると、このパラメータが削除されます。 - - デフォルト値: それぞれ'75'および'25'。 - -* `serverlimit`: [`ServerLimit`][]ディレクティブで、プロセスの設定数を制限します。`false`に設定すると、このパラメータが削除されます。 - - デフォルト値: '25'。 - -* `startservers`: モジュールの[`StartServers`][]ディレクティブで、起動時に作成される子サーバプロセスの数を設定します。`false`に設定すると、このパラメータが削除されます。 - - デフォルト値: '2'。 - -* `threadlimit`: モジュールの[`ThreadLimit`][]ディレクティブで、イベントスレッドの数を制限します。`false`に設定すると、このパラメータが削除されます。 - - デフォルト値: '64'。 - -* `threadsperchild`: [`ThreadsPerChild`][]ディレクティブで、各子サーバにより作成されるスレッドの数を設定します。 - - デフォルト値: '25'。`false`に設定すると、このパラメータが削除されます。 - -##### クラス: `apache::mod::auth_cas` - -[`mod_auth_cas`][]をインストールして管理します。パラメータの名前はApacheモジュールのディレクティブと共通です。 - -`cas_login_url`および`cas_validate_url`パラメータは必須です。 その他のいくつかのパラメータのデフォルト値は`undef`です。 - -> **注意**: auth_casモジュールは、EPELにより提供される依存関係パッケージがなければ、RH/CentOSで使用できません。 [https://github.com/Jasig/mod_auth_cas]()を参照してください。 - -**パラメータ**:　 - -- `cas_attribute_prefix`: ヘッダを追加します。SAMLバリデーションが有効になっている場合には、このヘッダの値が属性値になります。 - - デフォルト値: CAS_。 - -- `cas_attribute_delimiter`:`cas_attribute_prefix`により作成されたヘッダの属性値の区切り文字。 - - デフォルト値: ,。 - -- `cas_authoritative`: オプションの認証ディレクティブを承認してバインドするかどうかを決定します。 - - デフォルト値: `undef`。 - -- `cas_certificate_path`: `cas_login_url`および`cas_validate_url`のサーバについて、証明書認証局のX509証明書へのパスを設定します。 - - デフォルト値: `undef`。 - -- `cas_cache_clean_interval`: キャッシュクリーニング時間の最小秒数を設定します。 - - デフォルト値: `undef`。 - -- `cas_cookie_domain`: `Set-Cookie` HTTPヘッダの`Domain=`パラメータの値を設定します。 - - デフォルト値: `undef`。 - -- `cas_cookie_entropy`: セッション識別子を作成する際に使用するバイト数を設定します。 - - デフォルト値: `undef`。 - -- `cas_cookie_http_only`: `mod_auth_cas`がクッキーを発行する際のオプションの`HttpOnly`フラグを設定します。 - - デフォルト値: `undef`。 - -- `cas_cookie_path`: casクッキーセッションデータの保存場所。Webサーバユーザによる書き込みを可能にする必要があります。 - - デフォルト値: OSによって異なります。 - -- `cas_cookie_path_mode`: `cas_cookie_path`のモード。 - - デフォルト値: '0750'。 - -- `cas_debug`: モジュールのデバッギングモードを有効にするかどうかを決定します。 - - デフォルト値: 'Off'。 - -- `cas_idle_timeout`: 待機タイムアウトの制限を秒数で設定します。 - - デフォルト値: `undef`。 - -- `cas_login_url`: **必須**。ユーザがCASで保護されたリソースへのアクセスを試み、かつアクティブなセッションがない場合に、モジュールがユーザをリダイレクトする先のURLを設定します。 - -- `cas_proxy_validate_url`: プロキシバリデーションを実施する際に使用するURL。 - - デフォルト値: `undef`。 - -- `cas_root_proxied_as`: このApacheサーバへのアクセスがプロキシされた場合に、エンドユーザに表示されるURLを設定します。 - - デフォルト値: `undef`。 - -- `cas_scrub_request_headers`: mod_auth_cas内で特別な意味を持つ可能性のあるインバウンドリクエストヘッダを削除します。 - -- `cas_sso_enabled`: シングルサインアウトの実験的サポートを有効にします(POSTデータが壊れる可能性があります)。 - - デフォルト値: 'Off'。 - -- `cas_timeout`: `mod_auth_cas`セッションのアクティブ状態を維持する時間(秒数)を制限します。 - - デフォルト値: `undef`。 - -- `cas_validate_depth`: チェーンされた証明書バリデーションの深さを制限します。 - - デフォルト値: `undef`。 - -- `cas_validate_saml`: SAMLに関するCASサーバからの解析応答。 - - デフォルト値: 'Off'。 - -- `cas_validate_server`: CASサーバの証明書をバリデーションするかどうか(1.1 - RedHat 7では廃止予定)。 - - デフォルト値: `undef`。 - -- `cas_validate_url`: **必須**。HTTPクエリ文字列でクライアントの提示するチケットをバリデーションする際に使用するURL。 - -- `cas_version`: 従うべきCASプロトコルバージョン。値: '1'、'2'。 - - デフォルト値: '2'。 - -- `suppress_warning`: RedHat上にいることを示す警告を表示しないようにします(`mod_auth_cas`パッケージは、現在はepel-testingレポジトリで使用できます)。 - - デフォルト値: `false`。 - -##### クラス: `apache::mod::auth_mellon` - -[`mod_auth_mellon`][]をインストールして管理します。パラメータの名前はApacheモジュールのディレクティブと共通です。 - -``` puppet -class{ 'apache::mod::auth_mellon': - mellon_cache_size => 101, -} -``` - -**パラメータ**:　 - -* `mellon_cache_entry_size`: 1回のセッションの最大サイズ。 - - デフォルト値: `undef`。 - -* `mellon_cache_size`: mellonキャッシュのサイズ、単位はメガバイト。 - - デフォルト値: 100。 - -* `mellon_lock_file`: ロックファイルの場所。 - - デフォルト値: '`/run/mod_auth_mellon/lock`'。 - -* `mellon_post_directory`: ポストリクエストが保存される場所のフルパス。 - - デフォルト値: '`/var/cache/apache2/mod_auth_mellon/`'。 - -* `mellon_post_ttl`: ポストリクエストの維持時間。 - - デフォルト値: `undef`。 - -* `mellon_post_size`: ポストリクエストの最大サイズ。 - - デフォルト値: `undef`。 - -* `mellon_post_count`: ポストリクエストの最大数。 - - デフォルト値: `undef`。 - -##### クラス: `apache::mod::authn_dbd` - -`mod_authn_dbd`をインストールし、`authn_dbd.conf.erb`テンプレートを使用して設定を生成します。オプションで、AuthnProviderAliasを作成します。 - -``` puppet -class { 'apache::mod::authn_dbd': - $authn_dbd_params => - 'host=db01 port=3306 user=apache password=xxxxxx dbname=apacheauth', - $authn_dbd_query => 'SELECT password FROM authn WHERE user = %s', - $authn_dbd_alias => 'db_auth', -} -``` - -**パラメータ**:　 - -* `authn_dbd_alias`: AuthnProviderAlias'の名前。 - -* `authn_dbd_dbdriver`: 使用するデータベースドライブを指定します。 - - デフォルト値: 'mysql'。 - -* `authn_dbd_exptime`: DBDExptimeに相当します。 - - デフォルト値: 300。 - -* `authn_dbd_keep`: DBDKeepに相当します。 - - デフォルト値: 8。 - -* `authn_dbd_max`: DBDMaxに相当します。 - - デフォルト値: 20。 - -* `authn_dbd_min`: DBDMinに相当します。 - - デフォルト値: 4。　 - -* `authn_dbd_params`: **必須**。接続文字列に関して、DBDParamsに相当します。 - -* `authn_dbd_query`: 認証に関してユーザとパスワードを問い合わせるかどうか。 - -##### クラス: `apache::mod::authnz_ldap` - -`mod_authnz_ldap`をインストールし、`authnz_ldap.conf.erb`テンプレートを使用して設定を生成します。 - -**パラメータ**:　 - -* `package_name`: パッケージの名前。 - - デフォルト値: `undef`。 - -* `verify_server_cert`: サーバの証明書を確認するかどうか。 - - デフォルト値: `undef`。 - -##### クラス: `apache::mod::cluster` - -**注意**: `mod_cluster`に関して提供されている公式なパッケージはありません。そのため、Apacheモジュールの外部から使用できるようにする必要があります。バイナリはhttp://mod-cluster.jboss.org/にあります。 - -``` puppet -class { '::apache::mod::cluster': - ip => '172.17.0.1', - allowed_network => '172.17.0.', - balancer_name => 'mycluster', - version => '1.3.1' -} -``` - -**パラメータ**:　 - -* `port`: mod_clusterのリッスンポート。 - - デフォルト値: '6666'。 - -* `server_advertise`: サーバをアドバタイズするかどうか。 - - デフォルト値: `true`。 - -* `advertise_frequency`: アドバタイズメッセージ間のインターバルを秒数[.ミリ秒]で設定します。 - - デフォルト値: 10。 - -* `manager_allowed_network`: ネットワークにmod_cluster_managerへのアクセスを許可するかどうか。 - - デフォルト値: '127.0.0.1'。 - -* `keep_alive_timeout`: Apacheがリクエストを待機する長さを秒数で指定します。 - - デフォルト値: 60。 - -* `max_keep_alive_requests`: 維持されるリクエストの最大数。 - - デフォルト値: 0。 - -* `enable_mcpm_receive`: MCPMを有効にするかどうか。 - - デフォルト値: `true`。 - -* `ip`: リッスンするIPアドレスを指定します。 - -* `allowed_network`: バランスドメンバーネットワーク。 - -* `version`: `mod_cluster`バージョンを指定します。httpd 2.4ではバージョン1.3.0以上が必要です。 - -##### クラス: `apache::mod::deflate` - -[`mod_deflate`][]をインストールして設定します。 - -**パラメータ**:　 - -* `types`: デフレートする[MIMEタイプ][MIME `content*type`]の[配列][]。  - - デフォルト値: [ 'text/html text/plain text/xml'、'text/css'、'application/x*javascript application/javascript application/ecmascript'、'application/rss+xml'、'application/json' ]。 - -* `notes`: [ハッシュ][]、キーはタイプを表し、値はノート名を表します。 - - デフォルト値: { 'Input' => 'instream'、'Output' => 'outstream'、'Ratio' => 'ratio' }。 - -##### クラス: `apache::mod::expires` - -[`mod_expires`][]をインストールし、`expires.conf.erb`を使用して設定を生成します。 - -**パラメータ**:　 - -* `expires_active`: ドキュメント領域に関して`Expires`ヘッダの生成を有効にします。 - - ブーリアン。 - - デフォルト値: `true`。 - -* `expires_default`: [`ExpiresByType`][]構文または[インターバル構文][]を用いた有効期限計算のためのデフォルトアルゴリズムを指定します。 - - デフォルト値: `undef`。 - -* `expires_by_type`: [MIME `content*type`][]とその有効時間のセットを記述します。 - - 値: [ハッシュ][ハッシュ]の[配列][]、各ハッシュのキーは有効なMIME `content*type` ('text/json'など)、値は以下の有効な [インターバル構文][]。 - - デフォルト値: `undef`。 - -##### クラス: `apache::mod::ext_filter` - -[`mod_ext_filter`][]をインストールして設定します。 - -``` puppet -class { 'apache::mod::ext_filter': - ext_filter_define => { - 'slowdown' => 'mode=output cmd=/bin/cat preservescontentlength', - 'puppetdb-strip' => 'mode=output outtype=application/json cmd="pdb-resource-filter"', - }, -} -``` - -**パラメータ**:　 - -* `ext_filter_define`: フィルタ名とそのパラメータのハッシュ。 - - デフォルト値: `undef`。 - -##### クラス: `apache::mod::fcgid` - -[`mod_fcgid`][]をインストールして設定します。 - -このクラスでは、使用可能なすべてのオプションを個別にパラメータ化するのではなく、`options` [ハッシュ][]を使って`mod_fcgid`を設定します。例: - -``` puppet -class { 'apache::mod::fcgid': - options => { - 'FcgidIPCDir' => '/var/run/fcgidsock', - 'SharememPath' => '/var/run/fcgid_shm', - 'AddHandler' => 'fcgid-script .fcgi', - }, -} -``` - -すべてのオプションのリストについては、[公式`mod_fcgid`ドキュメント][`mod_fcgid`]を参照してください。 - -`apache::mod::fcgid`を含める場合は、ディレクトリごと、バーチャルホストごとに[`FcgidWrapper`][]を設定できます。最初にモジュールをロードする必要があります。`apache::vhost`で`fcgiwrapper`パラメータを設定している場合、Puppetは自動的にはモジュールを有効化しません。 - -``` puppet -include apache::mod::fcgid - -apache::vhost { 'example.org': - docroot => '/var/www/html', - directories => { - path => '/var/www/html', - fcgiwrapper => { - command => '/usr/local/bin/fcgiwrapper', - } - }, -} -``` - -##### クラス: `apache::mod::geoip` - -[`mod_geoip`][]をインストールして管理します。 - -**パラメータ**:　 - -* `db_file`: GeoIPデータベースファイルのパスを設定します。 - - 値: パス、または複数のGeoIPデータベースファイルの[配列][]パス。 - - デフォルト値: `/usr/share/GeoIP/GeoIP.dat`。 - -* `enable`: [`mod_geoip`][]を全体で有効にするかどうかを決定します。 - - ブーリアン。 - - デフォルト値: `false`。 - -* `flag`: GeoIPフラグを設定します。 - - 値: 'CheckCache'、'IndexCache'、'MemoryCache'、'Standard'。 - - デフォルト値: 'Standard'。 - -* `output`: 使用するアウトプット変数を定義します。 - - 値: 'All'、'Env'、'Request'、'Notes'。 - - デフォルト値: 'All'。 - -* `enable_utf8`: アウトプットをISO*8859*1 (ラテン*1)からUTF*8に変更します。 - - ブーリアン。 - - デフォルト値: `undef`。 - -* `scan_proxy_headers`: [GeoIPScanProxyHeaders][]オプションを有効にします。 - - ブーリアン。 - - デフォルト値: `undef`。 - -* `scan_proxy_header_field`: クライアントのIPアドレスの決定に使用するヘッダの[`mod_geoip`][]を指定します。 - - デフォルト値: `undef`。 - -* `use_last_xforwarededfor_ip` (sic): IPアドレスのカンマ区切りリストで見つかったクライアントのIPの最初または最後のIPアドレスを使うかどうかを決定します。 - - ブーリアン。 - - デフォルト値: `undef`。 - -##### クラス: `apache::mod::info` - -サーバ設定の全体的な概要を提供する[`mod_info`][]をインストールして管理します。 - -**パラメータ**:　 - -* `allow_from`: IPv4またはIPv6アドレスのホワイトリスト、または`/server*info`にアクセスできる範囲。 - - 値: IPv4アドレス、IPv6アドレス、または範囲の1つまたは複数のオクテット、またはいずれかの配列。 - - デフォルト値: ['127.0.0.1','::1']。　 - -* `apache_version`: 文字列で表されるApacheのバージョン番号、'2.2'や'2.4'など。　 - - デフォルト値: [`$::apache::apache_version`][`apache_version`]の値。 - - -* `restrict_access`: アクセス制限を有効にするかどうかを決定します。`false`の場合、`allow_from`ホワイトリストは無視され、すべてのIPアドレスが `/server*info`にアクセスできるようになります。 - - ブーリアン。 - - デフォルト値: `true`。 - -##### クラス: `apache::mod::jk` - -`mod_jk`をインストールして管理します。これは、Apache httpdリダイレクションと古いバージョンのTomCatおよびJBossを結ぶコネクタです。 - -**注意**: mod\_jkに関して提供されている公式のパッケージはありません。そのため、apacheモジュールの制御以外の手段で使用できるようにする必要があります。バイナリは[Apache Tomcatコネクタダウンロードページ](https://tomcat.apache.org/download-connectors.cgi)にあります。 - -``` puppet -class { '::apache::mod::jk': - ip = '192.168.2.15', - workers_file = 'conf/workers.properties', - mount_file = 'conf/uriworkermap.properties', - shm_file = 'run/jk.shm', - shm_size = '50M', - $workers_file_content = { - - }, -} -``` - -**`apache::mod::jk`**内のパラメータ: - -`mod_jk`パラメータを理解するための情報源としては、[公式ドキュメント](https://tomcat.apache.org/connectors-doc/reference/apache.html)が最適です。ただし、次はこれに含まれません: - -**add_listen** - -パラメータ`ip`および `port`に従って`Listen`ディレクティブを定義して(下記参照)、ApacheがIP/portの組合せをリッスンし`mod_jk`にリダイレクトするようにします。 -`Listen *:`または`Listen `のように、別の`Listen`ディレクティブが`mod_jk`バインディングで必要なものと競合するときに役立ちます。 - -タイプ: ブール値 -デフォルト: true - -**ip** - -`mod_jk`にバインディングするIP。 -バインディングアドレスがプライマリのネットワークインターフェースIPではないときに役立ちます。 - -タイプ: 文字列 -デフォルト: `$facts['ipaddress']` - -**port** - -`mod_jk`にバインディングするポート。 -リバースプロキシまたはキャッシュのような、別のものがポート80でリクエストを受信して、異なるポートのApacheに転送する必要があるときに役立ちます。 - -タイプ: 文字列(数値) -デフォルト: '80' - -**workers\_file\_content** - -各ディレクティブにはフォーマット`worker..=`があります。このマップは複数ハッシュのハッシュとして表され、外側のハッシュはワーカーを指定し、内側の各ハッシュは各ワーカーのプロパティと値を指定します。 -また、2つのグローバルディレクティブ 'worker.list'および'worker.mantain'もあります。 -例えば、ワーカーファイルは以下のようになります。 - -``` -worker.list = status -worker.list = some_name,other_name - -worker.mantain = 60 - -# Optional comment -worker.some_name.type=ajp13 -worker.some_name.socket_keepalive=true - -# I just like comments -worker.other_name.type=ajp12 (why would you?) -worker.other_name.socket_keepalive=false -``` - -以下のようにパラメータ化する必要があります。　 - -``` -$workers_file_content = { - worker_lists => ['status', 'some_name,other_name'], - worker_mantain => '60', - some_name => { - comment => 'Optional comment', - type => 'ajp13', - socket_keepalive => 'true', - }, - other_name => { - comment => 'I just like comments', - type => 'ajp12', - socket_keepalive => 'false', - }, -} -``` - -**mount\_file\_content** - -各ディレクティブにはフォーマット` = `があります。このマップは複数ハッシュのハッシュとして表され、外側のハッシュはワーカーを指定し、内側の各ハッシュは次の2つのアイテムを含みます: uri_list - ワーカーにマップするURIを用いた配列 - およびコメント - ワーカーに関するコメントを記したオプションの文字列。 -例えば、マウントファイルは以下のようになります。 - -``` -# Worker 1 -/context_1/ = worker_1 -/context_1/* = worker_1 - -# Worker 2 -/ = worker_2 -/context_2/ = worker_2 -/context_2/* = worker_2 -``` - -以下のようにパラメータ化する必要があります。　 - -``` -$mount_file_content = { - worker_1 => { - uri_list => ['/context_1/', '/context_1/*'], - comment => 'Worker 1', - }, - worker_2 => { - uri_list => ['/context_2/', '/context_2/*'], - comment => 'Worker 2', - }, -}, -``` - -**shm\_file and log\_file** - -これらのファイルがどのように定義されているかによって、クラスはそれらの最終パスを別々に作成します。 -- 相対パス: `logroot`で提供されたパスを追加します (下記参照) -- 絶対パスまたはパイプ: 提供されたパスをそのまま使用します - -例 (RHEL 6): - -``` -shm_file => 'shm_file' -# Ends up in -$shm_path = '/var/log/httpd/shm_file' -``` -``` -shm_file => '/run/shm_file' -# Ends up in -$shm_path = '/run/shm_file' -``` -``` -shm_file => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"' -# Ends up in -$shm_path = '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"' -``` - -> デフォルトのlogrootは十分健全です。このため、絶対パスを指定することは推奨しません。 - -**logroot** - -`shm_file`および`log_file`のベースディレクトリは`logroot`パラメータで決定されます。指定されない場合、デフォルトは`apache::params::logroot`です。 - -> デフォルトのlogrootは十分健全です。このため、上書きすることは推奨しません。 - -##### クラス: `apache::mod::passenger`　 - -[`mod_passenger`][]をインストールして管理します。Red Hatベースのシステムの場合は、[passengerドキュメント](https://www.phusionpassenger.com/library/install/apache/install/oss/el6/#step-1:-upgrade-your-kernel,-or-disable-selinux)に記載された最小要件を満たしていることを確認してください。 - -**パラメータ**:　 - -* `passenger_high_performance`: [`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance)を設定します。 - - 値: 'On'、'Off'。　 - - デフォルト値: `undef`。 - -* `passenger_pool_idle_time`: [`PassengerPoolIdleTime`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerpoolidletime)を設定します。 - - デフォルト値: `undef`。 - -* `passenger_max_pool_size`: [`PassengerMaxPoolSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxpoolsize)を設定します。 - - デフォルト値: `undef`。 - -* `passenger_max_request_queue_size`: [`PassengerMaxRequestQueueSize`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequestqueuesize)を設定します。 - - デフォルト値: `undef`。 - -* `passenger_max_requests`: [`PassengerMaxRequests`](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxrequests)を設定します。 - - デフォルト値: `undef`。 - -* `passenger_data_buffer_dir`: [`PassengerDataBufferDir`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerdatabufferdir)を設定します。 - - デフォルト値: `undef`。 - -##### クラス: `apache::mod::ldap` - -[`mod_ldap`][]をインストールして設定し、[`LDAPTrustedGlobalCert`](https://httpd.apache.org/docs/current/mod/mod_ldap.html#ldaptrustedglobalcert)ディレクティブの修正を可能にします。 - -``` puppet -class { 'apache::mod::ldap': - ldap_trusted_global_cert_file => '/etc/pki/tls/certs/ldap-trust.crt', - ldap_trusted_global_cert_type => 'CA_DER', - ldap_shared_cache_size => '500000', - ldap_cache_entries => '1024', - ldap_cache_ttl => '600', - ldap_opcache_entries => '1024', - ldap_opcache_ttl => '600', -} -``` - -**パラメータ**　 - -* `apache_version`: インストールされたApacheバージョンを指定します。 - - デフォルト値: `undef`。 - -* `ldap_trusted_global_cert_file`: LDAPサーバ上でSSLまたはTLS接続を確立する際に使用する、信頼できるCA証明書のパスとファイル名を指定します。 - -* `ldap_trusted_global_cert_type`:グローバルな信頼できる証明書フォーマットを指定します。 - - デフォルト値: 'CA_BASE64'。 - -* `ldap_shared_cache_size`: 共有されたメモリのキャッシュのサイズをバイトで指定します。 - -* `ldap_cache_entries`: 一次LDAPキャッシュのエントリの最大数を指定します。 - -* `ldap_cache_ttl`: キャッシュされたアイテムが有効に保たれる時間を秒数で指定します。 - -* `ldap_opcache_entries`: LDAP比較演算のキャッシュに用いるエントリ数を指定します。 - -* `ldap_opcache_ttl`: 演算キャッシュのエントリが有効に保たれる時間を秒数で指定します。 - -* `package_name`: カスタムパッケージ名を指定します。 - - デフォルト値: `undef`。 - -##### クラス: `apache::mod::negotiation` - -[`mod_negotiation`][]をインストールして設定します。 - -**パラメータ**:　 - -* `force_language_priority`: `ForceLanguagePriority`オプションを設定します。 - - 値: 文字列。　 - - デフォルト値: `Prefer Fallback`。 - -* `language_priority`: モジュールの`LanguagePriority`オプションを設定するための言語の[配列][]。 - - デフォルト値: [ 'en'、'ca'、'cs'、'da'、'de'、'el'、'eo'、'es'、'et'、'fr'、'he'、'hr'、'it'、'ja'、'ko'、'ltz'、'nl'、'nn'、'no'、'pl'、'pt'、'pt*BR'、'ru'、'sv'、'zh*CN'、'zh*TW' ]。 - -##### クラス: `apache::mod::nss` - -NSS暗号化ライブラリを使用するApacheのSSLプロバイダ。 - -**パラメータ:** - -- `transfer_log`: access.logのパス。 -- `error_log`: error.logのパス。 -- `passwd_file`: NSSPassPhraseDialogディレクティブに使用するファイルのパス。 -- `port`: SSLポート。デフォルト値8443。 - -##### クラス: `apache::mod::pagespeed` - -[`mod_pagespeed`][]をインストールして管理します。これは、Webページをリライトして冗長性と帯域を軽減するためのGoogleモジュールです。 - -このapacheモジュールには`mod-pagespeed-stable`が必要ですが、Puppetはパッケージを自動的にインストールするために必要なソフトウェアを管理**しません**。パッケージがインストールされていないか、お使いのパッケージマネージャで使用できない場合にこのクラスを宣言すると、Puppet実行は失敗します。 - -> **注意:** お使いのシステムが最新のGoogle Pagespeed要件を満たしていることを確認してください。 - -**パラメータ**:　 - -以下のパラメータはモジュールのディレクティブに相当します。詳細については、[モジュールのドキュメント][`mod_pagespeed`]を参照してください。 - -* `inherit_vhost_config`: デフォルト値: 'on'。 -* `filter_xhtml`: デフォルト値: `false`。 -* `cache_path`: デフォルト値: '/var/cache/mod_pagespeed/'。 -* `log_dir`: デフォルト値: '/var/log/pagespeed'。 -* `memcache_servers`: デフォルト値: []。 -* `rewrite_level`: デフォルト値: 'CoreFilters'。 -* `disable_filters`: デフォルト値: []。 -* `enable_filters`: デフォルト値: []。 -* `forbid_filters`: デフォルト値: []。 -* `rewrite_deadline_per_flush_ms`: デフォルト値: 10。 -* `additional_domains`: デフォルト値: `undef`。 -* `file_cache_size_kb`: デフォルト値: 102400。 -* `file_cache_clean_interval_ms`: デフォルト値: 3600000。 -* `lru_cache_per_process`: デフォルト値: 1024。 -* `lru_cache_byte_limit`: デフォルト値: 16384。 -* `css_flatten_max_bytes`: デフォルト値: 2048。 -* `css_inline_max_bytes`: デフォルト値: 2048。 -* `css_image_inline_max_bytes`: デフォルト値: 2048。 -* `image_inline_max_bytes`: デフォルト値: 2048。 -* `js_inline_max_bytes`: デフォルト値: 2048。 -* `css_outline_min_bytes`: デフォルト値: 3000。 -* `js_outline_min_bytes`: デフォルト値: 3000。 -* `inode_limit`: デフォルト値: 500000。 -* `image_max_rewrites_at_once`: デフォルト値: 8。 -* `num_rewrite_threads`: デフォルト値: 4。 -* `num_expensive_rewrite_threads`: デフォルト値: 4。 -* `collect_statistics`: デフォルト値: 'on'。 -* `statistics_logging`: デフォルト値: 'on'。 -* `allow_view_stats`: デフォルト値: []。 -* `allow_pagespeed_console`: デフォルト値: []。 -* `allow_pagespeed_message`: デフォルト値: []。 -* `message_buffer_size`: デフォルト値: 100000。 -* `additional_configuration`: ディレクティブ値ペアのハッシュ、またはpagespeed設定の最後に挿入する行の配列。デフォルト値: '{ }'。 - -##### クラス: `apache::mod::passenger`　 - -`mod_passenger`をインストールして設定します。 - ->**注意**: passengerモジュールは、EPELにより提供される依存関係パッケージと`mod_passengers`カスタムリポジトリがなければ、RH/CentOSでは使用できません。前述の`manage_repo`パラメータと[https://www.phusionpassenger.com/library/install/apache/install/oss/el7/]()を参照してください。 - -**パラメータ**:　 - -* `passenger_conf_file`: `$::apache::params::passenger_conf_file` -* `passenger_conf_package_file: `$::apache::params::passenger_conf_package_file` -* `passenger_high_performance`: デフォルト値: `undef` -* `passenger_pool_idle_time`: デフォルト値: `undef` -* `passenger_max_request_queue_size`: デフォルト値: `undef` -* `passenger_max_requests`: デフォルト値: `undef` -* `passenger_spawn_method`: デフォルト値: `undef` -* `passenger_stat_throttle_rate`: デフォルト値: `undef` -* `rack_autodetect`: デフォルト値: `undef` -* `rails_autodetect`: デフォルト値: `undef` -* `passenger_root` : `$::apache::params::passenger_root` -* `passenger_ruby` : `$::apache::params::passenger_ruby` -* `passenger_default_ruby`: `$::apache::params::passenger_default_ruby` -* `passenger_max_pool_size`: デフォルト値: `undef` -* `passenger_min_instances`: デフォルト値: `undef` -* `passenger_max_instances_per_app`: デフォルト値: `undef` -* `passenger_use_global_queue`: デフォルト値: `undef` -* `passenger_app_env`: デフォルト値: `undef` -* `passenger_log_file`: デフォルト値: `undef` -* `passenger_log_level`: デフォルト値: `undef` -* `passenger_data_buffer_dir`: デフォルト値: `undef` -* `manage_repo`: phusionpassenger.comリポジトリを管理するかどうか。デフォルト値: `true` -* `mod_package`: デフォルト値: `undef` -* `mod_package_ensure`: デフォルト値: `undef` -* `mod_lib`: デフォルト値: `undef` -* `mod_lib_path`: デフォルト値: `undef` -* `mod_id`: デフォルト値: `undef` -* `mod_path`: デフォルト値: `undef` - -##### クラス: `apache::mod::proxy` - -I`mod_proxy`をインストールし、`proxy.conf.erb`テンプレートを使用して設定を生成します。 - -**`apache::mod::proxy`内のパラメータ**: - -- `allow_from`: デフォルト値: `undef` -- `apache_version`: デフォルト値: `undef` -- `package_name`: デフォルト値: `undef` -- `proxy_requests`: デフォルト値: 'Off' -- `proxy_via`: デフォルト値: 'On' - -##### クラス: `apache::mod::proxy_balancer` - -ロードバランシングを提供する[`mod_proxy_balancer`][]をインストールして管理します。 - -**パラメータ**:　 - -* `manager`: バランサマネージャのサポートを有効にするかどうかを決定します。 - - デフォルト値: `false`。 - -* `manager_path`: バランサマネージャのサーバロケーション。 - - デフォルト値: '/balancer*manager'。 - -* `allow_from`: `/balancer*manager`にアクセスできるIPv4またはIPv6アドレスの[配列][]。 - - デフォルト値: ['127.0.0.1','::1']。　 - -* `apache_version`: 文字列で表されるApacheのバージョン番号、'2.2'や'2.4'など。　 - - デフォルト値: [`$::apache::apache_version`][`apache_version`]の値。Apache 2.4以上では、`mod_slotmem_shm`がロードされます。 - -##### クラス: `apache::mod::php` - -[`mod_php`][]をインストールして設定します。 - -**パラメータ**:　 - -以下のパラメータのデフォルト値は、オペレーティングシステムによって異なります。このクラスのパラメータのほとんどは、`mod_php`ディレクティブに相当します。詳細については、[モジュールのドキュメント][`mod_php`]を参照してください。 - -* `package_name`: `mod_php`をインストールするパッケージの名前。 -* `path`: `mod_php`共有オブジェクト(`.so`)ファイルのパスを定義します。 -* `source`: デフォルト設定のパスを定義します。値には`puppet:///`パスが含まれます。 -* `template`: Puppetが設定ファイルの生成に使用する`php.conf`テンプレートのパスを定義します。 -* `content`: `php.conf`に任意のコンテンツを追加します。 - -##### クラス: `apache::mod::proxy_html` - -**注意**: `mod_proxy_html`に関して提供されている公式なパッケージはありません。そのため、apacheモジュールの外部から使用できるようにする必要があります。 - -##### クラス: `apache::mod::reqtimeout` - -[`mod_reqtimeout`][]をインストールして設定します。 - -**パラメータ**　 - -* `timeouts`: [`RequestReadTimeout`][]オプションを設定します。 - - 値: 文字列または[配列][]。 - - デフォルト値: ['header=20-40,MinRate=500', 'body=20,MinRate=500']。 - -##### クラス: `apache::mod::rewrite` - -Apacheモジュール`mod_rewrite`をインストールして有効にします。 - -##### クラス: `apache::mod::shib` - -[Shibboleth](http://shibboleth.net/) Apacheモジュール`mod_shib`をインストールします。このモジュールは、Shibboleth認証プロバイダおよびShibboleth FederationsによるSAML2シングルサインオン(SSO)認証を有効にするものです。このクラスを定義すると、`apache::vhost`インスタンス内でShibboleth固有のパラメータが有効になります。 - -このクラスでインストールおよび設定されるのは、Shibboleth SSO認証をコンシュームするWebアプリケーションのApacheコンポーネントのみです。PuppetでShibboleth設定を手動で管理することも、[Shibboleth Puppetモジュール](https://github.com/aethylred/puppet-shibboleth)を使用することもできます。 - -**注意**: shibbolethモジュールは、Shibbolethのリポジトリにより提供される依存関係パッケージがなければ、RH/CentOSでは使用できません。[http://wiki.aaf.edu.au/tech-info/sp-install-guide]()を参照してください。 - -##### クラス: `apache::mod::ssl` - -[Apache SSL機能][`mod_ssl`]をインストールし、`ssl.conf.erb`テンプレートを使用して設定を生成します。ほとんどのオペレーティングシステムでは、この`ssl.conf`はモジュール設定ディレクトリに置かれています。Red Hatベースのオペレーティングシステムでは、このファイルは`/etc/httpd/conf.d`にあります。これは、RPMが設定を保存するのと同じロケーションです。 - -バーチャルホストでSSLを使用するには、`::apache`の[`default_ssl_vhost`][]パラメータを`true`に設定する**か**、[`apache::vhost`][]の[`ssl`][]パラメータを`true`に設定する必要があります。 - -- `ssl_cipher`: デフォルト値: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4' -- `ssl_compression`: デフォルト値: false -- `ssl_cryptodevice`: デフォルト値: 'builtin' -- `ssl_honorcipherorder`: デフォルト値: true -- `ssl_openssl_conf_cmd`: デフォルト値: undef -- `ssl_options`: デフォルト値: [ 'StdEnvVars' ] -- `ssl_pass_phrase_dialog`: デフォルト値: 'builtin' -- `ssl_protocol`: デフォルト値: [ 'all', '-SSLv2', '-SSLv3' ] -- `ssl_proxy_protocol`: デフォルト値: [] -- `ssl_random_seed_bytes`: 有効なオプション: 文字列、デフォルト値: '512' -- `ssl_sessioncache`: 有効なオプション: 文字列。デフォルト値: '300' -- `ssl_sessioncachetimeout`: 有効なオプション: 文字列。デフォルト値: '300' -- `ssl_mutex`: デフォルト値: OSによって異なります。有効なオプション: [mod_ssl][mod_ssl]ドキュメントを参照 - - RedHat/FreeBSD/Suse/Gentoo: 'default' - - Debian/Ubuntu + Apache >= 2.4: 'default' - - Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex' -**パラメータ: - -* `ssl_cipher` - - デフォルト値: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4' - -* `ssl_compression` - - デフォルト値: `false`。 - -* `ssl_cryptodevice` - - デフォルト値: 'builtin'　 - -* `ssl_honorcipherorder` - - デフォルト値: `true`。 - -* `ssl_openssl_conf_cmd` - - デフォルト値: `undef`。 - -* `ssl_options` - - デフォルト値: [ 'StdEnvVars' ] - -* `ssl_pass_phrase_dialog` - - デフォルト値: 'builtin'　 - -* `ssl_protocol` - - デフォルト値: [ 'all', '*SSLv2', '*SSLv3' ] - -* `ssl_random_seed_bytes` - - 値: 文字列。　 - - デフォルト値: '512' - -* `ssl_sessioncachetimeout` - - 値: 文字列。　 - - デフォルト値: '300' - -* `ssl_mutex`: - - 値: [mod_ssl][mod_ssl]ドキュメントを参照。 - - デフォルト値: OSによって異なります: - - * RedHat/FreeBSD/Suse/Gentoo: 'default'. - * Debian/Ubuntu + Apache >= 2.4: 'default'. - * Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex'. - * Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'. - - -##### クラス: `apache::mod::status` - -[`mod_status`][]をインストールし、`status.conf.erb`テンプレートを使用して設定を生成します。 - -**パラメータ**:　 - -* `allow_from`: `/server-status`にアクセスできるIPv4またはIPv6アドレスの[配列][]。 - - デフォルト値: ['127.0.0.1','::1']。　 -* `extended_status`: [`ExtendedStatus`][]ディレクティブをつうじて、各リクエストに関する拡張ステータス情報を追跡するかどうかを決定します。 - - 値: 'Off'、'On'。 - - デフォルト値: 'On'。 - -* `status_path`: ステータスページのサーバロケーション。 - - デフォルト値: '/server-status'。 - -##### クラス: `apache::mod::userdir` - -`http://example.com/~user/`構文を用いて、ユーザ指定のディレクトリにアクセスできるようにします。すべてのパラメータは、[公式のApacheドキュメント](https://httpd.apache.org/docs/2.4/mod/mod_userdir.html)で見られます。 - -**パラメータ**:　 - -* `overrides`: ディレクティブタイプの[配列][]。 - - デフォルト値: '[ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ]'。 - -##### クラス: `apache::mod::version` - -多くのオペレーティングシステムおよびApache構成上で[`mod_version`][]をインストールします。 - -Apache 2.4を使用するDebianおよびUbuntuが`apache::mod::version`で分類された場合は、`mod_version`がビルトインされているためロードできない旨の警告をPuppetが表示します。 - -##### クラス: `apache::mod::security` - -Trustwaveの[`mod_security`][]をインストールして設定します。これはすべてのバーチャルホストでデフォルトで有効化され、実行されます。 - -**パラメータ**:　 - -* `activated_rules`: `modsec_crs_path`のルールの[配列][]またはsymlinkを使用してアクティベートする絶対値。 -* `allowed_methods`: 許可されるHTTPメソッドのスペース*区切りリスト。 - - デフォルト値: 'GET HEAD POST OPTIONS'。 - -* `content_types`: 1つまたは複数の許可される[MIMEタイプ][MIME `content*type`]のリスト。 - - デフォルト値: 'application/x*www*form*urlencoded|multipart/form*data|text/xml|application/xml|application/x*amf'。 - -* `crs_package`: CRSルールをインストールするパッケージの名前。 - - デフォルト値: [`apache::params`][]内の`modsec_crs_package`。 - -* `manage_security_crs`: security_crs.confルールファイルを管理します。 - - デフォルト値: `true`。 - -* `modsec_dir`: Puppetがmodsec設定およびアクティベートされたルールリンクをインストールする場所のパスを定義します。 - - デフォルト値: 'On'、[`apache::params`][]の`modsec_dir`により設定。 -${modsec\_dir}/activated\_rules。 - -* `modsec_secruleengine`: modsecルールエンジンを設定します。値: 'On'、'Off'、'DetectionOnly'。 - - デフォルト値: [`apache::params`][]の`modsec_secruleengine`。 - -* `restricted_extensions`: 禁止されるファイル拡張子のスペース*区切りリスト。 - - デフォルト値: '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/'。 - -* `restricted_headers`: 禁止されるヘッダのスラッシュおよびスペースで区切ったリスト。 - - デフォルト値: 'Proxy*Connection/ /Lock*Token/ /Content*Range/ /Translate/ /via/ /if/'。 - -* `secdefaultaction`: OWASP ModSecurityコアルールセットに関して、動作モード、自己完結('deny')、コラボレーティブ検出('pass')を設定します。 - - デフォルト値: 'deny'。"log,auditlog,deny,status:406,tag:'SLA 24/7'"などの完全な値を設定することもできます。 - -* `secpcrematchlimit`: PCREライブラリのマッチ限度数を設定します。 - - デフォルト値: 1500。　 - -* `secpcrematchlimitrecursion`: PCREライブラリのマッチ再帰制限数を設定します。 - - デフォルト値: 1500。　 - -* `logroot`: オーディットおよびデバッグログの場所を設定します。 - - デフォルト値はApacheのログディレクトリ(Redhat: `/var/log/httpd`、Debian: `/var/log/apache2`)。 - -* `audit_log_releavant_status`: オーディットロギングの目的に関して、考慮すべき応答ステータスコードを設定します。 - - デフォルト値: '^(?:5|4(?!04))'。 - -* `audit_log_parts`: [オーディットログ][]に入れるべきセクションを設定します。 - - デフォルト値: 'ABIJDEFHZ'。 - -* `anomaly_score_blocking`: OWASP ModSecurityコアルールセットのコラボレーティブ検出ブロッキングをアクティベートまたはディアクティベートします。 - - デフォルト値: 'off'。 - -* `inbound_anomaly_threshold`: OWASP ModSecurityコアルールセットのコラボレーティブ検出モードに関して、インバウンドブロッキングルールのスコアリング閾値レベルを設定します。 - - デフォルト値: 5。　 - -* `outbound_anomaly_threshold`: OWASP ModSecurityコアルールセットのコラボレーティブ検出モードに関して、アウトバウンドブロッキングルールのスコアリング閾値レベルを設定します。 - - デフォルト値: 4。　 - -* `critical_anomaly_score`: OWASP ModSecurityコアルールセットのコラボレーティブ検出モードに関して、重要なセキュリティレベルのスコアリングポイントを設定します。 - - デフォルト値: 5。　 - -* `error_anomaly_score`: OWASP ModSecurityコアルールセットのコラボレーティブ検出モードに関して、エラー深刻度レベルのスコアリングポイントを設定します。 - - デフォルト値: 4。　 - -* `warning_anomaly_score`: OWASP ModSecurityコアルールセットのコラボレーティブ検出モードに関して、警告深刻度レベルのスコアリングポイントを設定します。 - - デフォルト値: 3。 - -* `notice_anomaly_score`: OWASP ModSecurityコアルールセットのコラボレーティブ検出モードに関して、通知深刻度レベルのスコアリングポイントを設定します。 - -デフォルト値: 2。 - -* `secrequestmaxnumargs`: リクエストの引数の最大数を設定します。 - - デフォルト値: 255。 - -* `secrequestbodylimit`: バッファリングに関してModSecurityが受け入れる最大リクエストボディサイズを設定します。 - - デフォルト値: '13107200'。 - -* `secrequestbodynofileslimit`: バッファリングに関してModSecurityが受け入れる最大リクエストボディサイズを設定します。リクエスト内でトランスポートされたファイルのサイズは除外されます。 - - デフォルト値: '131072'。 - -* `secrequestbodyinmemorylimit`: ModSecurityがメモリに保存する最大リクエストボディサイズを設定します。 - - デフォルト値: '131072'。 - -##### クラス: `apache::mod::wsgi` - -[`mod_wsgi`][]を使用したPythonサポートを有効にします。 - -**パラメータ**:　 - -* `mod_path`: `mod_wsgi`共有オブジェクト(`.so`)ファイルのパスを定義します。 - - デフォルト値: `undef`。 - - * `mod_path`パラメータに`/`が含まれていない場合、Puppetではオペレーティングシステムのデフォルトのモジュールパスの先頭にこれを付加します。含まれている場合は、そのとおりに扱われます。 - -* `package_name`: `mod_wsgi`をインストールするパッケージの名前。 - - デフォルト値: `undef`。 - -* `wsgi_python_home`: '/path/to/venv'などの[`WSGIPythonHome`][]ディレクティブを定義します。 - - 値: パスを指定する文字列。　 - - デフォルト値: `undef`。 - -* `wsgi_python_path`: '/path/to/venv/site*packages'などの[`WSGIPythonPath`][]ディレクティブを定義します。 - - 値: パスを指定する文字列。　 - - デフォルト値: `undef`。 - -* `wsgi_restrict_embedded`: 'On'などの[`WSGIRestrictEmbedded`][]ディレクティブを定義します。 - -値: On|Off|undef。 - -デフォルト値: undef。 - -* `wsgi_socket_prefix`: "\${APACHE\_RUN\_DIR}WSGI"などの[`WSGISocketPrefix`][]ディレクティブを定義します。 - - デフォルト値: [`apache::params`][]の`wsgi_socket_prefix`。 - -このクラスのパラメータはモジュールのディレクティブに相当します。詳細については、[モジュールのドキュメント][`mod_wsgi`]を参照してください。 - -### プライベートクラス - -#### クラス: `apache::confd::no_accf` - -FreeBSDの Apache 2.4で必要とされる`no-accf.conf`設定ファイルを`conf.d`内に作成します。 - -#### クラス: `apache::default_confd_files` - -FreeBSDに`conf.d`を含めます。 - -#### クラス: `apache::default_mods` - -デフォルト設定の実行に必要なApacheモジュールをインストールします。詳細については、`apache`クラスの[`default_mods`][]パラメータを参照してください。 - -#### クラス: `apache::package` - -基本のApacheパッケージをインストールして設定します。 - -#### クラス: `apache::params` - -各種のオペレーティングシステムのApacheパラメータを管理します。 - -#### クラス: `apache::service` - -Apacheデーモンを管理します。 - -#### クラス: `apache::version` - -オペレーティングシステムに基づき、Apacheバージョンの自動検出を試みます。 - -### パブリック定義タイプ　 - -#### 定義タイプ: `apache::balancer` - -[`mod_proxy`][]を用いて、Apacheロードバランシンググループ(バランサクラスタとも呼ばれます)を作成します。各ロードバランシンググループには、1つ以上のバランサメンバーが必要です。これは、 [`apache::balancermember`][]定義タイプによりPuppet内で宣言することができます。 - -各Apacheロードバランシンググループにつき、1つの`apache::balancer`定義タイプを宣言します。すべてのバランサメンバーについて`apache::balancermember`定義タイプをエクスポートし、[エクスポートリソース][]を用いて単一のApacheロードバランササーバで収集することもできます。 - -**パラメータ**:　 - -##### `name` - -バランサクラスタのタイトルと、その設定を含む`conf.d`の名前を設定します。 - -##### `proxy_set` - -キー‐値ペアを[`ProxySet`][]行として設定します。値: [ハッシュ][]。 - -デフォルト値: '{}'。 - -##### `collect_exported` - -[エクスポートリソース][]を使用するかどうかを決定します。 - -すべてのバックエンドサーバを静的に宣言する場合は、このパラメータを`false`に設定し、宣言済みの既存のバランサメンバーリソースに依存するようにします。また、[配列][]引数とともに`apache::balancermember`を使用します。 - -中央ノードで収集したエクスポートリソースを使用してバックエンドサーバを動的に宣言するには、このパラメータを`true`に設定し、バランサメンバーノードによりエクスポートされたバランサメンバーリソースを収集します。 - -エクスポートリソースを使用しない場合は、1回のPuppet実行ですべてのバランサメンバーが設定されます。エクスポートリソースを使用する場合は、まずバランシングしたノードについてPuppetを実行し、次にバランサで実行する必要があります。 - -ブーリアン。 - -デフォルト値: `true`。 - -#### 定義タイプ: `apache::balancermember` - -[`mod_proxy_balancer`][]のメンバーを定義します。これにより、ロードバランサの`apache.cfg`内でリッスンするサービス設定ブロック内のバランサメンバーが設定されます。 - -**パラメータ**:　 - -##### `balancer_cluster` - -**必須**。　 - -Apacheサービスのインスタンス名を設定します。宣言された[`apache::balancer`][]リソースの名前と一致する必要があります。 - -##### `url` - -バランサメンバーサーバとの連絡に使用するURLを指定します。 - -デフォルト値: 'http://${::fqdn}/'。 - -##### `options` - -URL後に[オプション](https://httpd.apache.org/docs/current/mod/mod_proxy.html#balancermember)の[配列][]を指定します。[`ProxyPass`][]で使用可能な任意のキー-値ペアを使用できます。 - -デフォルト値: 空配列。　 - -#### 定義タイプ: `apache::custom_config` - -Apacheサーバの`conf.d`ディレクトリにカスタム設定ファイルを追加します。このファイルが無効で、この定義タイプの[`verify_config`][]パラメータの値が`true`になっている場合は、Puppet実行時にエラーが生じます。 - -**パラメータ**:　 - -##### `ensure` - -設定ファイルが存在するべきかどうかを指定します。 - -値: 'absent'、'present'。　 - -デフォルト値: 'present'。　 - -##### `confdir`　 - -Puppetが設定ファイルを置くディレクトリを設定します。 - -デフォルト値: [`$::apache::confd_dir`][`confd_dir`]の値。 - -##### `content` - -設定ファイルのコンテンツを設定します。`content`および[`source`][]パラメータは、相互排他的な関係にあります。 - -デフォルト値: `undef`。　 - -##### `filename` - -Puppetが設定を保存する`confdir`下のファイル名を設定します。 - -デフォルト値: `priority`パラメータから生成したファイル名およびリソース名。 - -##### `priority` - -Apacheでは設定ファイルがアルファベット順に処理されるため、ファイル名の先頭にこのパラメータの数値を付加することで、設定ファイルの優先順位を設定します。 - -設定ファイル名の優先順位の接頭値を無視するには、このパラメータを`false`に設定します。 - -デフォルト値: '25'。 - -##### `source` - -設定ファイルのソースを指します。[`content`][]および`source`パラメータは互いに排他的です。 - -デフォルト値: `undef`。　 - -##### `verify_command` - -Puppetが設定ファイルの確認に用いるコマンドを指定します。完全修飾コマンドを使用してください。 - -このパラメータは、[`verify_config`][]パラメータの値が`true`になっている場合にのみ使用されます。`verify_command`が失敗すると、Puppet実行により設定ファイルが削除されてエラーが生じますが、Apacheサービスには通知されません。 - -デフォルト値: '/usr/sbin/apachectl -t'。 - -##### `verify_config` - -Apacheサービスに通知する前に設定ファイルのバリデーションを行うかどうかを指定します。 - -ブーリアン。 - -デフォルト値: `true`。 - -#### 定義タイプ: `apache::fastcgi::server` - -特定のファイルタイプを処理する1つまたは複数の外部FastCGIサーバを定義します。この定義タイプは、[`mod_fastcgi`][FastCGI]とともに使用します。 - -**パラメータ**　 - -##### `host` - -FastCGIのホスト名またはIPアドレスおよびTCPポート番号(1-65535)を決定します。 - -デフォルト値: '127.0.0.1:9000'。 - -##### `timeout` - -リクエストが中止され、エラーLogLevelにイベントが記録されるまでに、[FastCGI][]アプリケーションが非アクティブの状態で待機する秒数を設定します。この非アクティブタイマーは、FastCGIアプリケーションとの接続が待機中の場合のみ適用されます。アプリケーションの待ち行列に入ったリクエストに対して時間内に記述やフラッシュによる応答がないと、リクエストは中止されます。アプリケーションとの通信は完了したものの、クライアントとの通信が完了しなかった(応答がバッファリングされた)場合は、タイムアウトは適用されません。 - -デフォルト値: 15。 - -##### `flush` - -アプリケーションから受信したデータを、強制的に[`mod_fastcgi`][FastCGI]がクライアントに書き込みます。デフォルトでは、アプリケーションをできるだけ早くフリーな状態にするために、`mod_fastcgi`はデータをバッファリングします。 - -デフォルト値: `false`。 - -##### `faux_path` - -Apacheには、このファイル名を決定するURIを処理する[FastCGI][]があります。このパラメータで設定されたパスは、ローカルのファイルシステムに存在する必要はありません。 - -デフォルト値: "/var/www/${name}.fcgi"。 - -##### `alias` - -FastCGIサーバとアクションを内部でリンクします。このエイリアスは一意である必要があります。 - -デフォルト値: "/${name}.fcgi"。 - -##### `file_type` - -FastCGIサーバにより処理するファイルの[MIME `content-type`][]を設定します。 - -デフォルト値: 'application/x-httpd-php'。 - -#### 定義タイプ: `apache::listen` - -Apacheサーバまたはバーチャルホストのリッスンするアドレスとポートを定義する、Apache設定ディレクトリの`ports.conf`に、[`Listen`][]ディレクティブを追加します。[`apache::vhost`][]クラスはこの定義タイプを使用します。タイトルは ``、`:`、または`:`の形式をとります。 - -#### 定義タイプ: `apache::mod` - -対応する[`apache::mod::`][]クラスを持たないApacheモジュール用のパッケージをインストールし、Apacheサーバの`module`および`enable`ディレクトリ内で、モジュールのデフォルト設定ファイルを確認または配置します。デフォルトのロケーションは、オペレーティングシステムによって異なります。 - -**パラメータ**:　 - -##### `package` - -**必須**。　 - -PuppetがApacheモジュールのインストールに使用するパッケージの名前。 - -デフォルト値: `undef`。 - -##### `package_ensure` - -Apacheモジュールをインストールの必要性をPuppetが確認するかどうかを決定します。 - -値: 'absent'、'present'。　 - -デフォルト値: 'present'。　 - -##### `lib` - -モジュールの共有オブジェクト名を定義します。特別な理由がない限り、手動で設定しないでください。 - -デフォルト値: `mod_$name.so`。 - -##### `lib_path` - -モジュールのライブラリのパスを指定します。特別な理由がない限り、手動で設定しないでください。[`path`][]パラメータは、この値をオーバーライドします。 - -デフォルト値: `apache`クラスの[`lib_path`][]パラメータ。 - - -##### `loadfile_name` - -モジュールの[`LoadFile`][]ディレクティブのファイル名を設定します。Apacheの処理はアルファベット順に行われるため、ファイル名によってモジュールのロード順序も設定できます。 - -値: `\*.load`の形式のファイル名。 - -デフォルト値: '$name.load'のように、リソース名の後に'load'をつけた値。 - -##### `loadfiles` - -[`LoadFile`][]ディレクティブの配列を指定します。 - -デフォルト値: `undef`。 - -##### `path` - -モジュールのパスを指定します。特別な理由がない限り、このパラメータは手動で設定しないでください。 - -デフォルト値: [`lib_path`][]/[`lib`][]。 - -#### 定義タイプ: `apache::namevirtualhost` - -[名前ベースのバーチャルホスト][]を有効にし、Apache HTTPD設定ディレクトリの `ports.conf`ファイルに関連するすべてのディレクティブを追加します。タイトルは、'\*'、'\*:\'、'\_default\_:\、'\'、または'\:\'の形式をとることができます。 - -#### 定義タイプ: `apache::vhost` - -apacheモジュールでは、バーチャルホストのセットアップと設定に関して、かなりの柔軟性が認められています。この柔軟性の一部は、定義リソースタイプの`vhost`によるものです。これを使えば、さまざまなパラメータを用いて、Apacheを何度も検証することができます。 - -`apache::vhost`定義タイプを使えば、デフォルトの範囲外の要件を持つバーチャルホストについて、特別な設定をすることができます。基本の`::apache`クラス内でデフォルトのバーチャルホストを設定することも、カスタマイズしたバーチャルホストをデフォルトとして設定することもできます。カスタマイズしたバーチャルホストの[`priority`][]の数値は基本のクラスよりも小さくなるため、Apacheはカスタマイズしたバーチャルホストを先に処理します。 - -`apache::vhost`定義タイプでは、`concat::fragment`を使用して設定ファイルを構築します。定義タイプがもともとサポートしていない設定の要素についてカスタムフラグメントを挿入するには、カスタムフラグメントをひとつずつ追加します。 - -`apache::vhost`定義タイプでは、カスタムフラグメントの`order`パラメータについては10の倍数が使用されるため、10の倍数ではない`order`が機能します。 - -> **Note:** `apache::vhost`を作成するとき、`default`または`default-ssl`を指定することはできません。これはこの属性を持つvhostsが常にモジュールによって管理されるためです。これは`Apache::Vhost['default']`または`Apache::Vhost['default-ssl]`リソースを上書きできないことを意味します。 オプションの回避策として、`my default`などの別の名前のvhostを作成して、`default`および`default_ssl`が`false`に設定されていることを確認します。 - -``` -class { 'apache': - default_vhost => false - default_ssl_vhost => false, -} -``` - -**パラメータ**:　 - -##### `access_log` - -`*_access.log`ディレクティブ(`*_file`,`*_pipe`または`*_syslog`)を設定するかどうかを決定します。 - -ブーリアン。 - -デフォルト値: `true`。　 - -##### `access_log_env_var` - -特定の環境変数を持つリクエストのみをロギングするように指定します。 - -デフォルト値: `undef`。 - -##### `access_log_file` - -[`logroot`][]に置く`*_access.log`のファイル名を設定します。バーチャルホスト---例えばexample.comなど---を与えると、[SSL暗号化][SSL暗号化]バーチャルホストの場合はデフォルト値が'example.com_ssl.log'、暗号化されていないバーチャルホストの場合は'example.com_access.log'になります。 - -デフォルト値: `false`。 - -##### `access_log_format` - -アクセスログに、[`LogFormat`][]のニックネームかカスタムフォーマットの文字列のいずれを使うかを指定します。 - -デフォルト値: 'combined'。 - -##### `access_log_pipe` - -Apacheがアクセスログメッセージを送信するパイプを指定します。 - -デフォルト値: `undef`。 - -##### `access_log_syslog` - -すべてのアクセスログメッセージをsyslogに送ります。 - -デフォルト値: `undef`。 - -##### `add_default_charset` - -[`AddDefaultCharset`][]ディレクティブのデフォルトのメディア文字セット値を設定します。これは`text/plain`および`text/html`応答に追加されます。 - -デフォルト値: `undef`。 - -##### `add_listen` - -バーチャルホストが[`Listen`][]ステートメントを作成するかどうかを決定します。 - -`add_listen`を`false`に設定すると、バーチャルホストは`Listen`ステートメントを作成しません。これは、`ip`パラメータを渡されていないバーチャルホストと渡されているバーチャルホストを組み合わせる場合に重要となります。 - -ブーリアン。 - -デフォルト値: `true`。 - -##### `use_optional_includes` - -Apache 2.4以降の`additional_includes`について、Apacheが[`Include`][]の代わりに[`IncludeOptional`][]ディレクティブを使うかどうかを指定します。 - -ブーリアン。 - -デフォルト値: `false`。 - -##### `additional_includes` - -追加の静的なバーチャルホスト固有のApache設定ファイルのパスを指定します。このパラメータを使えば、このモジュールでサポートされていない固有のカスタム設定を実装することができます。 - -値: パスを指定する文字列また文字列の[配列][]。 - -デフォルト値: 空配列。　 - -##### `aliases` - -[ハッシュ][ハッシュ]のリストをバーチャルホストに渡し、[`mod_alias`][]ドキュメントに従って[`Alias`][]、[`AliasMatch`][]、[`ScriptAlias`][]、または[`ScriptAliasMatch`][]ディレクティブを作成します。 - -例:　 - -``` puppet -aliases => [ - { aliasmatch => '^/image/(.*)\.jpg$', - path => '/files/jpg.images/$1.jpg', - }, - { alias => '/image', - path => '/ftp/pub/image', - }, - { scriptaliasmatch => '^/cgi-bin(.*)', - path => '/usr/local/share/cgi-bin$1', - }, - { scriptalias => '/nagios/cgi-bin/', - path => '/usr/lib/nagios/cgi-bin/', - }, - { alias => '/nagios', - path => '/usr/share/nagios/html', - }, -], -``` - -`alias`、`aliasmatch`、`scriptalias`、`scriptaliasmatch`キーを機能させるには、``、``などの、それぞれに対応するコンテキストが必要です。Puppetは`aliases`パラメータで指定された順序でディレクティブを作成します。[`mod_alias`][]ドキュメントにもあるように、シャドーイングを避けるため、まず具体性の高い`alias`、`aliasmatch`、`scriptalias`、`scriptaliasmatch`パラメータを追加してから、全般的なパラメータを追加してください。 - -> **注意**: `scriptaliases`パラメータの代わりに`aliases`パラメータを使用すれば、各種のエイリアスディレクティブの順序を正確に制御できます。`scriptaliases`パラメータを使って`ScriptAliases`を定義すると、すべての*`Alias`ディレクティブの後に*すべての*`ScriptAlias`ディレクティブが*処理されます。これは`Alias`ディレクティブによる`ScriptAlias`ディレクティブのシャドーイングにつながり、多くの場合、問題が生じます。例えば、Nagiosに関する問題が生じる可能性があります。 - -I[`apache::mod::passenger`][]がロードされ、`PassengerHighPerformance`が`true`になっている場合、`Alias`ディレクティブが`PassengerEnabled => off`ステートメントを履行できない可能性があります。詳細については、[この記事](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html)を参照してください。 - -##### `allow_encoded_slashes` - -バーチャルホストの[`AllowEncodedSlashes`][]宣言を設定し、サーバのデフォルトをオーバーライドします。これにより、`\`および`/`文字を含むURLに対するバーチャルホストの応答が変更されます。値: 'nodecode'、'off'、'on'。デフォルト設定では、サーバ設定からこの宣言が省かれ、Apacheのデフォルト設定'Off'が選択されます。 - -デフォルト値: `undef`。　 - -##### `block` - -Apacheがアクセスをブロックする対象のリストを指定します。有効なオプション: 'scm'、これにより、`.svn`、`.git`、`.bzr`ディレクティブへのWebアクセスがブロックされます。 - -デフォルト値: 空[配列][]。 - -##### `cas_attribute_prefix` - -SAMLバリデーションが有効になっている場合に、このヘッダの値を属性値としてヘッダを追加します。 - -デフォルト値: [`apache::mod::auth_cas`][]により設定された値。 - -##### `cas_attribute_delimiter` - -`cas_attribute_prefix`により作成されたヘッダの属性値の区切り文字を設定します。 - -デフォルト値: [`apache::mod::auth_cas`][]により設定された値。　 - -##### `cas_login_url` - -ユーザがCASで保護されたリソースへのアクセスを試み、かつアクティブなセッションがない場合に、モジュールがユーザをリダイレクトする先のURLを設定します。 - -デフォルト値: [`apache::mod::auth_cas`][]により設定された値。　 - -##### `cas_scrub_request_headers` - -mod_auth_cas内で特別な意味を持つ可能性のあるインバウンドリクエストヘッダを削除します。 - -デフォルト値: [`apache::mod::auth_cas`][]により設定された値。　 - -##### `cas_sso_enabled` - -`cas_sso_enabled`: シングルサインアウトの実験的サポートを有効にします(POSTデータが壊れる可能性があります)。 - -デフォルト値: [`apache::mod::auth_cas`][]により設定された値。　 - -##### `cas_validate_saml` - -SAMLに関するCASサーバからの解析応答。 - -デフォルト値: [`apache::mod::auth_cas`][]により設定された値。　 - -##### `cas_validate_url` - -HTTPクエリ文字列でクライアントの提示するチケットをバリデーションする際に使用するURL。 - -デフォルト値: [`apache::mod::auth_cas`][]により設定された値。 - -##### `custom_fragment` - -カスタム設定ディレクティブの文字列を渡し、バーチャルホスト設定の最後に配置します。 - -デフォルト値: `undef`。 - -##### `default_vhost` - -任意の`apache::vhost`定義タイプを、他の`apache::vhost`定義タイプと一致しないリクエストをサーブするためのデフォルトとして設定します。 - -デフォルト値: `false`。 - -##### `directories` - -[`directories`](#parameter-directories-for-apachevhost)セクションを参照してください。 - -##### `directoryindex` - -ディレクトリ名の最後で'/'を指定することで、クライアントがディレクトリのインデックスをリクエストした際に探すべきリソースのリストを設定します。詳細については、[`DirectoryIndex`][]ディレクティブドキュメントを参照してください。 - -デフォルト値: `undef`。 - -##### `docroot` - -**必須**。　 - -[`DocumentRoot`][]ロケーションを設定します。Apacheはここからファイルをサーブします。 - -`docroot`と[`manage_docroot`][]がともに`false`に設定されている場合、[`DocumentRoot`][]は設定されず、それに付随する``ブロックは作成されません。 - -値: ディレクトリパスを指定する文字列。 - -##### `docroot_group` - -[`docroot`][]ディレクトリへのグループアクセスを設定します。 - -値: システムグループを指定する文字列。 - -デフォルト値: 'root'。　 - -##### `docroot_owner` - -[`docroot`][]ディレクトリへの個々のユーザのアクセスを設定します。 - -値: ユーザアカウントを指定する文字列。 - -デフォルト値: 'root'。　 - -##### `docroot_mode` - -[`docroot`][]ディレクトリへのアクセス許可を数字表記法で設定します。 - -値: 文字列。　 - -デフォルト値: `undef`。 - -##### `manage_docroot` - -Puppetが[`docroot`][]ディレクトリを管理するかどうかを決定します。 - -ブーリアン。 - -デフォルト値: `true`。 - -##### `error_log` - -`*_error.log`ディレクティブを設定するかどうかを指定します。 - -ブーリアン。 - -デフォルト値: `true`。 - -##### `error_log_file` - -バーチャルホストのエラーログについて、`*_error.log`ファイルを優先します。このパラメータが定義されていない場合、Puppetはまず[`error_log_pipe`][]で、次に[`error_log_syslog`][]で値を確認します。 - -これらのパラメータをいずれも設定しない場合は、例えばバーチャルホストが`example.com`なら、PuppetはSSLバーチャルホストのデフォルトを'$logroot/example.com_error_ssl.log'、非SSLバーチャルホストのデフォルトを'$logroot/example.com_error.log'とします。 - -デフォルト値: `undef`。 - -##### `error_log_pipe` - -エラーログメッセージを送るパイプを指定します。 - -[`error_log_file`][]パラメータに値がある場合は、このパラメータに効力は生じません。このパラメータにも`error_log_file`にも値がない場合、Puppetは[`error_log_syslog`][]をチェックします。 - -デフォルト値: `undef`。 - -##### `error_log_syslog` - -すべてのエラーログメッセージをsyslogに送るかどうかを決定します。 - -[`error_log_file`][]パラメータまたは[`error_log_pipe`][]パラメータのいずれかに値がある場合、このパラメータの効力は生じません。これらのパラメータのいずれにも値がない場合は、例えばバーチャルホスト`example.com`では、PuppetはSSLバーチャルホストのデフォルトを'$logroot/example.com_error_ssl.log'、非SSLバーチャルホストのデフォルトを '$logroot/example.com_error.log'とします。 - -ブーリアン。 - -デフォルト値: `undef`。 - -##### `error_documents` - -このバーチャルホストの[エラードキュメント](https://httpd.apache.org/docs/current/mod/core.html#errordocument)設定のオーバーライドに使用できるハッシュのリスト。 - -例:　 - -``` puppet -apache::vhost { 'sample.example.net': - error_documents => [ - { 'error_code' => '503', 'document' => '/service-unavail' }, - { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' }, - ], -} -``` - -デフォルト値: '[]'。 - -##### `ensure` - -バーチャルホストが存在するかどうかを指定します。 - -値: 'absent'、'present'。　 - -デフォルト値: 'present'。　 - -##### `fallbackresource` - -[FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource)ディレクティブを設定します。このディレクティブは、ファイルシステム内のどこにもマッピングされていないURLに対してどのようなアクションをとるか指定します。指定されていない場合は'HTTP 404 (Not Found)'が返されます。値は'/'で始めるか、'disabled'とする必要があります。 - -デフォルト値: `undef`。 - -#####`fastcgi_idle_timeout` - -fastcgiを使用する場合に、このオプションにより、サーバ応答のタイムアウトを設定します。 - -デフォルト値: `undef`。 - -##### `file_e_tag` - -[`FileETag`][]宣言のサーバデフォルトを設定します。これにより、静的ファイルの応答ヘッダフィールドが変更されます。 - -値: 'INode'、'MTime'、'Size'、'All'、'None'。 - -デフォルト値: `undef`、この場合、Apacheのデフォルト設定'MTime Size'が使用されます。 - -##### `filters` - -[フィルタ](https://httpd.apache.org/docs/current/mod/mod_filter.html)により、アウトプットコンテンツフィルタのスマートな文脈依存設定が有効になります。 - -``` puppet -apache::vhost { "$::fqdn": - filters => [ - 'FilterDeclare COMPRESS', - 'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/html', - 'FilterChain COMPRESS', - 'FilterProtocol COMPRESS DEFLATE change=yes;byteranges=no', - ], -} -``` - -##### `force_type` - -[`ForceType`][]ディレクティブを設定します。このディレクティブは、[MIME `content-type`][]がこのパラメータの値に一致するすべてのマッチングファイルをApacheに強制的にサーブさせます。 - -#### `add_charset` - -ディレクトリおよびファイル拡張子ごとに、Apacheにカスタムコンテンツ文字セットを設定させます。 - -##### `headers` - -レスポンスヘッダを置換、結合、または削除するための行を追加します。詳細については、[Apacheのmod_headersドキュメント](https://httpd.apache.org/docs/current/mod/mod_headers.html#header)を参照してください。 - -値: 文字列または文字列の配列。　 - -デフォルト値: `undef`。 - -##### `ip` - -バーチャルホストがリッスンするIPアドレスを設定します。デフォルトでは、Apacheのデフォルト挙動が使用され、すべてのIPをリッスンします。 - -値: 文字列または文字列の配列。　 - -デフォルト値: `undef`。 - -##### `ip_based` - -[IPベースの](https://httpd.apache.org/docs/current/vhosts/ip-based.html)バーチャルホストを有効にします。このパラメータにより、NameVirtualHostディレクティブの作成が禁止されます。これは、このディレクティブが名前ベースのバーチャルホストにリクエストを送る際に使用されるためです。 - -デフォルト値: `false`。 - -##### `itk` - -ハッシュで[ITK](http://mpm-itk.sesse.net/)を設定します。 - -通常は、以下のように使用します。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - itk => { - user => 'someuser', - group => 'somegroup', - }, -} -```　 - -値: ハッシュ。キーを含めることもできます。 - -* ユーザ + グループ -* `assignuseridexpr` -* `assigngroupidexpr` -* `maxclientvhost` -* `nice` -* `limituidrange` (Linux 3.5.0以降) -* `limitgidrange` (Linux 3.5.0以降) - -通常は、以下のように使用します。　 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - itk => { - user => 'someuser', - group => 'somegroup', - }, -} -```　 - -デフォルト値: `undef`。 - -##### `jk_mounts` - -'JkMount'および'JkUnMount'ディレクティブによりバーチャルホストを設定し、TomcatとApacheの間をマッピングするURLのパスを処理します。 - -このパラメータは、ハッシュの配列にする必要があります。各ハッシュには、'worker'と、'mount'または'unmount'キーのいずれかが含まれている必要があります。 - -通常は、以下のように使用します。　 - -``` puppet -apache::vhost { 'sample.example.net': - jk_mounts => [ - { mount => '/*', worker => 'tcnode1', }, - { unmount => '/*.jpg', worker => 'tcnode1', }, - ], -} -``` -デフォルト値: `undef`。 - -##### `keepalive` - -バーチャルホストで[`KeepAlive`][]ディレクティブによるHTTPの持続的接続を有効にするかどうかを決定します。デフォルトでは、グローバルなサーバ全体の[`KeepAlive`][]設定が有効になります。 - -バーチャルホストの関連オプションを設定するには、`keepalive_timeout`および`max_keepalive_requests`パラメータを使用します。 - -値: 'Off'、'On'。 - -デフォルト値: `undef`。　 - -##### `keepalive_timeout` - -バーチャルホストの[`KeepAliveTimeout`]ディレクティブを設定します。これにより、HTTPの持続的接続で後続のリクエストを実行するまでの待機時間が決まります。デフォルトでは、グローバルなサーバ全体の[`KeepAlive`][]設定が有効になります。 - -このパラメータが意味を持つのは、グローバルなサーバ全体の[`keepalive`パラメータ][]またはバーチャルホストごとの`keepalive`パラメータのいずれかが有効になっている場合のみです。　 - -デフォルト値: `undef`。　 - -##### `max_keepalive_requests` - -接続1回につき許可されるバーチャルホストへのリクエスト数を制限します。デフォルトでは、グローバルなサーバ全体の[`KeepAlive`][]設定が有効になります。 - -このパラメータが意味を持つのは、グローバルなサーバ全体の[`keepalive`パラメータ][]またはバーチャルホストごとの`keepalive`パラメータのいずれかが有効になっている場合のみです。　 - -デフォルト値: `undef`。 - -##### `auth_kerb` - -バーチャルホストの[`mod_auth_kerb`][]パラメータを有効にします。 - -通常は、以下のように使用します。　 - -``` puppet -apache::vhost { 'sample.example.net': - auth_kerb => `true`, - krb_method_negotiate => 'on', - krb_auth_realms => ['EXAMPLE.ORG'], - krb_local_user_mapping => 'on', - directories => { - path => '/var/www/html', - auth_name => 'Kerberos Login', - auth_type => 'Kerberos', - auth_require => 'valid-user', - }, -} -``` - -関連するパラメータは、`mod_auth_kerb`ディレクティブの名前に従います。 - -- `krb_method_negotiate`: Negotiateメソッドを使用するかどうかを決定します。デフォルト値: 'on'。 -- `krb_method_k5passwd`: Kerberos v5に関してパスワードベースの認証を使用するかどうかを決定します。デフォルト値: 'on'。 -- `krb_authoritative`: 'off'に設定すると、認証コントロールを別のモジュールに渡すことができます。デフォルト値: 'on'。 -- `krb_auth_realms`: 認証に使用するKerberos領域の配列を指定します。デフォルト値: '[]'。 -- `krb_5keytab`: Kerberos v5キータブファイルのロケーションを指定します。デフォルト値: `undef`。 -- `krb_local_user_mapping`: 今後の使用のために、ユーザ名から@REALMを取り除きます。デフォルト値: `undef`。 - -ブーリアン。 - -デフォルト値: `false`。 - -##### `krb_verify_kdc` - -このオプションを使えば、ローカルなキータブに対する認証チケットを無効にし、KDCスプーフィング攻撃を防ぐことができます。 - -デフォルト値: 'on'。 - -##### `krb_servicename` - -Apacheが認証に使用するサービス名を指定します。この名前に対応するキーをキータブに保存する必要があります。 - -デフォルト値: 'HTTP'。 - -##### `krb_save_credentials` - -このオプションにより、認証情報の保存機能が有効になります。 - -デフォルト値: 'off'。 - -##### `logroot` - -バーチャルホストのログファイルの保存場所を指定します。 - -デフォルト値: '/var/log//'。 - -##### `$logroot_ensure` - -バーチャルホストのlogrootディレクトリを削除するかどうかを決定します。 - -値: 'directory'、'absent'。 - -デフォルト値: 'directory'。 - -##### `logroot_mode` - -logrootディレクトリで設定されたモードをオーバーライドします。影響を把握できない場合は、ログが保存されているディレクトリへの書き込みアクセス権限を付与*しないで*ください。詳細については、[Apacheのログセキュリティドキュメント](https://httpd.apache.org/docs/2.4/logs.html#security)を参照してください。 - -デフォルト値: `undef`。 - -##### `logroot_owner` - -logrootディレクトリへの個々のユーザのアクセスを設定します。 - -デフォルト値：`undef`。 - -##### `logroot_group` - -[`logroot`][]ディレクトリへのグループアクセスを設定します。 - -デフォルト値：`undef`。 - -##### `log_level` - -エラーログの詳細レベルを指定します。 - -値: 'emerg'、'alert'、'crit'、'error'、'warn'、'notice'、'info'、'debug'。 - -デフォルト値: グローバルサーバ設定については'warn'。バーチャルホストごとにオーバーライドできます。 - -###### `modsec_body_limit` - -バッファリングに関してModSecurityが受け入れる最大リクエストボディサイズをバイト数で設定します。 - -値: 整数。 - -デフォルト値: `undef`。 - -###### `modsec_disable_vhost` - -バーチャルホストで[`mod_security`][]を無効にします。[`apache::mod::security`][]が含まれている場合にのみ有効です。 - -ブーリアン。 - -デフォルト値: `undef`。 - -###### `modsec_disable_ids` - -バーチャルホストから`mod_security` IDを削除します。 - -値: バーチャルホストから削除する`mod_security` IDの配列。ハッシュも使用できます。この場合、特定のロケーションからのIDの削除が可能です。 - -``` puppet -apache::vhost { 'sample.example.net': - modsec_disable_ids => [ 90015, 90016 ], -} -``` - -``` puppet -apache::vhost { 'sample.example.net': - modsec_disable_ids => { '/location1' => [ 90015, 90016 ] }, -} -``` - -デフォルト値: `undef`。 - -###### `modsec_disable_ips` - -[`mod_security`][]ルールマッチングから除外するIPアドレスの配列を指定します。 - -デフォルト値: `undef`。 - -###### `modsec_disable_msgs` - -バーチャルホストから削除するmod_security Msgの配列。ハッシュも使用できます。この場合、特定のロケーションからのMsgの削除が可能です。 - -``` puppet -apache::vhost { 'sample.example.net': - modsec_disable_msgs => [ 'Blind SQL Injection Attack', 'Session Fixation Attack' ], -} -``` - -``` puppet -apache::vhost { 'sample.example.net': - modsec_disable_msgs => { '/location1' => [ 'Blind SQL Injection Attack', 'Session Fixation Attack' ] }, -} -``` - -デフォルト値: `undef`。 - -###### `modsec_disable_tags` - - バーチャルホストから削除するmod_securityタグの配列。ハッシュも使用できます。この場合、特定のロケーションからのタグの削除が可能です。 - -``` puppet -apache::vhost { 'sample.example.net': - modsec_disable_tags => [ 'WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS' ], -} -``` - -``` puppet -apache::vhost { 'sample.example.net': - modsec_disable_tags => { '/location1' => [ 'WEB_ATTACK/SQL_INJECTION', 'WEB_ATTACK/XSS' ] }, -} -``` - -デフォルト値: `undef`。 - -##### `modsec_audit*` - -* `modsec_audit_log` -* `modsec_audit_log_file` -* `modsec_audit_log_pipe` - -この3つのパラメータは、いずれも`mod_security`オーディットログの送信方法を決定します([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog))。 - -* `modsec_audit_log_file`が設定されている場合は、[`logroot`][]と比較されます。 - - デフォルト値: `undef`。 - -* `modsec_audit_log_pipe`を設定する場合は、パイプで始める必要があります。例えば、'|/path/to/mlogc /path/to/mlogc.conf'のようになります。 - - デフォルト値: `undef`。 - -* `modsec_audit_log`が`true`になっている場合、バーチャルホスト---example.comなど---を与えると、[SSL暗号化][SSL encryption]バーチャルホストの場合はデフォルト値が'example.com\_security\_ssl.log'、暗号化されていないバーチャルホストの場合は'example.com\_security.log'になります。 - - デフォルト値: `false`。 - -上述のパラメータがいずれも設定されていない場合、グローバルオーディットログが使用されます(''/var/log/httpd/modsec\_audit.log''; Debianおよびデリバティブ: ''/var/log/apache2/modsec\_audit.log''; その他: )。 - -##### `no_proxy_uris` - -プロキシを使用しないURLを指定します。このパラメータは、[`proxy_dest`](#proxy_dest)と組み合わせて使用することはできません。 - -デフォルト値: []。　 - -##### `no_proxy_uris_match` - -このディレクティブは[`no_proxy_uris`][]と同じですが、正規表現をとります。 - -デフォルト値: []。　 - -##### `proxy_preserve_host` - -[ProxyPreserveHostディレクティブ](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypreservehost)を設定します。 - -このパラメータを`true`に設定すると、受信リクエストの`Host:`行が有効になり、ホスト名ではなくホストにプロキシされます。`false`に設定すると、このディレクティブが'Off'になります。 - -ブーリアン。 - -デフォルト値: `false`。 - -##### `proxy_add_headers` - -[ProxyAddHeadersディレクティブ](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyaddheaders)を設定します。 - -このパラメータは、プロキシ関連のHTTPヘッダ(X-Forwarded-For、X-Forwarded-Host、X-Forwarded-Server)をバックエンドサーバに送信するかどうかを制御します。 - -ブーリアン。 - -デフォルト値: `false`。 - -##### `proxy_error_override` - -[ProxyErrorOverrideディレクティブ](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyerroroverride)を設定します。このディレクティブは、プロキシされたコンテンツに関するエラーページをApacheによりオーバーライドすべきかどうかを制御します。 - -ブーリアン。 - -デフォルト値: `false`。 - -##### `options` - -指定されたバーチャルホストの[`Options`][]を設定します。例: - -``` puppet -apache::vhost { 'site.name.fdqn': - … - options => ['Indexes','FollowSymLinks','MultiViews'], -} -``` - -> **注意**: [`apache::vhost`][]の[`directories`][]パラメータを使うと、'Options'、'Override'、'DirectoryIndex'は`directories`内のパラメータであるため、無視されます。 - -デフォルト値: ['Indexes','FollowSymLinks','MultiViews']。 - -##### `override` - -指定されたバーチャルホストのオーバーライドを設定します。[AllowOverride](https://httpd.apache.org/docs/current/mod/core.html#allowoverride)引数の配列を使用できます。 - -デフォルト値: '[none]'。 - -##### `passenger_spawn_method` - -[PassengerSpawnMethod](https://www.phusionpassenger.com/library/config/apache/reference/#passengerspawnmethod)を設定します。Passengerが引き起こしたアプリケーションに直接か、preforkのcopy-on-writeメカニズムを使用します。 - -有効なオプション: `smart`または`direct`。 - -デフォルト値: `undef`。 - -##### `passenger_app_root` - -[PassengerRoot](https://www.phusionpassenger.com/library/config/apache/reference/#passengerapproot)を設定します。これは、DocumentRootと異なる場合のPassengerアプリケーションルートのロケーションです。 - -値: パスを指定する文字列。　 - -デフォルト値: `undef`。 - -##### `passenger_app_env` - -[PassengerAppEnv](https://www.phusionpassenger.com/library/config/apache/reference/#passengerappenv)を設定します。これは、Passengerアプリケーションに関する環境です。指定されていない場合は、グローバル設定の'production'がデフォルトになります。 - -値: 環境名を指定する文字列。 - -デフォルト値: `undef`。 - -##### `passenger_log_file` - -デフォルトでは、PassengerログメッセージはApacheグローバルエラーログに書き込まれます。[PassengerLogFile](https://www.phusionpassenger.com/library/config/apache/reference/#passengerlogfile)を使えば、そのメッセージを別のファイルに書き込むように設定することができます。このオプションは、Passenger 5.0.5以降でのみ使用できます。 - -値: パスを指定する文字列。　 - -デフォルト値: `undef`。 - -##### `passenger_log_level` - -このオプションを使えば、ログファイルに書き込む情報の量を指定できます。設定されていない場合は、[PassengerLogLevel](https://www.phusionpassenger.com/library/config/apache/reference/#passengerloglevel)は設定ファイルに表示されず、デフォルト値が使用されます。 - -デフォルト値: 3.0.0以前のPassengerバージョン: '0'; 5.0.0以降: '3'。 - -##### `passenger_ruby` - -[PassengerRuby](https://www.phusionpassenger.com/library/config/apache/reference/#passengerruby)を設定します。これは、バーチャルホスト上でこのアプリケーションに関して使用するRubyインタープリタです。 - -デフォルト値: `undef`。 - -##### `passenger_min_instances` - -[PassengerMinInstances](https://www.phusionpassenger.com/library/config/apache/reference/#passengermininstances)を設定します。これは、実行するアプリケーションプロセスの最小数です。 - -##### `passenger_max_requests` - -[PassengerMaxRequests](https://www.phusionpassenger.com/library/config/apache/reference/#pas -sengermaxrequests)を設定します。これは、アプリケーションプロセスが処理するリクエストの最大数です。 - -##### `passenger_max_instances_per_app` - -[PassengerMaxInstancesPerApp](https://www.phusionpassenger.com/library/config/apache/reference/#passengermaxinstancesperapp)を設定します。これは、単一のアプリケーションに関して同時に存在できるアプリケーションプロセスの最大数です。 - -デフォルト値: `undef`。 - -##### `passenger_start_timeout` - -[PassengerStartTimeout](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstarttimeout)を設定します。これは、アプリケーション起動のタイムアウトです。 - -##### `passenger_pre_start` - -[PassengerPreStart](https://www.phusionpassenger.com/library/config/apache/reference/#passengerprestart)を設定します。これは、プレ起動が必要とされる場合のアプリケーションのURLです。 - -##### `passenger_user` - -[PassengerUser](https://www.phusionpassenger.com/library/config/apache/reference/#passengeruser)を設定します。これは、サンドボックスアプリケーションの実行ユーザです。 - -##### `passenger_high_performance` - -[`PassengerHighPerformance`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerhighperformance)パラメータを設定します。 - -値: `true`、`false`。 - -デフォルト値: `undef`。 - -##### `passenger_nodejs` - -[`PassengerNodejs`](https://www.phusionpassenger.com/library/config/apache/reference/#passengernodejs)を設定します。これは、バーチャルホスト上でこのアプリケーションに関して使用するNodeJSインタープリタです。 - -##### `passenger_sticky_sessions` - -[`PassengerStickySessions`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstickysessions)パラメータを設定します。 - -ブーリアン。 - -デフォルト値: `undef`。 - -##### `passenger_startup_file` - -[`PassengerStartupFile`](https://www.phusionpassenger.com/library/config/apache/reference/#passengerstartupfile)パスを設定します。このパスは、アプリケーションルートに関連しています。 - -##### `php_flags & values` - -バーチャルホストごとの設定[`php_value`または`php_flag`](http://php.net/manual/en/configuration.changes.php)を許可します。これらのフラグや値は、ユーザまたはアプリケーションにより上書きすることができます。 - -デフォルト値: '{}'。 - -##### `php_admin_flags & values` - -バーチャルホストごとの設定[`php_admin_value`または`php_admin_flag`](http://php.net/manual/en/configuration.changes.php)を許可します。これらのフラグや値は、ユーザまたはアプリケーションにより上書きすることができます。 - -デフォルト値: '{}'。 - -##### `port` - -ホストを設定するポートを設定します。モジュールのデフォルトでは、ホストがリッスンするのは、非SSLバーチャルホストではポート80、SSLバーチャルホストではポート443です。ホストはこのパラメータで設定されたポートのみをリッスンします。 - -##### `priority` - -Apache HTTPD VirtualHost設定ファイルに関連するロード順序を設定します。 - -優先順位に一致するものがない場合は、アルファベット順で最初の名前ベースのバーチャルホストが使用されます。同様に、高い優先順位を渡すと、他に一致する名前がなければ、アルファベット順で最初の名前ベースのバーチャルホストが使用されます。 - -> **注意:** このパラメータを使用する必要はありません。ただし、使用する場合は、`apache::vhost`の`default_vhost`パラメータの優先順位は'15'になる点に留意してください。 - -ファイル名の優先順位の接頭値を無視するには、優先順位として`false`を渡します。 - -デフォルト値: '25'。 - -##### `proxy_dest` - -[ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass)設定の宛先アドレスを指定します。 - -デフォルト値: `undef`。 - -##### `proxy_pass` - -[ProxyPass](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass)設定の`path => URI`値の配列を指定します。オプションで、配列としてパラメータを追加できます。 - -デフォルト値: `undef`。 - -``` puppet -apache::vhost { 'site.name.fdqn': - … - proxy_pass => [ - { 'path' => '/a', 'url' => 'http://backend-a/' }, - { 'path' => '/b', 'url' => 'http://backend-b/' }, - { 'path' => '/c', 'url' => 'http://backend-a/c', 'params' => {'max'=>20, 'ttl'=>120, 'retry'=>300}}, - { 'path' => '/l', 'url' => 'http://backend-xy', - 'reverse_urls' => ['http://backend-x', 'http://backend-y'] }, - { 'path' => '/d', 'url' => 'http://backend-a/d', - 'params' => { 'retry' => '0', 'timeout' => '5' }, }, - { 'path' => '/e', 'url' => 'http://backend-a/e', - 'keywords' => ['nocanon', 'interpolate'] }, - { 'path' => '/f', 'url' => 'http://backend-f/', - 'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']}, - { 'path' => '/g', 'url' => 'http://backend-g/', - 'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], }, - { 'path' => '/h', 'url' => 'http://backend-h/h', - 'no_proxy_uris' => ['/h/admin', '/h/server-status'] }, - ], -} -``` - -* `reverse_urls`。*オプション。*この設定は、`mod_proxy_balancer`とともに使用する場合に役立ちます。値: 配列または文字列。 -* `reverse_cookies`。*オプション。*`ProxyPassReverseCookiePath`および`ProxyPassReverseCookieDomain`を設定します。 -* `params`。*オプション。*接続設定などのProxyPassキー-値パラメータを許可します。 -* `setenv`。*オプション。*プロキシディレクティブの[環境変数](https://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings)を設定します。値: 配列。 - -##### `proxy_dest_match` - -このディレクティブは[`proxy_dest`][]と同じですが、正規表現をとります。詳細については、[ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)を参照してください。 - -##### `proxy_dest_reverse_match` - -[`proxy_dest_match`][]が指定されている場合に、ProxyPassReverseを渡せるようにします。詳細については、[ProxyPassReverse](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassreverse)を参照してください。 - -##### `proxy_pass_match` - -このディレクティブは[`proxy_pass`][]と同じですが、正規表現をとります。詳細については、[ProxyPassMatch](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypassmatch)を参照してください。 - -##### `rack_base_uris` - -rack設定のリソース識別子を設定します。指定されたファイルパスは、_rack.erbテンプレート内の[Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri)のrackアプリケーションルートとしてリストされます。 - -デフォルト値: `undef`。 - -#####`passenger_base_uris` - -任意のURIをPhusion Passengerのサーブするアプリケーションとして指定するのに使用します。指定されたファイルパスは、_passenger_base_uris.erbテンプレート内の[Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI)のpassengerアプリケーションルートとしてリストされます。 - -デフォルト値: `undef`。 - -##### `redirect_dest` - -リダイレクト先のアドレスを指定します。 - -デフォルト値: `undef`。 - -##### `redirect_source` - -`redirect_dest`で指定された宛先にリダイレクトするソースURIを指定します。リダイレクトするアイテムが複数提供されている場合は、ソースと宛先の長さを一致させる必要があります。また、アイテムは順序に依存します。 - -``` puppet -apache::vhost { 'site.name.fdqn': - … - redirect_source => ['/images','/downloads'], - redirect_dest => ['http://img.example.com/','http://downloads.example.com/'], -} -``` - -##### `redirect_status` - -リダイレクトに追加するステータスを指定します。 - -デフォルト値: `undef`。 - -``` puppet -apache::vhost { 'site.name.fdqn': - … - redirect_status => ['temp','permanent'], -} -``` - -##### `redirectmatch_*` - -* `redirectmatch_regexp` -* `redirectmatch_status` -* `redirectmatch_dest` - -任意の正規表現について呼び出すサーバステータスとユーザの転送先を決定します。配列として入力します。 - -デフォルト値: `undef`。 - -``` puppet -apache::vhost { 'site.name.fdqn': - … - redirectmatch_status => ['404','404'], - redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'], - redirectmatch_dest => ['http://www.example.com/1','http://www.example.com/2'], -} -``` - -##### `request_headers` - -他のリクエストヘッダの追加、リクエストヘッダの削除など、収集した[リクエストヘッダ](https://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader)をさまざまな形で修正します。 - -デフォルト値: `undef`。 - -``` puppet -apache::vhost { 'site.name.fdqn': - … - request_headers => [ - 'append MirrorID "mirror 12"', - 'unset MirrorID', - ], -} -``` - -##### `rewrites` - -URLリライトルールを作成します。ハッシュの配列が求められます。 - -値: 'comment'、'rewrite_base'、'rewrite_cond'、'rewrite_rule'、'rewrite_map'のいずれかのハッシュキー。 - -デフォルト値: `undef`。 - -誰かがindex.htmlにアクセスした場合、welcome.htmlを表示するように指定できます。 - -``` puppet -apache::vhost { 'site.name.fdqn': - … - rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ] -} -``` - -このパラメータにより条件をリライトし、`true`の場合に関連ルールを実行させることが可能です。例えば、ビジターがIEを使っている場合のみURLをリライトするには、以下のように設定します。 - -``` puppet -apache::vhost { 'site.name.fdqn': - … - rewrites => [ - { - comment => 'redirect IE', - rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'], - rewrite_rule => ['^index\.html$ welcome.html'], - }, - ], -} -``` - -複数の条件を適用することもできます。たとえば、ブラウザがLynxかMozilla(バージョン1または2)の場合にのみ、index.htmlをwelcome.htmlにリライトする場合は、以下のようになります。 - -``` puppet -apache::vhost { 'site.name.fdqn': - … - rewrites => [ - { - comment => 'Lynx or Mozilla v1/2', - rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'], - rewrite_rule => ['^index\.html$ welcome.html'], - }, - ], -} -``` - -複数のリライトと条件を設定することも可能です。 - -``` puppet -apache::vhost { 'site.name.fdqn': - … - rewrites => [ - { - comment => 'Lynx or Mozilla v1/2', - rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'], - rewrite_rule => ['^index\.html$ welcome.html'], - }, - { - comment => 'Internet Explorer', - rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'], - rewrite_rule => ['^index\.html$ /index.IE.html [L]'], - }, - { - rewrite_base => /apps/, - rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'], - }, - { comment => 'Rewrite to lower case', - rewrite_cond => ['%{REQUEST_URI} [A-Z]'], - rewrite_map => ['lc int:tolower'], - rewrite_rule => ['(.*) ${lc:$1} [R=301,L]'], - }, - ], -} -``` - -リライトのルールおよび条件については、[`mod_rewrite`ドキュメント][`mod_rewrite`]を参照してください。 - -##### `rewrite_inherit` - -バーチャルホストが全体のリライトルールを継承するかどうかを決定します。 - -デフォルト値: `false`。 - -リライトルールは、全体(`$conf_file`または`$confd_dir`で)またはバーチャルホストの`.conf`ファイル内で指定することができます。デフォルトでは、バーチャルホストは全体の設定を継承しません。継承を有効にするには、`rewrites`パラメータを指定し、`rewrite_inherit`パラメータを`true`に設定します。 - -``` puppet -apache::vhost { 'site.name.fdqn': - … - rewrites => [ - , - ], - rewrite_inherit => `true`, -} -``` - -> **注意**: この設定を有効にするには、`rewrites`パラメータが**必須**です。 - -バーチャルホストに以下のディレクティブが含まれている場合は、Apacheが全体の`Rewrite`ルールを有効にします。 - -``` ApacheConf -RewriteEngine On -RewriteOptions Inherit -``` - -[公式`mod_rewrite`ドキュメント](https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html)のセクション"Rewriting in Virtual Hosts"を参照してください。 - -##### `scriptalias` - -'/usr/scripts'などの、パス'/cgi-bin'のエイリアスとするCGIスクリプトのディレクトリを定義します。 - -デフォルト値: `undef`。 - -##### `scriptaliases` - -> **注意**: このパラメータは廃止予定であり、`aliases`パラメータに置き換えられます。 - -ハッシュの配列をバーチャルホストに渡し、[`mod_alias`ドキュメント][`mod_alias`]に従ってScriptAliasまたはScriptAliasMatchステートメントのいずれかを作成します。 - -``` puppet -scriptaliases => [ - { - alias => '/myscript', - path => '/usr/share/myscript', - }, - { - aliasmatch => '^/foo(.*)', - path => '/usr/share/fooscripts$1', - }, - { - aliasmatch => '^/bar/(.*)', - path => '/usr/share/bar/wrapper.sh/$1', - }, - { - alias => '/neatscript', - path => '/usr/share/neatscript', - }, -] -``` - -ScriptAliasおよびScriptAliasMatchディレクティブは、指定した順に作成されます。 [AliasおよびAliasMatch](#aliases)ディレクティブと同様、シャドーイングを避けるため、まず具体的なエイリアスを指定してから、全般的なものを指定してください。 - -##### `serveradmin` - -エラーページの表示時にApacheが表示するEメールアドレスを指定します。 - -デフォルト値: `undef`。 - -##### `serveraliases` - -サイトの[ServerAliases](https://httpd.apache.org/docs/current/mod/core.html#serveralias)を設定します。 - -デフォルト値: '[]'。 - -##### `servername` - -バーチャルホストに接続するホスト名に対応するサーバ名を設定します。 - -デフォルト値: リソースのタイトル。 - -##### `setenv` - -HTTPDにより使用し、バーチャルホストの環境変数を設定します。 - -デフォルト値: '[]'。 - -例: - -``` puppet -apache::vhost { 'setenv.example.com': - setenv => ['SPECIAL_PATH /foo/bin'], -} -``` - -##### `setenvif` - -HTTPDにより使用し、条件を用いてバーチャルホストの環境変数を設定します。 - -デフォルト値: '[]'。 - -##### `setenvifnocase` - -HTTPDにより使用し、条件を用いてバーチャルホストの環境変数を設定します(大文字小文字を区別しないマッチング)。 - -デフォルト値: '[]'。 - -##### `suphp_*` - -* `suphp_addhandler` -* `suphp_configpath` -* `suphp_engine` - -[suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG)によりバーチャルホストを設定します。 - -* `suphp_addhandler`。デフォルト値: RedHatおよびFreeBSDでは'php5-script'、DebianおよびGentooでは'x-httpd-php'。 -* `suphp_configpath`。デフォルト値: RedHatおよびFreeBSDでは`undef`、DebianおよびGentooでは'/etc/php5/apache2'。 -* `suphp_engine`。値: 'on'または'off'。デフォルト値: 'off'。 - -suPHPによるバーチャルホスト設定の例: - -``` puppet -apache::vhost { 'suphp.example.com': - port => '80', - docroot => '/home/appuser/myphpapp', - suphp_addhandler => 'x-httpd-php', - suphp_engine => 'on', - suphp_configpath => '/etc/php5/apache2', - directories => { path => '/home/appuser/myphpapp', - 'suphp' => { user => 'myappuser', group => 'myappgroup' }, - } -} -``` - -##### `vhost_name` - -名前ベースのバーチャルホストを有効にします。バーチャルホストにIPではなくポートが割り当てられている場合は、バーチャルホスト名は'vhost_name:port'になります。バーチャルホストにIPもポートも割り当てられていない場合は、バーチャルホスト名はリソースのタイトルに設定されます。 - -デフォルト値: '*'。 - -##### `virtual_docroot` - -同じ名前を持つディレクトリにマッピングされたワイルドカードエイリアスサブドメインにより、バーチャルホストを設定します。例えば、'http://example.com' would map to '/var/www/example.com'のようになります。 - -デフォルト値: `false`。 - -``` puppet -apache::vhost { 'subdomain.loc': - vhost_name => '*', - port => '80', - virtual_docroot => '/var/www/%-2+', - docroot => '/var/www', - serveraliases => ['*.loc',], -} -``` - -##### `wsgi*` - -* `wsgi_daemon_process` -* `wsgi_daemon_process_options` -* `wsgi_process_group` -* `wsgi_script_aliases` -* `wsgi_pass_authorization` - -[WSGI](https://github.com/GrahamDumpleton/mod_wsgi)によりバーチャルホストを設定します。 - -* `wsgi_daemon_process`: WSGIデーモンの名前を設定するハッシュ。[特定のキー](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html)を使用できます。デフォルト値: `undef`。 -* `wsgi_daemon_process_options`。_オプション。_ デフォルト値: `undef`。 -* `wsgi_process_group`: バーチャルホストが実行されるグループIDを設定します。デフォルト値: `undef`。 -* `wsgi_script_aliases`: ファイルシステム.wsgiパスへのWebパスのハッシュにする必要があります。デフォルト値: `undef`。 -* `wsgi_script_aliases_match`: ファイルシステム.wsgiパスへのWebパスの正規表現のハッシュにする必要があります。デフォルト値: `undef`。 -* `wsgi_pass_authorization`: 'On'に設定すると、Apacheの代わりにWSGIアプリケーションを使って認証を処理します。詳細については、[mod_wsgi's WSGIPassAuthorizationドキュメント] (https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html)を参照してください。デフォルト値: `undef`、これにより、Apacheのデフォルト値である'Off'が使われます。 -* `wsgi_chunked_request`: チャンク形式のリクエストのサポートを有効にします。デフォルト値: `undef`。 - -WSGIによるバーチャルホスト設定の例: - -``` puppet -apache::vhost { 'wsgi.example.com': - port => '80', - docroot => '/var/www/pythonapp', - wsgi_daemon_process => 'wsgi', - wsgi_daemon_process_options => - { processes => '2', - threads => '15', - display-name => '%{GROUP}', - }, - wsgi_process_group => 'wsgi', - wsgi_script_aliases => { '/' => '/var/www/demo.wsgi' }, - wsgi_chunked_request => 'On', -} -``` - -#### `apache::vhost`のパラメータ`directories` - -`apache::vhost`クラスの`directories`パラメータは、バーチャルホストにハッシュの配列を渡し、[Directory](https://httpd.apache.org/docs/current/mod/core.html#directory)、[File](https://httpd.apache.org/docs/current/mod/core.html#files)、[Location](https://httpd.apache.org/docs/current/mod/core.html#location)ディレクティブブロックを作成します。これらのブロックは、'< Directory /path/to/directory>...< /Directory>'の形式をとります。 - -`path`キーは、ディレクトリ、ファイル、ロケーションブロックのパスを設定します。この値は、'directory'、'files'、または'location'プロバイダのパスか、'directorymatch'、'filesmatch'、または 'locationmatch'プロバイダの正規表現でなければなりません。`directories`に渡される各ハッシュには、キーのひとつとして`path`が含まれていなければ**なりません**。 - -`provider`キーはオプションです。設定されていない場合、このキーのデフォルトは'directory'になります。値: 'directory'、'files'、'proxy'、'location'、'directorymatch'、'filesmatch'、'proxymatch'、'locationmatch'。`provider`を'directorymatch'に設定すると、 Apache設定ファイルでキーワード'DirectoryMatch'が使用されます。 - -`directories`の使用例: - -``` puppet -apache::vhost { 'files.example.net': - docroot => '/var/www/files', - directories => [ - { 'path' => '/var/www/files', - 'provider' => 'files', - 'deny' => 'from all', - }, - ], -} -``` - -> **注意:** 少なくとも1つのディレクトリが`docroot`パラメータとマッチする必要があります。ディレクトリの宣言を開始すると、`apache::vhost`は必要なすべてのディレクトリブロックが宣言されるものと見なします。定義されない場合、`docroot`パラメータにマッチする1つのデフォルトディレクトリブロックが作成されます。 - -`directory`、`files`、または`location`ハッシュ内に、使用可能なハンドラを配置し、キーとして表す必要があります。以下のようになります。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ { path => '/path/to/directory', handler => value } ], -} -``` - -これらのハッシュで設定していないハンドラは、Puppet内で'undefined'と見なされ、バーチャルホストに追加されず、モジュールではデフォルト値が使われます。サポートされているハンドラは、次のとおりです。 - -##### `addhandlers` - -[AddHandler](https://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler)ディレクティブを設定します。これは、ファイル名の拡張子を指定されたハンドラにマッピングするものです。ハッシュのリストを使用し、`extensions`はハンドラによりマッピングされた拡張子を記述するために使用されます。`{ handler => 'handler-name', extensions => ['extension'] }`の形式をとります。 - -例: - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - addhandlers => [{ handler => 'cgi-script', extensions => ['.cgi']}], - }, - ], -} -``` - -##### `allow` - -[Allow](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow)ディレクティブを設定します。これは、ホスト名またはIPに基づく認証をグループ化するものです。**廃止予定:**このパラメータは、Apacheが変更されたため、廃止予定になっています。Apache 2.2以下でのみ機能します。1つのルールに対する単一の文字列としても、複数のルールに対する配列としても使用できます。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - allow => 'from example.org', - }, - ], -} -``` - -##### `allow_override` - -[.htaccess](https://httpd.apache.org/docs/current/mod/core.html#allowoverride)ファイルで許可されるディレクティブのタイプを設定します。配列を使用できます。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - allow_override => ['AuthConfig', 'Indexes'], - }, - ], -} -``` - -##### `auth_basic_authoritative` - -[AuthBasicAuthoritative](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicauthoritative)の値を設定します。これにより、下位のApacheモジュールに権限と認証を渡すかどうかが決定されます。 - -##### `auth_basic_fake` - -[AuthBasicFake](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicfake)の値を設定します。これにより、任意のディレクティブブロックに関する認証情報が静的に設定されます。 - -##### `auth_basic_provider` - -[AuthBasicProvider](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicprovider)の値を設定します。これにより、任意のロケーションの認証プロバイダが設定されます。 - -##### `auth_digest_algorithm` - -[AuthDigestAlgorithm](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestalgorithm)の値を設定します。これにより、チャレンジおよびレスポンスハッシュの計算に用いるアルゴリズムを選択します。 - -###### `auth_digest_domain` - -[AuthDigestDomain](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestdomain)の値を設定します。これにより、ダイジェスト認証に関して、同じ保護スペースで1つまたは複数のURIを指定できます。 - -##### `auth_digest_nonce_lifetime` - -[AuthDigestNonceLifetime](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestnoncelifetime)の値を設定します。これにより、サーバのノンスが有効になる長さを制御します。 - -##### `auth_digest_provider` - -[AuthDigestProvider](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestprovider)の値を設定します。これにより、任意のロケーションに関する認証プロバイダを設定します。 - -##### `auth_digest_qop` - -[AuthDigestQop](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestqop)の値を設定します。これにより、ダイジェスト認証で用いる保護品質を決定します。 - -##### `auth_digest_shmem_size` - -[AuthAuthDigestShmemSize](https://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestshmemsize)の値を設定します。これにより、クライアントの追跡に関して、サーバに割り当てられる共通メモリの量を定義します。 - -##### `auth_group_file` - -[AuthGroupFile](https://httpd.apache.org/docs/current/mod/mod_authz_groupfile.html#authgroupfile)の値を設定します。これにより、認証に関して、ユーザグループのリストを含むテキストファイルの名前を設定します。 - -##### `auth_name` - -[AuthName](https://httpd.apache.org/docs/current/mod/mod_authn_core.html#authname)の値を設定します。これにより、認証領域の名前を設定します。 - -##### `auth_require` - -アクセスを許可するのに必要なエンティティ名を設定します。詳細については、[Require](https://httpd.apache.org/docs/current/mod/mod_authz_host.html#requiredirectives)を参照してください。 - -##### `auth_type` - -[AuthType](https://httpd.apache.org/docs/current/mod/mod_authn_core.html#authtype)の値を設定します。これにより、ユーザ認証のタイプをガイドします。 - -##### `auth_user_file` - -[AuthUserFile](https://httpd.apache.org/docs/current/mod/mod_authn_file.html#authuserfile)の値を設定します。これにより、認証に関するユーザ/パスワードを含むテキストファイルの名前を設定します。 - -##### `auth_merging` - -[AuthMerging](https://httpd.apache.org/docs/current/mod/mod_authz_core.html#authmerging)の値を設定します。これにより、認証ロジックを組み合わせるかどうかを決定します。 - -##### `auth_ldap_url` - -[AuthLDAPURL](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapurl)の値を設定します。これにより、AuthBasicProvider 'ldap'を使用する場合のLDAPサーバのURLを決定します。 - -##### `auth_ldap_bind_dn` - -[AuthLDAPBindDN](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbinddn)の値を設定します。これにより、AuthBasicProvider 'ldap'を使用する場合に、エントリの検索時にLDAPサーバにバインドするオプションのDNを使用できるようになります。 - -##### `auth_ldap_bind_password` - -[AuthLDAPBindPassword](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapbindpassword)の値を設定します。これにより、AuthBasicProvider 'ldap'を使用する場合に、バインドDNとともに用いるオプションのバインドパスワードを使用できるようになります。 - -##### `auth_ldap_group_attribute` - -[AuthLDAPGroupAttribute](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattribute)の値の配列。ldapグループ内のユーザメンバーの確認に使用するLDAP属性を指定します。 - -デフォルト値: "member"および "uniquemember"。 - -##### `auth_ldap_group_attribute_is_dn` - -[AuthLDAPGroupAttributeIsDN](https://httpd.apache.org/docs/current/mod/mod_authnz_ldap.html#authldapgroupattributeisdn)の値を設定し、ldapグループのメンバーにDNかシンプルなユーザ名のどちらを使用するかを指定します。onに設定すると、グループメンバーシップの確認時に、クライアントユーザ名の識別名が使用されます。そうでない場合は、ユーザ名が使われます。有効な値は"on"か"off"です。 - -##### `custom_fragment` - -カスタム設定ディレクティブの文字列を渡し、ディレクトリ設定の最後に配置します。 - -``` puppet -apache::vhost { 'monitor': - … - directories => [ - { - path => '/path/to/directory', - custom_fragment => ' - - SetHandler balancer-manager - Order allow,deny - Allow from all - - - SetHandler server-status - Order allow,deny - Allow from all - -ProxyStatus On', - }, - ] -} -``` - -##### `dav` - -[Dav](http://httpd.apache.org/docs/current/mod/mod_dav.html#dav)の値を設定します。これにより、WebDAV HTTPメソッドを有効にするかどうかを決定します。値としては、'On'、'Off'、またはプロバイダの名前を使用できます。'On'に設定すると、`mod_dav_fs`モジュールにより実装されているデフォルトのファイルシステムプロバイダが有効になります。 - -##### `dav_depth_infinity` - -[DavDepthInfinity](http://httpd.apache.org/docs/current/mod/mod_dav.html#davdepthinfinity)の値を設定します。これは、`Depth: Infinity`ヘッダを持つ`PROPFIND`リクエストの処理を有効にするのに使用されます。 - -##### `dav_min_timeout` - -[DavMinTimeout](http://httpd.apache.org/docs/current/mod/mod_dav.html#davmintimeout)の値を設定します。DAVリソースでサーバがロック状態を維持する時間(秒数)を指定します。 - -##### `deny` - -[Deny](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny)ディレクティブを設定し、サーバへのアクセスを否定するホストを指定します。**廃止予定:** このパラメータは、Apacheが変更されたため、廃止予定になっています。Apache 2.2以下でのみ機能します。1つのルールに対する単一の文字列としても、複数のルールに対する配列としても使用できます。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - deny => 'from example.org', - }, - ], -} -``` - -##### `error_documents` - -ディレクトリの[ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument)設定をオーバーライドするハッシュの配列。 - -``` puppet -apache::vhost { 'sample.example.net': - directories => [ - { path => '/srv/www', - error_documents => [ - { 'error_code' => '503', - 'document' => '/service-unavail', - }, - ], - }, - ], -} -``` - -##### `ext_filter_options` - -[ExtFilterOptions](https://httpd.apache.org/docs/current/mod/mod_ext_filter.html)ディレクティブを設定します。 -このディレクティブを使用する前に、`class { 'apache::mod::ext_filter': }`を宣言する必要があります。 - -``` puppet -apache::vhost { 'filter.example.org': - docroot => '/var/www/filter', - directories => [ - { path => '/var/www/filter', - ext_filter_options => 'LogStderr Onfail=abort', - }, - ], -} -``` - -##### `geoip_enable` - -[GeoIPEnable](http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Configuration)ディレクティブを設定します。 -このディレクティブを使用する前に、`class {'apache::mod::geoip': }`を宣言する必要があります。 - -``` puppet -apache::vhost { 'first.example.com': - docroot => '/var/www/first', - directories => [ - { path => '/var/www/first', - geoip_enable => `true`, - }, - ], -} -``` - -##### `headers` - -[Header](https://httpd.apache.org/docs/current/mod/mod_headers.html#header)ディレクティブの行を追加します。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => { - path => '/path/to/directory', - headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"', - }, -} -``` - -##### `index_options` - -[ディレクトリインデキシング](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions)の設定を可能にします。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - directoryindex => 'disabled', # this is needed on Apache 2.4 or mod_autoindex doesn't work - options => ['Indexes','FollowSymLinks','MultiViews'], - index_options => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'], - }, - ], -} -``` - -##### `index_order_default` - -ディレクトリインデックスの[デフォルトの順序付け](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexorderdefault)を設定します。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - order => 'Allow,Deny', - index_order_default => ['Descending', 'Date'], - }, - ], -} -``` - -###### `index_style_sheet` - -[IndexStyleSheet](https://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexstylesheet)を設定します。これにより、ディレクトリインデックスにCSSスタイルシートが追加されます。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - options => ['Indexes','FollowSymLinks','MultiViews'], - index_options => ['FancyIndexing'], - index_style_sheet => '/styles/style.css', - }, - ], -} -``` - -##### `limit` - -ディレクトリブロック内に[Limit](https://httpd.apache.org/docs/current/mod/core.html#limit)ブロックを作成します。`require`ディレクティブを含めることもできます。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/docroot', - directories => [ - { path => '/', - provider => 'location', - limit => [ - { methods => 'GET HEAD', - require => ['valid-user'] - }, - ], - }, - ], -} -``` - -##### `limit_except` - -ディレクトリブロック内に[LimitExcept](https://httpd.apache.org/docs/current/mod/core.html#limitexcept)ブロックを作成します。`require`ディレクティブを含めることもできます。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/docroot', - directories => [ - { path => '/', - provider => 'location', - limit_except => [ - { methods => 'GET HEAD', - require => ['valid-user'] - }, - ], - }, - ], -} -``` - -##### `mellon_enable` - -[MellonEnable][`mod_auth_mellon`]ディレクトリを設定し、 [`mod_auth_mellon`][]を有効にします。[`apache::mod::auth_mellon`][]を使って`mod_auth_mellon`をインストールできます。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/', - provider => 'directory', - mellon_enable => 'info', - mellon_sp_private_key_file => '/etc/certs/${::fqdn}.key', - mellon_endpoint_path => '/mellon', - mellon_set_env_no_prefix => { 'ADFS_GROUP' => 'http://schemas.xmlsoap.org/claims/Group', - 'ADFS_EMAIL' => 'http://schemas.xmlsoap.org/claims/EmailAddress', }, - mellon_user => 'ADFS_LOGIN', - }, - { path => '/protected', - provider => 'location', - mellon_enable => 'auth', - auth_type => 'Mellon', - auth_require => 'valid-user', - mellon_cond => ['ADFS_LOGIN userA [MAP]','ADFS_LOGIN userB [MAP]'], - }, - ] -} -``` - -関連するパラメータは、`mod_auth_mellon`ディレクティブの名前に従います。 - -- `mellon_cond`: アクセスを許可するために満たす必要のあるmellon条件の配列をとり、配列内の各アイテムについて [MellonCond][`mod_auth_mellon`]ディレクティブを作成します。 -- `mellon_endpoint_path`: [MellonEndpointPath][`mod_auth_mellon`]を設定し、mellonエンドポイントパスを設定します。 -- `mellon_sp_metadata_file`: SPメタデータファイルの[MellonSPMetadataFile][`mod_auth_mellon`]ロケーションを設定します。 -- `mellon_idp_metadata_file`: IDPメタデータファイルの[MellonIDPMetadataFile][`mod_auth_mellon`]ロケーションを設定します。 -- `mellon_saml_rsponse_dump`: [MellonSamlResponseDump][`mod_auth_mellon`]ディレクティブを設定し、SAMLのデバッグを有効にします。 -- `mellon_set_env_no_prefix`:環境変数にマッピングする属性名のハッシュに関する [MellonSetEnvNoPrefix][`mod_auth_mellon`]ディレクティブを -設定します。 -- `mellon_sp_private_key_file`: サービスプロバイダのプライベートキー保存場所に関する[MellonSPPrivateKeyFile][`mod_auth_mellon`]ディレクティブを設定します。 -- `mellon_sp_cert_file`: サービスプロバイダの公開キー保存場所に関する[MellonSPCertFile][`mod_auth_mellon`]ディレクティブを設定します。 -- `mellon_user`: ユーザ名に関して使用する[MellonUser][`mod_auth_mellon`]属性を設定します。 - -##### `options` - -任意のディレクトリブロックに関する[オプション](https://httpd.apache.org/docs/current/mod/core.html#options)をリスト化します。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - options => ['Indexes','FollowSymLinks','MultiViews'], - }, - ], -} -``` - -##### `order` - -[Apacheコアドキュメント](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order)に従い、AllowおよびDenyステートメントの処理順序を設定します。**廃止予定:** このパラメータは、Apacheが変更されたため、廃止予定になっています。Apache 2.2以下でのみ機能します。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - order => 'Allow,Deny', - }, - ], -} -``` - -##### `passenger_enabled` - -[PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled)ディレクティブの値を'on'または'off'に設定します。`apache::mod::passenger`を含める必要があります。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - passenger_enabled => 'on', - }, - ], -} -``` - -> **注意:** PassengerEnabledディレクティブをPassengerHighPerformanceディレクティブとともに使用すると、[問題](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html)が生じます。 - -##### `php_value`および`php_flag` - -`php_value`はディレクトリの値を設定し、`php_flag`はブーリアンを用いてディレクトリを設定します。詳細は[こちら](http://php.net/manual/en/configuration.changes.php)で確認できます。 - -##### `php_admin_value`および`php_admin_flag` - -`php_admin_value`はディレクトリの値を設定し、`php_admin_flag`はブーリアンを用いてディレクトリを設定します。詳細は[こちら](http://php.net/manual/en/configuration.changes.php)で確認できます。 - - -##### `require` - - -[Apache Authzドキュメント](https://httpd.apache.org/docs/current/mod/mod_authz_core.html#require)に従い、`Require`ディレクティブを設定します。`require`が設定されていない場合、`Require all granted`がデフォルトになります。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - require => 'ip 10.17.42.23', - } - ], -} -``` - -より複雑な要件設定が必要な場合、apache >= 2.4では[RequireAll](https://httpd.apache.org/docs/2.4/mod/mod_authz_core.html#requireall)、[RequireNone](https://httpd.apache.org/docs/2.4/mod/mod_authz_core.html#requirenone)または[RequireAny](https://httpd.apache.org/docs/2.4/mod/mod_authz_core.html#requireany)ディレクティブを使用できます。'any'、'none'、'all'のみをサポートする(その他の値は無視されます)'enforce'キーを使うと、以下のように設定できます。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - require => { - enforce => 'any', - requires => [ - 'ip 1.2.3.4', - 'not host host.example.com', - 'user xyz', - ], - }, - }, - ], -} -``` - -`require`を`unmanaged`に設定すると、何も設定されません。これは、カスタムフラグメントで扱われる複雑な認証/権限要件に役立ちます。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - require => 'unmanaged', - } - ], -} -``` - - - -##### `satisfy` - -[Apacheコアドキュメント](https://httpd.apache.org/docs/2.2/mod/core.html#satisfy)に従い、`Satisfy`ディレクティブを設定します。**廃止予定:** このパラメータは、Apacheが変更されたため、廃止予定になっています。Apache 2.2以下でのみ機能します。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - satisfy => 'Any', - } - ], -} -``` - -##### `sethandler` - -[Apache Coreドキュメント](https://httpd.apache.org/docs/2.2/mod/core.html#sethandler)に従い、`SetHandler`ディレクティブを設定します。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - sethandler => 'None', - } - ], -} -``` - -##### `set_output_filter` - -[Apache Coreドキュメント](https://httpd.apache.org/docs/current/mod/core.html#setoutputfilter)に従い、`SetOutputFilter`ディレクティブを設定します。 - -``` puppet -apache::vhost{ 'filter.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - set_output_filter => puppetdb-strip-resource-params, - }, - ], -} -``` - -##### `rewrites` - -バーチャルホストディレクトリ内でURL [`rewrites`](#rewrites)ルールを作成します。ハッシュの配列が求められます。ハッシュキーは'comment'、'rewrite_base'、'rewrite_cond'または'rewrite_rule'のいずれかにすることができます。 - -``` puppet -apache::vhost { 'secure.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - rewrites => [ { comment => 'Permalink Rewrites', - rewrite_base => '/' - }, - { rewrite_rule => [ '^index\.php$ - [L]' ] - }, - { rewrite_cond => [ '%{REQUEST_FILENAME} !-f', - '%{REQUEST_FILENAME} !-d', - ], - rewrite_rule => [ '. /index.php [L]' ], - } - ], - }, - ], -} -``` - -> **注意**: ディレクトリにリライトを含める場合は、`apache::mod::rewrite`も含めてください。また、バーチャルホストのディレクトリのリライト設定ではなく、`apache::vhost`の`rewrites`パラメータを用いたリライトの設定を考慮してください。 - -##### `shib_request_settings` - -アプリケーションリクエストに関して、有効なコンテンツ設定の設定または変更を可能にします。このコマンドは、次の2つのパラメータをとります: コンテンツ設定の名前、およびそれについて設定する値。有効な設定については、Shibboleth [コンテンツ設定ドキュメント](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPContentSettings)を参照してください。このキーは、`apache::mod::shib`が定義されていない場合は無効になります。詳細については、[`mod_shib`ドキュメント](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions)を参照してください。 - -``` puppet -apache::vhost { 'secure.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - shib_request_settings => { 'requiresession' => 'On' }, - shib_use_headers => 'On', - }, - ], -} -``` - -##### `shib_use_headers` - -'On'に設定すると、アプリケーションに属性を公開するリクエストヘッダの使用がオンになります。このキーの値は'On'または'Off'です。デフォルト値は'Off'です。このキーは、`apache::mod::shib`が定義されていない場合は無効になります。詳細については、[`mod_shib`ドキュメント](https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig#NativeSPApacheConfig-Server/VirtualHostOptions)を参照してください。 - -##### `ssl_options` - -[SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions)の文字列またはリスト。これにより、SSLエンジンのランタイムオプションが設定されます。このハンドラは、バーチャルホストの親ブロック内のSSLOptionsセットよりも優先されます。 - -``` puppet -apache::vhost { 'secure.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - ssl_options => '+ExportCertData', - }, - { path => '/path/to/different/dir', - ssl_options => [ '-StdEnvVars', '+ExportCertData'], - }, - ], -} -``` - -##### `suphp` - -[suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG)設定に関する'user'および'group'キーを含むハッシュ。バーチャルホスト宣言で`suphp_engine => on`とともに使用する必要があり、`directories`内でのみ渡すことができます。 - -``` puppet -apache::vhost { 'secure.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/directory', - suphp => { - user => 'myappuser', - group => 'myappgroup', - }, - }, - ], -} -``` -##### `additional_includes` - -バーチャルホストディレクトリ内にある追加の静的な固有のApache設定ファイルのパスを指定します。値: 文字列パスの配列。 - -``` puppet -apache::vhost { 'sample.example.net': - docroot => '/path/to/directory', - directories => [ - { path => '/path/to/different/dir', - additional_includes => [ '/custom/path/includes', '/custom/path/another_includes', ], - }, - ], -} -``` - -#### `apache::vhost`のSSLパラメータ - -`::vhost`のすべてのSSLパラメータは、基本の`apache`クラスで設定された値がデフォルトになります。以下のパラメータを使えば、特定のバーチャルホストに関する個別のSSL設定を調整できます。 - -##### `ssl` - -バーチャルホストのSSLを有効にします。SSLバーチャルホストはHTTPSクエリにのみ応答します。値: ブーリアン。 - -デフォルト値: `false`。 - -##### `ssl_ca` - -使用するSSL認証局を指定して、認証に使用するクライアントの証明書を検証します。これを使用するには、`ssl_verify_client`も設定する必要があります。 - -デフォルト値: `undef`。 - -##### `ssl_cert` - -SSL証明書を指定します。 - -デフォルト値: オペレーティングシステムによって異なります。 - -* RedHat: '/etc/pki/tls/certs/localhost.crt' -* Debian: '/etc/ssl/certs/ssl-cert-snakeoil.pem' -* FreeBSD: '/usr/local/etc/apache22/server.crt' -* Gentoo: '/etc/ssl/apache2/server.crt' - -##### `ssl_protocol` - -[SSLProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol)を指定します。許可されるプロトコルの配列またはスペースで区切った文字列が求められます。 - -デフォルト値: 'all'、'-SSLv2'、'-SSLv3'。 - -##### `ssl_cipher` - -[SSLCipherSuite](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite)を指定します。 - -デフォルト値: 'HIGH:MEDIUM:!aNULL:!MD5'。 - -##### `ssl_honorcipherorder` - -[SSLHonorCipherOrder](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder)を指定し、クライアントの優先順ではなくサーバの優先順をApacheに使用させます。値: - -値: ブーリアン、'on'、'off'。 - -デフォルト値: `true`。 - -##### `ssl_certs_dir` - -SSL認証ディレクトリの場所を指定してクライアントの証明書を検証します。`ssl_verify_client`も設定されていない限り使用されません(下記参照)。 - -デフォルト: undef - -##### `ssl_chain` - -SSLチェーンを指定します。このデフォルト値は設定しなくても機能しますが、本稼働環境で使用する前に、固有の証明書情報により基本の`apache`クラス内で更新する必要があります。 - -デフォルト値: `undef`。 - -##### `ssl_crl` - -使用する証明書失効リストを指定します。(このデフォルト値は設定しなくても機能しますが、本稼働環境で使用する前に、固有の証明書情報により基本の`apache`クラス内で更新する必要があります。) - -デフォルト値: `undef`。 - -##### `ssl_crl_path` - -証明書失効リストの保存場所を指定して、クライアント認証の証明書を検証します(このデフォルト値は設定しなくても機能しますが、本稼働環境で使用する前に、固有の証明書情報により基本の`apache`クラス内で更新する必要があります)。 - -デフォルト値: `undef`。 - -##### `ssl_crl_check` - -[SSLCARevocationCheckディレクティブ](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcarevocationcheck)により、SSLクライアント認証の証明書失効チェックレベルを設定します。このデフォルト値は設定しなくても機能しますが、本稼働環境でCRLを使用する際に指定する必要があります。Apache 2.4以上にのみ適用され、それ以前のバージョンではこの値は無視されます。 - -デフォルト値: `undef`。 - -##### `ssl_key` - -SSLキーを指定します。 - -デフォルト値はオペレーティングシステムによって異なります。このデフォルト値は設定しなくても機能しますが、本稼働環境で使用する前に、固有の証明書情報により基本の`apache`クラス内で更新する必要があります。 - -* RedHat: '/etc/pki/tls/private/localhost.key' -* Debian: '/etc/ssl/private/ssl-cert-snakeoil.key' -* FreeBSD: '/usr/local/etc/apache22/server.key' -* Gentoo: '/etc/ssl/apache2/server.key' - -##### `ssl_verify_client` - -[SSLVerifyClient](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient)ディレクティブを設定します。これにより、クライアント認証に関する証明書確認レベルが設定されます。 - -``` puppet -apache::vhost { 'sample.example.net': - … - ssl_verify_client => 'optional', -} -``` - -値: 'none'、'optional'、'require'、'optional_no_ca'。 - -デフォルト値: `undef`。 - - -##### `ssl_verify_depth` - -[SSLVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth)ディレクティブを設定します。これにより、クライアント認証確認におけるCA証明書の最大深さが指定されます。これを有効にするには、`ssl_verify_client`を設定する必要があります。 - -``` puppet -apache::vhost { 'sample.example.net': - … - ssl_verify_client => 'require', - ssl_verify_depth => 1, -} -``` - -デフォルト値: `undef`。 - -##### `ssl_proxy_protocol` - -[SSLProxyProtocol](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyprotocol)ディレクティブを設定します。これにより、プロキシに関するサーバ環境を確立する際に`mod_ssl`が使用すべきSSLプロトコルフレーバーを制御します。提示されたプロトコルのうちの1つのみを使用しているサーバに接続します。 - -デフォルト値: `undef`。 - -##### `ssl_proxy_verify` - -[SSLProxyVerify](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify)ディレクティブを設定します。これにより、リクエストをリモートSSLサーバに転送するようにプロキシが設定されている場合のリモートサーバの証明書確認を設定します。 - -デフォルト値: `undef`。 - -##### `ssl_proxy_verify_depth` - -[SSLProxyVerifyDepth](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverifydepth)ディレクティブを設定します。これにより、リモートサーバに有効な証明書がないと判断するにあたり、mod_sslが行う確認の深さを設定します。 - -深さ0では、自己署名リモートサーバ証明書のみが許可されます。デフォルトの深さ 1では、リモートサーバ証明書を自己署名にすることも、サーバが直接知っているCAにより署名することもできます。 - -デフォルト値: `undef`。　 - -##### `ssl_proxy_ca_cert` - -[SSLProxyCACertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycacertificatefile)ディレクティブを設定します。これにより、やりとりするリモートサーバに関する認証局(CA)の証明書を集められるオールインワンファイルを指定します。これはリモートサーバ認証に用いられます。このファイルは、PEMエンコード証明書ファイルを優先順に連結したものにする必要があります。 - -デフォルト値: `undef`。　 - -##### `ssl_proxy_machine_cert` - -[SSLProxyMachineCertificateFile](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile)ディレクティブを設定します。これにより、このサーバがリモートサーバの認証に用いる証明書とキーを保存するオールインワンファイルを指定します。このファイルは、PEMエンコード証明書ファイルを優先順に連結したものにする必要があります。 - -``` puppet -apache::vhost { 'sample.example.net': - … - ssl_proxy_machine_cert => '/etc/httpd/ssl/client_certificate.pem', -} -``` - -デフォルト値: `undef`。　 - -##### `ssl_proxy_check_peer_cn` - -[SSLProxyCheckPeerCN](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeercn)ディレクティブを設定します。これにより、リモートサーバの証明書のCNフィールドをリクエストURLのホスト名と比較するかどうかを指定します。 - -値: 'on'、'off'。　 - -デフォルト値: `undef`。　 - -##### `ssl_proxy_check_peer_name` - -[SSLProxyCheckPeerName](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeername)ディレクティブを設定します。これにより、リモートサーバの証明書のCNフィールドをリクエストURLのホスト名と比較するかどうかを決定します。 - -値: 'on'、'off'。　 - -デフォルト値: `undef`。　 - -##### `ssl_proxy_check_peer_expire` - -[SSLProxyCheckPeerExpire](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxycheckpeerexpire)ディレクティブを設定します。これにより、リモートサーバの証明書の有効期限をチェックするかどうかを指定します。 - -値: 'on'、'off'。　 - -デフォルト値: `undef`。　 - -##### `ssl_options` - -[SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions)ディレクティブを設定します。これにより、各種のSSLエンジンのランタイムオプションを設定します。これは任意のバーチャルホスト全体の設定で、文字列にすることも配列にすることもできます。 - -文字列: - -``` puppet -apache::vhost { 'sample.example.net': - … - ssl_options => '+ExportCertData', -} -``` - -配列: - -``` puppet -apache::vhost { 'sample.example.net': - … - ssl_options => [ '+StrictRequire', '+ExportCertData' ], -} -``` - -デフォルト値: `undef`。 - -##### `ssl_openssl_conf_cmd` - -[SSLOpenSSLConfCmd](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslopensslconfcmd)ディレクティブを設定します。これにより、OpenSSLパラメータを直接設定できます。 - -デフォルト値: `undef`。　 - -##### `ssl_proxyengine` - -[SSLProxyEngine](https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine)を使用するかどうかを指定します。 - -ブーリアン。 - -デフォルト値: `true`。 - -##### `ssl_stapling` - -[SSLUseStapling](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslusestapling)を使用するかどうかを指定します。デフォルトでは、全体で設定されているものを使用します。 - -このパラメータはApache 2.4以上にのみ適用され、それ以前のバージョンでは無視されます。　 - -ブーリアンまたは`undef`。 - -デフォルト値: `undef`。　 - -##### `ssl_stapling_timeout` - -[SSLStaplingResponderTimeout](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingrespondertimeout)ディレクティブの設定に使用できます。 - -このパラメータはApache 2.4以上にのみ適用され、それ以前のバージョンでは無視されます。　 - -デフォルト値: なし。　 - -##### `ssl_stapling_return_errors` - -[SSLStaplingReturnResponderErrors](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslstaplingreturnrespondererrors)ディレクティブの設定に使用できます。 - -このパラメータはApache 2.4以上にのみ適用され、それ以前のバージョンでは無視されます。　 - -デフォルト値: なし。　 - -#### 定義タイプ: FastCGIサーバ - -このタイプは、mod\_fastcgiとともに使用します。特定のファイルタイプを扱う1つまたは複数の外部FastCGIサーバを定義することができます。 - -** 注意 ** Ubuntu 10.04+では、マルチバースリポジトリを手動で有効にする必要があります。 - -例: - -``` puppet -apache::fastcgi::server { 'php': - host => '127.0.0.1:9000', - timeout => 15, - flush => `false`, - faux_path => '/var/www/php.fcgi', - fcgi_alias => '/php.fcgi', - file_type => 'application/x-httpd-php', - pass_header => '' -} -``` - -その後、バーチャルホスト内で、上で指定したfastcgiサーバで扱う特定のファイルタイプを設定することができます。 - -``` puppet -apache::vhost { 'www': - ... - custom_fragment => 'AddType application/x-httpd-php .php' - ... -} -``` - -##### `host` - -FastCGIサーバのホスト名またはIPアドレスおよびTCPポート番号(1-65535)。 - -unixソケットを渡すこともできます。 - -``` puppet -apache::fastcgi::server { 'php': - host => '/var/run/fcgi.sock', -} -``` - -##### `timeout` - -リクエストが中止され、(エラーLogLevel)にイベントが記録されるまでに、FastCGIアプリケーションが非アクティブの状態で待機する秒数。この非アクティブタイマーは、FastCGIアプリケーションとの接続が待機中の場合のみ適用されます。アプリケーションの待ち行列に入ったリクエストに対して、時間内に記述やフラッシュによる応答がないと、リクエストは中止されます。アプリケーションとの通信が完了したものの、クライアントとの通信が完了しなかった(応答がバッファリングされた)場合は、タイムアウトは適用されません。 - -##### `flush` - -アプリケーションから受信したデータを、強制的にクライアントに書き込みます。デフォルトでは、アプリケーションをできるだけ早くフリーな状態にするために、`mod_fastcgi`はデータをバッファリングします。 - -##### `faux_path` - -ローカルファイルシステムに存在する必要はありません。Apacheがこのファイル名に解読するURIは、この外部FastCGIアプリケーションにより処理されます。 - -##### `alias` - -一意のエイリアス。 アクションとFastCGIサーバをリンクさせるために内部で用いられます。 - -##### `file_type` - -FastCGIサーバにより処理するファイルのMIMEタイプ。 - -##### `pass_header` - -リクエスト環境で渡されるHTTPリクエストヘッダの名前。このオプションにより、通常はCGI環境で利用できないヘッダコンテンツ(認証など)が利用できるようになります。 - -#### 定義タイプ: `apache::vhost::custom` - -`apache::vhost::custom`定義タイプは、 `apache::custom_config`定義タイプのシンラッパーで、Apacheにおいてバーチャルホストディレクトリに固有のデフォルト設定の一部をオーバーライドします。 - -**`apache::vhost::custom`内のパラメータ**: - -##### `content` - -設定ファイルのコンテンツを設定します。 - -##### `ensure` - -バーチャルホストファイルが存在するかどうかを指定します。 - -値: 'absent'、'present'。　 - -デフォルト値: 'present'。　 - -##### `priority` - -Apache HTTPD VirtualHost設定ファイルに関する相対的なロード順序を設定します。 - -デフォルト値: '25'。 - -##### `verify_config` - -Apacheサービスに通知する前に設定ファイルのバリデーションを行うかどうかを指定します。 - -ブーリアン。 - -デフォルト値: `true`。 - -### プライベート定義タイプ - -#### 定義タイプ: `apache::peruser::multiplexer`　 - -この定義タイプは、Apacheモジュールにクラスがあるかどうかを確認します。クラスがある場合は、そのクラスを含めます。ない場合は、モジュール名を[`apache::mod`][]定義タイプに渡します。 - -#### 定義タイプ: `apache::peruser::multiplexer`　 - -FreeBSDに関してのみ、[`Peruser`][]モジュールを有効にします。　 - -#### 定義タイプ: `apache::peruser::processor` - -FreeBSDに関してのみ、[`Peruser`][]モジュールを有効にします。　 - -#### 定義タイプ: `apache::security::file_link` - -[`apache::mod::security`][]の`activated_rules`をディスク上のそれぞれのCRSルールにリンクします。 - -### テンプレート - -Apacheモジュールは、[`apache::vhost`][]および[`apache::mod`][]定義タイプを有効にするにあたり、テンプレートに大きく依存しています。このテンプレートは、オペレーティングシステムに固有の[Facter][] factsをベースに構築されています。明示的にコールアウトされない限り、ほとんどのテンプレートは設定には使われません。 - -### 関数 -#### apache_pw_hash -Apacheが読みこむhtpasswdファイルに適したフォーマットでパスワードをハッシュします。 - -現在はSHAハッシュを使用しています。これは、このフォーマットは安全ではないとされているものの、ほとんどのプラットフォームでサポートされているもっとも安全なフォーマットであるためです。 - -## 制約事項 - -### 全般 - -このモジュールは、以下に関して、[オープンソースPuppet][]および[Puppet Enterprise][]の両方でCIテストが実施されています。 - -- CentOS 5および6 -- Ubuntu 12.04および14.04 -- Debian 7 -- RHEL 5、6、7 - -このモジュールでは、FreeBSD、Gentoo、Amazon Linuxなどの、他のディストリビューションおよびオペレーティングシステムで使用できる機能も提供されていますが、そうしたシステムについては公式なテストは実施されておらず、新たに不具合が生じる可能性があります。 - -### FreeBSD - -FreeBSDでこのモジュールを使用するには、apache24-2.4.12 (www/apache24)以降を使用する_必要があります_。 - -### Gentoo - -Gentooでは、このモジュールは[`gentoo/puppet-portage`][] Puppetモジュールに依存します。Gentooに関しては、一部の機能や設定が適用または有効化されますが、このモジュールに[対応するオペレーティングシステム][]ではありません。 - -### RHEL/CentOS -[`apache::mod::auth_cas`][]、[`apache::mod::passenger`][]、[`apache::mod::proxy_html`][]、[`apache::mod::shib`][]クラスは、追加のリポジトリから依存関係パッケージが提供されていなければ、RH/CentOSでは機能しません。 - -関連するリポジトリとパッケージについては、以下の各ドキュメントを参照してください。 - -#### RHEL/CentOS 5 - -[`apache::mod::passenger`][]および[`apache::mod::proxy_html`][]クラスは、リポジトリに適合するパッケージがないため、テストされていません。 - -#### RHEL/CentOS 6 - -[`apache::mod::passenger`][]クラスは、EL6リポジトリに適合するパッケージがないため、インストールされません。 - -#### RHEL/CentOS 7 - -[`apache::mod::passenger`][]および[`apache::mod::proxy_html`][]クラスは、EL7リポジトリに適合するパッケージがないため、テストされていません。また、[`apache::vhost`][]定義タイプの[`rack_base_uris`][]パラメータも、同様の理由でテストされていません。 - -### SELinuxおよびカスタムパス - -[SELinux][]が[適用モード][]になっていて、`logroot`、`mod_dir`、`vhost_dir`、`docroot`に関してカスタムパスを使用したい場合は、ファイルのコンテキストを各自で管理する必要があります。 - -これにはPuppetを使用できます。 - -``` puppet -exec { 'set_apache_defaults': - command => 'semanage fcontext -a -t httpd_sys_content_t "/custom/path(/.*)?"', - path => '/bin:/usr/bin/:/sbin:/usr/sbin', - require => Package['policycoreutils-python'], -} - -package { 'policycoreutils-python': - ensure => installed, -} - -exec { 'restorecon_apache': - command => 'restorecon -Rv /apache_spec', - path => '/bin:/usr/bin/:/sbin:/usr/sbin', - before => Class['Apache::Service'], - require => Class['apache'], -} - -class { 'apache': } - -host { 'test.server': - ip => '127.0.0.1', -} - -file { '/custom/path': - ensure => directory, -} - -file { '/custom/path/include': - ensure => present, - content => '#additional_includes', -} - -apache::vhost { 'test.server': - docroot => '/custom/path', - additional_includes => '/custom/path/include', -} -``` - -`chcon`ではなく、`semanage fcontext`を用いてコンテキストを設定する必要があります。これは、Puppetの`file`リソースでは、リソースにより指定されていない場合、その値のコンテキストがリセットされるためです。 - -### Ubuntu 10.04 - -[`apache::vhost::WSGIImportScript`][]パラメータにより、Apacheの古いバージョンではサポートされていないバーチャルホスト内のステートメントが作成され、不具合が生じます。これは今後のリファクタリングで修正される予定です。 - -### Ubuntu 16.04 -[`apache::mod::suphp`][]クラスは、リポジトリに適合するパッケージがないため、テストされていません。 - -## 開発 - -### 貢献 - -[Puppet Forge][]上の[Puppet][]モジュールはオープンプロジェクトであり、その価値を維持するにはコミュニティからの貢献が欠かせません。Puppetが提供する膨大な数のプラットフォームや、無数のハードウェア、ソフトウェア、デプロイ設定に弊社がアクセスすることは不可能です。 - -できるだけ変更に簡単に貢献していただき、お使いの環境でモジュールが動作するようにしたいと考えています。モジュールの品質の維持と改善のため、Puppetは貢献者に守っていただくガイドラインを設けています。 - -詳細については、[モジュールコントリビューションガイド][]および[CONTRIBUTING.md][]を参照してください。 diff --git a/modules/apache/spec/acceptance/apache_parameters_spec.rb b/modules/apache/spec/acceptance/apache_parameters_spec.rb deleted file mode 100755 index 2ba1a44..0000000 --- a/modules/apache/spec/acceptance/apache_parameters_spec.rb +++ /dev/null @@ -1,536 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -describe 'apache parameters' do - - # Currently this test only does something on FreeBSD. - describe 'default_confd_files => false' do - it 'doesnt do anything' do - pp = "class { 'apache': default_confd_files => false }" - apply_manifest(pp, :catch_failures => true) - end - - if fact('osfamily') == 'FreeBSD' - describe file("#{$confd_dir}/no-accf.conf.erb") do - it { is_expected.not_to be_file } - end - end - end - describe 'default_confd_files => true' do - it 'copies conf.d files' do - pp = "class { 'apache': default_confd_files => true }" - apply_manifest(pp, :catch_failures => true) - end - - if fact('osfamily') == 'FreeBSD' - describe file("#{$confd_dir}/no-accf.conf.erb") do - it { is_expected.to be_file } - end - end - end - - describe 'when set adds a listen statement' do - it 'applys cleanly' do - pp = "class { 'apache': ip => '10.1.1.1', service_ensure => stopped }" - apply_manifest(pp, :catch_failures => true) - end - - describe file($ports_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'Listen 10.1.1.1' } - end - end - - describe 'service tests => true' do - it 'starts the service' do - pp = <<-EOS - class { 'apache': - service_enable => true, - service_manage => true, - service_ensure => running, - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - it { is_expected.to be_running } - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { is_expected.to be_enabled } - end - end - end - - describe 'service tests => false' do - it 'stops the service' do - pp = <<-EOS - class { 'apache': - service_enable => false, - service_ensure => stopped, - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - it { is_expected.not_to be_running } - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { is_expected.not_to be_enabled } - end - end - end - - describe 'service manage => false' do - it 'we dont manage the service, so it shouldnt start the service' do - pp = <<-EOS - class { 'apache': - service_enable => true, - service_manage => false, - service_ensure => true, - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - it { is_expected.not_to be_running } - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { is_expected.not_to be_enabled } - end - end - end - - describe 'purge parameters => false' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': - purge_configs => false, - purge_vhost_dir => false, - vhost_dir => "#{$confd_dir}.vhosts" - } - EOS - shell("touch #{$confd_dir}/test.conf") - shell("mkdir -p #{$confd_dir}.vhosts && touch #{$confd_dir}.vhosts/test.conf") - apply_manifest(pp, :catch_failures => true) - end - - # Ensure the files didn't disappear. - describe file("#{$confd_dir}/test.conf") do - it { is_expected.to be_file } - end - describe file("#{$confd_dir}.vhosts/test.conf") do - it { is_expected.to be_file } - end - end - - if fact('osfamily') != 'Debian' - describe 'purge parameters => true' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': - purge_configs => true, - purge_vhost_dir => true, - vhost_dir => "#{$confd_dir}.vhosts" - } - EOS - shell("touch #{$confd_dir}/test.conf") - shell("mkdir -p #{$confd_dir}.vhosts && touch #{$confd_dir}.vhosts/test.conf") - apply_manifest(pp, :catch_failures => true) - end - - # File should be gone - describe file("#{$confd_dir}/test.conf") do - it { is_expected.not_to be_file } - end - describe file("#{$confd_dir}.vhosts/test.conf") do - it { is_expected.not_to be_file } - end - end - end - - describe 'serveradmin' do - it 'applies cleanly' do - pp = "class { 'apache': serveradmin => 'test@example.com' }" - apply_manifest(pp, :catch_failures => true) - end - - describe file($vhost) do - it { is_expected.to be_file } - it { is_expected.to contain 'ServerAdmin test@example.com' } - end - end - - describe 'sendfile' do - describe 'setup' do - it 'applies cleanly' do - pp = "class { 'apache': sendfile => 'On' }" - apply_manifest(pp, :catch_failures => true) - end - end - - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'EnableSendfile On' } - end - - describe 'setup' do - it 'applies cleanly' do - pp = "class { 'apache': sendfile => 'Off' }" - apply_manifest(pp, :catch_failures => true) - end - end - - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'Sendfile Off' } - end - end - - describe 'error_documents' do - describe 'setup' do - it 'applies cleanly' do - pp = "class { 'apache': error_documents => true }" - apply_manifest(pp, :catch_failures => true) - end - end - - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'Alias /error/' } - end - end - - describe 'timeout' do - describe 'setup' do - it 'applies cleanly' do - pp = "class { 'apache': timeout => '1234' }" - apply_manifest(pp, :catch_failures => true) - end - end - - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'Timeout 1234' } - end - end - - describe 'httpd_dir' do - describe 'setup' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': httpd_dir => '/tmp', service_ensure => stopped } - include 'apache::mod::mime' - EOS - apply_manifest(pp, :catch_failures => true) - end - end - - describe file("#{$mod_dir}/mime.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'AddLanguage eo .eo' } - end - end - - describe 'http_protocol_options' do - # Actually >= 2.4.24, but the minor version is not provided - # https://bugs.launchpad.net/ubuntu/+source/apache2/2.4.7-1ubuntu4.15 - # basically versions of the ubuntu or sles apache package cause issue - if $apache_version >= '2.4' && fact('operatingsystem') !~ /Ubuntu|SLES/ - describe 'setup' do - it 'applies cleanly' do - pp = "class { 'apache': http_protocol_options => 'Unsafe RegisteredMethods Require1.0'}" - apply_manifest(pp, :catch_failures => true) - end - end - - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'HttpProtocolOptions Unsafe RegisteredMethods Require1.0' } - end - end - end - - describe 'server_root' do - describe 'setup' do - it 'applies cleanly' do - pp = "class { 'apache': server_root => '/tmp/root', service_ensure => stopped }" - apply_manifest(pp, :catch_failures => true) - end - end - - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'ServerRoot "/tmp/root"' } - end - end - - describe 'confd_dir' do - describe 'setup' do - it 'applies cleanly' do - pp = "class { 'apache': confd_dir => '/tmp/root', service_ensure => stopped, use_optional_includes => true }" - apply_manifest(pp, :catch_failures => true) - end - end - - if $apache_version == '2.4' - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'IncludeOptional "/tmp/root/*.conf"' } - end - else - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'Include "/tmp/root/*.conf"' } - end - end - end - - describe 'conf_template' do - describe 'setup' do - it 'applies cleanly' do - pp = "class { 'apache': conf_template => 'another/test.conf.erb', service_ensure => stopped }" - shell("mkdir -p #{default['distmoduledir']}/another/templates") - shell("echo 'testcontent' >> #{default['distmoduledir']}/another/templates/test.conf.erb") - apply_manifest(pp, :catch_failures => true) - end - end - - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'testcontent' } - end - end - - describe 'servername' do - describe 'setup' do - it 'applies cleanly' do - pp = "class { 'apache': servername => 'test.server', service_ensure => stopped }" - apply_manifest(pp, :catch_failures => true) - end - end - - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'ServerName "test.server"' } - end - end - - describe 'user' do - describe 'setup' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': - manage_user => true, - manage_group => true, - user => 'testweb', - group => 'testweb', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - end - - describe user('testweb') do - it { is_expected.to exist } - it { is_expected.to belong_to_group 'testweb' } - end - - describe group('testweb') do - it { is_expected.to exist } - end - end - - describe 'logformats' do - describe 'setup' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': - log_formats => { - 'vhost_common' => '%v %h %l %u %t \\\"%r\\\" %>s %b', - 'vhost_combined' => '%v %h %l %u %t \\\"%r\\\" %>s %b \\\"%{Referer}i\\\" \\\"%{User-agent}i\\\"', - } - } - EOS - apply_manifest(pp, :catch_failures => true) - end - end - - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common' } - it { is_expected.to contain 'LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined' } - end - end - - - describe 'keepalive' do - describe 'setup' do - it 'applies cleanly' do - pp = "class { 'apache': keepalive => 'Off', keepalive_timeout => '30', max_keepalive_requests => '200' }" - apply_manifest(pp, :catch_failures => true) - end - end - - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'KeepAlive Off' } - it { is_expected.to contain 'KeepAliveTimeout 30' } - it { is_expected.to contain 'MaxKeepAliveRequests 200' } - end - end - - describe 'limitrequestfieldsize' do - describe 'setup' do - it 'applies cleanly' do - pp = "class { 'apache': limitreqfieldsize => '16830' }" - apply_manifest(pp, :catch_failures => true) - end - end - - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'LimitRequestFieldSize 16830' } - end - end - - describe 'logging' do - describe 'setup' do - it 'applies cleanly' do - pp = <<-EOS - if $::osfamily == 'RedHat' and "$::selinux" == "true" { - $semanage_package = $::operatingsystemmajrelease ? { - '5' => 'policycoreutils', - default => 'policycoreutils-python', - } - - package { $semanage_package: ensure => installed } - exec { 'set_apache_defaults': - command => 'semanage fcontext -a -t httpd_log_t "/apache_spec(/.*)?"', - path => '/bin:/usr/bin/:/sbin:/usr/sbin', - require => Package[$semanage_package], - } - exec { 'restorecon_apache': - command => 'restorecon -Rv /apache_spec', - path => '/bin:/usr/bin/:/sbin:/usr/sbin', - before => Service['httpd'], - require => Class['apache'], - } - } - file { '/apache_spec': ensure => directory, } - class { 'apache': logroot => '/apache_spec' } - EOS - apply_manifest(pp, :catch_failures => true) - end - end - - describe file("/apache_spec/#{$error_log}") do - it { is_expected.to be_file } - end - end - - describe 'ports_file' do - it 'applys cleanly' do - pp = <<-EOS - file { '/apache_spec': ensure => directory, } - class { 'apache': - ports_file => '/apache_spec/ports_file', - ip => '10.1.1.1', - service_ensure => stopped - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file('/apache_spec/ports_file') do - it { is_expected.to be_file } - it { is_expected.to contain 'Listen 10.1.1.1' } - end - end - - describe 'server_tokens' do - it 'applys cleanly' do - pp = <<-EOS - class { 'apache': - server_tokens => 'Minor', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'ServerTokens Minor' } - end - end - - describe 'server_signature' do - it 'applys cleanly' do - pp = <<-EOS - class { 'apache': - server_signature => 'testsig', - service_ensure => stopped, - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'ServerSignature testsig' } - end - end - - describe 'trace_enable' do - it 'applys cleanly' do - pp = <<-EOS - class { 'apache': - trace_enable => 'Off', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'TraceEnable Off' } - end - end - - describe 'file_e_tag' do - it 'applys cleanly' do - pp = <<-EOS - class { 'apache': - file_e_tag => 'None', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file($conf_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'FileETag None' } - end - end - - describe 'package_ensure' do - it 'applys cleanly' do - pp = <<-EOS - class { 'apache': - package_ensure => present, - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe package($package_name) do - it { is_expected.to be_installed } - end - end - -end diff --git a/modules/apache/spec/acceptance/apache_ssl_spec.rb b/modules/apache/spec/acceptance/apache_ssl_spec.rb deleted file mode 100644 index 0eab1de..0000000 --- a/modules/apache/spec/acceptance/apache_ssl_spec.rb +++ /dev/null @@ -1,156 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -describe 'apache ssl' do - - describe 'ssl parameters' do - it 'runs without error' do - pp = <<-EOS - class { 'apache': - service_ensure => stopped, - default_ssl_vhost => true, - default_ssl_cert => '/tmp/ssl_cert', - default_ssl_key => '/tmp/ssl_key', - default_ssl_chain => '/tmp/ssl_chain', - default_ssl_ca => '/tmp/ssl_ca', - default_ssl_crl_path => '/tmp/ssl_crl_path', - default_ssl_crl => '/tmp/ssl_crl', - default_ssl_crl_check => 'chain', - } - EOS - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{$vhost_dir}/15-default-ssl.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'SSLCertificateFile "/tmp/ssl_cert"' } - it { is_expected.to contain 'SSLCertificateKeyFile "/tmp/ssl_key"' } - it { is_expected.to contain 'SSLCertificateChainFile "/tmp/ssl_chain"' } - it { is_expected.not_to contain 'SSLCACertificateFile "/tmp/ssl_ca"' } - it { is_expected.not_to contain 'SSLCARevocationPath "/tmp/ssl_crl_path"' } - it { is_expected.not_to contain 'SSLCARevocationFile "/tmp/ssl_crl"' } - if $apache_version == '2.4' - it { is_expected.not_to contain 'SSLCARevocationCheck "chain"' } - else - it { is_expected.not_to contain 'SSLCARevocationCheck' } - end - end - end - - describe 'vhost ssl parameters' do - it 'runs without error' do - pp = <<-EOS - class { 'apache': - service_ensure => stopped, - } - - apache::vhost { 'test_ssl': - docroot => '/tmp/test', - ssl => true, - ssl_cert => '/tmp/ssl_cert', - ssl_key => '/tmp/ssl_key', - ssl_chain => '/tmp/ssl_chain', - ssl_ca => '/tmp/ssl_ca', - ssl_crl_path => '/tmp/ssl_crl_path', - ssl_crl => '/tmp/ssl_crl', - ssl_crl_check => 'chain', - ssl_certs_dir => '/tmp', - ssl_protocol => 'test', - ssl_cipher => 'test', - ssl_honorcipherorder => 'test', - ssl_verify_client => 'test', - ssl_verify_depth => 'test', - ssl_options => ['test', 'test1'], - ssl_proxyengine => true, - ssl_proxy_protocol => 'TLSv1.2', - } - EOS - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{$vhost_dir}/25-test_ssl.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'SSLCertificateFile "/tmp/ssl_cert"' } - it { is_expected.to contain 'SSLCertificateKeyFile "/tmp/ssl_key"' } - it { is_expected.to contain 'SSLCertificateChainFile "/tmp/ssl_chain"' } - it { is_expected.to contain 'SSLCACertificateFile "/tmp/ssl_ca"' } - it { is_expected.to contain 'SSLCACertificatePath "/tmp"' } - it { is_expected.to contain 'SSLCARevocationPath "/tmp/ssl_crl_path"' } - it { is_expected.to contain 'SSLCARevocationFile "/tmp/ssl_crl"' } - it { is_expected.to contain 'SSLProxyEngine On' } - it { is_expected.to contain 'SSLProtocol test' } - it { is_expected.to contain 'SSLCipherSuite test' } - it { is_expected.to contain 'SSLHonorCipherOrder test' } - it { is_expected.to contain 'SSLVerifyClient test' } - it { is_expected.to contain 'SSLVerifyDepth test' } - it { is_expected.to contain 'SSLOptions test test1' } - if $apache_version == '2.4' - it { is_expected.to contain 'SSLCARevocationCheck "chain"' } - else - it { is_expected.not_to contain 'SSLCARevocationCheck' } - end - end - end - - describe 'vhost ssl ssl_ca only' do - it 'runs without error' do - pp = <<-EOS - class { 'apache': - service_ensure => stopped, - } - - apache::vhost { 'test_ssl_ca_only': - docroot => '/tmp/test', - ssl => true, - ssl_cert => '/tmp/ssl_cert', - ssl_key => '/tmp/ssl_key', - ssl_ca => '/tmp/ssl_ca', - ssl_verify_client => 'test', - } - EOS - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{$vhost_dir}/25-test_ssl_ca_only.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'SSLCertificateFile "/tmp/ssl_cert"' } - it { is_expected.to contain 'SSLCertificateKeyFile "/tmp/ssl_key"' } - it { is_expected.to contain 'SSLCACertificateFile "/tmp/ssl_ca"' } - it { is_expected.not_to contain 'SSLCACertificatePath' } - end - end - - describe 'vhost ssl ssl_certs_dir' do - it 'runs without error' do - pp = <<-EOS - class { 'apache': - service_ensure => stopped, - } - - apache::vhost { 'test_ssl_certs_dir_only': - docroot => '/tmp/test', - ssl => true, - ssl_cert => '/tmp/ssl_cert', - ssl_key => '/tmp/ssl_key', - ssl_certs_dir => '/tmp', - ssl_verify_client => 'test', - } - EOS - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{$vhost_dir}/25-test_ssl_certs_dir_only.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'SSLCertificateFile "/tmp/ssl_cert"' } - it { is_expected.to contain 'SSLCertificateKeyFile "/tmp/ssl_key"' } - it { is_expected.to contain 'SSLCACertificatePath "/tmp"' } - it { is_expected.to contain 'SSLVerifyClient test' } - it { is_expected.not_to contain 'SSLCACertificateFile' } - end - end - -end diff --git a/modules/apache/spec/acceptance/class_spec.rb b/modules/apache/spec/acceptance/class_spec.rb deleted file mode 100644 index d67b1a8..0000000 --- a/modules/apache/spec/acceptance/class_spec.rb +++ /dev/null @@ -1,89 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -describe 'apache class' do - context 'default parameters' do - let(:pp) { "class { 'apache': }" } - - it_behaves_like "a idempotent resource" - - describe 'apache_version fact' do - before :all do - apply_manifest("include apache", :catch_failures => true) - version_check_pp = <<-EOS - notice("apache_version = >${apache_version}<") - EOS - @result = apply_manifest(version_check_pp, :catch_failures => true) - end - - it { - expect(@result.output).to match(/apache_version = >#{$apache_version}.* 'policycoreutils', - default => 'policycoreutils-python', - } - - package { $semanage_package: ensure => installed } - exec { 'set_apache_defaults': - command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"', - path => '/bin:/usr/bin/:/sbin:/usr/sbin', - subscribe => Package[$semanage_package], - refreshonly => true, - } - exec { 'restorecon_apache': - command => 'restorecon -Rv /apache_spec', - path => '/bin:/usr/bin/:/sbin:/usr/sbin', - before => Service['httpd'], - require => Class['apache'], - subscribe => Exec['set_apache_defaults'], - refreshonly => true, - } - } - file { '/apache_spec': ensure => directory, } - file { '/apache_spec/apache_custom': ensure => directory, } - class { 'apache': - mod_dir => '/apache_spec/apache_custom/mods', - vhost_dir => '/apache_spec/apache_custom/vhosts', - } - EOS - end - - # Run it twice and test for idempotency - it_behaves_like "a idempotent resource" - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - end -end diff --git a/modules/apache/spec/acceptance/custom_config_spec.rb b/modules/apache/spec/acceptance/custom_config_spec.rb deleted file mode 100644 index c8e254e..0000000 --- a/modules/apache/spec/acceptance/custom_config_spec.rb +++ /dev/null @@ -1,94 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -describe 'apache::custom_config define' do - context 'invalid config' do - it 'should not add the config' do - pp = <<-EOS - class { 'apache': } - apache::custom_config { 'acceptance_test': - content => 'INVALID', - } - EOS - - apply_manifest(pp, :expect_failures => true) - end - - describe file("#{$confd_dir}/25-acceptance_test.conf") do - it { is_expected.not_to be_file } - end - end - - context 'valid config' do - it 'should add the config' do - pp = <<-EOS - class { 'apache': } - apache::custom_config { 'acceptance_test': - content => '# just a comment', - } - EOS - - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$confd_dir}/25-acceptance_test.conf") do - it { is_expected.to contain '# just a comment' } - end - end - - context 'with a custom filename' do - it 'should store content in the described file' do - pp = <<-EOS - class { 'apache': } - apache::custom_config { 'filename_test': - filename => 'custom_filename', - content => '# just another comment', - } - EOS - - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$confd_dir}/custom_filename") do - it { is_expected.to contain '# just another comment' } - end - end - - describe 'custom_config without priority prefix' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - apache::custom_config { 'prefix_test': - priority => false, - content => '# just a comment', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$confd_dir}/prefix_test.conf") do - it { is_expected.to be_file } - end - end - - describe 'custom_config only applied after configs are written' do - it 'applies in the right order' do - pp = <<-EOS - class { 'apache': } - - apache::custom_config { 'ordering_test': - content => '# just a comment', - } - - # Try to wedge the apache::custom_config call between when httpd.conf is written and - # ports.conf is written. This should trigger a dependency cycle - File["#{$conf_file}"] -> Apache::Custom_config['ordering_test'] -> Concat["#{$ports_file}"] - EOS - expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Found 1 dependency cycle/i) - end - - describe file("#{$confd_dir}/25-ordering_test.conf") do - it { is_expected.not_to be_file } - end - end -end diff --git a/modules/apache/spec/acceptance/default_mods_spec.rb b/modules/apache/spec/acceptance/default_mods_spec.rb deleted file mode 100644 index 35706c9..0000000 --- a/modules/apache/spec/acceptance/default_mods_spec.rb +++ /dev/null @@ -1,111 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -describe 'apache::default_mods class' do - describe 'no default mods' do - # Using puppet_apply as a helper - let(:pp) do - <<-EOS - class { 'apache': - default_mods => false, - } - EOS - end - - # Run it twice and test for idempotency - it_behaves_like "a idempotent resource" - describe service($service_name) do - it { is_expected.to be_running } - end - end - - unless (fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '12') - describe 'no default mods and failing' do - before :all do - pp = <<-PP - include apache::params - class { 'apache': default_mods => false, service_ensure => stopped, } - PP - apply_manifest(pp) - end - # Using puppet_apply as a helper - it 'should apply with errors' do - pp = <<-EOS - class { 'apache': - default_mods => false, - } - apache::vhost { 'defaults.example.com': - docroot => '#{$doc_root}/defaults', - aliases => { - alias => '/css', - path => '#{$doc_root}/css', - }, - directories => [ - { - 'path' => "#{$doc_root}/admin", - 'auth_basic_fake' => 'demo demopass', - } - ], - setenv => 'TEST1 one', - } - EOS - - apply_manifest(pp, { :expect_failures => true }) - end - end - - describe service($service_name) do - it { is_expected.not_to be_running } - end - end - - describe 'alternative default mods' do - # Using puppet_apply as a helper - let(:pp) do - <<-EOS - class { 'apache': - default_mods => [ - 'info', - 'alias', - 'mime', - 'env', - 'expires', - ], - } - apache::vhost { 'defaults.example.com': - docroot => '#{$doc_root}/defaults', - aliases => { - alias => '/css', - path => '#{$doc_root}/css', - }, - setenv => 'TEST1 one', - } - EOS - end - it_behaves_like "a idempotent resource" - - describe service($service_name) do - it { is_expected.to be_running } - end - end - - describe 'change loadfile name' do - let(:pp) do - <<-EOS - class { 'apache': default_mods => false } - ::apache::mod { 'auth_basic': - loadfile_name => 'zz_auth_basic.load', - } - EOS - end - # Run it twice and test for idempotency - it_behaves_like "a idempotent resource" - describe service($service_name) do - it { is_expected.to be_running } - end - - describe file("#{$mod_dir}/zz_auth_basic.load") do - it { is_expected.to be_file } - end - end -end diff --git a/modules/apache/spec/acceptance/init_task_spec.rb b/modules/apache/spec/acceptance/init_task_spec.rb deleted file mode 100644 index 78bdaa0..0000000 --- a/modules/apache/spec/acceptance/init_task_spec.rb +++ /dev/null @@ -1,20 +0,0 @@ -# run a test task -require 'spec_helper_acceptance' - -describe 'apache tasks', if: pe_install? && puppet_version =~ %r{(5\.\d\.\d)} do - describe 'reload' do - it 'execute reload' do - pp = <<-EOS - class { 'apache': - default_vhost => false, - } - apache::listen { '9090':} - EOS - - apply_manifest(pp, :catch_failures => true) - - result = run_task(task_name: 'apache', params: 'action=reload') - expect_multiple_regexes(result: result, regexes: [%r{reload successful}, %r{Job completed. 1/1 nodes succeeded}]) - end - end -end diff --git a/modules/apache/spec/acceptance/itk_spec.rb b/modules/apache/spec/acceptance/itk_spec.rb deleted file mode 100644 index 059589a..0000000 --- a/modules/apache/spec/acceptance/itk_spec.rb +++ /dev/null @@ -1,60 +0,0 @@ -require 'spec_helper_acceptance' - -case fact('osfamily') -when 'Debian' - service_name = 'apache2' - majrelease = fact('operatingsystemmajrelease') - if ['6', '7', '10.04', '12.04'].include?(majrelease) - variant = :itk_only - else - variant = :prefork - end -when 'RedHat' - unless fact('operatingsystemmajrelease') == '5' - service_name = 'httpd' - majrelease = fact('operatingsystemmajrelease') - if ['6'].include?(majrelease) - variant = :itk_only - else - variant = :prefork - end - end -when 'FreeBSD' - service_name = 'apache24' - majrelease = fact('operatingsystemmajrelease') - variant = :prefork -end - -describe 'apache::mod::itk class', :if => service_name do - describe 'running puppet code' do - # Using puppet_apply as a helper - let(:pp) do - case variant - when :prefork - <<-EOS - class { 'apache': - mpm_module => 'prefork', - } - class { 'apache::mod::itk': } - EOS - when :itk_only - <<-EOS - class { 'apache': - mpm_module => 'itk', - } - EOS - end - end - # Run it twice and test for idempotency - it_behaves_like "a idempotent resource" - end - - describe service(service_name) do - it { is_expected.to be_running } - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - end -end diff --git a/modules/apache/spec/acceptance/mod_dav_svn_spec.rb b/modules/apache/spec/acceptance/mod_dav_svn_spec.rb deleted file mode 100644 index 2b15225..0000000 --- a/modules/apache/spec/acceptance/mod_dav_svn_spec.rb +++ /dev/null @@ -1,63 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -describe 'apache::mod::dav_svn class', :unless => (fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7') || (fact('operatingsystem') == 'SLES' and fact('operatingsystemmajorrelease') < '11') do - case fact('osfamily') - when 'Debian' - if fact('operatingsystemmajrelease') == '6' or fact('operatingsystemmajrelease') == '10.04' or fact('operatingsystemrelease') == '10.04' or fact('operatingsystemmajrelease') == '16.04' - authz_svn_load_file = 'dav_svn_authz_svn.load' - else - authz_svn_load_file = 'authz_svn.load' - end - else - authz_svn_load_file = 'dav_svn_authz_svn.load' - end - - context "default dav_svn config" do - it 'succeeds in puppeting dav_svn' do - pp= <<-EOS - class { 'apache': } - include apache::mod::dav_svn - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe file("#{$mod_dir}/dav_svn.load") do - it { is_expected.to contain "LoadModule dav_svn_module" } - end - end - - context "dav_svn with enabled authz_svn config" do - it 'succeeds in puppeting dav_svn' do - pp= <<-EOS - class { 'apache': } - class { 'apache::mod::dav_svn': - authz_svn_enabled => true, - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe file("#{$mod_dir}/#{authz_svn_load_file}") do - it { is_expected.to contain "LoadModule authz_svn_module" } - end - end -end diff --git a/modules/apache/spec/acceptance/mod_deflate_spec.rb b/modules/apache/spec/acceptance/mod_deflate_spec.rb deleted file mode 100644 index 1b55e08..0000000 --- a/modules/apache/spec/acceptance/mod_deflate_spec.rb +++ /dev/null @@ -1,33 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -describe 'apache::mod::deflate class' do - context "default deflate config" do - it 'succeeds in puppeting deflate' do - pp= <<-EOS - class { 'apache': } - include apache::mod::deflate - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe file("#{$mod_dir}/deflate.conf") do - it { is_expected.to contain "AddOutputFilterByType DEFLATE text/html text/plain text/xml" } - it { is_expected.to contain "AddOutputFilterByType DEFLATE text/css" } - it { is_expected.to contain "AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript" } - it { is_expected.to contain "AddOutputFilterByType DEFLATE application/rss+xml" } - it { is_expected.to contain "DeflateFilterNote Input instream" } - it { is_expected.to contain "DeflateFilterNote Output outstream" } - it { is_expected.to contain "DeflateFilterNote Ratio ratio" } - end - end -end diff --git a/modules/apache/spec/acceptance/mod_fcgid_spec.rb b/modules/apache/spec/acceptance/mod_fcgid_spec.rb deleted file mode 100644 index ce3b5b5..0000000 --- a/modules/apache/spec/acceptance/mod_fcgid_spec.rb +++ /dev/null @@ -1,57 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'apache::mod::fcgid class', :if => ((fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') != '5') and !(fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7')) do - context "default fcgid config" do - it 'succeeds in puppeting fcgid' do - pp = <<-EOS - class { 'epel': } # mod_fcgid lives in epel - class { 'apache': } - class { 'apache::mod::php': } # For /usr/bin/php-cgi - class { 'apache::mod::fcgid': - options => { - 'FcgidIPCDir' => '/var/run/fcgidsock', - }, - } - apache::vhost { 'fcgid.example.com': - port => '80', - docroot => '/var/www/fcgid', - directories => { - path => '/var/www/fcgid', - options => '+ExecCGI', - addhandlers => { - handler => 'fcgid-script', - extensions => '.php', - }, - fcgiwrapper => { - command => '/usr/bin/php-cgi', - suffix => '.php', - } - }, - } - file { '/var/www/fcgid/index.php': - ensure => file, - owner => 'root', - group => 'root', - content => "\\n", - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service('httpd') do - it { is_expected.to be_enabled } - it { is_expected.to be_running } - end - - it 'should answer to fcgid.example.com' do - shell("/usr/bin/curl -H 'Host: fcgid.example.com' 127.0.0.1:80") do |r| - expect(r.stdout).to match(/^Hello world$/) - expect(r.exit_code).to eq(0) - end - end - - it 'should run a php-cgi process' do - shell("pgrep -u apache php-cgi", :acceptable_exit_codes => [0]) - end - end -end diff --git a/modules/apache/spec/acceptance/mod_mime_spec.rb b/modules/apache/spec/acceptance/mod_mime_spec.rb deleted file mode 100644 index f8bc7c1..0000000 --- a/modules/apache/spec/acceptance/mod_mime_spec.rb +++ /dev/null @@ -1,30 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -describe 'apache::mod::mime class' do - context "default mime config" do - it 'succeeds in puppeting mime' do - pp= <<-EOS - class { 'apache': } - include apache::mod::mime - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe file("#{$mod_dir}/mime.conf") do - it { is_expected.to contain "AddType application/x-compress .Z" } - it { is_expected.to contain "AddHandler type-map var\n" } - it { is_expected.to contain "AddType text/html .shtml\n" } - it { is_expected.to contain "AddOutputFilter INCLUDES .shtml\n" } - end - end -end diff --git a/modules/apache/spec/acceptance/mod_negotiation_spec.rb b/modules/apache/spec/acceptance/mod_negotiation_spec.rb deleted file mode 100644 index 56c29e3..0000000 --- a/modules/apache/spec/acceptance/mod_negotiation_spec.rb +++ /dev/null @@ -1,78 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -describe 'apache::mod::negotiation class' do - context "default negotiation config" do - it 'succeeds in puppeting negotiation' do - pp= <<-EOS - class { '::apache': default_mods => false } - class { '::apache::mod::negotiation': } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$mod_dir}/negotiation.conf") do - it { should contain "LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW -ForceLanguagePriority Prefer Fallback" } - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { should be_running } - end - end - - context "with alternative force_language_priority" do - it 'succeeds in puppeting negotiation' do - pp= <<-EOS - class { '::apache': default_mods => false } - class { '::apache::mod::negotiation': - force_language_priority => 'Prefer', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$mod_dir}/negotiation.conf") do - it { should contain "ForceLanguagePriority Prefer" } - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { should be_running } - end - end - - context "with alternative language_priority" do - it 'succeeds in puppeting negotiation' do - pp= <<-EOS - class { '::apache': default_mods => false } - class { '::apache::mod::negotiation': - language_priority => [ 'en', 'es' ], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$mod_dir}/negotiation.conf") do - it { should contain "LanguagePriority en es" } - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { should be_running } - end - end -end diff --git a/modules/apache/spec/acceptance/mod_pagespeed_spec.rb b/modules/apache/spec/acceptance/mod_pagespeed_spec.rb deleted file mode 100644 index 1455d56..0000000 --- a/modules/apache/spec/acceptance/mod_pagespeed_spec.rb +++ /dev/null @@ -1,61 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -# Only run the test on centos 7, this is to cut down on the different types of setup -# required. Installing the dependancies are highly prone to failure. -describe 'apache::mod::pagespeed class', :if => - ((fact('operatingsystem') == 'CentOS' ) and - (fact('operatingsystemmajrelease') == '7' )) do - context "default pagespeed config" do - it 'succeeds in puppeting pagespeed' do - pp= <<-EOS - yumrepo { 'mod-pagespeed': - baseurl => "http://dl.google.com/linux/mod-pagespeed/rpm/stable/$::architecture", - enabled => 1, - gpgcheck => 1, - gpgkey => 'https://dl-ssl.google.com/linux/linux_signing_key.pub', - before => Class['apache'], - } - - class { 'apache': - mpm_module => 'prefork', - } - class { 'apache::mod::pagespeed': - enable_filters => ['remove_comments'], - disable_filters => ['extend_cache'], - forbid_filters => ['rewrite_javascript'], - } - apache::vhost { 'pagespeed.example.com': - port => '80', - docroot => '#{$doc_root}/pagespeed', - } - host { 'pagespeed.example.com': ip => '127.0.0.1', } - file { '#{$doc_root}/pagespeed/index.html': - ensure => file, - content => "\n\n\n

Hello World!

\n\n", - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - it { should be_enabled } - it { is_expected.to be_running } - end - - describe file("#{$mod_dir}/pagespeed.conf") do - it { is_expected.to contain "AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html" } - it { is_expected.to contain "ModPagespeedEnableFilters remove_comments" } - it { is_expected.to contain "ModPagespeedDisableFilters extend_cache" } - it { is_expected.to contain "ModPagespeedForbidFilters rewrite_javascript" } - end - - it 'should answer to pagespeed.example.com and include and be stripped of comments by mod_pagespeed' do - shell("/usr/bin/curl pagespeed.example.com:80") do |r| - expect(r.stdout).to match(//) - expect(r.stdout).not_to match(//) - expect(r.exit_code).to eq(0) - end - end - end -end diff --git a/modules/apache/spec/acceptance/mod_passenger_spec.rb b/modules/apache/spec/acceptance/mod_passenger_spec.rb deleted file mode 100644 index 4761d2c..0000000 --- a/modules/apache/spec/acceptance/mod_passenger_spec.rb +++ /dev/null @@ -1,208 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -describe 'apache::mod::passenger class' do - pending 'This cannot run in the same test run as apache::vhost with passenger - as the passenger.conf file is not yet managed by puppet and will be wiped out - between tests and not replaced' - case fact('osfamily') - when 'Debian' - conf_file = "#{$mod_dir}/passenger.conf" - load_file = "#{$mod_dir}/zpassenger.load" - - case fact('operatingsystem') - when 'Ubuntu' - case fact('lsbdistrelease') - when '10.04' - passenger_root = '/usr' - passenger_ruby = '/usr/bin/ruby' - when '12.04' - passenger_root = '/usr' - passenger_ruby = '/usr/bin/ruby' - when '14.04' - passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini' - passenger_ruby = '/usr/bin/ruby' - passenger_default_ruby = '/usr/bin/ruby' - when '16.04' - passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini' - passenger_ruby = '/usr/bin/ruby' - passenger_default_ruby = '/usr/bin/ruby' - else - # This may or may not work on Ubuntu releases other than the above - passenger_root = '/usr' - passenger_ruby = '/usr/bin/ruby' - end - when 'Debian' - case fact('lsbdistcodename') - when 'wheezy' - passenger_root = '/usr' - passenger_ruby = '/usr/bin/ruby' - when 'jessie' - passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini' - passenger_ruby = '/usr/bin/ruby' - passenger_default_ruby = '/usr/bin/ruby' - else - # This may or may not work on Debian releases other than the above - passenger_root = '/usr' - passenger_ruby = '/usr/bin/ruby' - end - end - - passenger_module_path = '/usr/lib/apache2/modules/mod_passenger.so' - rackapp_user = 'www-data' - rackapp_group = 'www-data' - when 'RedHat' - conf_file = "#{$mod_dir}/passenger.conf" - load_file = "#{$mod_dir}/zpassenger.load" - # sometimes installs as 3.0.12, sometimes as 3.0.19 - so just check for the stable part - passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini' - passenger_ruby = '/usr/bin/ruby' - passenger_module_path = 'modules/mod_passenger.so' - rackapp_user = 'apache' - rackapp_group = 'apache' - end - - pp_rackapp = <<-EOS - /* a simple ruby rack 'hello world' app */ - file { '/var/www/passenger': - ensure => directory, - owner => '#{rackapp_user}', - group => '#{rackapp_group}', - } - file { '/var/www/passenger/config.ru': - ensure => file, - owner => '#{rackapp_user}', - group => '#{rackapp_group}', - content => "app = proc { |env| [200, { \\"Content-Type\\" => \\"text/html\\" }, [\\"hello world\\"]] }\\nrun app", - } - apache::vhost { 'passenger.example.com': - port => '80', - docroot => '/var/www/passenger/public', - docroot_group => '#{rackapp_group}', - docroot_owner => '#{rackapp_user}', - require => File['/var/www/passenger/config.ru'], - } - host { 'passenger.example.com': ip => '127.0.0.1', } - EOS - - case fact('osfamily') - when 'Debian' - context "default passenger config" do - it 'succeeds in puppeting passenger' do - pp = <<-EOS - /* stock apache and mod_passenger */ - class { 'apache': } - class { 'apache::mod::passenger': } - #{pp_rackapp} - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe file(conf_file) do - it { is_expected.to contain "PassengerRoot \"#{passenger_root}\"" } - - case fact('operatingsystem') - when 'Ubuntu' - case fact('lsbdistrelease') - when '10.04' - it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" } - it { is_expected.not_to contain "/PassengerDefaultRuby/" } - when '12.04' - it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" } - it { is_expected.not_to contain "/PassengerDefaultRuby/" } - when '14.04' - it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" } - it { is_expected.not_to contain "/PassengerRuby/" } - when '16.04' - it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" } - it { is_expected.not_to contain "/PassengerRuby/" } - else - # This may or may not work on Ubuntu releases other than the above - it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" } - it { is_expected.not_to contain "/PassengerDefaultRuby/" } - end - when 'Debian' - case fact('lsbdistcodename') - when 'wheezy' - it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" } - it { is_expected.not_to contain "/PassengerDefaultRuby/" } - when 'jessie' - it { is_expected.to contain "PassengerDefaultRuby \"#{passenger_ruby}\"" } - it { is_expected.not_to contain "/PassengerRuby/" } - else - # This may or may not work on Debian releases other than the above - it { is_expected.to contain "PassengerRuby \"#{passenger_ruby}\"" } - it { is_expected.not_to contain "/PassengerDefaultRuby/" } - end - end - end - - describe file(load_file) do - it { is_expected.to contain "LoadModule passenger_module #{passenger_module_path}" } - end - - it 'should output status via passenger-memory-stats' do - shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-memory-stats") do |r| - expect(r.stdout).to match(/Apache processes/) - expect(r.stdout).to match(/Nginx processes/) - expect(r.stdout).to match(/Passenger processes/) - - # passenger-memory-stats output on newer Debian/Ubuntu verions do not contain - # these two lines - unless ((fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04') or - (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') or - (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8')) - expect(r.stdout).to match(/### Processes: [0-9]+/) - expect(r.stdout).to match(/### Total private dirty RSS: [0-9\.]+ MB/) - end - - expect(r.exit_code).to eq(0) - end - end - - # passenger-status fails under stock ubuntu-server-12042-x64 + mod_passenger, - # even when the passenger process is successfully installed and running - unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '12.04' - it 'should output status via passenger-status' do - # xml output not available on ubunutu <= 10.04, so sticking with default pool output - shell("PATH=/usr/bin:$PATH /usr/sbin/passenger-status") do |r| - # spacing may vary - expect(r.stdout).to match(/[\-]+ General information [\-]+/) - if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04' or - (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '16.04') or - fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8' - expect(r.stdout).to match(/Max pool size[ ]+: [0-9]+/) - expect(r.stdout).to match(/Processes[ ]+: [0-9]+/) - expect(r.stdout).to match(/Requests in top-level queue[ ]+: [0-9]+/) - else - expect(r.stdout).to match(/max[ ]+= [0-9]+/) - expect(r.stdout).to match(/count[ ]+= [0-9]+/) - expect(r.stdout).to match(/active[ ]+= [0-9]+/) - expect(r.stdout).to match(/inactive[ ]+= [0-9]+/) - expect(r.stdout).to match(/Waiting on global queue: [0-9]+/) - end - - expect(r.exit_code).to eq(0) - end - end - end - - it 'should answer to passenger.example.com' do - shell("/usr/bin/curl passenger.example.com:80") do |r| - expect(r.stdout).to match(/^hello world<\/b>$/) - expect(r.exit_code).to eq(0) - end - end - - end - end -end diff --git a/modules/apache/spec/acceptance/mod_php_spec.rb b/modules/apache/spec/acceptance/mod_php_spec.rb deleted file mode 100644 index 59be2ba..0000000 --- a/modules/apache/spec/acceptance/mod_php_spec.rb +++ /dev/null @@ -1,152 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -unless (fact('operatingsystem') == 'SLES' && fact('operatingsystemmajrelease') == '12') - describe 'apache::mod::php class' do - context "default php config" do - it 'succeeds in puppeting php' do - pp= <<-EOS - class { 'apache': - mpm_module => 'prefork', - } - class { 'apache::mod::php': } - apache::vhost { 'php.example.com': - port => '80', - docroot => '#{$doc_root}/php', - } - host { 'php.example.com': ip => '127.0.0.1', } - file { '#{$doc_root}/php/index.php': - ensure => file, - content => "\\n", - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04') - describe file("#{$mod_dir}/php7.0.conf") do - it { is_expected.to contain "DirectoryIndex index.php" } - end - else - describe file("#{$mod_dir}/php5.conf") do - it { is_expected.to contain "DirectoryIndex index.php" } - end - end - - it 'should answer to php.example.com' do - shell("/usr/bin/curl php.example.com:80") do |r| - expect(r.stdout).to match(/PHP Version/) - expect(r.exit_code).to eq(0) - end - end - end - - context "custom extensions, php_flag, php_value, php_admin_flag, and php_admin_value" do - it 'succeeds in puppeting php' do - pp= <<-EOS - class { 'apache': - mpm_module => 'prefork', - } - class { 'apache::mod::php': - extensions => ['.php','.php5'], - } - apache::vhost { 'php.example.com': - port => '80', - docroot => '#{$doc_root}/php', - php_values => { 'include_path' => '.:/usr/share/pear:/usr/bin/php', }, - php_flags => { 'display_errors' => 'on', }, - php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', }, - php_admin_flags => { 'engine' => 'on', }, - } - host { 'php.example.com': ip => '127.0.0.1', } - file { '#{$doc_root}/php/index.php5': - ensure => file, - content => "\\n", - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe file("#{$vhost_dir}/25-php.example.com.conf") do - it { is_expected.to contain " php_flag display_errors on" } - it { is_expected.to contain " php_value include_path \".:/usr/share/pear:/usr/bin/php\"" } - it { is_expected.to contain " php_admin_flag engine on" } - it { is_expected.to contain " php_admin_value open_basedir /var/www/php/:/usr/share/pear/" } - end - - it 'should answer to php.example.com' do - shell("/usr/bin/curl php.example.com:80") do |r| - expect(r.stdout).to match(/\/usr\/share\/pear\//) - expect(r.exit_code).to eq(0) - end - end - end - - context "provide custom config file" do - it 'succeeds in puppeting php' do - pp= <<-EOS - class {'apache': - mpm_module => 'prefork', - } - class {'apache::mod::php': - content => '# somecontent', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04') - describe file("#{$mod_dir}/php7.0.conf") do - it { should contain "# somecontent" } - end - else - describe file("#{$mod_dir}/php5.conf") do - it { should contain "# somecontent" } - end - end - end - - context "provide content and template config file" do - it 'succeeds in puppeting php' do - pp= <<-EOS - class {'apache': - mpm_module => 'prefork', - } - class {'apache::mod::php': - content => '# somecontent', - template => 'apache/mod/php5.conf.erb', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - if (fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04') - describe file("#{$mod_dir}/php7.0.conf") do - it { should contain "# somecontent" } - end - else - describe file("#{$mod_dir}/php5.conf") do - it { should contain "# somecontent" } - end - end - end - - end -end diff --git a/modules/apache/spec/acceptance/mod_proxy_html_spec.rb b/modules/apache/spec/acceptance/mod_proxy_html_spec.rb deleted file mode 100644 index ce8aad6..0000000 --- a/modules/apache/spec/acceptance/mod_proxy_html_spec.rb +++ /dev/null @@ -1,36 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -# Don't run proxy_html tests on RHEL7 because the yum repos are missing packages required by it. -describe 'apache::mod::proxy_html class', :unless => (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7') do - context "default proxy_html config" do - if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/ - it 'adds epel' do - pp = "class { 'epel': }" - apply_manifest(pp, :catch_failures => true) - end - end - - it 'succeeds in puppeting proxy_html' do - pp= <<-EOS - class { 'apache': } - class { 'apache::mod::proxy': } - class { 'apache::mod::proxy_http': } - # mod_proxy_html doesn't exist in RHEL5 - if $::osfamily == 'RedHat' and $::operatingsystemmajrelease != '5' { - class { 'apache::mod::proxy_html': } - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - end -end diff --git a/modules/apache/spec/acceptance/mod_security_spec.rb b/modules/apache/spec/acceptance/mod_security_spec.rb deleted file mode 100644 index 095cce9..0000000 --- a/modules/apache/spec/acceptance/mod_security_spec.rb +++ /dev/null @@ -1,386 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -describe 'apache::mod::security class', :unless => (fact('osfamily') == 'Debian' and (fact('lsbdistcodename') == 'squeeze' or fact('lsbdistcodename') == 'lucid' or fact('lsbdistcodename') == 'precise' or fact('lsbdistcodename') == 'wheezy')) || (fact('operatingsystem') == 'SLES' and fact('operatingsystemrelease') < '11') do - context "default mod_security config" do - if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/ - it 'adds epel' do - pp = "class { 'epel': }" - apply_manifest(pp, :catch_failures => true) - end - elsif fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7' - it 'changes obsoletes, per PUP-4497' do - pp = <<-EOS - ini_setting { 'obsoletes': - path => '/etc/yum.conf', - section => 'main', - setting => 'obsoletes', - value => '0', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - end - - it 'succeeds in puppeting mod_security' do - pp= <<-EOS - host { 'modsec.example.com': ip => '127.0.0.1', } - class { 'apache': } - class { 'apache::mod::security': } - apache::vhost { 'modsec.example.com': - port => '80', - docroot => '#{$doc_root}/html', - } - file { '#{$doc_root}/html/index.html': - ensure => file, - content => 'Index page', - } - EOS - apply_manifest(pp, :catch_failures => true) - - #Need to add a short sleep here because on RHEL6 the service takes a bit longer to init - if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/ - sleep 5 - end - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe package($package_name) do - it { is_expected.to be_installed } - end - - describe file("#{$mod_dir}/security.conf") do - it { is_expected.to contain "mod_security2.c" } - end - - describe 'should be listening on port 80' do - it 'should return index page' do - shell('/usr/bin/curl -A beaker modsec.example.com:80') do |r| - expect(r.stdout).to match(/Index page/) - expect(r.exit_code).to eq(0) - end - end - - unless fact('operatingsystem') == 'SLES' - it 'should block query with SQL' do - shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22] - end - end - end - - end #default mod_security config - - context "mod_security should allow disabling by vhost" do - it 'succeeds in puppeting mod_security' do - pp= <<-EOS - host { 'modsec.example.com': ip => '127.0.0.1', } - class { 'apache': } - class { 'apache::mod::security': } - apache::vhost { 'modsec.example.com': - port => '80', - docroot => '#{$doc_root}/html', - } - file { '#{$doc_root}/html/index.html': - ensure => file, - content => 'Index page', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe file("#{$mod_dir}/security.conf") do - it { is_expected.to contain "mod_security2.c" } - end - - unless fact('operatingsystem') == 'SLES' - it 'should block query with SQL' do - shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22] - end - end - - it 'should disable mod_security per vhost' do - pp= <<-EOS - class { 'apache': } - class { 'apache::mod::security': } - apache::vhost { 'modsec.example.com': - port => '80', - docroot => '#{$doc_root}/html', - modsec_disable_vhost => true, - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - it 'should return index page' do - shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r| - expect(r.stdout).to match(/Index page/) - expect(r.exit_code).to eq(0) - end - end - end #mod_security should allow disabling by vhost - - context "mod_security should allow disabling by ip" do - it 'succeeds in puppeting mod_security' do - pp= <<-EOS - host { 'modsec.example.com': ip => '127.0.0.1', } - class { 'apache': } - class { 'apache::mod::security': } - apache::vhost { 'modsec.example.com': - port => '80', - docroot => '#{$doc_root}/html', - } - file { '#{$doc_root}/html/index.html': - ensure => file, - content => 'Index page', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe file("#{$mod_dir}/security.conf") do - it { is_expected.to contain "mod_security2.c" } - end - - unless fact('operatingsystem') == 'SLES' - it 'should block query with SQL' do - shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22] - end - end - - it 'should disable mod_security per vhost' do - pp= <<-EOS - class { 'apache': } - class { 'apache::mod::security': } - apache::vhost { 'modsec.example.com': - port => '80', - docroot => '#{$doc_root}/html', - modsec_disable_ips => [ '127.0.0.1' ], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - it 'should return index page' do - shell('/usr/bin/curl -A beaker modsec.example.com:80') do |r| - expect(r.stdout).to match(/Index page/) - expect(r.exit_code).to eq(0) - end - end - end #mod_security should allow disabling by ip - - context "mod_security should allow disabling by id" do - it 'succeeds in puppeting mod_security' do - pp= <<-EOS - host { 'modsec.example.com': ip => '127.0.0.1', } - class { 'apache': } - class { 'apache::mod::security': } - apache::vhost { 'modsec.example.com': - port => '80', - docroot => '#{$doc_root}/html', - } - file { '#{$doc_root}/html/index.html': - ensure => file, - content => 'Index page', - } - file { '#{$doc_root}/html/index2.html': - ensure => file, - content => 'Page 2', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe file("#{$mod_dir}/security.conf") do - it { is_expected.to contain "mod_security2.c" } - end - - unless fact('operatingsystem') == 'SLES' - it 'should block query with SQL' do - shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22] - end - end - - it 'should disable mod_security per vhost' do - pp= <<-EOS - class { 'apache': } - class { 'apache::mod::security': } - apache::vhost { 'modsec.example.com': - port => '80', - docroot => '#{$doc_root}/html', - modsec_disable_ids => [ '950007' ], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - it 'should return index page' do - shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r| - expect(r.stdout).to match(/Index page/) - expect(r.exit_code).to eq(0) - end - end - - end #mod_security should allow disabling by id - - context "mod_security should allow disabling by msg" do - it 'succeeds in puppeting mod_security' do - pp= <<-EOS - host { 'modsec.example.com': ip => '127.0.0.1', } - class { 'apache': } - class { 'apache::mod::security': } - apache::vhost { 'modsec.example.com': - port => '80', - docroot => '#{$doc_root}/html', - } - file { '#{$doc_root}/html/index.html': - ensure => file, - content => 'Index page', - } - file { '#{$doc_root}/html/index2.html': - ensure => file, - content => 'Page 2', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe file("#{$mod_dir}/security.conf") do - it { is_expected.to contain "mod_security2.c" } - end - - unless fact('operatingsystem') == 'SLES' - it 'should block query with SQL' do - shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22] - end - end - - it 'should disable mod_security per vhost' do - pp= <<-EOS - class { 'apache': } - class { 'apache::mod::security': } - apache::vhost { 'modsec.example.com': - port => '80', - docroot => '#{$doc_root}/html', - modsec_disable_msgs => [ 'Blind SQL Injection Attack' ], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - it 'should return index page' do - shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r| - expect(r.stdout).to match(/Index page/) - expect(r.exit_code).to eq(0) - end - end - - end #mod_security should allow disabling by msg - - context "mod_security should allow disabling by tag" do - it 'succeeds in puppeting mod_security' do - pp= <<-EOS - host { 'modsec.example.com': ip => '127.0.0.1', } - class { 'apache': } - class { 'apache::mod::security': } - apache::vhost { 'modsec.example.com': - port => '80', - docroot => '#{$doc_root}/html', - } - file { '#{$doc_root}/html/index.html': - ensure => file, - content => 'Index page', - } - file { '#{$doc_root}/html/index2.html': - ensure => file, - content => 'Page 2', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe file("#{$mod_dir}/security.conf") do - it { is_expected.to contain "mod_security2.c" } - end - - unless fact('operatingsystem') == 'SLES' - it 'should block query with SQL' do - shell '/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users', :acceptable_exit_codes => [22] - end - end - - it 'should disable mod_security per vhost' do - pp= <<-EOS - class { 'apache': } - class { 'apache::mod::security': } - apache::vhost { 'modsec.example.com': - port => '80', - docroot => '#{$doc_root}/html', - modsec_disable_tags => [ 'WEB_ATTACK/SQL_INJECTION' ], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - it 'should return index page' do - shell('/usr/bin/curl -A beaker -f modsec.example.com:80?SELECT%20*FROM%20mysql.users') do |r| - expect(r.stdout).to match(/Index page/) - expect(r.exit_code).to eq(0) - end - end - - end #mod_security should allow disabling by tag - -end #apache::mod::security class diff --git a/modules/apache/spec/acceptance/mod_suphp_spec.rb b/modules/apache/spec/acceptance/mod_suphp_spec.rb deleted file mode 100644 index 0748667..0000000 --- a/modules/apache/spec/acceptance/mod_suphp_spec.rb +++ /dev/null @@ -1,57 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'apache::mod::suphp class', :if => (fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemmajrelease') != '16.04') do - context "default suphp config" do - it 'succeeds in puppeting suphp' do - pp = <<-EOS -class { 'apache': - mpm_module => 'prefork', -} -host { 'suphp.example.com': ip => '127.0.0.1', } -apache::vhost { 'suphp.example.com': - port => '80', - docroot => '/var/www/suphp', -} -file { '/var/www/suphp/index.php': - ensure => file, - owner => 'daemon', - group => 'daemon', - content => "\\n", - require => File['/var/www/suphp'], - before => Class['apache::mod::php'], -} -class { 'apache::mod::php': } -class { 'apache::mod::suphp': } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service('apache2') do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - it 'should answer to suphp.example.com' do - timeout = 0 - loop do - r = shell('curl suphp.example.com:80') - timeout += 1 - break if r.stdout =~ /^daemon$/ - if timeout > 40 - expect(timeout < 40).to be true - break - end - sleep(1) - end - shell("/usr/bin/curl suphp.example.com:80") do |r| - expect(r.stdout).to match(/^daemon$/) - expect(r.exit_code).to eq(0) - end - end - - end -end diff --git a/modules/apache/spec/acceptance/nodesets/centos-7-x64.yml b/modules/apache/spec/acceptance/nodesets/centos-7-x64.yml deleted file mode 100644 index 5eebdef..0000000 --- a/modules/apache/spec/acceptance/nodesets/centos-7-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-7-x64: - roles: - - agent - - default - platform: el-7-x86_64 - hypervisor: vagrant - box: puppetlabs/centos-7.2-64-nocm -CONFIG: - type: foss diff --git a/modules/apache/spec/acceptance/nodesets/debian-8-x64.yml b/modules/apache/spec/acceptance/nodesets/debian-8-x64.yml deleted file mode 100644 index fef6e63..0000000 --- a/modules/apache/spec/acceptance/nodesets/debian-8-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - debian-8-x64: - roles: - - agent - - default - platform: debian-8-amd64 - hypervisor: vagrant - box: puppetlabs/debian-8.2-64-nocm -CONFIG: - type: foss diff --git a/modules/apache/spec/acceptance/nodesets/default.yml b/modules/apache/spec/acceptance/nodesets/default.yml deleted file mode 100644 index dba339c..0000000 --- a/modules/apache/spec/acceptance/nodesets/default.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-1404-x64: - roles: - - agent - - default - platform: ubuntu-14.04-amd64 - hypervisor: vagrant - box: puppetlabs/ubuntu-14.04-64-nocm -CONFIG: - type: foss diff --git a/modules/apache/spec/acceptance/nodesets/docker/centos-7.yml b/modules/apache/spec/acceptance/nodesets/docker/centos-7.yml deleted file mode 100644 index a3333aa..0000000 --- a/modules/apache/spec/acceptance/nodesets/docker/centos-7.yml +++ /dev/null @@ -1,12 +0,0 @@ -HOSTS: - centos-7-x64: - platform: el-7-x86_64 - hypervisor: docker - image: centos:7 - docker_preserve_image: true - docker_cmd: '["/usr/sbin/init"]' - # install various tools required to get the image up to usable levels - docker_image_commands: - - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts' -CONFIG: - trace_limit: 200 diff --git a/modules/apache/spec/acceptance/nodesets/docker/debian-8.yml b/modules/apache/spec/acceptance/nodesets/docker/debian-8.yml deleted file mode 100644 index df5c319..0000000 --- a/modules/apache/spec/acceptance/nodesets/docker/debian-8.yml +++ /dev/null @@ -1,11 +0,0 @@ -HOSTS: - debian-8-x64: - platform: debian-8-amd64 - hypervisor: docker - image: debian:8 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen' -CONFIG: - trace_limit: 200 diff --git a/modules/apache/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/modules/apache/spec/acceptance/nodesets/docker/ubuntu-14.04.yml deleted file mode 100644 index b1efa58..0000000 --- a/modules/apache/spec/acceptance/nodesets/docker/ubuntu-14.04.yml +++ /dev/null @@ -1,12 +0,0 @@ -HOSTS: - ubuntu-1404-x64: - platform: ubuntu-14.04-amd64 - hypervisor: docker - image: ubuntu:14.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - # ensure that upstart is booting correctly in the container - - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8' -CONFIG: - trace_limit: 200 diff --git a/modules/apache/spec/acceptance/nodesets/suse.yml b/modules/apache/spec/acceptance/nodesets/suse.yml deleted file mode 100644 index ac04926..0000000 --- a/modules/apache/spec/acceptance/nodesets/suse.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -HOSTS: - sles-11-x86_64-agent: - roles: - - agent - - default - platform: sles-11-x86_64 - template: sles-11-x86_64 - hypervisor: virtualbox - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: virtualbox -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/modules/apache/spec/acceptance/prefork_worker_spec.rb b/modules/apache/spec/acceptance/prefork_worker_spec.rb deleted file mode 100644 index 6687161..0000000 --- a/modules/apache/spec/acceptance/prefork_worker_spec.rb +++ /dev/null @@ -1,80 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -case fact('osfamily') -when 'FreeBSD' - describe 'apache::mod::event class' do - describe 'running puppet code' do - # Using puppet_apply as a helper - it 'should work with no errors' do - pp = <<-EOS - class { 'apache': - mpm_module => 'event', - } - EOS - - # Run it twice and test for idempotency - apply_manifest(pp, :catch_failures => true) - expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero - end - end - - describe service($service_name) do - it { is_expected.to be_running } - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - end - end -end - -describe 'apache::mod::worker class' do - describe 'running puppet code' do - # Using puppet_apply as a helper - let(:pp) do - <<-EOS - class { 'apache': - mpm_module => 'worker', - } - EOS - end - - # Run it twice and test for idempotency - it_behaves_like "a idempotent resource" - end - - describe service($service_name) do - it { is_expected.to be_running } - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - end -end - -describe 'apache::mod::prefork class' do - describe 'running puppet code' do - # Using puppet_apply as a helper - let(:pp) do - <<-EOS - class { 'apache': - mpm_module => 'prefork', - } - EOS - end - # Run it twice and test for idempotency - it_behaves_like "a idempotent resource" - end - - describe service($service_name) do - it { is_expected.to be_running } - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - end -end diff --git a/modules/apache/spec/acceptance/service_spec.rb b/modules/apache/spec/acceptance/service_spec.rb deleted file mode 100644 index c62a349..0000000 --- a/modules/apache/spec/acceptance/service_spec.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'apache::service class' do - describe 'adding dependencies in between the base class and service class' do - let(:pp) do - <<-EOS - class { 'apache': } - file { '/tmp/test': - require => Class['apache'], - notify => Class['apache::service'], - } - EOS - end - - # Run it twice and test for idempotency - it_behaves_like "a idempotent resource" - end -end diff --git a/modules/apache/spec/acceptance/version.rb b/modules/apache/spec/acceptance/version.rb deleted file mode 100644 index fac4071..0000000 --- a/modules/apache/spec/acceptance/version.rb +++ /dev/null @@ -1,96 +0,0 @@ -_osfamily = fact('osfamily') -_operatingsystem = fact('operatingsystem') -_operatingsystemrelease = fact('operatingsystemrelease').to_f - -case _osfamily -when 'RedHat' - $confd_dir = '/etc/httpd/conf.d' - $conf_file = '/etc/httpd/conf/httpd.conf' - $ports_file = '/etc/httpd/conf/ports.conf' - $vhost_dir = '/etc/httpd/conf.d' - $vhost = '/etc/httpd/conf.d/15-default.conf' - $run_dir = '/var/run/httpd' - $doc_root = '/var/www' - $service_name = 'httpd' - $package_name = 'httpd' - $error_log = 'error_log' - $suphp_handler = 'php5-script' - $suphp_configpath = 'undef' - - if (_operatingsystem == 'Fedora' and _operatingsystemrelease >= 18) or (_operatingsystem != 'Fedora' and _operatingsystemrelease >= 7) - $apache_version = '2.4' - $mod_dir = '/etc/httpd/conf.modules.d' - else - $apache_version = '2.2' - $mod_dir = '/etc/httpd/conf.d' - end -when 'Debian' - $confd_dir = '/etc/apache2/conf.d' - $mod_dir = '/etc/apache2/mods-available' - $conf_file = '/etc/apache2/apache2.conf' - $ports_file = '/etc/apache2/ports.conf' - $vhost = '/etc/apache2/sites-available/15-default.conf' - $vhost_dir = '/etc/apache2/sites-enabled' - $run_dir = '/var/run/apache2' - $doc_root = '/var/www' - $service_name = 'apache2' - $package_name = 'apache2' - $error_log = 'error.log' - $suphp_handler = 'x-httpd-php' - $suphp_configpath = '/etc/php5/apache2' - - if _operatingsystem == 'Ubuntu' and _operatingsystemrelease >= 13.10 - $apache_version = '2.4' - elsif _operatingsystem == 'Debian' and _operatingsystemrelease >= 8.0 - $apache_version = '2.4' - else - $apache_version = '2.2' - end -when 'FreeBSD' - $confd_dir = '/usr/local/etc/apache24/Includes' - $mod_dir = '/usr/local/etc/apache24/Modules' - $conf_file = '/usr/local/etc/apache24/httpd.conf' - $ports_file = '/usr/local/etc/apache24/Includes/ports.conf' - $vhost = '/usr/local/etc/apache24/Vhosts/15-default.conf' - $vhost_dir = '/usr/local/etc/apache24/Vhosts' - $run_dir = '/var/run/apache24' - $doc_root = '/var/www' - $service_name = 'apache24' - $package_name = 'apache24' - $error_log = 'http-error.log' - - $apache_version = '2.2' -when 'Gentoo' - $confd_dir = '/etc/apache2/conf.d' - $mod_dir = '/etc/apache2/modules.d' - $conf_file = '/etc/apache2/httpd.conf' - $ports_file = '/etc/apache2/ports.conf' - $vhost = '/etc/apache2/vhosts.d/15-default.conf' - $vhost_dir = '/etc/apache2/vhosts.d' - $run_dir = '/var/run/apache2' - $doc_root = '/var/www' - $service_name = 'apache2' - $package_name = 'www-servers/apache' - $error_log = 'http-error.log' - - $apache_version = '2.4' -when 'Suse' - $confd_dir = '/etc/apache2/conf.d' - $mod_dir = '/etc/apache2/mods-available' - $conf_file = '/etc/apache2/httpd.conf' - $ports_file = '/etc/apache2/ports.conf' - $vhost = '/etc/apache2/sites-available/15-default.conf' - $vhost_dir = '/etc/apache2/sites-available' - $run_dir = '/var/run/apache2' - $doc_root = '/srv/www' - $service_name = 'apache2' - $package_name = 'apache2' - $error_log = 'error.log' - if _operatingsystemrelease < 12 - $apache_version = '2.2' - else - $apache_version = '2.4' - end -else - $apache_version = '0' -end diff --git a/modules/apache/spec/acceptance/vhost_spec.rb b/modules/apache/spec/acceptance/vhost_spec.rb deleted file mode 100644 index dae4115..0000000 --- a/modules/apache/spec/acceptance/vhost_spec.rb +++ /dev/null @@ -1,1716 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -describe 'apache::vhost define' do - context 'no default vhosts' do - it 'should create no default vhosts' do - pp = <<-EOS - class { 'apache': - default_vhost => false, - default_ssl_vhost => false, - service_ensure => stopped, - } - if ($::osfamily == 'Suse') { - exec { '/usr/bin/gensslcert': - require => Class['apache'], - } - } - EOS - - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/15-default.conf") do - it { is_expected.not_to be_file } - end - - describe file("#{$vhost_dir}/15-default-ssl.conf") do - it { is_expected.not_to be_file } - end - end - - context "default vhost without ssl" do - it 'should create a default vhost config' do - pp = <<-EOS - class { 'apache': } - EOS - - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/15-default.conf") do - it { is_expected.to contain '' } - end - - describe file("#{$vhost_dir}/15-default-ssl.conf") do - it { is_expected.not_to be_file } - end - end - - context 'default vhost with ssl' do - it 'should create default vhost configs' do - pp = <<-EOS - file { '#{$run_dir}': - ensure => 'directory', - recurse => true, - } - - class { 'apache': - default_ssl_vhost => true, - require => File['#{$run_dir}'], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/15-default.conf") do - it { is_expected.to contain '' } - end - - describe file("#{$vhost_dir}/15-default-ssl.conf") do - it { is_expected.to contain '' } - it { is_expected.to contain "SSLEngine on" } - end - end - - context 'new vhost on port 80' do - it 'should configure an apache vhost' do - pp = <<-EOS - class { 'apache': } - file { '/var/www': - ensure => 'directory', - recurse => true, - } - - apache::vhost { 'first.example.com': - port => '80', - docroot => '/var/www/first', - require => File['/var/www'], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-first.example.com.conf") do - it { is_expected.to contain '' } - it { is_expected.to contain "ServerName first.example.com" } - end - end - - context 'new proxy vhost on port 80' do - it 'should configure an apache proxy vhost' do - pp = <<-EOS - class { 'apache': } - apache::vhost { 'proxy.example.com': - port => '80', - docroot => '/var/www/proxy', - proxy_pass => [ - { 'path' => '/foo', 'url' => 'http://backend-foo/'}, - ], - proxy_preserve_host => true, - proxy_error_override => true, - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-proxy.example.com.conf") do - it { is_expected.to contain '' } - it { is_expected.to contain "ServerName proxy.example.com" } - it { is_expected.to contain "ProxyPass" } - it { is_expected.to contain "ProxyPreserveHost On" } - it { is_expected.to contain "ProxyErrorOverride On" } - it { is_expected.not_to contain "ProxyAddHeaders" } - it { is_expected.not_to contain "" } - end - end - - unless (fact('operatingsystem') == 'SLES' and fact('operatingsystemmajorrelease') <= '10') - context 'new proxy vhost on port 80' do - it 'should configure an apache proxy vhost' do - pp = <<-EOS - class { 'apache': } - apache::vhost { 'proxy.example.com': - port => '80', - docroot => '#{$docroot}/proxy', - proxy_pass_match => [ - { 'path' => '/foo', 'url' => 'http://backend-foo/'}, - ], - proxy_preserve_host => true, - proxy_error_override => true, - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-proxy.example.com.conf") do - it { is_expected.to contain '' } - it { is_expected.to contain "ServerName proxy.example.com" } - it { is_expected.to contain "ProxyPassMatch /foo http://backend-foo/" } - it { is_expected.to contain "ProxyPreserveHost On" } - it { is_expected.to contain "ProxyErrorOverride On" } - it { is_expected.not_to contain "ProxyAddHeaders" } - it { is_expected.not_to contain "" } - end - end - end - - context 'new vhost on port 80' do - it 'should configure two apache vhosts' do - pp = <<-EOS - class { 'apache': } - apache::vhost { 'first.example.com': - port => '80', - docroot => '/var/www/first', - } - host { 'first.example.com': ip => '127.0.0.1', } - file { '/var/www/first/index.html': - ensure => file, - content => "Hello from first\\n", - } - apache::vhost { 'second.example.com': - port => '80', - docroot => '/var/www/second', - } - host { 'second.example.com': ip => '127.0.0.1', } - file { '/var/www/second/index.html': - ensure => file, - content => "Hello from second\\n", - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - it 'should answer to first.example.com' do - shell("/usr/bin/curl first.example.com:80", {:acceptable_exit_codes => 0}) do |r| - expect(r.stdout).to eq("Hello from first\n") - end - end - - it 'should answer to second.example.com' do - shell("/usr/bin/curl second.example.com:80", {:acceptable_exit_codes => 0}) do |r| - expect(r.stdout).to eq("Hello from second\n") - end - end - end - - context 'new vhost with multiple IP addresses on port 80' do - it 'should configure one apache vhost with 2 ip addresses' do - pp = <<-EOS - class { 'apache': - default_vhost => false, - } - apache::vhost { 'example.com': - port => '80', - ip => ['127.0.0.1','127.0.0.2'], - ip_based => true, - docroot => '/var/www/html', - } - host { 'host1.example.com': ip => '127.0.0.1', } - host { 'host2.example.com': ip => '127.0.0.2', } - file { '/var/www/html/index.html': - ensure => file, - content => "Hello from vhost\\n", - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe file("#{$vhost_dir}/25-example.com.conf") do - it { is_expected.to contain '' } - it { is_expected.to contain "ServerName example.com" } - end - - describe file($ports_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'Listen 127.0.0.1:80' } - it { is_expected.to contain 'Listen 127.0.0.2:80' } - it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:80' } - it { is_expected.not_to contain 'NameVirtualHost 127.0.0.2:80' } - end - - it 'should answer to host1.example.com' do - shell("/usr/bin/curl host1.example.com:80", {:acceptable_exit_codes => 0}) do |r| - expect(r.stdout).to eq("Hello from vhost\n") - end - end - - it 'should answer to host2.example.com' do - shell("/usr/bin/curl host2.example.com:80", {:acceptable_exit_codes => 0}) do |r| - expect(r.stdout).to eq("Hello from vhost\n") - end - end - end - - context 'new vhost with multiple ports on 1 IP address' do - it 'should configure one apache vhost with 2 ports' do - pp = <<-EOS - class { 'apache': - default_vhost => false, - } - apache::vhost { 'example.com': - port => ['80','8080'], - ip => '127.0.0.1', - ip_based => true, - docroot => '/var/www/html', - } - host { 'host1.example.com': ip => '127.0.0.1', } - file { '/var/www/html/index.html': - ensure => file, - content => "Hello from vhost\\n", - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe file("#{$vhost_dir}/25-example.com.conf") do - it { is_expected.to contain '' } - it { is_expected.to contain "ServerName example.com" } - end - - describe file($ports_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'Listen 127.0.0.1:80' } - it { is_expected.to contain 'Listen 127.0.0.1:8080' } - it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:80' } - it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:8080' } - end - - it 'should answer to host1.example.com port 80' do - shell("/usr/bin/curl host1.example.com:80", {:acceptable_exit_codes => 0}) do |r| - expect(r.stdout).to eq("Hello from vhost\n") - end - end - - it 'should answer to host1.example.com port 8080' do - shell("/usr/bin/curl host1.example.com:8080", {:acceptable_exit_codes => 0}) do |r| - expect(r.stdout).to eq("Hello from vhost\n") - end - end - end - - context 'new vhost with multiple IP addresses on multiple ports' do - it 'should configure one apache vhost with 2 ip addresses and 2 ports' do - pp = <<-EOS - class { 'apache': - default_vhost => false, - } - apache::vhost { 'example.com': - port => ['80', '8080'], - ip => ['127.0.0.1','127.0.0.2'], - ip_based => true, - docroot => '/var/www/html', - } - host { 'host1.example.com': ip => '127.0.0.1', } - host { 'host2.example.com': ip => '127.0.0.2', } - file { '/var/www/html/index.html': - ensure => file, - content => "Hello from vhost\\n", - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe file("#{$vhost_dir}/25-example.com.conf") do - it { is_expected.to contain '' } - it { is_expected.to contain "ServerName example.com" } - end - - describe file($ports_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'Listen 127.0.0.1:80' } - it { is_expected.to contain 'Listen 127.0.0.1:8080' } - it { is_expected.to contain 'Listen 127.0.0.2:80' } - it { is_expected.to contain 'Listen 127.0.0.2:8080' } - it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:80' } - it { is_expected.not_to contain 'NameVirtualHost 127.0.0.1:8080' } - it { is_expected.not_to contain 'NameVirtualHost 127.0.0.2:80' } - it { is_expected.not_to contain 'NameVirtualHost 127.0.0.2:8080' } - end - - it 'should answer to host1.example.com port 80' do - shell("/usr/bin/curl host1.example.com:80", {:acceptable_exit_codes => 0}) do |r| - expect(r.stdout).to eq("Hello from vhost\n") - end - end - - it 'should answer to host1.example.com port 8080' do - shell("/usr/bin/curl host1.example.com:8080", {:acceptable_exit_codes => 0}) do |r| - expect(r.stdout).to eq("Hello from vhost\n") - end - end - - it 'should answer to host2.example.com port 80' do - shell("/usr/bin/curl host2.example.com:80", {:acceptable_exit_codes => 0}) do |r| - expect(r.stdout).to eq("Hello from vhost\n") - end - end - - it 'should answer to host2.example.com port 8080' do - shell("/usr/bin/curl host2.example.com:8080", {:acceptable_exit_codes => 0}) do |r| - expect(r.stdout).to eq("Hello from vhost\n") - end - end - end - - context 'new vhost with IPv6 address on port 80', :ipv6 do - it 'should configure one apache vhost with an ipv6 address' do - pp = <<-EOS - class { 'apache': - default_vhost => false, - } - apache::vhost { 'example.com': - port => '80', - ip => '::1', - ip_based => true, - docroot => '/var/www/html', - } - host { 'ipv6.example.com': ip => '::1', } - file { '/var/www/html/index.html': - ensure => file, - content => "Hello from vhost\\n", - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - describe file("#{$vhost_dir}/25-example.com.conf") do - it { is_expected.to contain '' } - it { is_expected.to contain "ServerName example.com" } - end - - describe file($ports_file) do - it { is_expected.to be_file } - it { is_expected.to contain 'Listen [::1]:80' } - it { is_expected.not_to contain 'NameVirtualHost [::1]:80' } - end - - it 'should answer to ipv6.example.com' do - shell("/usr/bin/curl ipv6.example.com:80", {:acceptable_exit_codes => 0}) do |r| - expect(r.stdout).to eq("Hello from vhost\n") - end - end - end - - context 'apache_directories' do - describe 'readme example, adapted' do - it 'should configure a vhost with Files' do - pp = <<-EOS - class { 'apache': } - - if versioncmp($apache_version, '2.4') >= 0 { - $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', } - } else { - $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', } - } - - $_directories = [ - { 'path' => '/var/www/files', }, - $_files_match_directory, - ] - - apache::vhost { 'files.example.net': - docroot => '/var/www/files', - directories => $_directories, - } - file { '/var/www/files/index.html': - ensure => file, - content => "Hello World\\n", - } - file { '/var/www/files/index.html.bak': - ensure => file, - content => "Hello World\\n", - } - host { 'files.example.net': ip => '127.0.0.1', } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - it 'should answer to files.example.net' do - expect(shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout).to eq("Hello World\n") - expect(shell("/usr/bin/curl -sSf files.example.net:80/index.html.bak", {:acceptable_exit_codes => 22}).stderr).to match(/curl: \(22\) The requested URL returned error: 403/) - end - end - - describe 'other Directory options' do - it 'should configure a vhost with multiple Directory sections' do - pp = <<-EOS - class { 'apache': } - - if versioncmp($apache_version, '2.4') >= 0 { - $_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'require' => 'all denied' } - } else { - $_files_match_directory = [ - { 'path' => 'private.html$', 'provider' => 'filesmatch', 'deny' => 'from all' }, - { 'path' => '/bar/bar.html', 'provider' => 'location', allow => [ 'from 127.0.0.1', ] }, - ] - } - - $_directories = [ - { 'path' => '/var/www/files', }, - { 'path' => '/foo/', 'provider' => 'location', 'directoryindex' => 'notindex.html', }, - $_files_match_directory, - ] - - apache::vhost { 'files.example.net': - docroot => '/var/www/files', - directories => $_directories, - } - file { '/var/www/files/foo': - ensure => directory, - } - file { '/var/www/files/foo/notindex.html': - ensure => file, - content => "Hello Foo\\n", - } - file { '/var/www/files/private.html': - ensure => file, - content => "Hello World\\n", - } - file { '/var/www/files/bar': - ensure => directory, - } - file { '/var/www/files/bar/bar.html': - ensure => file, - content => "Hello Bar\\n", - } - host { 'files.example.net': ip => '127.0.0.1', } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - it 'should answer to files.example.net' do - expect(shell("/usr/bin/curl -sSf files.example.net:80/").stdout).to eq("Hello World\n") - expect(shell("/usr/bin/curl -sSf files.example.net:80/foo/").stdout).to eq("Hello Foo\n") - expect(shell("/usr/bin/curl -sSf files.example.net:80/private.html", {:acceptable_exit_codes => 22}).stderr).to match(/curl: \(22\) The requested URL returned error: 403/) - expect(shell("/usr/bin/curl -sSf files.example.net:80/bar/bar.html").stdout).to eq("Hello Bar\n") - end - end - - describe 'SetHandler directive' do - it 'should configure a vhost with a SetHandler directive' do - pp = <<-EOS - class { 'apache': } - apache::mod { 'status': } - host { 'files.example.net': ip => '127.0.0.1', } - apache::vhost { 'files.example.net': - docroot => '/var/www/files', - directories => [ - { path => '/var/www/files', }, - { path => '/server-status', provider => 'location', sethandler => 'server-status', }, - ], - } - file { '/var/www/files/index.html': - ensure => file, - content => "Hello World\\n", - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - it 'should answer to files.example.net' do - expect(shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout).to eq("Hello World\n") - expect(shell("/usr/bin/curl -sSf files.example.net:80/server-status?auto").stdout).to match(/Scoreboard: /) - end - end - - describe 'Satisfy and Auth directive', :unless => $apache_version == '2.4' do - it 'should configure a vhost with Satisfy and Auth directive' do - pp = <<-EOS - class { 'apache': } - host { 'files.example.net': ip => '127.0.0.1', } - apache::vhost { 'files.example.net': - docroot => '/var/www/files', - directories => [ - { - path => '/var/www/files/foo', - auth_type => 'Basic', - auth_name => 'Basic Auth', - auth_user_file => '/var/www/htpasswd', - auth_require => "valid-user", - }, - { - path => '/var/www/files/bar', - auth_type => 'Basic', - auth_name => 'Basic Auth', - auth_user_file => '/var/www/htpasswd', - auth_require => 'valid-user', - satisfy => 'Any', - }, - { - path => '/var/www/files/baz', - allow => 'from 10.10.10.10', - auth_type => 'Basic', - auth_name => 'Basic Auth', - auth_user_file => '/var/www/htpasswd', - auth_require => 'valid-user', - satisfy => 'Any', - }, - ], - } - file { '/var/www/files/foo': - ensure => directory, - } - file { '/var/www/files/bar': - ensure => directory, - } - file { '/var/www/files/baz': - ensure => directory, - } - file { '/var/www/files/foo/index.html': - ensure => file, - content => "Hello World\\n", - } - file { '/var/www/files/bar/index.html': - ensure => file, - content => "Hello World\\n", - } - file { '/var/www/files/baz/index.html': - ensure => file, - content => "Hello World\\n", - } - file { '/var/www/htpasswd': - ensure => file, - content => "login:IZ7jMcLSx0oQk", # "password" as password - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { should be_running } - end - - it 'should answer to files.example.net' do - shell("/usr/bin/curl -sSf files.example.net:80/foo/index.html", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 401/) - shell("/usr/bin/curl -sSf -u login:password files.example.net:80/foo/index.html").stdout.should eq("Hello World\n") - shell("/usr/bin/curl -sSf files.example.net:80/bar/index.html").stdout.should eq("Hello World\n") - shell("/usr/bin/curl -sSf -u login:password files.example.net:80/bar/index.html").stdout.should eq("Hello World\n") - shell("/usr/bin/curl -sSf files.example.net:80/baz/index.html", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 401/) - shell("/usr/bin/curl -sSf -u login:password files.example.net:80/baz/index.html").stdout.should eq("Hello World\n") - end - end - end - - case fact('lsbdistcodename') - when 'precise', 'wheezy' - context 'vhost FallbackResource example' do - it 'should configure a vhost with FallbackResource' do - pp = <<-EOS - class { 'apache': } - apache::vhost { 'fallback.example.net': - docroot => '/var/www/fallback', - fallbackresource => '/index.html' - } - file { '/var/www/fallback/index.html': - ensure => file, - content => "Hello World\\n", - } - host { 'fallback.example.net': ip => '127.0.0.1', } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - it 'should answer to fallback.example.net' do - shell("/usr/bin/curl fallback.example.net:80/Does/Not/Exist") do |r| - expect(r.stdout).to eq("Hello World\n") - end - end - - end - else - # The current stable RHEL release (6.4) comes with Apache httpd 2.2.15 - # That was released March 6, 2010. - # FallbackResource was backported to 2.2.16, and released July 25, 2010. - # Ubuntu Lucid (10.04) comes with apache2 2.2.14, released October 3, 2009. - # https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x/STATUS - end - - context 'virtual_docroot hosting separate sites' do - it 'should configure a vhost with VirtualDocumentRoot' do - pp = <<-EOS - class { 'apache': } - apache::vhost { 'virt.example.com': - vhost_name => '*', - serveraliases => '*virt.example.com', - port => '80', - docroot => '/var/www/virt', - virtual_docroot => '/var/www/virt/%1', - } - host { 'virt.example.com': ip => '127.0.0.1', } - host { 'a.virt.example.com': ip => '127.0.0.1', } - host { 'b.virt.example.com': ip => '127.0.0.1', } - file { [ '/var/www/virt/a', '/var/www/virt/b', ]: ensure => directory, } - file { '/var/www/virt/a/index.html': ensure => file, content => "Hello from a.virt\\n", } - file { '/var/www/virt/b/index.html': ensure => file, content => "Hello from b.virt\\n", } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - it 'should answer to a.virt.example.com' do - shell("/usr/bin/curl a.virt.example.com:80", {:acceptable_exit_codes => 0}) do |r| - expect(r.stdout).to eq("Hello from a.virt\n") - end - end - - it 'should answer to b.virt.example.com' do - shell("/usr/bin/curl b.virt.example.com:80", {:acceptable_exit_codes => 0}) do |r| - expect(r.stdout).to eq("Hello from b.virt\n") - end - end - end - - context 'proxy_pass for alternative vhost' do - it 'should configure a local vhost and a proxy vhost' do - apply_manifest(%{ - class { 'apache': default_vhost => false, } - apache::vhost { 'localhost': - docroot => '/var/www/local', - ip => '127.0.0.1', - port => '8888', - } - apache::listen { '*:80': } - apache::vhost { 'proxy.example.com': - docroot => '/var/www', - port => '80', - add_listen => false, - proxy_pass => { - 'path' => '/', - 'url' => 'http://localhost:8888/subdir/', - }, - } - host { 'proxy.example.com': ip => '127.0.0.1', } - file { ['/var/www/local', '/var/www/local/subdir']: ensure => directory, } - file { '/var/www/local/subdir/index.html': - ensure => file, - content => "Hello from localhost\\n", - } - }, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - it 'should get a response from the back end' do - shell("/usr/bin/curl --max-redirs 0 proxy.example.com:80") do |r| - expect(r.stdout).to eq("Hello from localhost\n") - expect(r.exit_code).to eq(0) - end - end - end - - unless (fact('operatingsystem') == 'SLES' and fact('operatingsystemmajorrelease') <= '10') - context 'proxy_pass_match for alternative vhost' do - it 'should configure a local vhost and a proxy vhost' do - apply_manifest(%{ - class { 'apache': default_vhost => false, } - apache::vhost { 'localhost': - docroot => '/var/www/local', - ip => '127.0.0.1', - port => '8888', - } - apache::listen { '*:80': } - apache::vhost { 'proxy.example.com': - docroot => '/var/www', - port => '80', - add_listen => false, - proxy_pass_match => { - 'path' => '/', - 'url' => 'http://localhost:8888/subdir/', - }, - } - host { 'proxy.example.com': ip => '127.0.0.1', } - file { ['/var/www/local', '/var/www/local/subdir']: ensure => directory, } - file { '/var/www/local/subdir/index.html': - ensure => file, - content => "Hello from localhost\\n", - } - }, :catch_failures => true) - end - - describe service($service_name) do - if (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') - pending 'Should be enabled - Bug 760616 on Debian 8' - else - it { should be_enabled } - end - it { is_expected.to be_running } - end - - it 'should get a response from the back end' do - shell("/usr/bin/curl --max-redirs 0 proxy.example.com:80") do |r| - expect(r.stdout).to eq("Hello from localhost\n") - expect(r.exit_code).to eq(0) - end - end - end - end - - describe 'ip_based' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - ip_based => true, - servername => 'test.server', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file($ports_file) do - it { is_expected.to be_file } - it { is_expected.not_to contain 'NameVirtualHost test.server' } - end - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain "ServerName test.server" } - end - end - - describe 'ip_based and no servername' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - ip_based => true, - servername => '', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file($ports_file) do - it { is_expected.to be_file } - it { is_expected.not_to contain 'NameVirtualHost test.server' } - end - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.not_to contain "ServerName" } - end - end - - describe 'add_listen' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': default_vhost => false } - host { 'testlisten.server': ip => '127.0.0.1' } - apache::listen { '81': } - apache::vhost { 'testlisten.server': - docroot => '/tmp', - port => '80', - add_listen => false, - servername => 'testlisten.server', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file($ports_file) do - it { is_expected.to be_file } - it { is_expected.not_to contain 'Listen 80' } - it { is_expected.to contain 'Listen 81' } - end - end - - describe 'docroot' do - it 'applies cleanly' do - pp = <<-EOS - user { 'test_owner': ensure => present, } - group { 'test_group': ensure => present, } - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp/test', - docroot_owner => 'test_owner', - docroot_group => 'test_group', - docroot_mode => '0750', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file('/tmp/test') do - it { is_expected.to be_directory } - it { is_expected.to be_owned_by 'test_owner' } - it { is_expected.to be_grouped_into 'test_group' } - it { is_expected.to be_mode 750 } - end - end - - describe 'default_vhost' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - default_vhost => true, - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file($ports_file) do - it { is_expected.to be_file } - if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7' - it { is_expected.not_to contain 'NameVirtualHost test.server' } - elsif fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemrelease') =~ /(14\.04|13\.10|16\.04)/ - it { is_expected.not_to contain 'NameVirtualHost test.server' } - elsif fact('operatingsystem') == 'Debian' and fact('operatingsystemmajrelease') == '8' - it { is_expected.not_to contain 'NameVirtualHost test.server' } - elsif fact('operatingsystem') == 'SLES' and fact('operatingsystemrelease') >= '12' - it { is_expected.not_to contain 'NameVirtualHost test.server' } - else - it { is_expected.to contain 'NameVirtualHost test.server' } - end - end - - describe file("#{$vhost_dir}/10-test.server.conf") do - it { is_expected.to be_file } - end - end - - describe 'options' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - options => ['Indexes','FollowSymLinks', 'ExecCGI'], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'Options Indexes FollowSymLinks ExecCGI' } - end - end - - describe 'override' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - override => ['All'], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'AllowOverride All' } - end - end - - describe 'logroot' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - logroot => '/tmp', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain ' CustomLog "/tmp' } - end - end - - ['access', 'error'].each do |logtype| - case logtype - when 'access' - logname = 'CustomLog' - when 'error' - logname = 'ErrorLog' - end - - describe "#{logtype}_log" do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - logroot => '/tmp', - #{logtype}_log => false, - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.not_to contain " #{logname} \"/tmp" } - end - end - - describe "#{logtype}_log_pipe" do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - logroot => '/tmp', - #{logtype}_log_pipe => '|/bin/sh', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain " #{logname} \"|/bin/sh" } - end - end - - describe "#{logtype}_log_syslog" do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - logroot => '/tmp', - #{logtype}_log_syslog => 'syslog', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain " #{logname} \"syslog\"" } - end - end - end - - describe 'access_log_format' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - logroot => '/tmp', - access_log_syslog => 'syslog', - access_log_format => '%h %l', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'CustomLog "syslog" "%h %l"' } - end - end - - describe 'access_log_env_var' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - logroot => '/tmp', - access_log_syslog => 'syslog', - access_log_env_var => 'admin', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'CustomLog "syslog" combined env=admin' } - end - end - - describe 'multiple access_logs' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - logroot => '/tmp', - access_logs => [ - {'file' => 'log1'}, - {'file' => 'log2', 'env' => 'admin' }, - {'file' => '/var/tmp/log3', 'format' => '%h %l'}, - {'syslog' => 'syslog' } - ] - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'CustomLog "/tmp/log1" combined' } - it { is_expected.to contain 'CustomLog "/tmp/log2" combined env=admin' } - it { is_expected.to contain 'CustomLog "/var/tmp/log3" "%h %l"' } - it { is_expected.to contain 'CustomLog "syslog" combined' } - end - end - - describe 'aliases' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - aliases => [ - { alias => '/image' , path => '/ftp/pub/image' } , - { scriptalias => '/myscript' , path => '/usr/share/myscript' } - ], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'Alias /image "/ftp/pub/image"' } - it { is_expected.to contain 'ScriptAlias /myscript "/usr/share/myscript"' } - end - end - - describe 'scriptaliases' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - scriptaliases => [{ alias => '/myscript', path => '/usr/share/myscript', }], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'ScriptAlias /myscript "/usr/share/myscript"' } - end - end - - describe 'proxy' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': service_ensure => stopped, } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - proxy_dest => 'test2', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'ProxyPass / test2/' } - end - end - - describe 'actions' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - action => 'php-fastcgi', - } - EOS - pp = pp + "\nclass { 'apache::mod::actions': }" if fact('osfamily') == 'Debian' || fact('osfamily') == 'Suse' - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'Action php-fastcgi /cgi-bin virtual' } - end - end - - describe 'suphp' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': service_ensure => stopped, } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - suphp_addhandler => '#{$suphp_handler}', - suphp_engine => 'on', - suphp_configpath => '#{$suphp_configpath}', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain "suPHP_AddHandler #{$suphp_handler}" } - it { is_expected.to contain 'suPHP_Engine on' } - it { is_expected.to contain "suPHP_ConfigPath \"#{$suphp_configpath}\"" } - end - end - - describe 'rack_base_uris' do - unless fact('osfamily') == 'RedHat' or fact('operatingsystem') == 'SLES' - it 'applies cleanly' do - test = lambda do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - rack_base_uris => ['/test'], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - test.call - end - end - end - - describe 'no_proxy_uris' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': service_ensure => stopped, } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - proxy_dest => 'http://test2', - no_proxy_uris => [ 'http://test2/test' ], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'ProxyPass http://test2/test !' } - it { is_expected.to contain 'ProxyPass / http://test2/' } - end - end - - describe 'redirect' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - redirect_source => ['/images'], - redirect_dest => ['http://test.server/'], - redirect_status => ['permanent'], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'Redirect permanent /images http://test.server/' } - end - end - - describe 'request_headers' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - request_headers => ['append MirrorID "mirror 12"'], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'append MirrorID "mirror 12"' } - end - end - - describe 'rewrite rules' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - rewrites => [ - { comment => 'test', - rewrite_cond => '%{HTTP_USER_AGENT} ^Lynx/ [OR]', - rewrite_rule => ['^index\.html$ welcome.html'], - rewrite_map => ['lc int:tolower'], - } - ], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain '#test' } - it { is_expected.to contain 'RewriteCond %{HTTP_USER_AGENT} ^Lynx/ [OR]' } - it { is_expected.to contain 'RewriteRule ^index.html$ welcome.html' } - it { is_expected.to contain 'RewriteMap lc int:tolower' } - end - end - - describe 'directory rewrite rules' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - if ! defined(Class['apache::mod::rewrite']) { - include ::apache::mod::rewrite - } - apache::vhost { 'test.server': - docroot => '/tmp', - directories => [ - { - path => '/tmp', - rewrites => [ - { - comment => 'Permalink Rewrites', - rewrite_base => '/', - }, - { rewrite_rule => [ '^index\\.php$ - [L]' ] }, - { rewrite_cond => [ - '%{REQUEST_FILENAME} !-f', - '%{REQUEST_FILENAME} !-d', ], rewrite_rule => [ '. /index.php [L]' ], } - ], - }, - ], - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { should be_file } - it { should contain '#Permalink Rewrites' } - it { should contain 'RewriteEngine On' } - it { should contain 'RewriteBase /' } - it { should contain 'RewriteRule ^index\.php$ - [L]' } - it { should contain 'RewriteCond %{REQUEST_FILENAME} !-f' } - it { should contain 'RewriteCond %{REQUEST_FILENAME} !-d' } - it { should contain 'RewriteRule . /index.php [L]' } - end - end - - describe 'setenv/setenvif' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - setenv => ['TEST /test'], - setenvif => ['Request_URI "\.gif$" object_is_image=gif'] - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'SetEnv TEST /test' } - it { is_expected.to contain 'SetEnvIf Request_URI "\.gif$" object_is_image=gif' } - end - end - - describe 'block' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - block => 'scm', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain '' } - end - end - - describe 'wsgi' do - context 'on lucid', :if => fact('lsbdistcodename') == 'lucid' do - it 'import_script applies cleanly' do - pp = <<-EOS - class { 'apache': } - class { 'apache::mod::wsgi': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - wsgi_application_group => '%{GLOBAL}', - wsgi_daemon_process => 'wsgi', - wsgi_daemon_process_options => {processes => '2'}, - wsgi_process_group => 'nobody', - wsgi_script_aliases => { '/test' => '/test1' }, - wsgi_script_aliases_match => { '/test/([^/*])' => '/test1' }, - wsgi_pass_authorization => 'On', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - end - - context 'on everything but lucid', :unless => (fact('lsbdistcodename') == 'lucid' or fact('operatingsystem') == 'SLES') do - it 'import_script applies cleanly' do - pp = <<-EOS - class { 'apache': } - class { 'apache::mod::wsgi': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - wsgi_application_group => '%{GLOBAL}', - wsgi_daemon_process => 'wsgi', - wsgi_daemon_process_options => {processes => '2'}, - wsgi_import_script => '/test1', - wsgi_import_script_options => { application-group => '%{GLOBAL}', process-group => 'wsgi' }, - wsgi_process_group => 'nobody', - wsgi_script_aliases => { '/test' => '/test1' }, - wsgi_script_aliases_match => { '/test/([^/*])' => '/test1' }, - wsgi_pass_authorization => 'On', - wsgi_chunked_request => 'On', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'WSGIApplicationGroup %{GLOBAL}' } - it { is_expected.to contain 'WSGIDaemonProcess wsgi processes=2' } - it { is_expected.to contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' } - it { is_expected.to contain 'WSGIProcessGroup nobody' } - it { is_expected.to contain 'WSGIScriptAlias /test "/test1"' } - it { is_expected.to contain 'WSGIPassAuthorization On' } - it { is_expected.to contain 'WSGIChunkedRequest On' } - end - end - end - - describe 'custom_fragment' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - custom_fragment => inline_template('#weird test string'), - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain '#weird test string' } - end - end - - describe 'itk' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - itk => { user => 'nobody', group => 'nobody' } - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'AssignUserId nobody nobody' } - end - end - - # Limit testing to Debian, since Centos does not have fastcgi package. - case fact('osfamily') - when 'Debian' - describe 'fastcgi' do - it 'applies cleanly' do - pp = <<-EOS - $_os = $::operatingsystem - - if $_os == 'Ubuntu' { - $_location = "http://archive.ubuntu.com/ubuntu/" - $_security_location = "http://archive.ubuntu.com/ubuntu/" - $_release = $::lsbdistcodename - $_release_security = "${_release}-security" - $_repos = "main universe multiverse" - } else { - $_location = "http://httpredir.debian.org/debian/" - $_security_location = "http://security.debian.org/" - $_release = $::lsbdistcodename - $_release_security = "${_release}/updates" - $_repos = "main contrib non-free" - } - - include ::apt - apt::source { "${_os}_${_release}": - location => $_location, - release => $_release, - repos => $_repos, - } - - apt::source { "${_os}_${_release}-updates": - location => $_location, - release => "${_release}-updates", - repos => $_repos, - } - - apt::source { "${_os}_${_release}-security": - location => $_security_location, - release => $_release_security, - repos => $_repos, - } - EOS - - #apt-get update may not run clean here. Should be OK. - apply_manifest(pp, :catch_failures => false) - - pp2 = <<-EOS - class { 'apache': } - class { 'apache::mod::fastcgi': } - host { 'test.server': ip => '127.0.0.1' } - apache::vhost { 'test.server': - docroot => '/tmp', - fastcgi_server => 'localhost', - fastcgi_socket => '/tmp/fast/1234', - fastcgi_dir => '/tmp/fast', - } - EOS - apply_manifest(pp2, :catch_failures => true, :acceptable_exit_codes => [0, 2]) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'FastCgiExternalServer localhost -socket /tmp/fast/1234' } - it { is_expected.to contain '' } - end - end - end - - describe 'additional_includes' do - it 'applies cleanly' do - pp = <<-EOS - if $::osfamily == 'RedHat' and "$::selinux" == "true" { - $semanage_package = $::operatingsystemmajrelease ? { - '5' => 'policycoreutils', - default => 'policycoreutils-python', - } - exec { 'set_apache_defaults': - command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"', - path => '/bin:/usr/bin/:/sbin:/usr/sbin', - require => Package[$semanage_package], - } - package { $semanage_package: ensure => installed } - exec { 'restorecon_apache': - command => 'restorecon -Rv /apache_spec', - path => '/bin:/usr/bin/:/sbin:/usr/sbin', - before => Service['httpd'], - require => Class['apache'], - } - } - class { 'apache': } - host { 'test.server': ip => '127.0.0.1' } - file { '/apache_spec': ensure => directory, } - file { '/apache_spec/include': ensure => present, content => '#additional_includes' } - apache::vhost { 'test.server': - docroot => '/apache_spec', - additional_includes => '/apache_spec/include', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'Include "/apache_spec/include"' } - end - end - - describe 'virtualhost without priority prefix' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - apache::vhost { 'test.server': - priority => false, - docroot => '/tmp' - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/test.server.conf") do - it { is_expected.to be_file } - end - end - - describe 'SSLProtocol directive' do - it 'applies cleanly' do - pp = <<-EOS - class { 'apache': } - apache::vhost { 'test.server': - docroot => '/tmp', - ssl => true, - ssl_protocol => ['All', '-SSLv2'], - } - apache::vhost { 'test2.server': - docroot => '/tmp', - ssl => true, - ssl_protocol => 'All -SSLv2', - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-test.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'SSLProtocol *All -SSLv2' } - end - - describe file("#{$vhost_dir}/25-test2.server.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'SSLProtocol *All -SSLv2' } - end - end -end diff --git a/modules/apache/spec/acceptance/vhosts_spec.rb b/modules/apache/spec/acceptance/vhosts_spec.rb deleted file mode 100644 index d8fb062..0000000 --- a/modules/apache/spec/acceptance/vhosts_spec.rb +++ /dev/null @@ -1,32 +0,0 @@ -require 'spec_helper_acceptance' -require_relative './version.rb' - -describe 'apache::vhosts class' do - context 'custom vhosts defined via class apache::vhosts' do - it 'should create custom vhost config files' do - pp = <<-EOS - class { 'apache::vhosts': - vhosts => { - 'custom_vhost_1' => { - 'docroot' => '/var/www/custom_vhost_1', - 'port' => '81', - }, - 'custom_vhost_2' => { - 'docroot' => '/var/www/custom_vhost_2', - 'port' => '82', - }, - }, - } - EOS - apply_manifest(pp, :catch_failures => true) - end - - describe file("#{$vhost_dir}/25-custom_vhost_1.conf") do - it { is_expected.to contain '' } - end - - describe file("#{$vhost_dir}/25-custom_vhost_2.conf") do - it { is_expected.to contain '' } - end - end -end diff --git a/modules/apache/spec/classes/apache_spec.rb b/modules/apache/spec/classes/apache_spec.rb deleted file mode 100644 index 355f9f1..0000000 --- a/modules/apache/spec/classes/apache_spec.rb +++ /dev/null @@ -1,910 +0,0 @@ -require 'spec_helper' - -describe 'apache', :type => :class do - context "on a Debian OS" do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_package("httpd").with( - 'notify' => 'Class[Apache::Service]', - 'ensure' => 'installed' - ) - } - it { is_expected.to contain_user("www-data") } - it { is_expected.to contain_group("www-data") } - it { is_expected.to contain_class("apache::service") } - it { is_expected.to contain_file("/var/www").with( - 'ensure' => 'directory' - ) - } - it { is_expected.to contain_file("/etc/apache2/sites-enabled").with( - 'ensure' => 'directory', - 'recurse' => 'true', - 'purge' => 'true', - 'notify' => 'Class[Apache::Service]', - 'require' => 'Package[httpd]' - ) - } - it { is_expected.to contain_file("/etc/apache2/mods-enabled").with( - 'ensure' => 'directory', - 'recurse' => 'true', - 'purge' => 'true', - 'notify' => 'Class[Apache::Service]', - 'require' => 'Package[httpd]' - ) - } - it { is_expected.to contain_file("/etc/apache2/mods-available").with( - 'ensure' => 'directory', - 'recurse' => 'true', - 'purge' => 'false', - 'notify' => 'Class[Apache::Service]', - 'require' => 'Package[httpd]' - ) - } - it { is_expected.to contain_concat("/etc/apache2/ports.conf").with( - 'owner' => 'root', - 'group' => 'root', - 'mode' => '0644', - 'notify' => 'Class[Apache::Service]' - ) - } - # Assert that load files are placed and symlinked for these mods, but no conf file. - [ - 'auth_basic', - 'authn_file', - 'authz_default', - 'authz_groupfile', - 'authz_host', - 'authz_user', - 'dav', - 'env' - ].each do |modname| - it { is_expected.to contain_file("#{modname}.load").with( - 'path' => "/etc/apache2/mods-available/#{modname}.load", - 'ensure' => 'file' - ) } - it { is_expected.to contain_file("#{modname}.load symlink").with( - 'path' => "/etc/apache2/mods-enabled/#{modname}.load", - 'ensure' => 'link', - 'target' => "/etc/apache2/mods-available/#{modname}.load" - ) } - it { is_expected.not_to contain_file("#{modname}.conf") } - it { is_expected.not_to contain_file("#{modname}.conf symlink") } - end - - context "with Apache version < 2.4" do - let :params do - { :apache_version => '2.2' } - end - - it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^Include "/etc/apache2/conf\.d/\*\.conf"$} } - end - - context "with Apache version >= 2.4" do - let :params do - { - :apache_version => '2.4', - :use_optional_includes => true - } - end - - it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^IncludeOptional "/etc/apache2/conf\.d/\*\.conf"$} } - end - - context "when specifying slash encoding behaviour" do - let :params do - { :allow_encoded_slashes => 'nodecode' } - end - - it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^AllowEncodedSlashes nodecode$} } - end - - context "when specifying fileETag behaviour" do - let :params do - { :file_e_tag => 'None' } - end - - it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^FileETag None$} } - end - - context "when specifying default character set" do - let :params do - { :default_charset => 'none' } - end - - it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^AddDefaultCharset none$} } - end - - # Assert that both load files and conf files are placed and symlinked for these mods - [ - 'alias', - 'autoindex', - 'dav_fs', - 'deflate', - 'dir', - 'mime', - 'negotiation', - 'setenvif', - ].each do |modname| - it { is_expected.to contain_file("#{modname}.load").with( - 'path' => "/etc/apache2/mods-available/#{modname}.load", - 'ensure' => 'file' - ) } - it { is_expected.to contain_file("#{modname}.load symlink").with( - 'path' => "/etc/apache2/mods-enabled/#{modname}.load", - 'ensure' => 'link', - 'target' => "/etc/apache2/mods-available/#{modname}.load" - ) } - it { is_expected.to contain_file("#{modname}.conf").with( - 'path' => "/etc/apache2/mods-available/#{modname}.conf", - 'ensure' => 'file' - ) } - it { is_expected.to contain_file("#{modname}.conf symlink").with( - 'path' => "/etc/apache2/mods-enabled/#{modname}.conf", - 'ensure' => 'link', - 'target' => "/etc/apache2/mods-available/#{modname}.conf" - ) } - end - - describe "Check default type" do - context "with Apache version < 2.4" do - let :params do - { - :apache_version => '2.2', - } - end - - context "when default_type => 'none'" do - let :params do - { :default_type => 'none' } - end - - it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^DefaultType none$} } - end - context "when default_type => 'text/plain'" do - let :params do - { :default_type => 'text/plain' } - end - - it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^DefaultType text/plain$} } - end - end - - context "with Apache version >= 2.4" do - let :params do - { - :apache_version => '2.4', - } - end - it { is_expected.to contain_file("/etc/apache2/apache2.conf").without_content %r{^DefaultType [.]*$} } - end - end - - describe "Don't create user resource" do - context "when parameter manage_user is false" do - let :params do - { :manage_user => false } - end - - it { is_expected.not_to contain_user('www-data') } - it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^User www-data\n} } - end - end - describe "Don't create group resource" do - context "when parameter manage_group is false" do - let :params do - { :manage_group => false } - end - - it { is_expected.not_to contain_group('www-data') } - it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^Group www-data\n} } - end - end - - describe "Add extra LogFormats" do - context "When parameter log_formats is a hash" do - let :params do - { :log_formats => { - 'vhost_common' => "%v %h %l %u %t \"%r\" %>s %b", - 'vhost_combined' => "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" - } } - end - - it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common\n} } - it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" vhost_combined\n} } - end - end - - describe "Override existing LogFormats" do - context "When parameter log_formats is a hash" do - let :params do - { :log_formats => { - 'common' => "%v %h %l %u %t \"%r\" %>s %b", - 'combined' => "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" - } } - end - - it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" common\n} } - it { is_expected.to contain_file("/etc/apache2/apache2.conf").without_content %r{^LogFormat "%h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" combined\n} } - it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" common\n} } - it { is_expected.to contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" combined\n} } - it { is_expected.to contain_file("/etc/apache2/apache2.conf").without_content %r{^LogFormat "%h %l %u %t \"%r\" %>s %b \"%\{Referer\}i\" \"%\{User-agent\}i\"" combined\n} } - end - end - - context "8" do - let :facts do - super().merge({ - :lsbdistcodename => 'jessie', - :operatingsystemrelease => '8' - }) - end - it { is_expected.to contain_file("/var/www/html").with( - 'ensure' => 'directory' - ) - } - end - context "on Ubuntu" do - let :facts do - super().merge({ - :operatingsystem => 'Ubuntu' - }) - end - - context "14.04" do - let :facts do - super().merge({ - :lsbdistrelease => '14.04', - :operatingsystemrelease => '14.04' - }) - end - it { is_expected.to contain_file("/var/www/html").with( - 'ensure' => 'directory' - ) - } - end - context "13.10" do - let :facts do - super().merge({ - :lsbdistrelease => '13.10', - :operatingsystemrelease => '13.10' - }) - end - it { is_expected.to contain_class('apache').with_apache_version('2.4') } - end - context "12.04" do - let :facts do - super().merge({ - :lsbdistrelease => '12.04', - :operatingsystemrelease => '12.04' - }) - end - it { is_expected.to contain_class('apache').with_apache_version('2.2') } - end - context "13.04" do - let :facts do - super().merge({ - :lsbdistrelease => '13.04', - :operatingsystemrelease => '13.04' - }) - end - it { is_expected.to contain_class('apache').with_apache_version('2.2') } - end - end - end - context "on a RedHat 5 OS" do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '5', - :concat_basedir => '/dne', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_package("httpd").with( - 'notify' => 'Class[Apache::Service]', - 'ensure' => 'installed' - ) - } - it { is_expected.to contain_user("apache") } - it { is_expected.to contain_group("apache") } - it { is_expected.to contain_class("apache::service") } - it { is_expected.to contain_file("/var/www/html").with( - 'ensure' => 'directory' - ) - } - it { is_expected.to contain_file("/etc/httpd/conf.d").with( - 'ensure' => 'directory', - 'recurse' => 'true', - 'purge' => 'true', - 'notify' => 'Class[Apache::Service]', - 'require' => 'Package[httpd]' - ) - } - it { is_expected.to contain_concat("/etc/httpd/conf/ports.conf").with( - 'owner' => 'root', - 'group' => 'root', - 'mode' => '0644', - 'notify' => 'Class[Apache::Service]' - ) - } - describe "Alternate confd/mod/vhosts directory" do - let :params do - { - :vhost_dir => '/etc/httpd/site.d', - :confd_dir => '/etc/httpd/conf.d', - :mod_dir => '/etc/httpd/mod.d', - } - end - - ['mod.d','site.d','conf.d'].each do |dir| - it { is_expected.to contain_file("/etc/httpd/#{dir}").with( - 'ensure' => 'directory', - 'recurse' => 'true', - 'purge' => 'true', - 'notify' => 'Class[Apache::Service]', - 'require' => 'Package[httpd]' - ) } - end - - # Assert that load files are placed for these mods, but no conf file. - [ - 'auth_basic', - 'authn_file', - 'authz_default', - 'authz_groupfile', - 'authz_host', - 'authz_user', - 'dav', - 'env', - ].each do |modname| - it { is_expected.to contain_file("#{modname}.load").with_path( - "/etc/httpd/mod.d/#{modname}.load" - ) } - it { is_expected.not_to contain_file("#{modname}.conf").with_path( - "/etc/httpd/mod.d/#{modname}.conf" - ) } - end - - # Assert that both load files and conf files are placed for these mods - [ - 'alias', - 'autoindex', - 'dav_fs', - 'deflate', - 'dir', - 'mime', - 'negotiation', - 'setenvif', - ].each do |modname| - it { is_expected.to contain_file("#{modname}.load").with_path( - "/etc/httpd/mod.d/#{modname}.load" - ) } - it { is_expected.to contain_file("#{modname}.conf").with_path( - "/etc/httpd/mod.d/#{modname}.conf" - ) } - end - - context "with Apache version < 2.4" do - let :params do - { :apache_version => '2.2' } - end - - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/conf\.d/\*\.conf"$} } - end - - context "with Apache version >= 2.4" do - let :params do - { - :apache_version => '2.4', - :use_optional_includes => true - } - end - - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} } - end - - context "with Apache version < 2.4" do - let :params do - { - :apache_version => '2.2', - :rewrite_lock => '/var/lock/subsys/rewrite-lock' - } - end - - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^RewriteLock /var/lock/subsys/rewrite-lock$} } - end - - context "with Apache version < 2.4" do - let :params do - { - :apache_version => '2.2' - } - end - - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").without_content %r{^RewriteLock [.]*$} } - end - - context "with Apache version >= 2.4" do - let :params do - { - :apache_version => '2.4', - :rewrite_lock => '/var/lock/subsys/rewrite-lock' - } - end - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").without_content %r{^RewriteLock [.]*$} } - end - - context "when specifying slash encoding behaviour" do - let :params do - { :allow_encoded_slashes => 'nodecode' } - end - - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^AllowEncodedSlashes nodecode$} } - end - - context "when specifying default character set" do - let :params do - { :default_charset => 'none' } - end - - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^AddDefaultCharset none$} } - end - - context "with Apache version < 2.4" do - let :params do - { - :apache_version => '2.2', - } - end - - context "when default_type => 'none'" do - let :params do - { :default_type => 'none' } - end - - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^DefaultType none$} } - end - context "when default_type => 'text/plain'" do - let :params do - { :default_type => 'text/plain' } - end - - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^DefaultType text/plain$} } - end - end - - context "with Apache version >= 2.4" do - let :params do - { - :apache_version => '2.4', - } - end - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").without_content %r{^DefaultType [.]*$} } - end - - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/site\.d/\*"$} } - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} } - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} } - end - - describe "Alternate conf directory" do - let :params do - { :conf_dir => '/opt/rh/root/etc/httpd/conf' } - end - - it { is_expected.to contain_file("/opt/rh/root/etc/httpd/conf/httpd.conf").with( - 'ensure' => 'file', - 'notify' => 'Class[Apache::Service]', - 'require' => ['Package[httpd]', 'Concat[/etc/httpd/conf/ports.conf]'], - ) } - end - - describe "Alternate conf.d directory" do - let :params do - { :confd_dir => '/etc/httpd/special_conf.d' } - end - - it { is_expected.to contain_file("/etc/httpd/special_conf.d").with( - 'ensure' => 'directory', - 'recurse' => 'true', - 'purge' => 'true', - 'notify' => 'Class[Apache::Service]', - 'require' => 'Package[httpd]' - ) } - end - - describe "Alternate mpm_modules" do - context "when declaring mpm_module is false" do - let :params do - { :mpm_module => false } - end - it 'should not declare mpm modules' do - is_expected.not_to contain_class('apache::mod::event') - is_expected.not_to contain_class('apache::mod::itk') - is_expected.not_to contain_class('apache::mod::peruser') - is_expected.not_to contain_class('apache::mod::prefork') - is_expected.not_to contain_class('apache::mod::worker') - end - end - context "when declaring mpm_module => prefork" do - let :params do - { :mpm_module => 'prefork' } - end - it { is_expected.to contain_class('apache::mod::prefork') } - it { is_expected.not_to contain_class('apache::mod::event') } - it { is_expected.not_to contain_class('apache::mod::itk') } - it { is_expected.not_to contain_class('apache::mod::peruser') } - it { is_expected.not_to contain_class('apache::mod::worker') } - end - context "when declaring mpm_module => worker" do - let :params do - { :mpm_module => 'worker' } - end - it { is_expected.to contain_class('apache::mod::worker') } - it { is_expected.not_to contain_class('apache::mod::event') } - it { is_expected.not_to contain_class('apache::mod::itk') } - it { is_expected.not_to contain_class('apache::mod::peruser') } - it { is_expected.not_to contain_class('apache::mod::prefork') } - end - end - - describe "different templates for httpd.conf" do - context "with default" do - let :params do - { :conf_template => 'apache/httpd.conf.erb' } - end - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^# Security\n} } - end - context "with non-default" do - let :params do - { :conf_template => 'site_apache/fake.conf.erb' } - end - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Fake template for rspec.$} } - end - end - - describe "default mods" do - context "without" do - let :params do - { :default_mods => false } - end - - it { is_expected.to contain_apache__mod('authz_host') } - it { is_expected.not_to contain_apache__mod('env') } - end - context "custom" do - let :params do - { :default_mods => [ - 'info', - 'alias', - 'mime', - 'env', - 'setenv', - 'expires', - ]} - end - - it { is_expected.to contain_apache__mod('authz_host') } - it { is_expected.to contain_apache__mod('env') } - it { is_expected.to contain_class('apache::mod::info') } - it { is_expected.to contain_class('apache::mod::mime') } - end - end - describe "Don't create user resource" do - context "when parameter manage_user is false" do - let :params do - { :manage_user => false } - end - - it { is_expected.not_to contain_user('apache') } - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^User apache\n} } - end - end - describe "Don't create group resource" do - context "when parameter manage_group is false" do - let :params do - { :manage_group => false } - end - - it { is_expected.not_to contain_group('apache') } - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Group apache\n} } - - end - end - describe "sendfile" do - context "with invalid value" do - let :params do - { :sendfile => 'foo' } - end - it "should fail" do - expect do - catalogue - end.to raise_error(Puppet::PreformattedError, /Evaluation Error: Error while evaluating a Resource Statement, Class\[Apache\]: parameter 'sendfile' expects a match for Enum\['Off', 'On', 'off', 'on'\]/) - end - end - context "On" do - let :params do - { :sendfile => 'On' } - end - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^EnableSendfile On\n} } - end - context "Off" do - let :params do - { :sendfile => 'Off' } - end - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^EnableSendfile Off\n} } - end - end - context "on Fedora" do - let :facts do - super().merge({ - :operatingsystem => 'Fedora' - }) - end - - context "21" do - let :facts do - super().merge({ - :lsbdistrelease => '21', - :operatingsystemrelease => '21' - }) - end - it { is_expected.to contain_class('apache').with_apache_version('2.4') } - end - context "Rawhide" do - let :facts do - super().merge({ - :lsbdistrelease => 'Rawhide', - :operatingsystemrelease => 'Rawhide' - }) - end - it { is_expected.to contain_class('apache').with_apache_version('2.4') } - end - # kinda obsolete - context "17" do - let :facts do - super().merge({ - :lsbdistrelease => '17', - :operatingsystemrelease => '17' - }) - end - it { is_expected.to contain_class('apache').with_apache_version('2.2') } - end - end - end - context "on a FreeBSD OS" do - let :facts do - { - :id => 'root', - :kernel => 'FreeBSD', - :osfamily => 'FreeBSD', - :operatingsystem => 'FreeBSD', - :operatingsystemrelease => '10', - :concat_basedir => '/dne', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_class("apache::package").with({'ensure' => 'present'}) } - it { is_expected.to contain_user("www") } - it { is_expected.to contain_group("www") } - it { is_expected.to contain_class("apache::service") } - it { is_expected.to contain_file("/usr/local/www/apache24/data").with( - 'ensure' => 'directory' - ) - } - it { is_expected.to contain_file("/usr/local/etc/apache24/Vhosts").with( - 'ensure' => 'directory', - 'recurse' => 'true', - 'purge' => 'true', - 'notify' => 'Class[Apache::Service]', - 'require' => 'Package[httpd]' - ) } - it { is_expected.to contain_file("/usr/local/etc/apache24/Modules").with( - 'ensure' => 'directory', - 'recurse' => 'true', - 'purge' => 'true', - 'notify' => 'Class[Apache::Service]', - 'require' => 'Package[httpd]' - ) } - it { is_expected.to contain_concat("/usr/local/etc/apache24/ports.conf").with( - 'owner' => 'root', - 'group' => 'wheel', - 'mode' => '0644', - 'notify' => 'Class[Apache::Service]' - ) } - # Assert that load files are placed for these mods, but no conf file. - [ - 'auth_basic', - 'authn_core', - 'authn_file', - 'authz_groupfile', - 'authz_host', - 'authz_user', - 'dav', - 'env' - ].each do |modname| - it { is_expected.to contain_file("#{modname}.load").with( - 'path' => "/usr/local/etc/apache24/Modules/#{modname}.load", - 'ensure' => 'file' - ) } - it { is_expected.not_to contain_file("#{modname}.conf") } - end - - # Assert that both load files and conf files are placed for these mods - [ - 'alias', - 'autoindex', - 'dav_fs', - 'deflate', - 'dir', - 'mime', - 'negotiation', - 'setenvif', - ].each do |modname| - it { is_expected.to contain_file("#{modname}.load").with( - 'path' => "/usr/local/etc/apache24/Modules/#{modname}.load", - 'ensure' => 'file' - ) } - it { is_expected.to contain_file("#{modname}.conf").with( - 'path' => "/usr/local/etc/apache24/Modules/#{modname}.conf", - 'ensure' => 'file' - ) } - end - end - context "on a Gentoo OS" do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_user("apache") } - it { is_expected.to contain_group("apache") } - it { is_expected.to contain_class("apache::service") } - it { is_expected.to contain_file("/var/www/localhost/htdocs").with( - 'ensure' => 'directory' - ) - } - it { is_expected.to contain_file("/etc/apache2/vhosts.d").with( - 'ensure' => 'directory', - 'recurse' => 'true', - 'purge' => 'true', - 'notify' => 'Class[Apache::Service]', - 'require' => 'Package[httpd]' - ) } - it { is_expected.to contain_file("/etc/apache2/modules.d").with( - 'ensure' => 'directory', - 'recurse' => 'true', - 'purge' => 'true', - 'notify' => 'Class[Apache::Service]', - 'require' => 'Package[httpd]' - ) } - it { is_expected.to contain_concat("/etc/apache2/ports.conf").with( - 'owner' => 'root', - 'group' => 'wheel', - 'mode' => '0644', - 'notify' => 'Class[Apache::Service]' - ) } - end - context 'on all OSes' do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context 'with a custom apache_name parameter' do - let :params do { - :apache_name => 'httpd24-httpd' - } - end - it { is_expected.to contain_package("httpd").with( - 'notify' => 'Class[Apache::Service]', - 'ensure' => 'installed', - 'name' => 'httpd24-httpd' - ) - } - end - context 'with a custom file_mode parameter' do - let :params do { - :file_mode => '0640' - } - end - it { is_expected.to contain_concat("/etc/httpd/conf/ports.conf").with( - 'mode' => '0640', - ) - } - end - context 'with a custom root_directory_options parameter' do - let :params do { - :root_directory_options => ['-Indexes', '-FollowSymLinks'] - } - end - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{Options -Indexes -FollowSymLinks} } - end - context 'with a custom root_directory_secured parameter and Apache < 2.4' do - let :params do { - :apache_version => '2.2', - :root_directory_secured => true - } - end - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{Options FollowSymLinks\n\s+AllowOverride None\n\s+Order deny,allow\n\s+Deny from all} } - end - context 'with a custom root_directory_secured parameter and Apache >= 2.4' do - let :params do { - :apache_version => '2.4', - :root_directory_secured => true - } - end - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{Options FollowSymLinks\n\s+AllowOverride None\n\s+Require all denied} } - end - context 'default vhost defaults' do - it { is_expected.to contain_apache__vhost('default').with_ensure('present') } - it { is_expected.to contain_apache__vhost('default-ssl').with_ensure('absent') } - it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{Options FollowSymLinks} } - end - context 'without default non-ssl vhost' do - let :params do { - :default_vhost => false - } - end - it { is_expected.to contain_apache__vhost('default').with_ensure('absent') } - it { is_expected.not_to contain_file('/var/www/html') } - end - context 'with default ssl vhost' do - let :params do { - :default_ssl_vhost => true - } - end - it { is_expected.to contain_apache__vhost('default-ssl').with_ensure('present') } - it { is_expected.to contain_file('/var/www/html') } - end - end - context 'with unsupported osfamily' do - let :facts do - { :osfamily => 'Darwin', - :operatingsystemrelease => '13.1.0', - :concat_basedir => '/dne', - :is_pe => false, - } - end - - it do - expect { - catalogue - }.to raise_error(Puppet::Error, /Unsupported osfamily/) - end - end -end diff --git a/modules/apache/spec/classes/dev_spec.rb b/modules/apache/spec/classes/dev_spec.rb deleted file mode 100644 index 933d677..0000000 --- a/modules/apache/spec/classes/dev_spec.rb +++ /dev/null @@ -1,89 +0,0 @@ -require 'spec_helper' - -describe 'apache::dev', :type => :class do - let(:pre_condition) {[ - 'include apache' - ]} - context "on a Debian OS" do - let :facts do - { - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :is_pe => false, - :concat_basedir => '/foo', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin', - :kernel => 'Linux' - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_package("libaprutil1-dev") } - it { is_expected.to contain_package("libapr1-dev") } - it { is_expected.to contain_package("apache2-prefork-dev") } - end - context "on an Ubuntu 14 OS" do - let :facts do - { - :lsbdistrelease => '14.04', - :lsbdistcodename => 'trusty', - :osfamily => 'Debian', - :operatingsystem => 'Ubuntu', - :operatingsystemrelease => '14.04', - :is_pe => false, - :concat_basedir => '/foo', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin', - :kernel => 'Linux' - } - end - it { is_expected.to contain_package("apache2-dev") } - end - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6', - :is_pe => false, - :concat_basedir => '/foo', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin', - :kernel => 'Linux' - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_package("httpd-devel") } - end - context "on a FreeBSD OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystem => 'FreeBSD', - :operatingsystemrelease => '9', - :is_pe => false, - :concat_basedir => '/foo', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin', - :kernel => 'FreeBSD' - } - end - it { is_expected.to contain_class("apache::params") } - end - context "on a Gentoo OS" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :is_pe => false, - :concat_basedir => '/foo', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin', - :kernel => 'Linux' - } - end - it { is_expected.to contain_class("apache::params") } - end -end diff --git a/modules/apache/spec/classes/mod/alias_spec.rb b/modules/apache/spec/classes/mod/alias_spec.rb deleted file mode 100644 index 99854e8..0000000 --- a/modules/apache/spec/classes/mod/alias_spec.rb +++ /dev/null @@ -1,97 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::alias', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "default configuration with parameters" do - context "on a Debian OS", :compile do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - it { is_expected.to contain_apache__mod("alias") } - it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/share\/apache2\/icons\/"/) } - end - context "on a RedHat 6-based OS", :compile do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - it { is_expected.to contain_apache__mod("alias") } - it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/var\/www\/icons\/"/) } - end - context "on a RedHat 7-based OS", :compile do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '7', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - it { is_expected.to contain_apache__mod("alias") } - it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/share\/httpd\/icons\/"/) } - end - context "with icons options", :compile do - let :pre_condition do - 'class { apache: default_mods => false }' - end - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '7', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - let :params do - { - 'icons_options' => 'foo' - } - end - it { is_expected.to contain_apache__mod("alias") } - it { is_expected.to contain_file("alias.conf").with(:content => /Options foo/) } - end - context "on a FreeBSD OS", :compile do - let :facts do - { - :id => 'root', - :kernel => 'FreeBSD', - :osfamily => 'FreeBSD', - :operatingsystem => 'FreeBSD', - :operatingsystemrelease => '10', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - it { is_expected.to contain_apache__mod("alias") } - it { is_expected.to contain_file("alias.conf").with(:content => /Alias \/icons\/ "\/usr\/local\/www\/apache24\/icons\/"/) } - end - end -end diff --git a/modules/apache/spec/classes/mod/auth_cas_spec.rb b/modules/apache/spec/classes/mod/auth_cas_spec.rb deleted file mode 100644 index aee3f8c..0000000 --- a/modules/apache/spec/classes/mod/auth_cas_spec.rb +++ /dev/null @@ -1,64 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::auth_cas', :type => :class do - context "default params" do - let :params do - { - :cas_login_url => 'https://cas.example.com/login', - :cas_validate_url => 'https://cas.example.com/validate', - :cas_cookie_path => '/var/cache/apache2/mod_auth_cas/' - } - end - - it_behaves_like "a mod class, without including apache" - end - - context "default configuration with parameters" do - let :params do - { - :cas_login_url => 'https://cas.example.com/login', - :cas_validate_url => 'https://cas.example.com/validate', - } - end - - context "on a Debian OS", :compile do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod("auth_cas") } - it { is_expected.to contain_package("libapache2-mod-auth-cas") } - it { is_expected.to contain_file("auth_cas.conf").with_path('/etc/apache2/mods-available/auth_cas.conf') } - it { is_expected.to contain_file("/var/cache/apache2/mod_auth_cas/").with_owner('www-data') } - end - context "on a RedHat OS", :compile do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod("auth_cas") } - it { is_expected.to contain_package("mod_auth_cas") } - it { is_expected.to contain_file("auth_cas.conf").with_path('/etc/httpd/conf.d/auth_cas.conf') } - it { is_expected.to contain_file("/var/cache/mod_auth_cas/").with_owner('apache') } - end - end -end diff --git a/modules/apache/spec/classes/mod/auth_kerb_spec.rb b/modules/apache/spec/classes/mod/auth_kerb_spec.rb deleted file mode 100644 index 0f77a62..0000000 --- a/modules/apache/spec/classes/mod/auth_kerb_spec.rb +++ /dev/null @@ -1,106 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::auth_kerb', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "default configuration with parameters" do - context "on a Debian OS", :compile do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod("auth_kerb") } - it { is_expected.to contain_package("libapache2-mod-auth-kerb") } - end - context "on a RedHat OS", :compile do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod("auth_kerb") } - it { is_expected.to contain_package("mod_auth_kerb") } - end - context "on a FreeBSD OS", :compile do - let :facts do - { - :id => 'root', - :kernel => 'FreeBSD', - :osfamily => 'FreeBSD', - :operatingsystem => 'FreeBSD', - :operatingsystemrelease => '9', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod("auth_kerb") } - it { is_expected.to contain_package("www/mod_auth_kerb2") } - end - context "on a Gentoo OS", :compile do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod("auth_kerb") } - it { is_expected.to contain_package("www-apache/mod_auth_kerb") } - end - end - context "overriding mod_packages" do - context "on a RedHat OS", :compile do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - let :pre_condition do - <<-EOS - include apache::params - class { 'apache': - mod_packages => merge($::apache::params::mod_packages, { - 'auth_kerb' => 'httpd24-mod_auth_kerb', - }) - } - EOS - end - it { is_expected.to contain_apache__mod("auth_kerb") } - it { is_expected.to contain_package("httpd24-mod_auth_kerb") } - it { is_expected.to_not contain_package("mod_auth_kerb") } - end - end -end diff --git a/modules/apache/spec/classes/mod/auth_mellon_spec.rb b/modules/apache/spec/classes/mod/auth_mellon_spec.rb deleted file mode 100644 index 7d0826f..0000000 --- a/modules/apache/spec/classes/mod/auth_mellon_spec.rb +++ /dev/null @@ -1,90 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::auth_mellon', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "default configuration with parameters" do - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :fqdn => 'test.example.com', - :is_pe => false, - } - end - describe 'with no parameters' do - it { should contain_apache__mod('auth_mellon') } - it { should contain_package('libapache2-mod-auth-mellon') } - it { should contain_file('auth_mellon.conf').with_path('/etc/apache2/mods-available/auth_mellon.conf') } - it { should contain_file('auth_mellon.conf').with_content("MellonPostDirectory \"\/var\/cache\/apache2\/mod_auth_mellon\/\"\n") } - end - describe 'with parameters' do - let :params do - { :mellon_cache_size => '200', - :mellon_cache_entry_size => '2010', - :mellon_lock_file => '/tmp/junk', - :mellon_post_directory => '/tmp/post', - :mellon_post_ttl => '5', - :mellon_post_size => '8', - :mellon_post_count => '10' - } - end - it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheSize\s+200$/) } - it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheEntrySize\s+2010$/) } - it { should contain_file('auth_mellon.conf').with_content(/^MellonLockFile\s+"\/tmp\/junk"$/) } - it { should contain_file('auth_mellon.conf').with_content(/^MellonPostDirectory\s+"\/tmp\/post"$/) } - it { should contain_file('auth_mellon.conf').with_content(/^MellonPostTTL\s+5$/) } - it { should contain_file('auth_mellon.conf').with_content(/^MellonPostSize\s+8$/) } - it { should contain_file('auth_mellon.conf').with_content(/^MellonPostCount\s+10$/) } - end - - end - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :fqdn => 'test.example.com', - :is_pe => false, - } - end - describe 'with no parameters' do - it { should contain_apache__mod('auth_mellon') } - it { should contain_package('mod_auth_mellon') } - it { should contain_file('auth_mellon.conf').with_path('/etc/httpd/conf.d/auth_mellon.conf') } - it { should contain_file('auth_mellon.conf').with_content("MellonCacheSize 100\nMellonLockFile \"/run/mod_auth_mellon/lock\"\n") } - end - describe 'with parameters' do - let :params do - { :mellon_cache_size => '200', - :mellon_cache_entry_size => '2010', - :mellon_lock_file => '/tmp/junk', - :mellon_post_directory => '/tmp/post', - :mellon_post_ttl => '5', - :mellon_post_size => '8', - :mellon_post_count => '10' - } - end - it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheSize\s+200$/) } - it { should contain_file('auth_mellon.conf').with_content(/^MellonCacheEntrySize\s+2010$/) } - it { should contain_file('auth_mellon.conf').with_content(/^MellonLockFile\s+"\/tmp\/junk"$/) } - it { should contain_file('auth_mellon.conf').with_content(/^MellonPostDirectory\s+"\/tmp\/post"$/) } - it { should contain_file('auth_mellon.conf').with_content(/^MellonPostTTL\s+5$/) } - it { should contain_file('auth_mellon.conf').with_content(/^MellonPostSize\s+8$/) } - it { should contain_file('auth_mellon.conf').with_content(/^MellonPostCount\s+10$/) } - end - end - end -end diff --git a/modules/apache/spec/classes/mod/authn_dbd_spec.rb b/modules/apache/spec/classes/mod/authn_dbd_spec.rb deleted file mode 100644 index 4e101d1..0000000 --- a/modules/apache/spec/classes/mod/authn_dbd_spec.rb +++ /dev/null @@ -1,62 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::authn_dbd', :type => :class do - context "default params" do - let :params do - { - :authn_dbd_params => 'host=db_host port=3306 user=apache password=###### dbname=apache_auth', - } - end - - it_behaves_like "a mod class, without including apache" - end - - context "default configuration with parameters" do - let :params do - { - :authn_dbd_params => 'host=db_host port=3306 user=apache password=###### dbname=apache_auth', - :authn_dbd_alias => 'db_authn', - :authn_dbd_query => 'SELECT password FROM authn WHERE username = %s' - } - end - - context "on a Debian OS", :compile do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod("authn_dbd") } - it { is_expected.to contain_apache__mod("dbd") } - it { is_expected.to contain_file("authn_dbd.conf").with_path('/etc/apache2/mods-available/authn_dbd.conf') } - end - - context "on a RedHat OS", :compile do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod("authn_dbd") } - it { is_expected.to contain_apache__mod("dbd") } - it { is_expected.to contain_file("authn_dbd.conf").with_path('/etc/httpd/conf.d/authn_dbd.conf') } - end - end -end diff --git a/modules/apache/spec/classes/mod/authnz_ldap_spec.rb b/modules/apache/spec/classes/mod/authnz_ldap_spec.rb deleted file mode 100644 index 7469d16..0000000 --- a/modules/apache/spec/classes/mod/authnz_ldap_spec.rb +++ /dev/null @@ -1,76 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::authnz_ldap', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "default configuration with parameters" do - context "on a Debian OS" do - let :facts do - { - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :operatingsystem => 'Debian', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_class("apache::mod::ldap") } - it { is_expected.to contain_apache__mod('authnz_ldap') } - - context 'default verify_server_cert' do - it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) } - end - - context 'verify_server_cert = false' do - let(:params) { { :verify_server_cert => false } } - it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) } - end - - context 'verify_server_cert = wrong' do - let(:params) { { :verify_server_cert => 'wrong' } } - it 'should raise an error' do - expect { is_expected.to raise_error Puppet::Error } - end - end - end #Debian - - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :operatingsystem => 'RedHat', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_class("apache::mod::ldap") } - it { is_expected.to contain_apache__mod('authnz_ldap') } - - context 'default verify_server_cert' do - it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) } - end - - context 'verify_server_cert = false' do - let(:params) { { :verify_server_cert => false } } - it { is_expected.to contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) } - end - - context 'verify_server_cert = wrong' do - let(:params) { { :verify_server_cert => 'wrong' } } - it 'should raise an error' do - expect { is_expected.to raise_error Puppet::Error } - end - end - end # Redhat - end -end diff --git a/modules/apache/spec/classes/mod/authnz_pam_spec.rb b/modules/apache/spec/classes/mod/authnz_pam_spec.rb deleted file mode 100644 index 4bceeab..0000000 --- a/modules/apache/spec/classes/mod/authnz_pam_spec.rb +++ /dev/null @@ -1,44 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::authnz_pam', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "default configuration with parameters" do - context "on a Debian OS" do - let :facts do - { - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :operatingsystem => 'Debian', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache") } - it { is_expected.to contain_package("libapache2-mod-authnz-pam") } - it { is_expected.to contain_apache__mod('authnz_pam') } - end #Debian - - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :operatingsystem => 'RedHat', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache") } - it { is_expected.to contain_package("mod_authnz_pam") } - it { is_expected.to contain_apache__mod('authnz_pam') } - end # Redhat - end -end diff --git a/modules/apache/spec/classes/mod/cluster_spec.rb b/modules/apache/spec/classes/mod/cluster_spec.rb deleted file mode 100644 index b5f74ba..0000000 --- a/modules/apache/spec/classes/mod/cluster_spec.rb +++ /dev/null @@ -1,105 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::cluster', :type => :class do - context 'on a RedHat OS Release 7 with mod version = 1.3.0' do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '7', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - let(:params) { - { - :allowed_network => '172.17.0', - :balancer_name => 'mycluster', - :ip => '172.17.0.1', - :version => '1.3.0' - } - } - - it { is_expected.to contain_class("apache") } - it { is_expected.to contain_apache__mod('proxy') } - it { is_expected.to contain_apache__mod('proxy_ajp') } - it { is_expected.to contain_apache__mod('manager') } - it { is_expected.to contain_apache__mod('proxy_cluster') } - it { is_expected.to contain_apache__mod('advertise') } - it { is_expected.to contain_apache__mod('cluster_slotmem') } - - it { is_expected.to contain_file('cluster.conf') } - end - - context 'on a RedHat OS Release 7 with mod version > 1.3.0' do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '7', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - let(:params) { - { - :allowed_network => '172.17.0', - :balancer_name => 'mycluster', - :ip => '172.17.0.1', - :version => '1.3.1' - } - } - - it { is_expected.to contain_class('apache') } - it { is_expected.to contain_apache__mod('proxy') } - it { is_expected.to contain_apache__mod('proxy_ajp') } - it { is_expected.to contain_apache__mod('manager') } - it { is_expected.to contain_apache__mod('proxy_cluster') } - it { is_expected.to contain_apache__mod('advertise') } - it { is_expected.to contain_apache__mod('cluster_slotmem') } - - it { is_expected.to contain_file('cluster.conf') } - end - - context 'on a RedHat OS Release 6 with mod version < 1.3.0' do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - let(:params) { - { - :allowed_network => '172.17.0', - :balancer_name => 'mycluster', - :ip => '172.17.0.1', - :version => '1.2.0' - } - } - - it { is_expected.to contain_class('apache') } - it { is_expected.to contain_apache__mod('proxy') } - it { is_expected.to contain_apache__mod('proxy_ajp') } - it { is_expected.to contain_apache__mod('manager') } - it { is_expected.to contain_apache__mod('proxy_cluster') } - it { is_expected.to contain_apache__mod('advertise') } - it { is_expected.to contain_apache__mod('slotmem') } - - it { is_expected.to contain_file('cluster.conf') } - end -end diff --git a/modules/apache/spec/classes/mod/dav_svn_spec.rb b/modules/apache/spec/classes/mod/dav_svn_spec.rb deleted file mode 100644 index 426b547..0000000 --- a/modules/apache/spec/classes/mod/dav_svn_spec.rb +++ /dev/null @@ -1,80 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::dav_svn', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "default configuration with parameters" do - context "on a Debian OS" do - let :facts do - { - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :operatingsystemmajrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('dav_svn') } - it { is_expected.to contain_package("libapache2-svn") } - end - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :operatingsystemmajrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('dav_svn') } - it { is_expected.to contain_package("mod_dav_svn") } - end - context "on a FreeBSD OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :operatingsystemmajrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('dav_svn') } - it { is_expected.to contain_package("devel/subversion") } - end - context "on a Gentoo OS", :compile do - let :facts do - { - :id => 'root', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :kernel => 'Linux', - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('dav_svn') } - it { is_expected.to contain_package("dev-vcs/subversion") } - end - end -end diff --git a/modules/apache/spec/classes/mod/deflate_spec.rb b/modules/apache/spec/classes/mod/deflate_spec.rb deleted file mode 100644 index 264c70f..0000000 --- a/modules/apache/spec/classes/mod/deflate_spec.rb +++ /dev/null @@ -1,127 +0,0 @@ -require 'spec_helper' - -# This function is called inside the OS specific contexts -def general_deflate_specs - it { is_expected.to contain_apache__mod("deflate") } - - it do - is_expected.to contain_file("deflate.conf").with_content( - "AddOutputFilterByType DEFLATE text/css\n"\ - "AddOutputFilterByType DEFLATE text/html\n"\ - "\n"\ - "DeflateFilterNote Input instream\n"\ - "DeflateFilterNote Ratio ratio\n" - ) - end -end - -describe 'apache::mod::deflate', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "default configuration with parameters" do - let :pre_condition do - 'class { "apache::mod::deflate": - types => [ "text/html", "text/css" ], - notes => { - "Input" => "instream", - "Ratio" => "ratio", - } - } - ' - end - - context "On a Debian OS with default params" do - let :facts do - { - :id => 'root', - :lsbdistcodename => 'squeeze', - :kernel => 'Linux', - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - - # Load the more generic tests for this context - general_deflate_specs() - - it { is_expected.to contain_file("deflate.conf").with({ - :ensure => 'file', - :path => '/etc/apache2/mods-available/deflate.conf', - } ) } - it { is_expected.to contain_file("deflate.conf symlink").with({ - :ensure => 'link', - :path => '/etc/apache2/mods-enabled/deflate.conf', - } ) } - end - - context "on a RedHat OS with default params" do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - - # Load the more generic tests for this context - general_deflate_specs() - - it { is_expected.to contain_file("deflate.conf").with_path("/etc/httpd/conf.d/deflate.conf") } - end - - context "On a FreeBSD OS with default params" do - let :facts do - { - :id => 'root', - :kernel => 'FreeBSD', - :osfamily => 'FreeBSD', - :operatingsystem => 'FreeBSD', - :operatingsystemrelease => '9', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - - # Load the more generic tests for this context - general_deflate_specs() - - it { is_expected.to contain_file("deflate.conf").with({ - :ensure => 'file', - :path => '/usr/local/etc/apache24/Modules/deflate.conf', - } ) } - end - - context "On a Gentoo OS with default params" do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :is_pe => false, - } - end - - # Load the more generic tests for this context - general_deflate_specs() - - it { is_expected.to contain_file("deflate.conf").with({ - :ensure => 'file', - :path => '/etc/apache2/modules.d/deflate.conf', - } ) } - end - end -end diff --git a/modules/apache/spec/classes/mod/dev_spec.rb b/modules/apache/spec/classes/mod/dev_spec.rb deleted file mode 100644 index 4c9f324..0000000 --- a/modules/apache/spec/classes/mod/dev_spec.rb +++ /dev/null @@ -1,32 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::dev', :type => :class do - let(:pre_condition) {[ - 'include apache' - ]} - - it_behaves_like "a mod class, without including apache" - - [ - ['RedHat', '6', 'Santiago', 'Linux'], - ['Debian', '6', 'squeeze', 'Linux'], - ['FreeBSD', '9', 'FreeBSD', 'FreeBSD'], - ].each do |osfamily, operatingsystemrelease, lsbdistcodename, kernel| - context "on a #{osfamily} OS" do - let :facts do - { - :lsbdistcodename => lsbdistcodename, - :osfamily => osfamily, - :operatingsystem => osfamily, - :operatingsystemrelease => operatingsystemrelease, - :is_pe => false, - :concat_basedir => '/foo', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin', - :kernel => kernel - } - end - it { is_expected.to contain_class('apache::dev') } - end - end -end diff --git a/modules/apache/spec/classes/mod/dir_spec.rb b/modules/apache/spec/classes/mod/dir_spec.rb deleted file mode 100644 index 9aad0d3..0000000 --- a/modules/apache/spec/classes/mod/dir_spec.rb +++ /dev/null @@ -1,137 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::dir', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "default configuration with parameters" do - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :lsbdistcodename => 'squeeze', - :is_pe => false, - } - end - context "passing no parameters" do - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('dir') } - it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) } - end - context "passing indexes => ['example.txt','fearsome.aspx']" do - let :params do - {:indexes => ['example.txt','fearsome.aspx']} - end - it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) } - it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) } - end - end - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'Redhat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context "passing no parameters" do - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('dir') } - it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) } - end - context "passing indexes => ['example.txt','fearsome.aspx']" do - let :params do - {:indexes => ['example.txt','fearsome.aspx']} - end - it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) } - it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) } - end - end - context "on a FreeBSD OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context "passing no parameters" do - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('dir') } - it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) } - end - context "passing indexes => ['example.txt','fearsome.aspx']" do - let :params do - {:indexes => ['example.txt','fearsome.aspx']} - end - it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) } - it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) } - end - end - context "on a Gentoo OS" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - context "passing no parameters" do - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('dir') } - it { is_expected.to contain_file('dir.conf').with_content(/^DirectoryIndex /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.html /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.html\.var /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.cgi /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.pl /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.php /) } - it { is_expected.to contain_file('dir.conf').with_content(/ index\.xhtml$/) } - end - context "passing indexes => ['example.txt','fearsome.aspx']" do - let :params do - {:indexes => ['example.txt','fearsome.aspx']} - end - it { is_expected.to contain_file('dir.conf').with_content(/ example\.txt /) } - it { is_expected.to contain_file('dir.conf').with_content(/ fearsome\.aspx$/) } - end - end - end -end diff --git a/modules/apache/spec/classes/mod/disk_cache_spec.rb b/modules/apache/spec/classes/mod/disk_cache_spec.rb deleted file mode 100644 index ebb5ef6..0000000 --- a/modules/apache/spec/classes/mod/disk_cache_spec.rb +++ /dev/null @@ -1,125 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::disk_cache', :type => :class do - context "on a Debian OS" do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - context "with Apache version < 2.4" do - let :pre_condition do - 'class{ "apache": - apache_version => "2.2", - default_mods => ["cache"], - mod_dir => "/tmp/junk", - }' - end - it { should compile } - it { should contain_class('apache::mod::disk_cache') } - it { is_expected.to contain_apache__mod("disk_cache") } - it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1/) } - end - context "with Apache version >= 2.4" do - let :pre_condition do - 'class{ "apache": - apache_version => "2.4", - default_mods => ["cache"], - mod_dir => "/tmp/junk", - }' - end - it { should compile } - it { should contain_class('apache::mod::disk_cache') } - it { should contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') } - it { is_expected.to contain_apache__mod("cache_disk") } - it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1/) } - end - end - - context "on a RedHat 6-based OS" do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - context "with Apache version < 2.4" do - let :pre_condition do - 'class{ "apache": - apache_version => "2.2", - default_mods => ["cache"], - mod_dir => "/tmp/junk", - }' - end - it { is_expected.to contain_apache__mod("disk_cache") } - it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_proxy\"\nCacheDirLevels 2\nCacheDirLength 1/) } - end - context "with Apache version >= 2.4" do - let :pre_condition do - 'class{ "apache": - apache_version => "2.4", - default_mods => ["cache"], - mod_dir => "/tmp/junk", - }' - end - it { is_expected.to contain_apache__mod("cache_disk") } - it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/httpd\/proxy\"\nCacheDirLevels 2\nCacheDirLength 1/) } - end - end - context "on a FreeBSD OS" do - let :facts do - { - :id => 'root', - :kernel => 'FreeBSD', - :osfamily => 'FreeBSD', - :operatingsystem => 'FreeBSD', - :operatingsystemrelease => '10', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - context "with Apache version < 2.4" do - let :pre_condition do - 'class{ "apache": - apache_version => "2.2", - default_mods => ["cache"], - mod_dir => "/tmp/junk", - }' - end - it { should compile } - it { should contain_class('apache::mod::disk_cache') } - it { should contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') } - it { is_expected.to contain_apache__mod("disk_cache") } - it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_disk_cache\"\nCacheDirLevels 2\nCacheDirLength 1/) } - end - context "with Apache version >= 2.4" do - let :pre_condition do - 'class{ "apache": - apache_version => "2.4", - default_mods => ["cache"], - mod_dir => "/tmp/junk", - }' - end - it { should compile } - it { should contain_class('apache::mod::disk_cache') } - it { should contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') } - it { is_expected.to contain_apache__mod("cache_disk") } - it { is_expected.to contain_file("disk_cache.conf").with(:content => /CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1/) } - end - end -end diff --git a/modules/apache/spec/classes/mod/dumpio_spec.rb b/modules/apache/spec/classes/mod/dumpio_spec.rb deleted file mode 100644 index 106b23a..0000000 --- a/modules/apache/spec/classes/mod/dumpio_spec.rb +++ /dev/null @@ -1,51 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::dumpio', :type => :class do - context "on a Debian OS" do - let :pre_condition do - 'class{"apache": - default_mods => false, - mod_dir => "/tmp/junk", - }' - end - let :facts do - { - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :operatingsystemmajrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context "default configuration fore parameters" do - it { should compile } - it { should contain_class('apache::mod::dumpio') } - it { should contain_file("dumpio.conf").with_path("/tmp/junk/dumpio.conf") } - it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOInput\s+"Off"$/)} - it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOOutput\s+"Off"$/)} - end - context "with dumpio_input set to On" do - let :params do - { - :dump_io_input => 'On', - } - end - it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOInput\s+"On"$/)} - it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOOutput\s+"Off"$/)} - end - context "with dumpio_ouput set to On" do - let :params do - { - :dump_io_output => 'On', - } - end - it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOInput\s+"Off"$/)} - it { should contain_file("dumpio.conf").with_content(/^\s*DumpIOOutput\s+"On"$/)} - end - end -end diff --git a/modules/apache/spec/classes/mod/event_spec.rb b/modules/apache/spec/classes/mod/event_spec.rb deleted file mode 100644 index b010d4c..0000000 --- a/modules/apache/spec/classes/mod/event_spec.rb +++ /dev/null @@ -1,214 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::event', :type => :class do - let :pre_condition do - 'class { "apache": mpm_module => false, }' - end - context "on a FreeBSD OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('event') } - it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/event.conf").with_ensure('file') } - end - context "on a Gentoo OS" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('event') } - it { is_expected.to contain_file("/etc/apache2/modules.d/event.conf").with_ensure('file') } - end - context "on a Debian OS" do - let :facts do - { - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('event') } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file') } - it { is_expected.to contain_file("/etc/apache2/mods-enabled/event.conf").with_ensure('link') } - - context "Test mpm_event new params" do - let :params do - { - :serverlimit => '0', - :startservers => '1', - :maxclients => '2', - :minsparethreads => '3', - :maxsparethreads => '4', - :threadsperchild => '5', - :maxrequestsperchild => '6', - :threadlimit => '7', - :listenbacklog => '8', - :maxrequestworkers => '9', - :maxconnectionsperchild => '10', - } - end - - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ServerLimit\s*0/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*StartServers\s*1/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxClients/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MinSpareThreads\s*3/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxSpareThreads\s*4/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadsPerChild\s*5/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestsPerChild/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadLimit\s*7/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ListenBacklog\s*8/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxRequestWorkers\s*9/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxConnectionsPerChild\s*10/) } - end - - context "Test mpm_event old style params" do - let :params do - { - :serverlimit => '0', - :startservers => '1', - :maxclients => '2', - :minsparethreads => '3', - :maxsparethreads => '4', - :threadsperchild => '5', - :maxrequestsperchild => '6', - :threadlimit => '7', - :listenbacklog => '8', - :maxrequestworkers => :undef, - :maxconnectionsperchild => :undef, - } - end - - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ServerLimit\s*0/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*StartServers\s*1/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxClients\s*2/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MinSpareThreads\s*3/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxSpareThreads\s*4/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadsPerChild\s*5/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*MaxRequestsPerChild\s*6/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ThreadLimit\s*7/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').with_content(/^\s*ListenBacklog\s*8/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestWorkers/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxConnectionsPerChild/) } - end - - context "Test mpm_event false params" do - let :params do - { - :serverlimit => false, - :startservers => false, - :maxclients => false, - :minsparethreads => false, - :maxsparethreads => false, - :threadsperchild => false, - :maxrequestsperchild => false, - :threadlimit => false, - :listenbacklog => false, - :maxrequestworkers => false, - :maxconnectionsperchild => false, - } - end - - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*ServerLimit/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*StartServers/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxClients/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MinSpareThreads/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxSpareThreads/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*ThreadsPerChild/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestsPerChild/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*ThreadLimit/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*ListenBacklog/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxRequestWorkers/) } - it { is_expected.to contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file').without_content(/^\s*MaxConnectionsPerChild/) } - end - - context "with Apache version < 2.4" do - let :params do - { - :apache_version => '2.2', - } - end - - it { is_expected.not_to contain_file("/etc/apache2/mods-available/event.load") } - it { is_expected.not_to contain_file("/etc/apache2/mods-enabled/event.load") } - - it { is_expected.to contain_package("apache2-mpm-event") } - end - - context "with Apache version >= 2.4" do - let :params do - { - :apache_version => '2.4', - } - end - - it { is_expected.to contain_file("/etc/apache2/mods-available/event.load").with({ - 'ensure' => 'file', - 'content' => "LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so\n" - }) - } - it { is_expected.to contain_file("/etc/apache2/mods-enabled/event.load").with_ensure('link') } - end - end - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - context "with Apache version >= 2.4" do - let :params do - { - :apache_version => '2.4', - } - end - - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('worker') } - it { is_expected.not_to contain_apache__mod('prefork') } - - it { is_expected.to contain_file("/etc/httpd/conf.d/event.conf").with_ensure('file') } - - it { is_expected.to contain_file("/etc/httpd/conf.d/event.load").with({ - 'ensure' => 'file', - 'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n", - }) - } - end - end -end diff --git a/modules/apache/spec/classes/mod/expires_spec.rb b/modules/apache/spec/classes/mod/expires_spec.rb deleted file mode 100644 index 397fee0..0000000 --- a/modules/apache/spec/classes/mod/expires_spec.rb +++ /dev/null @@ -1,83 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::expires', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "with expires active", :compile do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - it { is_expected.to contain_apache__mod("expires") } - it { is_expected.to contain_file("expires.conf").with(:content => /ExpiresActive On\n/) } - end - context "with expires default", :compile do - let :pre_condition do - 'class { apache: default_mods => false }' - end - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '7', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - let :params do - { - 'expires_default' => 'access plus 1 month' - } - end - it { is_expected.to contain_apache__mod("expires") } - it { is_expected.to contain_file("expires.conf").with_content( - "ExpiresActive On\n" \ - "ExpiresDefault \"access plus 1 month\"\n" - ) - } - end - context "with expires by type", :compile do - let :pre_condition do - 'class { apache: default_mods => false }' - end - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '7', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - } - end - let :params do - { - 'expires_by_type' => [ - { 'text/json' => 'mod plus 1 day' }, - { 'text/html' => 'access plus 1 year' }, - ] - } - end - it { is_expected.to contain_apache__mod("expires") } - it { is_expected.to contain_file("expires.conf").with_content( - "ExpiresActive On\n" \ - "ExpiresByType text/json \"mod plus 1 day\"\n" \ - "ExpiresByType text/html \"access plus 1 year\"\n" - ) - } - end -end diff --git a/modules/apache/spec/classes/mod/ext_filter_spec.rb b/modules/apache/spec/classes/mod/ext_filter_spec.rb deleted file mode 100644 index a0cf37c..0000000 --- a/modules/apache/spec/classes/mod/ext_filter_spec.rb +++ /dev/null @@ -1,64 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::ext_filter', :type => :class do - it_behaves_like "a mod class, without including apache" - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :fqdn => 'test.example.com', - :is_pe => false, - } - end - describe 'with no parameters' do - it { is_expected.to contain_apache__mod('ext_filter') } - it { is_expected.not_to contain_file('ext_filter.conf') } - end - describe 'with parameters' do - let :params do - { :ext_filter_define => {'filtA' => 'input=A output=B', - 'filtB' => 'input=C cmd="C"' }, - } - end - it { is_expected.to contain_file('ext_filter.conf').with_content(/^ExtFilterDefine\s+filtA\s+input=A output=B$/) } - it { is_expected.to contain_file('ext_filter.conf').with_content(/^ExtFilterDefine\s+filtB\s+input=C cmd="C"$/) } - end - - end - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :fqdn => 'test.example.com', - :is_pe => false, - } - end - describe 'with no parameters' do - it { is_expected.to contain_apache__mod('ext_filter') } - it { is_expected.not_to contain_file('ext_filter.conf') } - end - describe 'with parameters' do - let :params do - { :ext_filter_define => {'filtA' => 'input=A output=B', - 'filtB' => 'input=C cmd="C"' }, - } - end - it { is_expected.to contain_file('ext_filter.conf').with_path('/etc/httpd/conf.d/ext_filter.conf') } - it { is_expected.to contain_file('ext_filter.conf').with_content(/^ExtFilterDefine\s+filtA\s+input=A output=B$/) } - it { is_expected.to contain_file('ext_filter.conf').with_content(/^ExtFilterDefine\s+filtB\s+input=C cmd="C"$/) } - end - end -end diff --git a/modules/apache/spec/classes/mod/fastcgi_spec.rb b/modules/apache/spec/classes/mod/fastcgi_spec.rb deleted file mode 100644 index 778d27c..0000000 --- a/modules/apache/spec/classes/mod/fastcgi_spec.rb +++ /dev/null @@ -1,43 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::fastcgi', :type => :class do - it_behaves_like "a mod class, without including apache" - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('fastcgi') } - it { is_expected.to contain_package("libapache2-mod-fastcgi") } - it { is_expected.to contain_file('fastcgi.conf') } - end - - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('fastcgi') } - it { is_expected.to contain_package("mod_fastcgi") } - it { is_expected.not_to contain_file('fastcgi.conf') } - end -end diff --git a/modules/apache/spec/classes/mod/fcgid_spec.rb b/modules/apache/spec/classes/mod/fcgid_spec.rb deleted file mode 100644 index f08596b..0000000 --- a/modules/apache/spec/classes/mod/fcgid_spec.rb +++ /dev/null @@ -1,141 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::fcgid', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :operatingsystemmajrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('fcgid').with({ - 'loadfile_name' => nil - }) } - it { is_expected.to contain_package("libapache2-mod-fcgid") } - end - - context "on a RHEL6" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :operatingsystemmajrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - describe 'without parameters' do - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('fcgid').with({ - 'loadfile_name' => nil - }) } - it { is_expected.to contain_package("mod_fcgid") } - end - - describe 'with parameters' do - let :params do { - :options => { - 'FcgidIPCDir' => '/var/run/fcgidsock', - 'SharememPath' => '/var/run/fcgid_shm', - 'FcgidMinProcessesPerClass' => '0', - 'AddHandler' => 'fcgid-script .fcgi', - } - } end - - it 'should contain the correct config' do - content = catalogue.resource('file', 'fcgid.conf').send(:parameters)[:content] - expect(content.split("\n").reject { |c| c =~ /(^#|^$)/ }).to eq([ - '', - ' AddHandler fcgid-script .fcgi', - ' FcgidIPCDir /var/run/fcgidsock', - ' FcgidMinProcessesPerClass 0', - ' SharememPath /var/run/fcgid_shm', - '', - ]) - end - end - end - - context "on RHEL7" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '7', - :operatingsystemmajrelease => '7', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - describe 'without parameters' do - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('fcgid').with({ - 'loadfile_name' => 'unixd_fcgid.load' - }) } - it { is_expected.to contain_package("mod_fcgid") } - end - end - - context "on a FreeBSD OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '10', - :operatingsystemmajrelease => '10', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('fcgid').with({ - 'loadfile_name' => 'unixd_fcgid.load' - }) } - it { is_expected.to contain_package("www/mod_fcgid") } - end - - context "on a Gentoo OS" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('fcgid').with({ - 'loadfile_name' => nil, - }) } - it { is_expected.to contain_package("www-apache/mod_fcgid") } - end -end diff --git a/modules/apache/spec/classes/mod/info_spec.rb b/modules/apache/spec/classes/mod/info_spec.rb deleted file mode 100644 index 766a9e4..0000000 --- a/modules/apache/spec/classes/mod/info_spec.rb +++ /dev/null @@ -1,222 +0,0 @@ -require 'spec_helper' - -# This function is called inside the OS specific contexts -def general_info_specs_22 - it { is_expected.to contain_apache__mod('info') } - - context 'passing no parameters' do - it { - is_expected.to contain_file('info.conf').with_content( - "\n"\ - " SetHandler server-info\n"\ - " Order deny,allow\n"\ - " Deny from all\n"\ - " Allow from 127.0.0.1\n"\ - " Allow from ::1\n"\ - "\n" - ) - } - end - context 'passing restrict_access => false' do - let :params do { - :restrict_access => false - } - end - it { - is_expected.to contain_file('info.conf').with_content( - "\n"\ - " SetHandler server-info\n"\ - "\n" - ) - } - end - context "passing allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1']" do - let :params do - {:allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1']} - end - it { - is_expected.to contain_file('info.conf').with_content( - "\n"\ - " SetHandler server-info\n"\ - " Order deny,allow\n"\ - " Deny from all\n"\ - " Allow from 10.10.1.2\n"\ - " Allow from 192.168.1.2\n"\ - " Allow from 127.0.0.1\n"\ - "\n" - ) - } - end - context 'passing both restrict_access and allow_from' do - let :params do - { - :restrict_access => false, - :allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1'] - } - end - it { - is_expected.to contain_file('info.conf').with_content( - "\n"\ - " SetHandler server-info\n"\ - "\n" - ) - } - end -end - -def general_info_specs_24 - it { is_expected.to contain_apache__mod('info') } - - context 'passing no parameters' do - it { - is_expected.to contain_file('info.conf').with_content( - "\n"\ - " SetHandler server-info\n"\ - " Require ip 127.0.0.1 ::1\n"\ - "\n" - ) - } - end - context 'passing restrict_access => false' do - let :params do { - :restrict_access => false - } - end - it { - is_expected.to contain_file('info.conf').with_content( - "\n"\ - " SetHandler server-info\n"\ - "\n" - ) - } - end - context "passing allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1']" do - let :params do - {:allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1']} - end - it { - is_expected.to contain_file('info.conf').with_content( - "\n"\ - " SetHandler server-info\n"\ - " Require ip 10.10.1.2 192.168.1.2 127.0.0.1\n"\ - "\n" - ) - } - end - context 'passing both restrict_access and allow_from' do - let :params do - { - :restrict_access => false, - :allow_from => ['10.10.1.2', '192.168.1.2', '127.0.0.1'] - } - end - it { - is_expected.to contain_file('info.conf').with_content( - "\n"\ - " SetHandler server-info\n"\ - "\n" - ) - } - end -end - -describe 'apache::mod::info', :type => :class do - it_behaves_like "a mod class, without including apache" - - context 'On a Debian OS' do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - # Load the more generic tests for this context - general_info_specs_22() - - it { is_expected.to contain_file('info.conf').with({ - :ensure => 'file', - :path => '/etc/apache2/mods-available/info.conf', - } ) } - it { is_expected.to contain_file('info.conf symlink').with({ - :ensure => 'link', - :path => '/etc/apache2/mods-enabled/info.conf', - } ) } - end - - context 'on a RedHat OS' do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - # Load the more generic tests for this context - general_info_specs_22() - - it { is_expected.to contain_file('info.conf').with({ - :ensure => 'file', - :path => '/etc/httpd/conf.d/info.conf', - } ) } - end - - context 'on a FreeBSD OS' do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '10', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - # Load the more generic tests for this context - general_info_specs_24() - - it { is_expected.to contain_file('info.conf').with({ - :ensure => 'file', - :path => '/usr/local/etc/apache24/Modules/info.conf', - } ) } - end - - context 'on a Gentoo OS' do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - - # Load the more generic tests for this context - general_info_specs_24() - - it { is_expected.to contain_file('info.conf').with({ - :ensure => 'file', - :path => '/etc/apache2/modules.d/info.conf', - } ) } - end -end diff --git a/modules/apache/spec/classes/mod/intercept_form_submit_spec.rb b/modules/apache/spec/classes/mod/intercept_form_submit_spec.rb deleted file mode 100644 index 14a91fc..0000000 --- a/modules/apache/spec/classes/mod/intercept_form_submit_spec.rb +++ /dev/null @@ -1,44 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::intercept_form_submit', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "default configuration with parameters" do - context "on a Debian OS" do - let :facts do - { - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :operatingsystem => 'Debian', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache") } - it { is_expected.to contain_package("libapache2-mod-intercept-form-submit") } - it { is_expected.to contain_apache__mod('intercept_form_submit') } - end #Debian - - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :operatingsystem => 'RedHat', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache") } - it { is_expected.to contain_package("mod_intercept_form_submit") } - it { is_expected.to contain_apache__mod('intercept_form_submit') } - end # Redhat - end -end diff --git a/modules/apache/spec/classes/mod/itk_spec.rb b/modules/apache/spec/classes/mod/itk_spec.rb deleted file mode 100644 index 27369f1..0000000 --- a/modules/apache/spec/classes/mod/itk_spec.rb +++ /dev/null @@ -1,130 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::itk', :type => :class do - let :pre_condition do - 'class { "apache": mpm_module => false, }' - end - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('itk') } - it { is_expected.to contain_file("/etc/apache2/mods-available/itk.conf").with_ensure('file') } - it { is_expected.to contain_file("/etc/apache2/mods-enabled/itk.conf").with_ensure('link') } - - context "with Apache version < 2.4" do - let :params do - { - :apache_version => '2.2', - } - end - - it { is_expected.not_to contain_file("/etc/apache2/mods-available/itk.load") } - it { is_expected.not_to contain_file("/etc/apache2/mods-enabled/itk.load") } - - it { is_expected.to contain_package("apache2-mpm-itk") } - end - - context "with Apache version >= 2.4" do - let :pre_condition do - 'class { "apache": mpm_module => prefork, }' - end - - let :params do - { - :apache_version => '2.4', - } - end - - it { is_expected.to contain_file("/etc/apache2/mods-available/itk.load").with({ - 'ensure' => 'file', - 'content' => "LoadModule mpm_itk_module /usr/lib/apache2/modules/mod_mpm_itk.so\n" - }) - } - it { is_expected.to contain_file("/etc/apache2/mods-enabled/itk.load").with_ensure('link') } - end - end - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('itk') } - it { is_expected.to contain_file("/etc/httpd/conf.d/itk.conf").with_ensure('file') } - it { is_expected.to contain_package("httpd-itk") } - - context "with Apache version < 2.4" do - let :params do - { - :apache_version => '2.2', - } - end - - it { is_expected.to contain_file_line("/etc/sysconfig/httpd itk enable").with({ - 'require' => 'Package[httpd]', - }) - } - end - - context "with Apache version >= 2.4" do - let :pre_condition do - 'class { "apache": mpm_module => prefork, }' - end - - let :params do - { - :apache_version => '2.4', - } - end - - it { is_expected.to contain_file("/etc/httpd/conf.d/itk.load").with({ - 'ensure' => 'file', - 'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n" - }) - } - end - end - context "on a FreeBSD OS" do - let :pre_condition do - 'class { "apache": mpm_module => false, }' - end - - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '10', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - :mpm_module => 'itk', - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('itk') } - it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/itk.conf").with_ensure('file') } - it { is_expected.to contain_package("www/mod_mpm_itk") } - end -end diff --git a/modules/apache/spec/classes/mod/jk_spec.rb b/modules/apache/spec/classes/mod/jk_spec.rb deleted file mode 100644 index 57305c1..0000000 --- a/modules/apache/spec/classes/mod/jk_spec.rb +++ /dev/null @@ -1,222 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::jk', :type => :class do - it_behaves_like 'a mod class, without including apache' - - shared_examples 'minimal resources' do |mod_dir| - it { is_expected.to compile } - it { is_expected.to compile.with_all_deps } - it { is_expected.to create_class('apache::mod::jk') } - it { is_expected.to contain_class('apache') } - it { is_expected.to contain_apache__mod('jk') } - it { is_expected.to contain_file('jk.conf').that_notifies('Class[apache::service]') } - it { is_expected.to contain_file('jk.conf').with({ :path => "#{mod_dir}/jk.conf" }) } - end - - default_ip = '192.168.1.1' - altern8_ip = '10.1.2.3' - default_port = 80 - altern8_port = 8008 - - context "RHEL 6 with only required facts and default parameters" do - - let (:facts) do - { - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6', - :ipaddress => default_ip, - } - end - - let (:pre_condition) do - 'include apache' - end - - let (:params) do - { - :logroot => '/var/log/httpd', - } - end - - mod_dir = '/etc/httpd/conf.d' - let (:mod_dir) { mod_dir } - - it_behaves_like 'minimal resources', mod_dir - it { is_expected.to contain_apache__listen("#{default_ip}:#{default_port}") } - it { - verify_contents(catalogue, 'jk.conf', ['', '']) - } - - end - - context "Debian 8 with only required facts and default parameters" do - - let (:facts) do - { - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '8', - :ipaddress => default_ip, - } - end - - let (:pre_condition) do - 'include apache' - end - - let (:params) do - { - :logroot => '/var/log/apache2', - } - end - - mod_dir = '/etc/apache2/mods-available' - let (:mod_dir) { mod_dir } - - it_behaves_like 'minimal resources', mod_dir - it { is_expected.to contain_apache__listen("#{default_ip}:#{default_port}") } - it { - verify_contents(catalogue, 'jk.conf', ['', '']) - } - - end - - context "RHEL 6 with required facts and alternative IP" do - - let (:facts) do - { - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6', - :ipaddress => default_ip, - } - end - - let (:pre_condition) do - 'include apache' - end - - let (:params) do - { - :ip => altern8_ip, - :logroot => '/var/log/httpd', - } - end - - it { is_expected.to contain_apache__listen("#{altern8_ip}:#{default_port}") } - - end - - context "RHEL 6 with required facts and alternative port" do - - let (:facts) do - { - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6', - :ipaddress => default_ip, - } - end - - let (:pre_condition) do - 'include apache' - end - - let (:params) do - { - :port => altern8_port, - :logroot => '/var/log/httpd', - } - end - - it { is_expected.to contain_apache__listen("#{default_ip}:#{altern8_port}") } - - end - - context "RHEL 6 with required facts and no binding" do - - let (:facts) do - { - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6', - :ipaddress => default_ip, - } - end - - let (:pre_condition) do - 'include apache' - end - - let (:params) do - { - :add_listen => false, - :logroot => '/var/log/httpd', - } - end - - it { is_expected.not_to contain_apache__listen("#{default_ip}:#{default_port}") } - - end - - { - :default => { - :shm_file => :undef, - :log_file => :undef, - :shm_path => '/var/log/httpd/jk-runtime-status', - :log_path => '/var/log/httpd/mod_jk.log', - }, - :relative => { - :shm_file => 'shm_file', - :log_file => 'log_file', - :shm_path => '/var/log/httpd/shm_file', - :log_path => '/var/log/httpd/log_file', - }, - :absolute => { - :shm_file => '/run/shm_file', - :log_file => '/tmp/log_file', - :shm_path => '/run/shm_file', - :log_path => '/tmp/log_file', - }, - :pipe => { - :shm_file => :undef, - :log_file => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"', - :shm_path => '/var/log/httpd/jk-runtime-status', - :log_path => '"|rotatelogs /var/log/httpd/mod_jk.log.%Y%m%d 86400 -180"', - }, - }.each do |option, paths| - context "RHEL 6 with #{option} shm_file and log_file paths" do - - let (:facts) do - { - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6', - } - end - - let (:pre_condition) do - 'include apache' - end - - let (:params) do { - :logroot => '/var/log/httpd', - :shm_file => paths[:shm_file], - :log_file => paths[:log_file], - } end - - it { is_expected.to contain_file('jk.conf').with_content( - "# This file is generated automatically by Puppet - DO NOT EDIT\n"\ - "# Any manual changes will be overwritten\n"\ - "\n"\ - "\n"\ - " JkShmFile #{paths[:shm_path]}\n"\ - " JkLogFile #{paths[:log_path]}\n"\ - "\n" - ) } - - end - end - -end diff --git a/modules/apache/spec/classes/mod/ldap_spec.rb b/modules/apache/spec/classes/mod/ldap_spec.rb deleted file mode 100644 index 73c51ad..0000000 --- a/modules/apache/spec/classes/mod/ldap_spec.rb +++ /dev/null @@ -1,86 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::ldap', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "on a Debian OS" do - let :facts do - { - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :operatingsystem => 'Debian', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_class("apache::mod::ldap") } - it { is_expected.to contain_apache__mod('ldap') } - - context 'default ldap_trusted_global_cert_file' do - it { is_expected.to contain_file('ldap.conf').without_content(/^LDAPTrustedGlobalCert/) } - end - - context 'ldap_trusted_global_cert_file param' do - let(:params) { { :ldap_trusted_global_cert_file => 'ca.pem' } } - it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$/) } - end - - context 'set multiple ldap params' do - let(:params) {{ - :ldap_trusted_global_cert_file => 'ca.pem', - :ldap_trusted_global_cert_type => 'CA_DER', - :ldap_shared_cache_size => '500000', - :ldap_cache_entries => '1024', - :ldap_cache_ttl => '600', - :ldap_opcache_entries => '1024', - :ldap_opcache_ttl => '600' - }} - it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_DER ca\.pem$/) } - it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPSharedCacheSize 500000$/) } - it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPCacheEntries 1024$/) } - it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPCacheTTL 600$/) } - it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPOpCacheEntries 1024$/) } - it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPOpCacheTTL 600$/) } - end - end #Debian - - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :operatingsystem => 'RedHat', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_class("apache::mod::ldap") } - it { is_expected.to contain_apache__mod('ldap') } - - context 'default ldap_trusted_global_cert_file' do - it { is_expected.to contain_file('ldap.conf').without_content(/^LDAPTrustedGlobalCert/) } - end - - context 'ldap_trusted_global_cert_file param' do - let(:params) { { :ldap_trusted_global_cert_file => 'ca.pem' } } - it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_BASE64 ca\.pem$/) } - end - - context 'ldap_trusted_global_cert_file and ldap_trusted_global_cert_type params' do - let(:params) {{ - :ldap_trusted_global_cert_file => 'ca.pem', - :ldap_trusted_global_cert_type => 'CA_DER' - }} - it { is_expected.to contain_file('ldap.conf').with_content(/^LDAPTrustedGlobalCert CA_DER ca\.pem$/) } - end - end # Redhat -end diff --git a/modules/apache/spec/classes/mod/lookup_identity.rb b/modules/apache/spec/classes/mod/lookup_identity.rb deleted file mode 100644 index a04e2e8..0000000 --- a/modules/apache/spec/classes/mod/lookup_identity.rb +++ /dev/null @@ -1,44 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::lookup_identity', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "default configuration with parameters" do - context "on a Debian OS" do - let :facts do - { - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :operatingsystem => 'Debian', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache") } - it { is_expected.to contain_package("libapache2-mod-lookup-identity") } - it { is_expected.to contain_apache__mod('lookup_identity') } - end #Debian - - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :operatingsystem => 'RedHat', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache") } - it { is_expected.to contain_package("mod_lookup_identity") } - it { is_expected.to contain_apache__mod('lookup_identity') } - end # Redhat - end -end diff --git a/modules/apache/spec/classes/mod/mime_magic_spec.rb b/modules/apache/spec/classes/mod/mime_magic_spec.rb deleted file mode 100644 index cf8f898..0000000 --- a/modules/apache/spec/classes/mod/mime_magic_spec.rb +++ /dev/null @@ -1,110 +0,0 @@ -require 'spec_helper' - -# This function is called inside the OS specific contexts -def general_mime_magic_specs - it { is_expected.to contain_apache__mod("mime_magic") } -end - -describe 'apache::mod::mime_magic', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "On a Debian OS with default params" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - general_mime_magic_specs() - - it do - is_expected.to contain_file("mime_magic.conf").with_content( - "MIMEMagicFile \"/etc/apache2/magic\"\n" - ) - end - - it { is_expected.to contain_file("mime_magic.conf").with({ - :ensure => 'file', - :path => '/etc/apache2/mods-available/mime_magic.conf', - } ) } - it { is_expected.to contain_file("mime_magic.conf symlink").with({ - :ensure => 'link', - :path => '/etc/apache2/mods-enabled/mime_magic.conf', - } ) } - - context "with magic_file => /tmp/Debian_magic" do - let :params do - { :magic_file => "/tmp/Debian_magic" } - end - - it do - is_expected.to contain_file("mime_magic.conf").with_content( - "MIMEMagicFile \"/tmp/Debian_magic\"\n" - ) - end - end - - end - - context "on a RedHat OS with default params" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - general_mime_magic_specs() - - it do - is_expected.to contain_file("mime_magic.conf").with_content( - "MIMEMagicFile \"/etc/httpd/conf/magic\"\n" - ) - end - - it { is_expected.to contain_file("mime_magic.conf").with_path("/etc/httpd/conf.d/mime_magic.conf") } - - end - - context "with magic_file => /tmp/magic" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - let :params do - { :magic_file => "/tmp/magic" } - end - - it do - is_expected.to contain_file("mime_magic.conf").with_content( - "MIMEMagicFile \"/tmp/magic\"\n" - ) - end - end - - -end diff --git a/modules/apache/spec/classes/mod/mime_spec.rb b/modules/apache/spec/classes/mod/mime_spec.rb deleted file mode 100644 index b0675a3..0000000 --- a/modules/apache/spec/classes/mod/mime_spec.rb +++ /dev/null @@ -1,52 +0,0 @@ -require 'spec_helper' - -# This function is called inside the OS specific conte, :compilexts -def general_mime_specs - it { is_expected.to contain_apache__mod("mime") } -end - -describe 'apache::mod::mime', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "On a Debian OS with default params", :compile do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - general_mime_specs() - - it { is_expected.to contain_file("mime.conf").with_path('/etc/apache2/mods-available/mime.conf') } - - end - - context "on a RedHat OS with default params", :compile do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - general_mime_specs() - - it { is_expected.to contain_file("mime.conf").with_path("/etc/httpd/conf.d/mime.conf") } - - end - -end diff --git a/modules/apache/spec/classes/mod/negotiation_spec.rb b/modules/apache/spec/classes/mod/negotiation_spec.rb deleted file mode 100644 index 9dadb76..0000000 --- a/modules/apache/spec/classes/mod/negotiation_spec.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::negotiation', :type => :class do - it_behaves_like "a mod class, without including apache" - describe "OS independent tests" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :kernel => 'Linux', - :lsbdistcodename => 'squeeze', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - context "default params" do - it { should contain_class("apache") } - it do - should contain_file('negotiation.conf').with( { - :ensure => 'file', - :content => 'LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW -ForceLanguagePriority Prefer Fallback -', - } ) - end - end - - context 'with force_language_priority parameter' do - let :params do - { :force_language_priority => 'Prefer' } - end - it do - should contain_file('negotiation.conf').with( { - :ensure => 'file', - :content => /^ForceLanguagePriority Prefer$/, - } ) - end - end - - context 'with language_priority parameter' do - let :params do - { :language_priority => [ 'en', 'es' ] } - end - it do - should contain_file('negotiation.conf').with( { - :ensure => 'file', - :content => /^LanguagePriority en es$/, - } ) - end - end - end -end diff --git a/modules/apache/spec/classes/mod/pagespeed_spec.rb b/modules/apache/spec/classes/mod/pagespeed_spec.rb deleted file mode 100644 index 2cbc3d1..0000000 --- a/modules/apache/spec/classes/mod/pagespeed_spec.rb +++ /dev/null @@ -1,51 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::pagespeed', :type => :class do - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('pagespeed') } - it { is_expected.to contain_package("mod-pagespeed-stable") } - - context "when setting additional_configuration to a Hash" do - let :params do { :additional_configuration => { 'Key' => 'Value' } } end - it { is_expected.to contain_file('pagespeed.conf').with_content /Key Value/ } - end - - context "when setting additional_configuration to an Array" do - let :params do { :additional_configuration => [ 'Key Value' ] } end - it { is_expected.to contain_file('pagespeed.conf').with_content /Key Value/ } - end - end - - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('pagespeed') } - it { is_expected.to contain_package("mod-pagespeed-stable") } - it { is_expected.to contain_file('pagespeed.conf') } - end -end diff --git a/modules/apache/spec/classes/mod/passenger_spec.rb b/modules/apache/spec/classes/mod/passenger_spec.rb deleted file mode 100644 index 200d457..0000000 --- a/modules/apache/spec/classes/mod/passenger_spec.rb +++ /dev/null @@ -1,331 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::passenger', :type => :class do - it_behaves_like "a mod class, without including apache" - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :kernel => 'Linux', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('passenger') } - it { is_expected.to contain_package("libapache2-mod-passenger") } - it { is_expected.to contain_file('zpassenger.load').with({ - 'path' => '/etc/apache2/mods-available/zpassenger.load', - }) } - it { is_expected.to contain_file('passenger.conf').with({ - 'path' => '/etc/apache2/mods-available/passenger.conf', - }) } - describe "with passenger_root => '/usr/lib/example'" do - let :params do - { :passenger_root => '/usr/lib/example' } - end - it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/example"}) } - end - describe "with passenger_ruby => /usr/lib/example/ruby" do - let :params do - { :passenger_ruby => '/usr/lib/example/ruby' } - end - it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby"}) } - end - describe "with passenger_default_ruby => /usr/lib/example/ruby1.9.3" do - let :params do - { :passenger_ruby => '/usr/lib/example/ruby1.9.3' } - end - it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby1.9.3"}) } - end - describe "with passenger_high_performance => on" do - let :params do - { :passenger_high_performance => 'on' } - end - it { is_expected.to contain_file('passenger.conf').with_content(/^ PassengerHighPerformance on$/) } - end - describe "with passenger_pool_idle_time => 1200" do - let :params do - { :passenger_pool_idle_time => 1200 } - end - it { is_expected.to contain_file('passenger.conf').with_content(/^ PassengerPoolIdleTime 1200$/) } - end - describe "with passenger_max_request_queue_size => 100" do - let :params do - { :passenger_max_request_queue_size => 100 } - end - it { is_expected.to contain_file('passenger.conf').with_content(/^ PassengerMaxRequestQueueSize 100$/) } - end - - describe "with passenger_max_requests => 20" do - let :params do - { :passenger_max_requests => 20 } - end - it { is_expected.to contain_file('passenger.conf').with_content(/^ PassengerMaxRequests 20$/) } - end - describe "with passenger_spawn_method => direct" do - let :params do - { :passenger_spawn_method => 'direct' } - end - it { is_expected.to contain_file('passenger.conf').with_content(/^ PassengerSpawnMethod direct$/) } - end - describe "with passenger_stat_throttle_rate => 10" do - let :params do - { :passenger_stat_throttle_rate => 10 } - end - it { is_expected.to contain_file('passenger.conf').with_content(/^ PassengerStatThrottleRate 10$/) } - end - describe "with passenger_max_pool_size => 16" do - let :params do - { :passenger_max_pool_size => 16 } - end - it { is_expected.to contain_file('passenger.conf').with_content(/^ PassengerMaxPoolSize 16$/) } - end - describe "with passenger_min_instances => 5" do - let :params do - { :passenger_min_instances => 5 } - end - it { is_expected.to contain_file('passenger.conf').with_content(/^ PassengerMinInstances 5$/) } - end - describe "with passenger_max_instances_per_app => 8" do - let :params do - { :passenger_max_instances_per_app => 8 } - end - it { is_expected.to contain_file('passenger.conf').with_content(/^ PassengerMaxInstancesPerApp 8$/) } - end - describe "with rack_autodetect => on" do - let :params do - { :rack_autodetect => 'on' } - end - it { is_expected.to contain_file('passenger.conf').with_content(/^ RackAutoDetect on$/) } - end - describe "with rails_autodetect => on" do - let :params do - { :rails_autodetect => 'on' } - end - it { is_expected.to contain_file('passenger.conf').with_content(/^ RailsAutoDetect on$/) } - end - describe "with passenger_use_global_queue => on" do - let :params do - { :passenger_use_global_queue => 'on' } - end - it { is_expected.to contain_file('passenger.conf').with_content(/^ PassengerUseGlobalQueue on$/) } - end - describe "with passenger_app_env => 'foo'" do - let :params do - { :passenger_app_env => 'foo' } - end - it { is_expected.to contain_file('passenger.conf').with_content(/^ PassengerAppEnv foo$/) } - end - describe "with passenger_log_file => '/var/log/apache2/passenger.log'" do - let :params do - { :passenger_log_file => '/var/log/apache2/passenger.log' } - end - it { is_expected.to contain_file('passenger.conf').with_content(%r{^ PassengerLogFile /var/log/apache2/passenger.log$}) } - end - describe "with passenger_log_level => 3" do - let :params do - { :passenger_log_level => 3 } - end - it { is_expected.to contain_file('passenger.conf').with_content(%r{^ PassengerLogLevel 3$}) } - end - describe "with mod_path => '/usr/lib/foo/mod_foo.so'" do - let :params do - { :mod_path => '/usr/lib/foo/mod_foo.so' } - end - it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$/) } - end - describe "with mod_lib_path => '/usr/lib/foo'" do - let :params do - { :mod_lib_path => '/usr/lib/foo' } - end - it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$/) } - end - describe "with mod_lib => 'mod_foo.so'" do - let :params do - { :mod_lib => 'mod_foo.so' } - end - it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$/) } - end - describe "with mod_id => 'mod_foo'" do - let :params do - { :mod_id => 'mod_foo' } - end - it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$/) } - end - - context "with Ubuntu 12.04 defaults" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '12.04', - :kernel => 'Linux', - :operatingsystem => 'Ubuntu', - :lsbdistrelease => '12.04', - :concat_basedir => '/dne', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) } - it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) } - it { is_expected.to contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) } - end - - context "with Ubuntu 14.04 defaults" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '14.04', - :operatingsystem => 'Ubuntu', - :kernel => 'Linux', - :lsbdistrelease => '14.04', - :concat_basedir => '/dne', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) } - it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRuby/) } - it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) } - end - - context "with Debian 7 defaults" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '7.3', - :operatingsystem => 'Debian', - :kernel => 'Linux', - :lsbdistcodename => 'wheezy', - :concat_basedir => '/dne', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) } - it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) } - it { is_expected.to contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) } - end - - context "with Debian 8 defaults" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '8.0', - :operatingsystem => 'Debian', - :kernel => 'Linux', - :lsbdistcodename => 'jessie', - :concat_basedir => '/dne', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) } - it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRuby/) } - it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) } - end - end - - context "on a RedHat OS" do - let :rh_facts do - { - :osfamily => 'RedHat', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - context "on EL6" do - let(:facts) { rh_facts.merge(:operatingsystemrelease => '6') } - - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('passenger') } - it { is_expected.to contain_package("mod_passenger") } - it { is_expected.to contain_file('passenger_package.conf').with({ - 'path' => '/etc/httpd/conf.d/passenger.conf', - }) } - it { is_expected.to contain_file('passenger_package.conf').without_content } - it { is_expected.to contain_file('passenger_package.conf').without_source } - it { is_expected.to contain_file('zpassenger.load').with({ - 'path' => '/etc/httpd/conf.d/zpassenger.load', - }) } - it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRoot/) } - it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRuby/) } - describe "with passenger_root => '/usr/lib/example'" do - let :params do - { :passenger_root => '/usr/lib/example' } - end - it { is_expected.to contain_file('passenger.conf').with_content(/^ PassengerRoot "\/usr\/lib\/example"$/) } - end - describe "with passenger_ruby => /usr/lib/example/ruby" do - let :params do - { :passenger_ruby => '/usr/lib/example/ruby' } - end - it { is_expected.to contain_file('passenger.conf').with_content(/^ PassengerRuby "\/usr\/lib\/example\/ruby"$/) } - end - end - - context "on EL7" do - let(:facts) { rh_facts.merge(:operatingsystemrelease => '7') } - - it { is_expected.to contain_file('passenger_package.conf').with({ - 'path' => '/etc/httpd/conf.d/passenger.conf', - }) } - it { is_expected.to contain_file('zpassenger.load').with({ - 'path' => '/etc/httpd/conf.modules.d/zpassenger.load', - }) } - end - end - context "on a FreeBSD OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('passenger') } - it { is_expected.to contain_package("www/rubygem-passenger") } - end - context "on a Gentoo OS" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('passenger') } - it { is_expected.to contain_package("www-apache/passenger") } - end -end diff --git a/modules/apache/spec/classes/mod/perl_spec.rb b/modules/apache/spec/classes/mod/perl_spec.rb deleted file mode 100644 index f5b61fe..0000000 --- a/modules/apache/spec/classes/mod/perl_spec.rb +++ /dev/null @@ -1,74 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::perl', :type => :class do - it_behaves_like "a mod class, without including apache" - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('perl') } - it { is_expected.to contain_package("libapache2-mod-perl2") } - end - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('perl') } - it { is_expected.to contain_package("mod_perl") } - end - context "on a FreeBSD OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('perl') } - it { is_expected.to contain_package("www/mod_perl2") } - end - context "on a Gentoo OS" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :operatingsystem => 'Gentoo', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('perl') } - it { is_expected.to contain_package("www-apache/mod_perl") } - end -end diff --git a/modules/apache/spec/classes/mod/peruser_spec.rb b/modules/apache/spec/classes/mod/peruser_spec.rb deleted file mode 100644 index 097a36f..0000000 --- a/modules/apache/spec/classes/mod/peruser_spec.rb +++ /dev/null @@ -1,43 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::peruser', :type => :class do - let :pre_condition do - 'class { "apache": mpm_module => false, }' - end - context "on a FreeBSD OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '10', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it do - expect { - catalogue - }.to raise_error(Puppet::Error, /Unsupported osfamily FreeBSD/) - end - end - context "on a Gentoo OS" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('peruser') } - it { is_expected.to contain_file("/etc/apache2/modules.d/peruser.conf").with_ensure('file') } - end -end diff --git a/modules/apache/spec/classes/mod/php_spec.rb b/modules/apache/spec/classes/mod/php_spec.rb deleted file mode 100644 index ad61e89..0000000 --- a/modules/apache/spec/classes/mod/php_spec.rb +++ /dev/null @@ -1,319 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::php', :type => :class do - describe "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context "with mpm_module => prefork" do - let :pre_condition do - 'class { "apache": mpm_module => prefork, }' - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_class("apache::mod::prefork") } - it { is_expected.to contain_apache__mod('php5') } - it { is_expected.to contain_package("libapache2-mod-php5") } - it { is_expected.to contain_file("php5.load").with( - :content => "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n" - ) } - end - context "with mpm_module => itk" do - let :pre_condition do - 'class { "apache": mpm_module => itk, }' - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_class("apache::mod::itk") } - it { is_expected.to contain_apache__mod('php5') } - it { is_expected.to contain_package("libapache2-mod-php5") } - it { is_expected.to contain_file("php5.load").with( - :content => "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n" - ) } - end - context "on jessie" do - let :pre_condition do - 'class { "apache": mpm_module => prefork, }' - end - let(:facts) { super().merge({ - :operatingsystemrelease => '8', - :lsbdistcodename => 'jessie', - }) } - it { is_expected.to contain_file("php5.load").with( - :content => "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n" - ) } - end - context "on stretch" do - let :pre_condition do - 'class { "apache": mpm_module => prefork, }' - end - let(:facts) { super().merge({ - :operatingsystemrelease => '9', - :lsbdistcodename => 'stretch', - }) } - it { is_expected.to contain_apache__mod('php7.0') } - it { is_expected.to contain_package("libapache2-mod-php7.0") } - it { is_expected.to contain_file("php7.0.load").with( - :content => "LoadModule php7_module /usr/lib/apache2/modules/libphp7.0.so\n" - ) } - end - end - describe "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context "with default params" do - let :pre_condition do - 'class { "apache": }' - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('php5') } - it { is_expected.to contain_package("php") } - it { is_expected.to contain_file("php5.load").with( - :content => "LoadModule php5_module modules/libphp5.so\n" - ) } - end - context "with alternative package name" do let :pre_condition do - 'class { "apache": }' - end - let :params do - { :package_name => 'php54'} - end - it { is_expected.to contain_package("php54") } - end - context "with alternative path" do let :pre_condition do - 'class { "apache": }' - end - let :params do - { :path => 'alternative-path'} - end - it { is_expected.to contain_file("php5.load").with( - :content => "LoadModule php5_module alternative-path\n" - ) } - end - context "with alternative extensions" do let :pre_condition do - 'class { "apache": }' - end - let :params do - { :extensions => ['.php','.php5']} - end - it { is_expected.to contain_file("php5.conf").with_content(Regexp.new(Regexp.escape(''))) } - end - context "with specific version" do - let :pre_condition do - 'class { "apache": }' - end - let :params do - { :package_ensure => '5.3.13'} - end - it { is_expected.to contain_package("php").with( - :ensure => '5.3.13' - ) } - end - context "with mpm_module => prefork" do - let :pre_condition do - 'class { "apache": mpm_module => prefork, }' - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_class("apache::mod::prefork") } - it { is_expected.to contain_apache__mod('php5') } - it { is_expected.to contain_package("php") } - it { is_expected.to contain_file("php5.load").with( - :content => "LoadModule php5_module modules/libphp5.so\n" - ) } - end - context "with mpm_module => itk" do - let :pre_condition do - 'class { "apache": mpm_module => itk, }' - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_class("apache::mod::itk") } - it { is_expected.to contain_apache__mod('php5') } - it { is_expected.to contain_package("php") } - it { is_expected.to contain_file("php5.load").with( - :content => "LoadModule php5_module modules/libphp5.so\n" - ) } - end - end - describe "on a FreeBSD OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '10', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context "with mpm_module => prefork" do - let :pre_condition do - 'class { "apache": mpm_module => prefork, }' - end - it { is_expected.to contain_class('apache::params') } - it { is_expected.to contain_apache__mod('php5') } - it { is_expected.to contain_package("www/mod_php5") } - it { is_expected.to contain_file('php5.load') } - end - context "with mpm_module => itk" do - let :pre_condition do - 'class { "apache": mpm_module => itk, }' - end - it { is_expected.to contain_class('apache::params') } - it { is_expected.to contain_class('apache::mod::itk') } - it { is_expected.to contain_apache__mod('php5') } - it { is_expected.to contain_package("www/mod_php5") } - it { is_expected.to contain_file('php5.load') } - end - end - describe "on a Gentoo OS" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - context "with mpm_module => prefork" do - let :pre_condition do - 'class { "apache": mpm_module => prefork, }' - end - it { is_expected.to contain_class('apache::params') } - it { is_expected.to contain_apache__mod('php5') } - it { is_expected.to contain_package("dev-lang/php") } - it { is_expected.to contain_file('php5.load') } - end - context "with mpm_module => itk" do - let :pre_condition do - 'class { "apache": mpm_module => itk, }' - end - it { is_expected.to contain_class('apache::params') } - it { is_expected.to contain_class('apache::mod::itk') } - it { is_expected.to contain_apache__mod('php5') } - it { is_expected.to contain_package("dev-lang/php") } - it { is_expected.to contain_file('php5.load') } - end - end - describe "OS independent tests" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :kernel => 'Linux', - :lsbdistcodename => 'squeeze', - :concat_basedir => '/dne', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context 'with content param' do - let :pre_condition do - 'class { "apache": mpm_module => prefork, }' - end - let :params do - { :content => 'somecontent' } - end - it { should contain_file('php5.conf').with( - :content => 'somecontent' - ) } - end - context 'with template param' do - let :pre_condition do - 'class { "apache": mpm_module => prefork, }' - end - let :params do - { :template => 'apache/mod/php.conf.erb' } - end - it { should contain_file('php5.conf').with( - :content => /^# PHP is an HTML-embedded scripting language which attempts to make it/ - ) } - end - context 'with source param' do - let :pre_condition do - 'class { "apache": mpm_module => prefork, }' - end - let :params do - { :source => 'some-path' } - end - it { should contain_file('php5.conf').with( - :source => 'some-path' - ) } - end - context 'content has priority over template' do - let :pre_condition do - 'class { "apache": mpm_module => prefork, }' - end - let :params do - { - :template => 'apache/mod/php5.conf.erb', - :content => 'somecontent' - } - end - it { should contain_file('php5.conf').with( - :content => 'somecontent' - ) } - end - context 'source has priority over template' do - let :pre_condition do - 'class { "apache": mpm_module => prefork, }' - end - let :params do - { - :template => 'apache/mod/php5.conf.erb', - :source => 'some-path' - } - end - it { should contain_file('php5.conf').with( - :source => 'some-path' - ) } - end - context 'source has priority over content' do - let :pre_condition do - 'class { "apache": mpm_module => prefork, }' - end - let :params do - { - :content => 'somecontent', - :source => 'some-path' - } - end - it { should contain_file('php5.conf').with( - :source => 'some-path' - ) } - end - context 'with mpm_module => worker' do - let :pre_condition do - 'class { "apache": mpm_module => worker, }' - end - it 'should raise an error' do - expect { expect(subject).to contain_apache__mod('php5') }.to raise_error Puppet::Error, /mpm_module => 'prefork' or mpm_module => 'itk'/ - end - end - end -end diff --git a/modules/apache/spec/classes/mod/prefork_spec.rb b/modules/apache/spec/classes/mod/prefork_spec.rb deleted file mode 100644 index cbbca2e..0000000 --- a/modules/apache/spec/classes/mod/prefork_spec.rb +++ /dev/null @@ -1,140 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::prefork', :type => :class do - let :pre_condition do - 'class { "apache": mpm_module => false, }' - end - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('prefork') } - it { is_expected.to contain_file("/etc/apache2/mods-available/prefork.conf").with_ensure('file') } - it { is_expected.to contain_file("/etc/apache2/mods-enabled/prefork.conf").with_ensure('link') } - - context "with Apache version < 2.4" do - let :params do - { - :apache_version => '2.2', - } - end - - it { is_expected.not_to contain_file("/etc/apache2/mods-available/prefork.load") } - it { is_expected.not_to contain_file("/etc/apache2/mods-enabled/prefork.load") } - - it { is_expected.to contain_package("apache2-mpm-prefork") } - end - - context "with Apache version >= 2.4" do - let :params do - { - :apache_version => '2.4', - } - end - - it { is_expected.to contain_file("/etc/apache2/mods-available/prefork.load").with({ - 'ensure' => 'file', - 'content' => "LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so\n" - }) - } - it { is_expected.to contain_file("/etc/apache2/mods-enabled/prefork.load").with_ensure('link') } - end - end - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('prefork') } - it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.conf").with_ensure('file') } - - context "with Apache version < 2.4" do - let :params do - { - :apache_version => '2.2', - } - end - - it { is_expected.to contain_file_line("/etc/sysconfig/httpd prefork enable").with({ - 'require' => 'Package[httpd]', - }) - } - it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.conf").without({ 'content' => /MaxRequestWorkers/ }) } - it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.conf").without({ 'content' => /MaxConnectionsPerChild/ }) } - end - - context "with Apache version >= 2.4" do - let :params do - { - :apache_version => '2.4', - :maxrequestworkers => '512', - :maxconnectionsperchild => '4000' - } - end - - it { is_expected.not_to contain_apache__mod('event') } - - it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.load").with({ - 'ensure' => 'file', - 'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n", - }) - } - it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.conf").without({ 'content' => /MaxClients/ }) } - it { is_expected.to contain_file("/etc/httpd/conf.d/prefork.conf").without({ 'content' => /MaxRequestsPerChild/ }) } - end - end - context "on a FreeBSD OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('prefork') } - it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/prefork.conf").with_ensure('file') } - end - context "on a Gentoo OS" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('prefork') } - it { is_expected.to contain_file("/etc/apache2/modules.d/prefork.conf").with_ensure('file') } - end -end diff --git a/modules/apache/spec/classes/mod/proxy_balancer_spec.rb b/modules/apache/spec/classes/mod/proxy_balancer_spec.rb deleted file mode 100644 index d646ba7..0000000 --- a/modules/apache/spec/classes/mod/proxy_balancer_spec.rb +++ /dev/null @@ -1,95 +0,0 @@ -require 'spec_helper' - -# Helper function for testing the contents of `proxy_balancer.conf` -def balancer_manager_conf_spec(allow_from, manager_path) - it do - is_expected.to contain_file("proxy_balancer.conf").with_content( - "\n"\ - " SetHandler balancer-manager\n"\ - " Require ip #{Array(allow_from).join(' ')}\n"\ - "\n" - ) - end -end - -describe 'apache::mod::proxy_balancer', :type => :class do - let :pre_condition do - [ - 'include apache::mod::proxy', - ] - end - it_behaves_like "a mod class, without including apache" - - context "default configuration with default parameters" do - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '8', - :concat_basedir => '/dne', - :lsbdistcodename => 'jessie', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - it { is_expected.to contain_apache__mod("proxy_balancer") } - - it { is_expected.to_not contain_file("proxy_balancer.conf") } - it { is_expected.to_not contain_file("proxy_balancer.conf symlink") } - - end - - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - it { is_expected.to contain_apache__mod("proxy_balancer") } - - it { is_expected.to_not contain_file("proxy_balancer.conf") } - it { is_expected.to_not contain_file("proxy_balancer.conf symlink") } - - end - end - - context "default configuration with custom parameters $manager => true, $allow_from => ['10.10.10.10','11.11.11.11'], $status_path => '/custom-manager'" do - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '8', - :concat_basedir => '/dne', - :lsbdistcodename => 'jessie', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :params do - { - :manager => true, - :allow_from => ['10.10.10.10','11.11.11.11'], - :manager_path => '/custom-manager', - } - end - - balancer_manager_conf_spec(["10.10.10.10", "11.11.11.11"], "/custom-manager") - - end - end -end diff --git a/modules/apache/spec/classes/mod/proxy_connect_spec.rb b/modules/apache/spec/classes/mod/proxy_connect_spec.rb deleted file mode 100644 index 33059c0..0000000 --- a/modules/apache/spec/classes/mod/proxy_connect_spec.rb +++ /dev/null @@ -1,65 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::proxy_connect', :type => :class do - let :pre_condition do - [ - 'include apache::mod::proxy', - ] - end - it_behaves_like "a mod class, without including apache" - context 'on a Debian OS' do - let :facts do - { - :osfamily => 'Debian', - :concat_basedir => '/dne', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context 'with Apache version < 2.2' do - let :facts do - super().merge({ - :operatingsystemrelease => '7.0', - :lsbdistcodename => 'wheezy', - }) - end - let :params do - { - :apache_version => '2.1', - } - end - it { is_expected.not_to contain_apache__mod('proxy_connect') } - end - context 'with Apache version = 2.2' do - let :facts do - super().merge({ - :operatingsystemrelease => '7.0', - :lsbdistcodename => 'wheezy', - }) - end - let :params do - { - :apache_version => '2.2', - } - end - it { is_expected.to contain_apache__mod('proxy_connect') } - end - context 'with Apache version >= 2.4' do - let :facts do - super().merge({ - :operatingsystemrelease => '8.0', - :lsbdistcodename => 'jessie', - }) - end - let :params do - { - :apache_version => '2.4', - } - end - it { is_expected.to contain_apache__mod('proxy_connect') } - end - end -end diff --git a/modules/apache/spec/classes/mod/proxy_html_spec.rb b/modules/apache/spec/classes/mod/proxy_html_spec.rb deleted file mode 100644 index 0d70276..0000000 --- a/modules/apache/spec/classes/mod/proxy_html_spec.rb +++ /dev/null @@ -1,128 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::proxy_html', :type => :class do - let :pre_condition do - [ - 'include apache::mod::proxy', - 'include apache::mod::proxy_http', - ] - end - it_behaves_like "a mod class, without including apache" - context "on a Debian OS" do - shared_examples "debian" do |loadfiles| - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => loadfiles) } - it { is_expected.to contain_package("libapache2-mod-proxy-html") } - end - let :facts do - { - :osfamily => 'Debian', - :concat_basedir => '/dne', - :architecture => 'i386', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :hardwaremodel => 'i386', - :is_pe => false, - } - end - - context "on squeeze" do - let(:facts) { super().merge({ :operatingsystemrelease => '6' }) } - it_behaves_like "debian", ['/usr/lib/libxml2.so.2'] - it { is_expected.to_not contain_apache__mod('xml2enc') } - end - context "on wheezy" do - let(:facts) { super().merge({ :operatingsystemrelease => '7' }) } - it { is_expected.to_not contain_apache__mod('xml2enc') } - context "i386" do - let(:facts) { super().merge({ - :hardwaremodel => 'i686', - :architecture => 'i386' - })} - it_behaves_like "debian", ["/usr/lib/i386-linux-gnu/libxml2.so.2"] - end - context "x64" do - let(:facts) { super().merge({ - :hardwaremodel => 'x86_64', - :architecture => 'amd64' - })} - it_behaves_like "debian", ["/usr/lib/x86_64-linux-gnu/libxml2.so.2"] - end - end - context "on jessie" do - let(:facts) { super().merge({ :operatingsystemrelease => '8' }) } - it { is_expected.to contain_apache__mod('xml2enc').with(:loadfiles => nil) } - context "i386" do - let(:facts) { super().merge({ - :hardwaremodel => 'i686', - :architecture => 'i386' - })} - it_behaves_like "debian", ["/usr/lib/i386-linux-gnu/libxml2.so.2"] - end - context "x64" do - let(:facts) { super().merge({ - :hardwaremodel => 'x86_64', - :architecture => 'amd64' - })} - it_behaves_like "debian", ["/usr/lib/x86_64-linux-gnu/libxml2.so.2"] - end - end - end - context "on a RedHat OS", :compile do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => nil) } - it { is_expected.to contain_package("mod_proxy_html") } - it { is_expected.to contain_apache__mod('xml2enc').with(:loadfiles => nil) } - end - context "on a FreeBSD OS", :compile do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => nil) } - it { is_expected.to contain_apache__mod('xml2enc').with(:loadfiles => nil) } - it { is_expected.to contain_package("www/mod_proxy_html") } - end - context "on a Gentoo OS", :compile do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('proxy_html').with(:loadfiles => nil) } - it { is_expected.to contain_apache__mod('xml2enc').with(:loadfiles => nil) } - it { is_expected.to contain_package("www-apache/mod_proxy_html") } - end -end diff --git a/modules/apache/spec/classes/mod/proxy_wstunnel.rb b/modules/apache/spec/classes/mod/proxy_wstunnel.rb deleted file mode 100644 index 5af217a..0000000 --- a/modules/apache/spec/classes/mod/proxy_wstunnel.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::proxy_wstunnel', :type => :class do - it_behaves_like "a mod class, without including apache" -end diff --git a/modules/apache/spec/classes/mod/python_spec.rb b/modules/apache/spec/classes/mod/python_spec.rb deleted file mode 100644 index 1393293..0000000 --- a/modules/apache/spec/classes/mod/python_spec.rb +++ /dev/null @@ -1,75 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::python', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod("python") } - it { is_expected.to contain_package("libapache2-mod-python") } - end - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod("python") } - it { is_expected.to contain_package("mod_python") } - end - context "on a FreeBSD OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod("python") } - it { is_expected.to contain_package("www/mod_python3") } - end - context "on a Gentoo OS" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod("python") } - it { is_expected.to contain_package("www-apache/mod_python") } - end -end diff --git a/modules/apache/spec/classes/mod/remoteip_spec.rb b/modules/apache/spec/classes/mod/remoteip_spec.rb deleted file mode 100644 index d75ea56..0000000 --- a/modules/apache/spec/classes/mod/remoteip_spec.rb +++ /dev/null @@ -1,48 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::remoteip', :type => :class do - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '8', - :concat_basedir => '/dne', - :lsbdistcodename => 'jessie', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - } - end - let :params do - { :apache_version => '2.4' } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('remoteip') } - it { is_expected.to contain_file('remoteip.conf').with({ - 'path' => '/etc/apache2/mods-available/remoteip.conf', - }) } - - describe "with header X-Forwarded-For" do - let :params do - { :header => 'X-Forwarded-For' } - end - it { is_expected.to contain_file('remoteip.conf').with_content(/^RemoteIPHeader X-Forwarded-For$/) } - end - describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do - let :params do - { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] } - end - it { is_expected.to contain_file('remoteip.conf').with_content(/^RemoteIPInternalProxy 10.42.17.8$/) } - it { is_expected.to contain_file('remoteip.conf').with_content(/^RemoteIPInternalProxy 10.42.18.99$/) } - end - describe "with Apache version < 2.4" do - let :params do - { :apache_version => '2.2' } - end - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /mod_remoteip is only available in Apache 2.4/) - end - end - end -end diff --git a/modules/apache/spec/classes/mod/reqtimeout_spec.rb b/modules/apache/spec/classes/mod/reqtimeout_spec.rb deleted file mode 100644 index c3a0977..0000000 --- a/modules/apache/spec/classes/mod/reqtimeout_spec.rb +++ /dev/null @@ -1,146 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::reqtimeout', :type => :class do - it_behaves_like "a mod class, without including apache" - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :lsbdistcodename => 'squeeze', - :is_pe => false, - } - end - context "passing no parameters" do - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('reqtimeout') } - it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-40,minrate=500\nRequestReadTimeout body=10,minrate=500$/) } - end - context "passing timeouts => ['header=20-60,minrate=600', 'body=60,minrate=600']" do - let :params do - {:timeouts => ['header=20-60,minrate=600', 'body=60,minrate=600']} - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('reqtimeout') } - it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-60,minrate=600\nRequestReadTimeout body=60,minrate=600$/) } - end - context "passing timeouts => 'header=20-60,minrate=600'" do - let :params do - {:timeouts => 'header=20-60,minrate=600'} - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('reqtimeout') } - it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-60,minrate=600$/) } - end - end - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'Redhat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context "passing no parameters" do - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('reqtimeout') } - it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-40,minrate=500\nRequestReadTimeout body=10,minrate=500$/) } - end - context "passing timeouts => ['header=20-60,minrate=600', 'body=60,minrate=600']" do - let :params do - {:timeouts => ['header=20-60,minrate=600', 'body=60,minrate=600']} - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('reqtimeout') } - it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-60,minrate=600\nRequestReadTimeout body=60,minrate=600$/) } - end - context "passing timeouts => 'header=20-60,minrate=600'" do - let :params do - {:timeouts => 'header=20-60,minrate=600'} - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('reqtimeout') } - it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-60,minrate=600$/) } - end - end - context "on a FreeBSD OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context "passing no parameters" do - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('reqtimeout') } - it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-40,minrate=500\nRequestReadTimeout body=10,minrate=500$/) } - end - context "passing timeouts => ['header=20-60,minrate=600', 'body=60,minrate=600']" do - let :params do - {:timeouts => ['header=20-60,minrate=600', 'body=60,minrate=600']} - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('reqtimeout') } - it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-60,minrate=600\nRequestReadTimeout body=60,minrate=600$/) } - end - context "passing timeouts => 'header=20-60,minrate=600'" do - let :params do - {:timeouts => 'header=20-60,minrate=600'} - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('reqtimeout') } - it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-60,minrate=600$/) } - end - end - context "on a Gentoo OS" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - context "passing no parameters" do - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('reqtimeout') } - it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-40,minrate=500\nRequestReadTimeout body=10,minrate=500$/) } - end - context "passing timeouts => ['header=20-60,minrate=600', 'body=60,minrate=600']" do - let :params do - {:timeouts => ['header=20-60,minrate=600', 'body=60,minrate=600']} - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('reqtimeout') } - it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-60,minrate=600\nRequestReadTimeout body=60,minrate=600$/) } - end - context "passing timeouts => 'header=20-60,minrate=600'" do - let :params do - {:timeouts => 'header=20-60,minrate=600'} - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('reqtimeout') } - it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-60,minrate=600$/) } - end - end -end diff --git a/modules/apache/spec/classes/mod/rpaf_spec.rb b/modules/apache/spec/classes/mod/rpaf_spec.rb deleted file mode 100644 index 13f0e6c..0000000 --- a/modules/apache/spec/classes/mod/rpaf_spec.rb +++ /dev/null @@ -1,126 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::rpaf', :type => :class do - it_behaves_like "a mod class, without including apache" - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('rpaf') } - it { is_expected.to contain_package("libapache2-mod-rpaf") } - it { is_expected.to contain_file('rpaf.conf').with({ - 'path' => '/etc/apache2/mods-available/rpaf.conf', - }) } - it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) } - - describe "with sethostname => true" do - let :params do - { :sethostname => 'true' } - end - it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) } - end - describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do - let :params do - { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] } - end - it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) } - end - describe "with header => X-Real-IP" do - let :params do - { :header => 'X-Real-IP' } - end - it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) } - end - end - context "on a FreeBSD OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('rpaf') } - it { is_expected.to contain_package("www/mod_rpaf2") } - it { is_expected.to contain_file('rpaf.conf').with({ - 'path' => '/usr/local/etc/apache24/Modules/rpaf.conf', - }) } - it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) } - - describe "with sethostname => true" do - let :params do - { :sethostname => 'true' } - end - it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) } - end - describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do - let :params do - { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] } - end - it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) } - end - describe "with header => X-Real-IP" do - let :params do - { :header => 'X-Real-IP' } - end - it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) } - end - end - context "on a Gentoo OS" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__mod('rpaf') } - it { is_expected.to contain_package("www-apache/mod_rpaf") } - it { is_expected.to contain_file('rpaf.conf').with({ - 'path' => '/etc/apache2/modules.d/rpaf.conf', - }) } - it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFenable On$/) } - - describe "with sethostname => true" do - let :params do - { :sethostname => 'true' } - end - it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) } - end - describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do - let :params do - { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] } - end - it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) } - end - describe "with header => X-Real-IP" do - let :params do - { :header => 'X-Real-IP' } - end - it { is_expected.to contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) } - end - end -end diff --git a/modules/apache/spec/classes/mod/security_spec.rb b/modules/apache/spec/classes/mod/security_spec.rb deleted file mode 100644 index e30f721..0000000 --- a/modules/apache/spec/classes/mod/security_spec.rb +++ /dev/null @@ -1,162 +0,0 @@ - -require 'spec_helper' - -describe 'apache::mod::security', :type => :class do - it_behaves_like "a mod class, without including apache" - context "on RedHat based systems" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystem => 'CentOS', - :operatingsystemrelease => '7', - :kernel => 'Linux', - :id => 'root', - :concat_basedir => '/', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { should contain_apache__mod('security').with( - :id => 'security2_module', - :lib => 'mod_security2.so' - ) } - it { should contain_apache__mod('unique_id_module').with( - :id => 'unique_id_module', - :lib => 'mod_unique_id.so' - ) } - it { should contain_package('mod_security_crs') } - it { should contain_file('security.conf').with( - :path => '/etc/httpd/conf.modules.d/security.conf' - ) } - it { should contain_file('security.conf') - .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$}) - .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$}) - .with_content(%r{^\s+SecDebugLog /var/log/httpd/modsec_debug.log$}) - .with_content(%r{^\s+SecAuditLog /var/log/httpd/modsec_audit.log$}) - } - it { should contain_file('/etc/httpd/modsecurity.d').with( - :ensure => 'directory', - :path => '/etc/httpd/modsecurity.d', - :owner => 'root', - :group => 'root', - :mode => '0755', - ) } - it { should contain_file('/etc/httpd/modsecurity.d/activated_rules').with( - :ensure => 'directory', - :path => '/etc/httpd/modsecurity.d/activated_rules', - :owner => 'apache', - :group => 'apache' - ) } - it { should contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with( - :path => '/etc/httpd/modsecurity.d/security_crs.conf' - ) } - it { should contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') } - it { should contain_file('modsecurity_35_bad_robots.data').with( - :path => '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data', - :target => '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data', - ) } - - describe 'with parameters' do - let :params do - { - :activated_rules => [ - '/tmp/foo/bar.conf', - ], - :audit_log_relevant_status => "^(?:5|4(?!01|04))", - :audit_log_parts => "ABCDZ", - :secdefaultaction => "deny,status:406,nolog,auditlog", - } - end - it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} } - it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} } - it { should contain_file('/etc/httpd/modsecurity.d/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} } - it { should contain_file('bar.conf').with( - :path => '/etc/httpd/modsecurity.d/activated_rules/bar.conf', - :target => '/tmp/foo/bar.conf', - ) } - end - describe 'with other modsec parameters' do - let :params do - { - :manage_security_crs => false - } - end - it { should_not contain_file('/etc/httpd/modsecurity.d/security_crs.conf') } - end - end - context "on Debian based systems" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/', - :lsbdistcodename => 'squeeze', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :kernel => 'Linux', - :is_pe => false, - } - end - it { should contain_apache__mod('security').with( - :id => 'security2_module', - :lib => 'mod_security2.so' - ) } - it { should contain_apache__mod('unique_id_module').with( - :id => 'unique_id_module', - :lib => 'mod_unique_id.so' - ) } - it { should contain_package('modsecurity-crs') } - it { should contain_file('security.conf').with( - :path => '/etc/apache2/mods-available/security.conf' - ) } - it { should contain_file('security.conf') - .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$}) - .with_content(%r{^\s+SecAuditLogParts ABIJDEFHZ$}) - .with_content(%r{^\s+SecDebugLog /var/log/apache2/modsec_debug.log$}) - .with_content(%r{^\s+SecAuditLog /var/log/apache2/modsec_audit.log$}) - } - it { should contain_file('/etc/modsecurity').with( - :ensure => 'directory', - :path => '/etc/modsecurity', - :owner => 'root', - :group => 'root', - :mode => '0755', - ) } - it { should contain_file('/etc/modsecurity/activated_rules').with( - :ensure => 'directory', - :path => '/etc/modsecurity/activated_rules', - :owner => 'www-data', - :group => 'www-data' - ) } - it { should contain_file('/etc/modsecurity/security_crs.conf').with( - :path => '/etc/modsecurity/security_crs.conf' - ) } - it { should contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') } - it { should contain_file('modsecurity_35_bad_robots.data').with( - :path => '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data', - :target => '/usr/share/modsecurity-crs/base_rules/modsecurity_35_bad_robots.data', - ) } - - describe 'with parameters' do - let :params do - { - :activated_rules => [ - '/tmp/foo/bar.conf', - ], - :audit_log_relevant_status => "^(?:5|4(?!01|04))", - :audit_log_parts => "ABCDZ", - :secdefaultaction => "deny,status:406,nolog,auditlog", - } - end - it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} } - it { should contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} } - it { should contain_file('/etc/modsecurity/security_crs.conf').with_content %r{^\s*SecDefaultAction "phase:2,deny,status:406,nolog,auditlog"$} } - it { should contain_file('bar.conf').with( - :path => '/etc/modsecurity/activated_rules/bar.conf', - :target => '/tmp/foo/bar.conf', - ) } - end - end - -end diff --git a/modules/apache/spec/classes/mod/shib_spec.rb b/modules/apache/spec/classes/mod/shib_spec.rb deleted file mode 100644 index a651c28..0000000 --- a/modules/apache/spec/classes/mod/shib_spec.rb +++ /dev/null @@ -1,42 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::shib', :type => :class do - it_behaves_like "a mod class, without including apache" - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :fqdn => 'test.example.com', - :is_pe => false, - } - end - describe 'with no parameters' do - it { should contain_apache__mod('shib2').with_id('mod_shib') } - end - end - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :fqdn => 'test.example.com', - :is_pe => false, - } - end - describe 'with no parameters' do - it { should contain_apache__mod('shib2').with_id('mod_shib') } - end - end -end diff --git a/modules/apache/spec/classes/mod/speling_spec.rb b/modules/apache/spec/classes/mod/speling_spec.rb deleted file mode 100644 index b4844ec..0000000 --- a/modules/apache/spec/classes/mod/speling_spec.rb +++ /dev/null @@ -1,37 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::speling', :type => :class do - it_behaves_like "a mod class, without including apache" - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_apache__mod('speling') } - end - - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_apache__mod('speling') } - end -end diff --git a/modules/apache/spec/classes/mod/ssl_spec.rb b/modules/apache/spec/classes/mod/ssl_spec.rb deleted file mode 100644 index 18816bb..0000000 --- a/modules/apache/spec/classes/mod/ssl_spec.rb +++ /dev/null @@ -1,293 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::ssl', :type => :class do - it_behaves_like "a mod class, without including apache" - context 'on an unsupported OS' do - let :facts do - { - :osfamily => 'Magic', - :operatingsystemrelease => '0', - :concat_basedir => '/dne', - :operatingsystem => 'Magic', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { expect { catalogue }.to raise_error(Puppet::Error, /Unsupported osfamily:/) } - end - - context 'on a RedHat' do - context '6 OS' do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class('apache::params') } - it { is_expected.to contain_apache__mod('ssl') } - it { is_expected.to contain_package('mod_ssl') } - it { is_expected.to contain_file('ssl.conf').with_path('/etc/httpd/conf.d/ssl.conf') } - context 'with a custom package_name parameter' do - let :params do - { :package_name => 'httpd24-mod_ssl' } - end - it { is_expected.to contain_class('apache::params') } - it { is_expected.to contain_apache__mod('ssl') } - it { is_expected.to contain_package('httpd24-mod_ssl') } - it { is_expected.not_to contain_package('mod_ssl') } - it { is_expected.to contain_file('ssl.conf').with_content(%r{^ SSLSessionCache "shmcb:/var/cache/mod_ssl/scache\(512000\)"$})} - end - end - context '7 OS with custom directories for PR#1635' do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '7', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :pre_condition do - "class { 'apache': - confd_dir => '/etc/httpd/conf.puppet.d', - default_mods => false, - default_vhost => false, - mod_dir => '/etc/httpd/conf.modules.puppet.d', - vhost_dir => '/etc/httpd/conf.puppet.d', - }" - end - it { is_expected.to contain_package('mod_ssl') } - it { is_expected.to contain_file('ssl.conf').with_path('/etc/httpd/conf.puppet.d/ssl.conf') } - end - end - - context 'on a Debian OS' do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class('apache::params') } - it { is_expected.to contain_apache__mod('ssl') } - it { is_expected.not_to contain_package('libapache2-mod-ssl') } - end - - context 'on a FreeBSD OS' do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class('apache::params') } - it { is_expected.to contain_apache__mod('ssl') } - end - - context 'on a Gentoo OS' do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class('apache::params') } - it { is_expected.to contain_apache__mod('ssl') } - it { is_expected.to contain_file('ssl.conf').with_content(%r{^ SSLSessionCache "shmcb:/var/run/ssl_scache\(512000\)"$})} - end - - context 'on a Suse OS' do - let :facts do - { - :osfamily => 'Suse', - :operatingsystem => 'SLES', - :operatingsystemrelease => '12', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class('apache::params') } - it { is_expected.to contain_apache__mod('ssl') } - it { is_expected.to contain_file('ssl.conf').with_content(%r{^ SSLSessionCache "shmcb:/var/lib/apache2/ssl_scache\(512000\)"$})} - end - # Template config doesn't vary by distro - context "on all distros" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystem => 'CentOS', - :operatingsystemrelease => '6', - :kernel => 'Linux', - :id => 'root', - :concat_basedir => '/dne', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - context 'not setting ssl_pass_phrase_dialog' do - it { is_expected.to contain_file('ssl.conf').with_content(/^ SSLPassPhraseDialog builtin$/)} - end - - context 'setting ssl_ca to a path' do - let :params do - { - :ssl_ca => '/etc/pki/some/path/ca.crt', - } - end - it { is_expected.to contain_file('ssl.conf').with_content(/^ SSLCACertificateFile/)} - end - context "with Apache version < 2.4" do - let :params do - { - :apache_version => '2.2', - } - end - context 'ssl_compression with default value' do - it { is_expected.not_to contain_file('ssl.conf').with_content(/^ SSLCompression Off$/)} - end - - context 'setting ssl_compression to true' do - let :params do - { - :ssl_compression => true, - } - end - it { is_expected.not_to contain_file('ssl.conf').with_content(/^ SSLCompression On$/)} - end - context 'setting ssl_stapling to true' do - let :params do - { - :ssl_stapling => true, - } - end - it { is_expected.not_to contain_file('ssl.conf').with_content(/^ SSLUseStapling/)} - end - end - context "with Apache version >= 2.4" do - let :params do - { - :apache_version => '2.4', - } - end - context 'ssl_compression with default value' do - it { is_expected.not_to contain_file('ssl.conf').with_content(/^ SSLCompression Off$/)} - end - - context 'setting ssl_compression to true' do - let :params do - { - :apache_version => '2.4', - :ssl_compression => true, - } - end - it { is_expected.to contain_file('ssl.conf').with_content(/^ SSLCompression On$/)} - end - context 'setting ssl_stapling to true' do - let :params do - { - :apache_version => '2.4', - :ssl_stapling => true, - } - end - it { is_expected.to contain_file('ssl.conf').with_content(/^ SSLUseStapling On$/)} - end - context 'setting ssl_stapling_return_errors to true' do - let :params do - { - :apache_version => '2.4', - :ssl_stapling_return_errors => true, - } - end - it { is_expected.to contain_file('ssl.conf').with_content(/^ SSLStaplingReturnResponderErrors On$/)} - end - end - - context 'setting ssl_pass_phrase_dialog' do - let :params do - { - :ssl_pass_phrase_dialog => 'exec:/path/to/program', - } - end - it { is_expected.to contain_file('ssl.conf').with_content(/^ SSLPassPhraseDialog exec:\/path\/to\/program$/)} - end - - context 'setting ssl_random_seed_bytes' do - let :params do - { - :ssl_random_seed_bytes => '1024', - } - end - it { is_expected.to contain_file('ssl.conf').with_content(%r{^ SSLRandomSeed startup file:/dev/urandom 1024$})} - end - - context 'setting ssl_openssl_conf_cmd' do - let :params do - { - :ssl_openssl_conf_cmd => 'DHParameters "foo.pem"', - } - end - it { is_expected.to contain_file('ssl.conf').with_content(/^\s+SSLOpenSSLConfCmd DHParameters "foo.pem"$/)} - end - - context 'setting ssl_mutex' do - let :params do - { - :ssl_mutex => 'posixsem', - } - end - it { is_expected.to contain_file('ssl.conf').with_content(%r{^ SSLMutex posixsem$})} - end - context 'setting ssl_sessioncache' do - let :params do - { - :ssl_sessioncache => '/tmp/customsessioncache(51200)', - } - end - it { is_expected.to contain_file('ssl.conf').with_content(%r{^ SSLSessionCache "shmcb:/tmp/customsessioncache\(51200\)"$})} - end - context 'setting ssl_proxy_protocol' do - let :params do - { - :ssl_proxy_protocol => [ '-ALL', '+TLSv1'], - } - end - it { is_expected.to contain_file('ssl.conf').with_content(%r{^ SSLProxyProtocol -ALL \+TLSv1$})} - end - end -end diff --git a/modules/apache/spec/classes/mod/status_spec.rb b/modules/apache/spec/classes/mod/status_spec.rb deleted file mode 100644 index 7bc7831..0000000 --- a/modules/apache/spec/classes/mod/status_spec.rb +++ /dev/null @@ -1,205 +0,0 @@ -require 'spec_helper' - -# Helper function for testing the contents of `status.conf` -def status_conf_spec(allow_from, extended_status, status_path) - it do - is_expected.to contain_file("status.conf").with_content( - "\n"\ - " SetHandler server-status\n"\ - " Order deny,allow\n"\ - " Deny from all\n"\ - " Allow from #{Array(allow_from).join(' ')}\n"\ - "\n"\ - "ExtendedStatus #{extended_status}\n"\ - "\n"\ - "\n"\ - " # Show Proxy LoadBalancer status in mod_status\n"\ - " ProxyStatus On\n"\ - "\n" - ) - end -end - -describe 'apache::mod::status', :type => :class do - it_behaves_like "a mod class, without including apache" - - context "default configuration with parameters" do - context "on a Debian OS with default params" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - it { is_expected.to contain_apache__mod("status") } - - status_conf_spec(["127.0.0.1", "::1"], "On", "/server-status") - - it { is_expected.to contain_file("status.conf").with({ - :ensure => 'file', - :path => '/etc/apache2/mods-available/status.conf', - } ) } - - it { is_expected.to contain_file("status.conf symlink").with({ - :ensure => 'link', - :path => '/etc/apache2/mods-enabled/status.conf', - } ) } - - end - - context "on a RedHat OS with default params" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - it { is_expected.to contain_apache__mod("status") } - - status_conf_spec(["127.0.0.1", "::1"], "On", "/server-status") - - it { is_expected.to contain_file("status.conf").with_path("/etc/httpd/conf.d/status.conf") } - - end - - context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off', $status_path => '/custom-status'" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :params do - { - :allow_from => ['10.10.10.10','11.11.11.11'], - :extended_status => 'Off', - :status_path => '/custom-status', - } - end - - status_conf_spec(["10.10.10.10", "11.11.11.11"], "Off", "/custom-status") - - end - - context "with valid parameter type $allow_from => ['10.10.10.10']" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :params do - { :allow_from => ['10.10.10.10'] } - end - it 'should expect to succeed array validation' do - expect { - is_expected.to contain_file("status.conf") - }.not_to raise_error() - end - end - - context "with invalid parameter type $allow_from => '10.10.10.10'" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :params do - { :allow_from => '10.10.10.10' } - end - it 'should expect to fail array validation' do - expect { - is_expected.to contain_file("status.conf") - }.to raise_error(Puppet::Error) - end - end - - # Only On or Off are valid options - ['On', 'Off'].each do |valid_param| - context "with valid value $extended_status => '#{valid_param}'" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :params do - { :extended_status => valid_param } - end - it 'should expect to succeed regular expression validation' do - expect { - is_expected.to contain_file("status.conf") - }.not_to raise_error() - end - end - end - - ['Yes', 'No'].each do |invalid_param| - context "with invalid value $extended_status => '#{invalid_param}'" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :params do - { :extended_status => invalid_param } - end - it 'should expect to fail regular expression validation' do - expect { - is_expected.to contain_file("status.conf") - }.to raise_error(Puppet::Error) - end - end - end - end -end diff --git a/modules/apache/spec/classes/mod/suphp_spec.rb b/modules/apache/spec/classes/mod/suphp_spec.rb deleted file mode 100644 index 71dbab3..0000000 --- a/modules/apache/spec/classes/mod/suphp_spec.rb +++ /dev/null @@ -1,38 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::suphp', :type => :class do - it_behaves_like "a mod class, without including apache" - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_package("libapache2-mod-suphp") } - end - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_package("mod_suphp") } - end -end diff --git a/modules/apache/spec/classes/mod/userdir_spec.rb b/modules/apache/spec/classes/mod/userdir_spec.rb deleted file mode 100644 index ae9863f..0000000 --- a/modules/apache/spec/classes/mod/userdir_spec.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::userdir', :type => :class do - context "on a Debian OS" do - let :pre_condition do - 'class { "apache": - default_mods => false, - mod_dir => "/tmp/junk", - }' - end - let :facts do - { - :lsbdistcodename => 'squeeze', - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :operatingsystemmajrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context "default parameters" do - it { should compile } - end - context "with dir set to something" do - let :params do - { - :dir => 'hi', - } - end - it { should contain_file("userdir.conf").with_content(%r{^\s*UserDir\s+/home/\*/hi$})} - it { should contain_file("userdir.conf").with_content(%r{^\s*\$})} - end - context "with home set to something" do - let :params do - { - :home => '/u', - } - end - it { should contain_file("userdir.conf").with_content(%r{^\s*UserDir\s+/u/\*/public_html$})} - it { should contain_file("userdir.conf").with_content(%r{^\s*\$})} - end - context "with path set to something" do - let :params do - { - :path => 'public_html /usr/web http://www.example.com/', - } - end - it { should contain_file("userdir.conf").with_content(%r{^\s*UserDir\s+public_html /usr/web http://www\.example\.com/$})} - it { should contain_file("userdir.conf").with_content(%r{^\s*\$})} - end - end -end diff --git a/modules/apache/spec/classes/mod/worker_spec.rb b/modules/apache/spec/classes/mod/worker_spec.rb deleted file mode 100644 index 9d0d8e5..0000000 --- a/modules/apache/spec/classes/mod/worker_spec.rb +++ /dev/null @@ -1,189 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::worker', :type => :class do - let :pre_condition do - 'class { "apache": mpm_module => false, }' - end - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('worker') } - it { is_expected.to contain_file("/etc/apache2/mods-available/worker.conf").with_ensure('file') } - it { is_expected.to contain_file("/etc/apache2/mods-enabled/worker.conf").with_ensure('link') } - - context "with Apache version < 2.4" do - let :params do - { - :apache_version => '2.2', - } - end - - it { is_expected.not_to contain_file("/etc/apache2/mods-available/worker.load") } - it { is_expected.not_to contain_file("/etc/apache2/mods-enabled/worker.load") } - - it { is_expected.to contain_package("apache2-mpm-worker") } - end - - context "with Apache version >= 2.4" do - let :params do - { - :apache_version => '2.4', - } - end - - it { is_expected.to contain_file("/etc/apache2/mods-available/worker.load").with({ - 'ensure' => 'file', - 'content' => "LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so\n" - }) - } - it { is_expected.to contain_file("/etc/apache2/mods-enabled/worker.load").with_ensure('link') } - end - end - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('worker') } - it { is_expected.to contain_file("/etc/httpd/conf.d/worker.conf").with_ensure('file') } - - context "with Apache version < 2.4" do - let :params do - { - :apache_version => '2.2', - } - end - - it { is_expected.to contain_file_line("/etc/sysconfig/httpd worker enable").with({ - 'require' => 'Package[httpd]', - }) - } - end - - context "with Apache version >= 2.4" do - let :params do - { - :apache_version => '2.4', - } - end - - it { is_expected.not_to contain_apache__mod('event') } - - it { is_expected.to contain_file("/etc/httpd/conf.d/worker.load").with({ - 'ensure' => 'file', - 'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n", - }) - } - end - end - context "on a FreeBSD OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('worker') } - it { is_expected.to contain_file("/usr/local/etc/apache24/Modules/worker.conf").with_ensure('file') } - end - context "on a Gentoo OS" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.not_to contain_apache__mod('worker') } - it { is_expected.to contain_file("/etc/apache2/modules.d/worker.conf").with_ensure('file') } - end - - # Template config doesn't vary by distro - context "on all distros" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystem => 'CentOS', - :operatingsystemrelease => '6', - :kernel => 'Linux', - :id => 'root', - :concat_basedir => '/dne', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - context 'defaults' do - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ServerLimit\s+25$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+StartServers\s+2$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxClients\s+150$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MinSpareThreads\s+25$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxSpareThreads\s+75$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadsPerChild\s+25$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxRequestsPerChild\s+0$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadLimit\s+64$/) } - it { should contain_file("/etc/httpd/conf.d/worker.conf").with(:content => /^\s*ListenBacklog\s*511/) } - end - - context 'setting params' do - let :params do - { - :serverlimit => 10, - :startservers => 11, - :maxclients => 12, - :minsparethreads => 13, - :maxsparethreads => 14, - :threadsperchild => 15, - :maxrequestsperchild => 16, - :threadlimit => 17, - :listenbacklog => 8, - } - end - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ServerLimit\s+10$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+StartServers\s+11$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxClients\s+12$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MinSpareThreads\s+13$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxSpareThreads\s+14$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadsPerChild\s+15$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxRequestsPerChild\s+16$/) } - it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadLimit\s+17$/) } - it { should contain_file("/etc/httpd/conf.d/worker.conf").with(:content => /^\s*ListenBacklog\s*8/) } - end - end -end diff --git a/modules/apache/spec/classes/mod/wsgi_spec.rb b/modules/apache/spec/classes/mod/wsgi_spec.rb deleted file mode 100644 index 6261a95..0000000 --- a/modules/apache/spec/classes/mod/wsgi_spec.rb +++ /dev/null @@ -1,151 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod::wsgi', :type => :class do - it_behaves_like "a mod class, without including apache" - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_class('apache::mod::wsgi').with( - 'wsgi_socket_prefix' => nil - ) - } - it { is_expected.to contain_package("libapache2-mod-wsgi") } - end - context "on a RedHat OS" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_class('apache::mod::wsgi').with( - 'wsgi_socket_prefix' => '/var/run/wsgi' - ) - } - it { is_expected.to contain_package("mod_wsgi") } - - describe "with WSGIRestrictEmbedded enabled" do - let :params do - { :wsgi_restrict_embedded => 'On' } - end - it {is_expected.to contain_file('wsgi.conf').with_content(/^ WSGIRestrictEmbedded On$/)} - end - describe "with custom WSGISocketPrefix" do - let :params do - { :wsgi_socket_prefix => 'run/wsgi' } - end - it {is_expected.to contain_file('wsgi.conf').with_content(/^ WSGISocketPrefix run\/wsgi$/)} - end - describe "with custom WSGIPythonHome" do - let :params do - { :wsgi_python_home => '/path/to/virtenv' } - end - it {is_expected.to contain_file('wsgi.conf').with_content(/^ WSGIPythonHome "\/path\/to\/virtenv"$/)} - end - describe "with custom package_name and mod_path" do - let :params do - { - :package_name => 'mod_wsgi_package', - :mod_path => '/foo/bar/baz', - } - end - it { is_expected.to contain_apache__mod('wsgi').with({ - 'package' => 'mod_wsgi_package', - 'path' => '/foo/bar/baz', - }) - } - it { is_expected.to contain_package("mod_wsgi_package") } - it { is_expected.to contain_file('wsgi.load').with_content(%r"LoadModule wsgi_module /foo/bar/baz") } - end - describe "with custom mod_path not containing /" do - let :params do - { - :package_name => 'mod_wsgi_package', - :mod_path => 'wsgi_mod_name.so', - } - end - it { is_expected.to contain_apache__mod('wsgi').with({ - 'path' => 'modules/wsgi_mod_name.so', - 'package' => 'mod_wsgi_package', - }) - } - it { is_expected.to contain_file('wsgi.load').with_content(%r"LoadModule wsgi_module modules/wsgi_mod_name.so") } - - end - describe "with package_name but no mod_path" do - let :params do - { - :mod_path => '/foo/bar/baz', - } - end - it { expect { catalogue }.to raise_error Puppet::Error, /apache::mod::wsgi - both package_name and mod_path must be specified!/ } - end - describe "with mod_path but no package_name" do - let :params do - { - :package_name => '/foo/bar/baz', - } - end - it { expect { catalogue }.to raise_error Puppet::Error, /apache::mod::wsgi - both package_name and mod_path must be specified!/ } - end - end - context "on a FreeBSD OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_class('apache::mod::wsgi').with( - 'wsgi_socket_prefix' => nil - ) - } - it { is_expected.to contain_package("www/mod_wsgi") } - end - context "on a Gentoo OS" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_class('apache::mod::wsgi').with( - 'wsgi_socket_prefix' => nil - ) - } - it { is_expected.to contain_package("www-apache/mod_wsgi") } - end -end diff --git a/modules/apache/spec/classes/params_spec.rb b/modules/apache/spec/classes/params_spec.rb deleted file mode 100644 index 32ccd31..0000000 --- a/modules/apache/spec/classes/params_spec.rb +++ /dev/null @@ -1,22 +0,0 @@ -require 'spec_helper' - -describe 'apache::params', :type => :class do - context "On a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - it { is_expected.to compile.with_all_deps } - it { is_expected.to have_resource_count(0) } - end -end diff --git a/modules/apache/spec/classes/service_spec.rb b/modules/apache/spec/classes/service_spec.rb deleted file mode 100644 index a065abc..0000000 --- a/modules/apache/spec/classes/service_spec.rb +++ /dev/null @@ -1,157 +0,0 @@ -require 'spec_helper' - -describe 'apache::service', :type => :class do - let :pre_condition do - 'include apache::params' - end - context "on a Debian OS" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_service("httpd").with( - 'name' => 'apache2', - 'ensure' => 'running', - 'enable' => 'true' - ) - } - - context "with $service_name => 'foo'" do - let (:params) {{ :service_name => 'foo' }} - it { is_expected.to contain_service("httpd").with( - 'name' => 'foo' - ) - } - end - - context "with $service_enable => true" do - let (:params) {{ :service_enable => true }} - it { is_expected.to contain_service("httpd").with( - 'name' => 'apache2', - 'ensure' => 'running', - 'enable' => 'true' - ) - } - end - - context "with $service_enable => false" do - let (:params) {{ :service_enable => false }} - it { is_expected.to contain_service("httpd").with( - 'name' => 'apache2', - 'ensure' => 'running', - 'enable' => 'false' - ) - } - end - - context "with $service_ensure => 'running'" do - let (:params) {{ :service_ensure => 'running', }} - it { is_expected.to contain_service("httpd").with( - 'ensure' => 'running', - 'enable' => 'true' - ) - } - end - - context "with $service_ensure => 'stopped'" do - let (:params) {{ :service_ensure => 'stopped', }} - it { is_expected.to contain_service("httpd").with( - 'ensure' => 'stopped', - 'enable' => 'true' - ) - } - end - - context "with $service_ensure => 'UNDEF'" do - let (:params) {{ :service_ensure => 'UNDEF' }} - it { is_expected.to contain_service("httpd").without_ensure } - end - - context "with $service_restart unset" do - it { is_expected.to contain_service("httpd").without_restart } - end - - context "with $service_restart => '/usr/sbin/apachectl graceful'" do - let (:params) {{ :service_restart => '/usr/sbin/apachectl graceful' }} - it { is_expected.to contain_service("httpd").with( - 'restart' => '/usr/sbin/apachectl graceful' - ) - } - end - end - - - context "on a RedHat 5 OS, do not manage service" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '5', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let(:params) do - { - 'service_ensure' => 'running', - 'service_name' => 'httpd', - 'service_manage' => false - } - end - it { is_expected.not_to contain_service('httpd') } - end - - context "on a FreeBSD 5 OS" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { is_expected.to contain_service("httpd").with( - 'name' => 'apache24', - 'ensure' => 'running', - 'enable' => 'true' - ) - } - end - - context "on a Gentoo OS" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - it { is_expected.to contain_service("httpd").with( - 'name' => 'apache2', - 'ensure' => 'running', - 'enable' => 'true' - ) - } - end -end diff --git a/modules/apache/spec/classes/vhosts_spec.rb b/modules/apache/spec/classes/vhosts_spec.rb deleted file mode 100644 index 3220079..0000000 --- a/modules/apache/spec/classes/vhosts_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require 'spec_helper' - -describe 'apache::vhosts', :type => :class do - context 'on all OSes' do - let :facts do - { - :id => 'root', - :kernel => 'Linux', - :osfamily => 'RedHat', - :operatingsystem => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context 'with custom vhosts parameter' do - let :params do { - :vhosts => { - 'custom_vhost_1' => { - 'docroot' => '/var/www/custom_vhost_1', - 'port' => '81', - }, - 'custom_vhost_2' => { - 'docroot' => '/var/www/custom_vhost_2', - 'port' => '82', - }, - }, - } - end - it { is_expected.to contain_apache__vhost('custom_vhost_1') } - it { is_expected.to contain_apache__vhost('custom_vhost_2') } - end - end -end diff --git a/modules/apache/spec/defines/balancer_spec.rb b/modules/apache/spec/defines/balancer_spec.rb deleted file mode 100644 index 3b43e3f..0000000 --- a/modules/apache/spec/defines/balancer_spec.rb +++ /dev/null @@ -1,72 +0,0 @@ -require 'spec_helper' - -describe 'apache::balancer', :type => :define do - let :title do - 'myapp' - end - let :facts do - { - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :lsbdistcodename => 'squeeze', - :id => 'root', - :concat_basedir => '/dne', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :kernel => 'Linux', - :is_pe => false, - } - end - describe 'apache pre_condition with defaults' do - let :pre_condition do - 'include apache' - end - describe "accept a target parameter and use it" do - let :params do - { - :target => '/tmp/myapp.conf' - } - end - it { should contain_concat('apache_balancer_myapp').with({ - :path => "/tmp/myapp.conf", - })} - it { should_not contain_apache__mod('slotmem_shm') } - it { should_not contain_apache__mod('lbmethod_byrequests') } - end - context "on jessie" do - let(:facts) { super().merge({ - :operatingsystemrelease => '8', - :lsbdistcodename => 'jessie', - }) } - it { should contain_apache__mod('slotmem_shm') } - it { should contain_apache__mod('lbmethod_byrequests') } - end - end - describe 'apache pre_condition with conf_dir set' do - let :pre_condition do - 'class{"apache": - confd_dir => "/junk/path" - }' - end - it { should contain_concat('apache_balancer_myapp').with({ - :path => "/junk/path/balancer_myapp.conf", - })} - end - - describe 'with lbmethod and with apache::mod::proxy_balancer::apache_version set' do - let :pre_condition do - 'class{"apache::mod::proxy_balancer": - apache_version => "2.4" - }' - end - let :params do - { - :proxy_set => { - 'lbmethod' => 'bytraffic', - }, - } - end - it { should contain_apache__mod('slotmem_shm') } - it { should contain_apache__mod('lbmethod_bytraffic') } - end -end diff --git a/modules/apache/spec/defines/balancermember_spec.rb b/modules/apache/spec/defines/balancermember_spec.rb deleted file mode 100644 index 6221290..0000000 --- a/modules/apache/spec/defines/balancermember_spec.rb +++ /dev/null @@ -1,61 +0,0 @@ -require 'spec_helper' - -describe 'apache::balancermember', :type => :define do - let :pre_condition do - 'include apache' - end - let :facts do - { - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :lsbdistcodename => 'squeeze', - :id => 'root', - :concat_basedir => '/dne', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :kernel => 'Linux', - :is_pe => false, - } - end - describe "allows multiple balancermembers with the same url" do - let :pre_condition do - 'include apache - apache::balancer {"balancer":} - apache::balancer {"balancer-external":} - apache::balancermember {"http://127.0.0.1:8080-external": url => "http://127.0.0.1:8080/", balancer_cluster => "balancer-external"} - ' - end - let :title do - 'http://127.0.0.1:8080/' - end - let :params do - { - :options => [], - :url => 'http://127.0.0.1:8080/', - :balancer_cluster => 'balancer-internal' - } - end - it { should contain_concat__fragment('BalancerMember http://127.0.0.1:8080/') } - end - describe "allows balancermember with a different target" do - let :pre_condition do - 'include apache - apache::balancer {"balancername": target => "/etc/apache/balancer.conf"} - apache::balancermember {"http://127.0.0.1:8080-external": url => "http://127.0.0.1:8080/", balancer_cluster => "balancername"} - ' - end - let :title do - 'http://127.0.0.1:8080/' - end - let :params do - { - :options => [], - :url => 'http://127.0.0.1:8080/', - :balancer_cluster => 'balancername' - } - end - it { should contain_concat__fragment('BalancerMember http://127.0.0.1:8080/').with({ - :target => "apache_balancer_balancername", - })} - end -end diff --git a/modules/apache/spec/defines/custom_config_spec.rb b/modules/apache/spec/defines/custom_config_spec.rb deleted file mode 100644 index 5f996fd..0000000 --- a/modules/apache/spec/defines/custom_config_spec.rb +++ /dev/null @@ -1,125 +0,0 @@ -require 'spec_helper' - -describe 'apache::custom_config', :type => :define do - let :pre_condition do - 'class { "apache": }' - end - let :title do - 'rspec' - end - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context 'defaults with content' do - let :params do - { - 'content' => '# Test', - } - end - it { is_expected.to contain_exec("syntax verification for rspec").with({ - 'refreshonly' => 'true', - 'subscribe' => 'File[apache_rspec]', - 'command' => '/usr/sbin/apachectl -t', - 'notify' => 'Class[Apache::Service]', - 'before' => 'Exec[remove rspec if invalid]', - }) - } - it { is_expected.to contain_exec("remove rspec if invalid").with({ - 'unless' => '/usr/sbin/apachectl -t', - 'subscribe' => 'File[apache_rspec]', - 'refreshonly' => 'true', - }) - } - it { is_expected.to contain_file("apache_rspec").with({ - 'ensure' => 'present', - 'content' => '# Test', - 'require' => 'Package[httpd]', - }) - } - end - context 'set everything with source' do - let :params do - { - 'confdir' => '/dne', - 'priority' => '30', - 'source' => 'puppet:///modules/apache/test', - 'verify_command' => '/bin/true', - } - end - it { is_expected.to contain_exec("syntax verification for rspec").with({ - 'command' => '/bin/true', - }) - } - it { is_expected.to contain_exec("remove rspec if invalid").with({ - 'command' => '/bin/rm /dne/30-rspec.conf', - 'unless' => '/bin/true', - }) - } - it { is_expected.to contain_file("apache_rspec").with({ - 'path' => '/dne/30-rspec.conf', - 'ensure' => 'present', - 'source' => 'puppet:///modules/apache/test', - 'require' => 'Package[httpd]', - }) - } - end - context 'verify_config => false' do - let :params do - { - 'content' => '# test', - 'verify_config' => false, - } - end - it { is_expected.to_not contain_exec('syntax verification for rspec') } - it { is_expected.to_not contain_exec('remove rspec if invalid') } - it { is_expected.to contain_file('apache_rspec').with({ - 'notify' => 'Class[Apache::Service]' - }) - } - end - context 'ensure => absent' do - let :params do - { - 'ensure' => 'absent' - } - end - it { is_expected.to_not contain_exec('syntax verification for rspec') } - it { is_expected.to_not contain_exec('remove rspec if invalid') } - it { is_expected.to contain_file('apache_rspec').with({ - 'ensure' => 'absent', - }) - } - end - describe 'validation' do - context 'both content and source' do - let :params do - { - 'content' => 'foo', - 'source' => 'bar', - } - end - it do - expect { - catalogue - }.to raise_error(Puppet::Error, /Only one of \$content and \$source can be specified\./) - end - end - context 'neither content nor source' do - it do - expect { - catalogue - }.to raise_error(Puppet::Error, /One of \$content and \$source must be specified\./) - end - end - end -end diff --git a/modules/apache/spec/defines/fastcgi_server_spec.rb b/modules/apache/spec/defines/fastcgi_server_spec.rb deleted file mode 100644 index b147349..0000000 --- a/modules/apache/spec/defines/fastcgi_server_spec.rb +++ /dev/null @@ -1,156 +0,0 @@ -require 'spec_helper' - -describe 'apache::fastcgi::server', :type => :define do - let :pre_condition do - 'include apache' - end - let :title do - 'www' - end - describe 'os-dependent items' do - context "on RedHat based systems" do - let :default_facts do - { - :osfamily => 'RedHat', - :operatingsystem => 'CentOS', - :operatingsystemrelease => '6', - :kernel => 'Linux', - :id => 'root', - :concat_basedir => '/dne', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :facts do default_facts end - it { should contain_class("apache") } - it { should contain_class("apache::mod::fastcgi") } - it { should contain_file("fastcgi-pool-#{title}.conf").with( - :ensure => 'file', - :path => "/etc/httpd/conf.d/fastcgi-pool-#{title}.conf" - ) } - end - context "on Debian based systems" do - let :default_facts do - { - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :lsbdistcodename => 'squeeze', - :kernel => 'Linux', - :id => 'root', - :concat_basedir => '/dne', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :facts do default_facts end - it { should contain_class("apache") } - it { should contain_class("apache::mod::fastcgi") } - it { should contain_file("fastcgi-pool-#{title}.conf").with( - :ensure => 'file', - :path => "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf" - ) } - end - context "on FreeBSD systems" do - let :default_facts do - { - :osfamily => 'FreeBSD', - :operatingsystem => 'FreeBSD', - :operatingsystemrelease => '9', - :kernel => 'FreeBSD', - :id => 'root', - :concat_basedir => '/dne', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :facts do default_facts end - it { should contain_class("apache") } - it { should contain_class("apache::mod::fastcgi") } - it { should contain_file("fastcgi-pool-#{title}.conf").with( - :ensure => 'file', - :path => "/usr/local/etc/apache24/Includes/fastcgi-pool-#{title}.conf" - ) } - end - context "on Gentoo systems" do - let :default_facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :kernel => 'Linux', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - let :facts do default_facts end - it { should contain_class("apache") } - it { should contain_class("apache::mod::fastcgi") } - it { should contain_file("fastcgi-pool-#{title}.conf").with( - :ensure => 'file', - :path => "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf" - ) } - end - end - describe 'os-independent items' do - let :facts do - { - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :lsbdistcodename => 'squeeze', - :kernel => 'Linux', - :id => 'root', - :concat_basedir => '/dne', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - describe ".conf content using TCP communication" do - let :params do - { - :host => '127.0.0.1:9001', - :timeout => 30, - :flush => true, - :faux_path => '/var/www/php-www.fcgi', - :fcgi_alias => '/php-www.fcgi', - :file_type => 'application/x-httpd-php', - :pass_header => 'Authorization' - } - end - let :expected do -'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -host 127.0.0.1:9001 -pass-header Authorization -Alias /php-www.fcgi /var/www/php-www.fcgi -Action application/x-httpd-php /php-www.fcgi -' - end - it do - should contain_file("fastcgi-pool-www.conf").with_content(expected) - end - end - describe ".conf content using socket communication" do - let :params do - { - :host => '/var/run/fcgi.sock', - :timeout => 30, - :flush => true, - :faux_path => '/var/www/php-www.fcgi', - :fcgi_alias => '/php-www.fcgi', - :file_type => 'application/x-httpd-php' - } - end - let :expected do -'FastCGIExternalServer /var/www/php-www.fcgi -idle-timeout 30 -flush -socket /var/run/fcgi.sock -Alias /php-www.fcgi /var/www/php-www.fcgi -Action application/x-httpd-php /php-www.fcgi -' - end - it do - should contain_file("fastcgi-pool-www.conf").with_content(expected) - end - end - - end -end diff --git a/modules/apache/spec/defines/mod_spec.rb b/modules/apache/spec/defines/mod_spec.rb deleted file mode 100644 index 1697190..0000000 --- a/modules/apache/spec/defines/mod_spec.rb +++ /dev/null @@ -1,166 +0,0 @@ -require 'spec_helper' - -describe 'apache::mod', :type => :define do - let :pre_condition do - 'include apache' - end - context "on a RedHat osfamily" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - describe "for non-special modules" do - let :title do - 'spec_m' - end - it { is_expected.to contain_class("apache::params") } - it "should manage the module load file" do - is_expected.to contain_file('spec_m.load').with({ - :path => '/etc/httpd/conf.d/spec_m.load', - :content => "LoadModule spec_m_module modules/mod_spec_m.so\n", - :owner => 'root', - :group => 'root', - :mode => '0644', - } ) - end - end - - describe "with file_mode set" do - let :pre_condition do - "class {'::apache': file_mode => '0640'}" - end - let :title do - 'spec_m' - end - it "should manage the module load file" do - is_expected.to contain_file('spec_m.load').with({ - :mode => '0640', - } ) - end - end - - describe "with shibboleth module and package param passed" do - # name/title for the apache::mod define - let :title do - 'xsendfile' - end - # parameters - let(:params) { {:package => 'mod_xsendfile'} } - - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_package('mod_xsendfile') } - end - end - - context "on a Debian osfamily" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - describe "for non-special modules" do - let :title do - 'spec_m' - end - it { is_expected.to contain_class("apache::params") } - it "should manage the module load file" do - is_expected.to contain_file('spec_m.load').with({ - :path => '/etc/apache2/mods-available/spec_m.load', - :content => "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n", - :owner => 'root', - :group => 'root', - :mode => '0644', - } ) - end - it "should link the module load file" do - is_expected.to contain_file('spec_m.load symlink').with({ - :path => '/etc/apache2/mods-enabled/spec_m.load', - :target => '/etc/apache2/mods-available/spec_m.load', - :owner => 'root', - :group => 'root', - :mode => '0644', - } ) - end - end - end - - context "on a FreeBSD osfamily" do - let :facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - - describe "for non-special modules" do - let :title do - 'spec_m' - end - it { is_expected.to contain_class("apache::params") } - it "should manage the module load file" do - is_expected.to contain_file('spec_m.load').with({ - :path => '/usr/local/etc/apache24/Modules/spec_m.load', - :content => "LoadModule spec_m_module /usr/local/libexec/apache24/mod_spec_m.so\n", - :owner => 'root', - :group => 'wheel', - :mode => '0644', - } ) - end - end - end - - context "on a Gentoo osfamily" do - let :facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - - describe "for non-special modules" do - let :title do - 'spec_m' - end - it { is_expected.to contain_class("apache::params") } - it "should manage the module load file" do - is_expected.to contain_file('spec_m.load').with({ - :path => '/etc/apache2/modules.d/spec_m.load', - :content => "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n", - :owner => 'root', - :group => 'wheel', - :mode => '0644', - } ) - end - end - end -end diff --git a/modules/apache/spec/defines/modsec_link_spec.rb b/modules/apache/spec/defines/modsec_link_spec.rb deleted file mode 100644 index a5b4c53..0000000 --- a/modules/apache/spec/defines/modsec_link_spec.rb +++ /dev/null @@ -1,53 +0,0 @@ -require 'spec_helper' - -describe 'apache::security::rule_link', :type => :define do - let :pre_condition do - 'class { "apache": } - class { "apache::mod::security": activated_rules => [] } - ' - end - - let :title do - 'base_rules/modsecurity_35_bad_robots.data' - end - - context "on RedHat based systems" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystem => 'CentOS', - :operatingsystemrelease => '7', - :kernel => 'Linux', - :id => 'root', - :concat_basedir => '/', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - it { should contain_file('modsecurity_35_bad_robots.data').with( - :path => '/etc/httpd/modsecurity.d/activated_rules/modsecurity_35_bad_robots.data', - :target => '/usr/lib/modsecurity.d/base_rules/modsecurity_35_bad_robots.data' - ) } - end - - context "on Debian based systems" do - let :facts do - { - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/', - :lsbdistcodename => 'squeeze', - :id => 'root', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :kernel => 'Linux', - :is_pe => false, - } - end - it { should contain_file('modsecurity_35_bad_robots.data').with( - :path => '/etc/modsecurity/activated_rules/modsecurity_35_bad_robots.data', - :target => '/usr/share/modsecurity-crs/base_rules/modsecurity_35_bad_robots.data' - ) } - end - -end diff --git a/modules/apache/spec/defines/vhost_custom_spec.rb b/modules/apache/spec/defines/vhost_custom_spec.rb deleted file mode 100644 index 804be86..0000000 --- a/modules/apache/spec/defines/vhost_custom_spec.rb +++ /dev/null @@ -1,99 +0,0 @@ -require 'spec_helper' - -describe 'apache::vhost::custom', :type => :define do - let :title do - 'rspec.example.com' - end - let :default_params do - { - :content => 'foobar' - } - end - describe 'os-dependent items' do - context "on RedHat based systems" do - let :default_facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :operatingsystem => 'RedHat', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :params do default_params end - let :facts do default_facts end - end - context "on Debian based systems" do - let :default_facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :params do default_params end - let :facts do default_facts end - it { is_expected.to contain_file("apache_rspec.example.com").with( - :ensure => 'present', - :content => 'foobar', - :path => '/etc/apache2/sites-available/25-rspec.example.com.conf', - ) } - it { is_expected.to contain_file("25-rspec.example.com.conf symlink").with( - :ensure => 'link', - :path => '/etc/apache2/sites-enabled/25-rspec.example.com.conf', - :target => '/etc/apache2/sites-available/25-rspec.example.com.conf' - ) } - end - context "on FreeBSD systems" do - let :default_facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :operatingsystem => 'FreeBSD', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :params do default_params end - let :facts do default_facts end - it { is_expected.to contain_file("apache_rspec.example.com").with( - :ensure => 'present', - :content => 'foobar', - :path => '/usr/local/etc/apache24/Vhosts/25-rspec.example.com.conf', - ) } - end - context "on Gentoo systems" do - let :default_facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - let :params do default_params end - let :facts do default_facts end - it { is_expected.to contain_file("apache_rspec.example.com").with( - :ensure => 'present', - :content => 'foobar', - :path => '/etc/apache2/vhosts.d/25-rspec.example.com.conf', - ) } - end - end -end diff --git a/modules/apache/spec/defines/vhost_spec.rb b/modules/apache/spec/defines/vhost_spec.rb deleted file mode 100644 index c1d1417..0000000 --- a/modules/apache/spec/defines/vhost_spec.rb +++ /dev/null @@ -1,1528 +0,0 @@ -require 'spec_helper' - -describe 'apache::vhost', :type => :define do - let :pre_condition do - 'class { "apache": default_vhost => false, default_mods => false, vhost_enable_dir => "/etc/apache2/sites-enabled"}' - end - let :title do - 'rspec.example.com' - end - let :default_params do - { - :docroot => '/rspec/docroot', - :port => '84', - } - end - describe 'os-dependent items' do - context "on RedHat based systems" do - let :default_facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :params do default_params end - let :facts do default_facts end - it { is_expected.to contain_class("apache") } - it { is_expected.to contain_class("apache::params") } - end - context "on Debian based systems" do - let :default_facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :params do default_params end - let :facts do default_facts end - it { is_expected.to contain_class("apache") } - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_concat("25-rspec.example.com.conf").with( - :ensure => 'present', - :path => '/etc/apache2/sites-available/25-rspec.example.com.conf' - ) } - it { is_expected.to contain_file("25-rspec.example.com.conf symlink").with( - :ensure => 'link', - :path => '/etc/apache2/sites-enabled/25-rspec.example.com.conf', - :target => '/etc/apache2/sites-available/25-rspec.example.com.conf' - ) } - end - context "on FreeBSD systems" do - let :default_facts do - { - :osfamily => 'FreeBSD', - :operatingsystemrelease => '9', - :concat_basedir => '/dne', - :operatingsystem => 'FreeBSD', - :id => 'root', - :kernel => 'FreeBSD', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :params do default_params end - let :facts do default_facts end - it { is_expected.to contain_class("apache") } - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_concat("25-rspec.example.com.conf").with( - :ensure => 'present', - :path => '/usr/local/etc/apache24/Vhosts/25-rspec.example.com.conf' - ) } - end - context "on Gentoo systems" do - let :default_facts do - { - :osfamily => 'Gentoo', - :operatingsystem => 'Gentoo', - :operatingsystemrelease => '3.16.1-gentoo', - :concat_basedir => '/dne', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin', - :is_pe => false, - } - end - let :params do default_params end - let :facts do default_facts end - it { is_expected.to contain_class("apache") } - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_concat("25-rspec.example.com.conf").with( - :ensure => 'present', - :path => '/etc/apache2/vhosts.d/25-rspec.example.com.conf' - ) } - end - end - describe 'os-independent items' do - let :facts do - { - :osfamily => 'Debian', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :lsbdistcodename => 'squeeze', - :operatingsystem => 'Debian', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - describe 'basic assumptions' do - let :params do default_params end - it { is_expected.to contain_class("apache") } - it { is_expected.to contain_class("apache::params") } - it { is_expected.to contain_apache__listen(params[:port]) } - it { is_expected.to contain_apache__namevirtualhost("*:#{params[:port]}") } - end - context 'set everything!' do - let :params do - { - 'docroot' => '/var/www/foo', - 'manage_docroot' => false, - 'virtual_docroot' => true, - 'port' => '8080', - 'ip' => '127.0.0.1', - 'ip_based' => true, - 'add_listen' => false, - 'docroot_owner' => 'user', - 'docroot_group' => 'wheel', - 'docroot_mode' => '0664', - 'serveradmin' => 'foo@localhost', - 'ssl' => true, - 'ssl_cert' => '/ssl/cert', - 'ssl_key' => '/ssl/key', - 'ssl_chain' => '/ssl/chain', - 'ssl_crl_path' => '/ssl/crl', - 'ssl_crl' => 'foo.crl', - 'ssl_certs_dir' => '/ssl/certs', - 'ssl_protocol' => 'SSLv2', - 'ssl_cipher' => 'HIGH', - 'ssl_honorcipherorder' => 'Off', - 'ssl_verify_client' => 'optional', - 'ssl_verify_depth' => '3', - 'ssl_options' => '+ExportCertData', - 'ssl_openssl_conf_cmd' => 'DHParameters "foo.pem"', - 'ssl_proxy_verify' => 'require', - 'ssl_proxy_check_peer_cn' => 'on', - 'ssl_proxy_check_peer_name' => 'on', - 'ssl_proxy_check_peer_expire' => 'on', - 'ssl_proxyengine' => true, - 'ssl_proxy_protocol' => 'TLSv1.2', - - 'priority' => '30', - 'default_vhost' => true, - 'servername' => 'example.com', - 'serveraliases' => ['test-example.com'], - 'options' => ['MultiView'], - 'override' => ['All'], - 'directoryindex' => 'index.html', - 'vhost_name' => 'test', - 'logroot' => '/var/www/logs', - 'logroot_ensure' => 'directory', - 'logroot_mode' => '0600', - 'logroot_owner' => 'root', - 'logroot_group' => 'root', - 'log_level' => 'crit', - 'access_log' => false, - 'access_log_file' => 'httpd_access_log', - 'access_log_syslog' => true, - 'access_log_format' => '%h %l %u %t \"%r\" %>s %b', - 'access_log_env_var' => '', - 'aliases' => '/image', - 'directories' => [ - { - 'path' => '/var/www/files', - 'provider' => 'files', - 'require' => [ 'valid-user', 'all denied', ], - }, - { - 'path' => '/var/www/files', - 'provider' => 'files', - 'additional_includes' => [ '/custom/path/includes', '/custom/path/another_includes', ], - }, - { - 'path' => '/var/www/files', - 'provider' => 'files', - 'require' => 'all granted', - }, - { - 'path' => '/var/www/files', - 'provider' => 'files', - 'require' => - { - 'enforce' => 'all', - 'requires' => ['all-valid1', 'all-valid2'], - }, - }, - { - 'path' => '/var/www/files', - 'provider' => 'files', - 'require' => - { - 'enforce' => 'none', - 'requires' => ['none-valid1', 'none-valid2'], - }, - }, - { - 'path' => '/var/www/files', - 'provider' => 'files', - 'require' => - { - 'enforce' => 'any', - 'requires' => ['any-valid1', 'any-valid2'], - }, - }, - { - 'path' => '*', - 'provider' => 'proxy', - }, - { 'path' => '/var/www/files/indexed_directory', - 'directoryindex' => 'disabled', - 'options' => ['Indexes','FollowSymLinks','MultiViews'], - 'index_options' => ['FancyIndexing'], - 'index_style_sheet' => '/styles/style.css', - }, - { 'path' => '/var/www/files/output_filtered', - 'set_output_filter' => 'output_filter', - }, - { 'path' => '/var/www/files', - 'provider' => 'location', - 'limit' => [ - { 'methods' => 'GET HEAD', - 'require' => ['valid-user'] - }, - ], - }, - { 'path' => '/var/www/files', - 'provider' => 'location', - 'limit_except' => [ - { 'methods' => 'GET HEAD', - 'require' => ['valid-user'] - }, - ], - }, - { 'path' => '/var/www/dav', - 'dav' => 'filesystem', - 'dav_depth_infinity' => true, - 'dav_min_timeout' => '600', - }, - ], - 'error_log' => false, - 'error_log_file' => 'httpd_error_log', - 'error_log_syslog' => true, - 'error_documents' => 'true', - 'fallbackresource' => '/index.php', - 'scriptalias' => '/usr/lib/cgi-bin', - 'scriptaliases' => [ - { - 'alias' => '/myscript', - 'path' => '/usr/share/myscript', - }, - { - 'aliasmatch' => '^/foo(.*)', - 'path' => '/usr/share/fooscripts$1', - }, - ], - 'proxy_dest' => '/', - 'proxy_pass' => [ - { - 'path' => '/a', - 'url' => 'http://backend-a/', - 'keywords' => ['noquery', 'interpolate'], - 'no_proxy_uris' => ['/a/foo', '/a/bar'], - 'no_proxy_uris_match' => ['/a/foomatch'], - 'reverse_cookies' => [ - { - 'path' => '/a', - 'url' => 'http://backend-a/', - }, - { - 'domain' => 'foo', - 'url' => 'http://foo', - } - ], - 'params' => { - 'retry' => '0', - 'timeout' => '5' - }, - 'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1'], - } - ], - 'proxy_pass_match' => [ - { - 'path' => '/a', - 'url' => 'http://backend-a/', - 'keywords' => ['noquery', 'interpolate'], - 'no_proxy_uris' => ['/a/foo', '/a/bar'], - 'no_proxy_uris_match' => ['/a/foomatch'], - 'params' => { - 'retry' => '0', - 'timeout' => '5' - }, - 'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1'], - } - ], - 'suphp_addhandler' => 'foo', - 'suphp_engine' => 'on', - 'suphp_configpath' => '/var/www/html', - 'php_admin_flags' => ['foo', 'bar'], - 'php_admin_values' => ['true', 'false'], - 'no_proxy_uris' => '/foo', - 'no_proxy_uris_match' => '/foomatch', - 'proxy_preserve_host' => true, - 'proxy_add_headers' => true, - 'proxy_error_override' => true, - 'redirect_source' => '/bar', - 'redirect_dest' => '/', - 'redirect_status' => 'temp', - 'redirectmatch_status' => ['404'], - 'redirectmatch_regexp' => ['\.git$'], - 'redirectmatch_dest' => ['http://www.example.com'], - 'rack_base_uris' => ['/rackapp1'], - 'passenger_base_uris' => ['/passengerapp1'], - 'headers' => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"', - 'request_headers' => ['append MirrorID "mirror 12"'], - 'rewrites' => [ - { - 'rewrite_rule' => ['^index\.html$ welcome.html'] - } - ], - 'filters' => [ - 'FilterDeclare COMPRESS', - 'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/html', - 'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/css', - 'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/plain', - 'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/xml', - 'FilterChain COMPRESS', - 'FilterProtocol COMPRESS DEFLATE change=yes;byteranges=no', - ], - 'rewrite_base' => '/', - 'rewrite_rule' => '^index\.html$ welcome.html', - 'rewrite_cond' => '%{HTTP_USER_AGENT} ^MSIE', - 'rewrite_inherit' => true, - 'setenv' => ['FOO=/bin/true'], - 'setenvif' => 'Request_URI "\.gif$" object_is_image=gif', - 'setenvifnocase' => 'REMOTE_ADDR ^127.0.0.1 localhost=true', - 'block' => 'scm', - 'wsgi_application_group' => '%{GLOBAL}', - 'wsgi_daemon_process' => 'wsgi', - 'wsgi_daemon_process_options' => { - 'processes' => '2', - 'threads' => '15', - 'display-name' => '%{GROUP}', - }, - 'wsgi_import_script' => '/var/www/demo.wsgi', - 'wsgi_import_script_options' => { - 'process-group' => 'wsgi', - 'application-group' => '%{GLOBAL}' - }, - 'wsgi_process_group' => 'wsgi', - 'wsgi_script_aliases' => { - '/' => '/var/www/demo.wsgi' - }, - 'wsgi_script_aliases_match' => { - '^/test/(^[/*)' => '/var/www/demo.wsgi' - }, - 'wsgi_pass_authorization' => 'On', - 'custom_fragment' => '#custom string', - 'itk' => { - 'user' => 'someuser', - 'group' => 'somegroup' - }, - 'wsgi_chunked_request' => 'On', - 'action' => 'foo', - 'fastcgi_server' => 'localhost', - 'fastcgi_socket' => '/tmp/fastcgi.socket', - 'fastcgi_dir' => '/tmp', - 'fastcgi_idle_timeout' => '120', - 'additional_includes' => '/custom/path/includes', - 'apache_version' => '2.4', - 'use_optional_includes' => true, - 'suexec_user_group' => 'root root', - 'allow_encoded_slashes' => 'nodecode', - 'passenger_spawn_method' => 'direct', - 'passenger_app_root' => '/usr/share/myapp', - 'passenger_app_env' => 'test', - 'passenger_ruby' => '/usr/bin/ruby1.9.1', - 'passenger_min_instances' => '1', - 'passenger_max_requests' => '1000', - 'passenger_start_timeout' => '600', - 'passenger_pre_start' => 'http://localhost/myapp', - 'passenger_high_performance' => true, - 'passenger_user' => 'sandbox', - 'passenger_nodejs' => '/usr/bin/node', - 'passenger_sticky_sessions' => true, - 'passenger_startup_file' => 'bin/www', - 'add_default_charset' => 'UTF-8', - 'jk_mounts' => [ - { 'mount' => '/*', 'worker' => 'tcnode1', }, - { 'unmount' => '/*.jpg', 'worker' => 'tcnode1', }, - ], - 'auth_kerb' => true, - 'krb_method_negotiate' => 'off', - 'krb_method_k5passwd' => 'off', - 'krb_authoritative' => 'off', - 'krb_auth_realms' => ['EXAMPLE.ORG','EXAMPLE.NET'], - 'krb_5keytab' => '/tmp/keytab5', - 'krb_local_user_mapping' => 'off', - 'http_protocol_options' => 'Strict LenientMethods Allow0.9', - 'keepalive' => 'on', - 'keepalive_timeout' => '100', - 'max_keepalive_requests' => '1000', - } - end - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '7', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :kernelversion => '3.6.2', - :is_pe => false, - } - end - - it { is_expected.to compile } - it { is_expected.to_not contain_file('/var/www/foo') } - it { is_expected.to contain_class('apache::mod::ssl') } - it { is_expected.to contain_file('ssl.conf').with( - :content => /^\s+SSLHonorCipherOrder On$/ ) } - it { is_expected.to contain_file('ssl.conf').with( - :content => /^\s+SSLPassPhraseDialog builtin$/ ) } - it { is_expected.to contain_file('ssl.conf').with( - :content => /^\s+SSLSessionCacheTimeout 300$/ ) } - it { is_expected.to contain_class('apache::mod::mime') } - it { is_expected.to contain_class('apache::mod::vhost_alias') } - it { is_expected.to contain_class('apache::mod::wsgi') } - it { is_expected.to contain_class('apache::mod::suexec') } - it { is_expected.to contain_class('apache::mod::passenger') } - it { is_expected.to contain_file('/var/www/logs').with({ - 'ensure' => 'directory', - 'mode' => '0600', - }) - } - it { is_expected.to contain_class('apache::mod::rewrite') } - it { is_expected.to contain_class('apache::mod::alias') } - it { is_expected.to contain_class('apache::mod::proxy') } - it { is_expected.to contain_class('apache::mod::proxy_http') } - it { is_expected.to contain_class('apache::mod::passenger') } - it { is_expected.to contain_class('apache::mod::passenger') } - it { is_expected.to contain_class('apache::mod::fastcgi') } - it { is_expected.to contain_class('apache::mod::headers') } - it { is_expected.to contain_class('apache::mod::filter') } - it { is_expected.to contain_class('apache::mod::env') } - it { is_expected.to contain_class('apache::mod::setenvif') } - it { is_expected.to contain_concat('30-rspec.example.com.conf').with({ - 'owner' => 'root', - 'mode' => '0644', - 'require' => 'Package[httpd]', - 'notify' => 'Class[Apache::Service]', - }) - } - it { is_expected.to contain_file('30-rspec.example.com.conf symlink').with({ - 'ensure' => 'link', - 'path' => '/etc/apache2/sites-enabled/30-rspec.example.com.conf', - }) - } - it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') } - it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') } - it { is_expected.to contain_concat__fragment('rspec.example.com-aliases') } - it { is_expected.to contain_concat__fragment('rspec.example.com-itk') } - it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories') } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Include\s'\/custom\/path\/includes'$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Include\s'\/custom\/path\/another_includes'$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Require valid-user$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Require all denied$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Require all granted$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+<\/RequireAll>$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Require all-valid1$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Require all-valid2$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+<\/RequireNone>$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Require none-valid1$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Require none-valid2$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+<\/RequireAny>$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Require any-valid1$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Require any-valid2$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Options\sIndexes\sFollowSymLinks\sMultiViews$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+IndexOptions\sFancyIndexing$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+IndexStyleSheet\s'\/styles\/style\.css'$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+DirectoryIndex\sdisabled$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+SetOutputFilter\soutput_filter$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /\s+\s*Require valid-user\s*<\/Limit>/m ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /\s+\s*Require valid-user\s*<\/LimitExcept>/m ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Dav\sfilesystem$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+DavDepthInfinity\sOn$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+DavMinTimeout\s600$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') } - it { is_expected.to contain_concat__fragment('rspec.example.com-logging') } - it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-access_log') } - it { is_expected.to contain_concat__fragment('rspec.example.com-action') } - it { is_expected.to contain_concat__fragment('rspec.example.com-block') } - it { is_expected.to contain_concat__fragment('rspec.example.com-error_document') } - it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content( - /retry=0/) } - it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content( - /timeout=5/) } - it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content( - /SetEnv force-proxy-request-1.0 1/) } - it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content( - /SetEnv proxy-nokeepalive 1/) } - it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content( - /noquery interpolate/) } - it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content( - /ProxyPreserveHost On/) } - it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content( - /ProxyAddHeaders On/) } - it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content( - /ProxyPassReverseCookiePath\s+\/a\s+http:\/\//) } - it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content( - /ProxyPassReverseCookieDomain\s+foo\s+http:\/\/foo/) } - it { is_expected.to contain_concat__fragment('rspec.example.com-rack') } - it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') } - it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite') } - it { is_expected.to contain_concat__fragment('rspec.example.com-rewrite').with( - :content => /^\s+RewriteOptions Inherit$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-scriptalias') } - it { is_expected.to contain_concat__fragment('rspec.example.com-serveralias') } - it { is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content( - %r{SetEnv FOO=/bin/true}) } - it { is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content( - %r{SetEnvIf Request_URI "\\.gif\$" object_is_image=gif}) } - it { is_expected.to contain_concat__fragment('rspec.example.com-setenv').with_content( - %r{SetEnvIfNoCase REMOTE_ADDR \^127.0.0.1 localhost=true}) } - it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') } - it { is_expected.to contain_concat__fragment('rspec.example.com-ssl').with( - :content => /^\s+SSLOpenSSLConfCmd\s+DHParameters "foo.pem"$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy') } - it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with( - :content => /^\s+SSLProxyEngine On$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with( - :content => /^\s+SSLProxyCheckPeerCN\s+on$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with( - :content => /^\s+SSLProxyCheckPeerName\s+on$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with( - :content => /^\s+SSLProxyCheckPeerExpire\s+on$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy').with( - :content => /^\s+SSLProxyProtocol\s+TLSv1.2$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-suphp') } - it { is_expected.to contain_concat__fragment('rspec.example.com-php_admin') } - it { is_expected.to contain_concat__fragment('rspec.example.com-header') } - it { is_expected.to contain_concat__fragment('rspec.example.com-filters').with( - :content => /^\s+FilterDeclare COMPRESS$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-requestheader') } - it { is_expected.to contain_concat__fragment('rspec.example.com-wsgi') } - it { is_expected.to contain_concat__fragment('rspec.example.com-custom_fragment') } - it { is_expected.to contain_concat__fragment('rspec.example.com-fastcgi') } - it { is_expected.to contain_concat__fragment('rspec.example.com-suexec') } - it { is_expected.to contain_concat__fragment('rspec.example.com-allow_encoded_slashes') } - it { is_expected.to contain_concat__fragment('rspec.example.com-passenger') } - it { is_expected.to contain_concat__fragment('rspec.example.com-charsets') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-security') } - it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') } - it { is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts').with( - :content => /^\s+JkMount\s+\/\*\s+tcnode1$/)} - it { is_expected.to contain_concat__fragment('rspec.example.com-jk_mounts').with( - :content => /^\s+JkUnMount\s+\/\*\.jpg\s+tcnode1$/)} - it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with( - :content => /^\s+KrbMethodNegotiate\soff$/)} - it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with( - :content => /^\s+KrbAuthoritative\soff$/)} - it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with( - :content => /^\s+KrbAuthRealms\sEXAMPLE.ORG\sEXAMPLE.NET$/)} - it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with( - :content => /^\s+Krb5Keytab\s\/tmp\/keytab5$/)} - it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with( - :content => /^\s+KrbLocalUserMapping\soff$/)} - it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with( - :content => /^\s+KrbServiceName\sHTTP$/)} - it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with( - :content => /^\s+KrbSaveCredentials\soff$/)} - it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with( - :content => /^\s+KrbVerifyKDC\son$/)} - it { is_expected.to contain_concat__fragment('rspec.example.com-http_protocol_options').with( - :content => /^\s*HttpProtocolOptions\s+Strict\s+LenientMethods\s+Allow0\.9$/)} - it { is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with( - :content => /^\s+KeepAlive\son$/)} - it { is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with( - :content => /^\s+KeepAliveTimeout\s100$/)} - it { is_expected.to contain_concat__fragment('rspec.example.com-keepalive_options').with( - :content => /^\s+MaxKeepAliveRequests\s1000$/)} - end - context 'vhost with multiple ip addresses' do - let :params do - { - 'port' => '80', - 'ip' => ['127.0.0.1','::1'], - 'ip_based' => true, - 'servername' => 'example.com', - 'docroot' => '/var/www/html', - 'add_listen' => true, - 'ensure' => 'present' - } - end - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '7', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :kernelversion => '3.6.2', - :is_pe => false, - } - end - - it { is_expected.to compile } - it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with( - :content => /[.\/m]*[.\/m]*$/ ) } - it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') } - it { is_expected.to contain_concat__fragment('Listen [::1]:80') } - it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:80') } - it { is_expected.to_not contain_concat__fragment('NameVirtualHost [::1]:80') } - end - - context 'vhost with multiple ports' do - let :params do - { - 'port' => ['80', '8080'], - 'ip' => '127.0.0.1', - 'ip_based' => true, - 'servername' => 'example.com', - 'docroot' => '/var/www/html', - 'add_listen' => true, - 'ensure' => 'present' - } - end - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '7', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :kernelversion => '3.6.2', - :is_pe => false, - } - end - - it { is_expected.to compile } - it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with( - :content => /[.\/m]*[.\/m]*$/ ) } - it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') } - it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:8080') } - it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:80') } - it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:8080') } - end - - context 'vhost with multiple ip addresses, multiple ports' do - let :params do - { - 'port' => ['80', '8080'], - 'ip' => ['127.0.0.1','::1'], - 'ip_based' => true, - 'servername' => 'example.com', - 'docroot' => '/var/www/html', - 'add_listen' => true, - 'ensure' => 'present' - } - end - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '7', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :kernelversion => '3.6.2', - :is_pe => false, - } - end - - it { is_expected.to compile } - it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with( - :content => /[.\/m]*[.\/m]*$/ ) } - it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:80') } - it { is_expected.to contain_concat__fragment('Listen 127.0.0.1:8080') } - it { is_expected.to contain_concat__fragment('Listen [::1]:80') } - it { is_expected.to contain_concat__fragment('Listen [::1]:8080') } - it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:80') } - it { is_expected.to_not contain_concat__fragment('NameVirtualHost 127.0.0.1:8080') } - it { is_expected.to_not contain_concat__fragment('NameVirtualHost [::1]:80') } - it { is_expected.to_not contain_concat__fragment('NameVirtualHost [::1]:8080') } - end - - context 'vhost with ipv6 address' do - let :params do - { - 'port' => '80', - 'ip' => '::1', - 'ip_based' => true, - 'servername' => 'example.com', - 'docroot' => '/var/www/html', - 'add_listen' => true, - 'ensure' => 'present' - } - end - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '7', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :kernelversion => '3.6.2', - :is_pe => false, - } - end - - it { is_expected.to compile } - it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with( - :content => /[.\/m]*[.\/m]*$/ ) } - it { is_expected.to contain_concat__fragment('Listen [::1]:80') } - it { is_expected.to_not contain_concat__fragment('NameVirtualHost [::1]:80') } - end - - context 'vhost with wildcard ip address' do - let :params do - { - 'port' => '80', - 'ip' => '*', - 'ip_based' => true, - 'servername' => 'example.com', - 'docroot' => '/var/www/html', - 'add_listen' => true, - 'ensure' => 'present' - } - end - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '7', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :kernelversion => '3.6.2', - :is_pe => false, - } - end - - it { is_expected.to compile } - it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header').with( - :content => /[.\/m]*[.\/m]*$/ ) } - it { is_expected.to contain_concat__fragment('Listen *:80') } - it { is_expected.to_not contain_concat__fragment('NameVirtualHost *:80') } - end - - context 'modsec_audit_log' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'modsec_audit_log' => true, - } - end - it { is_expected.to compile } - it { is_expected.to contain_concat__fragment('rspec.example.com-security').with( - :content => /^\s*SecAuditLog "\/var\/log\/apache2\/rspec\.example\.com_security\.log"$/ ) } - end - context 'modsec_audit_log_file' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'modsec_audit_log_file' => 'foo.log', - } - end - it { is_expected.to compile } - it { is_expected.to contain_concat__fragment('rspec.example.com-security').with( - :content => /\s*SecAuditLog "\/var\/log\/apache2\/foo.log"$/ ) } - end - context 'set only aliases' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'aliases' => [ - { - 'alias' => '/alias', - 'path' => '/rspec/docroot', - }, - ] - } - end - it { is_expected.to contain_class('apache::mod::alias')} - end - context 'proxy_pass_match' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'proxy_pass_match' => [ - { - 'path' => '.*', - 'url' => 'http://backend-a/', - 'params' => { 'timeout' => 300 }, - } - ], - } - end - it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content( - /ProxyPassMatch .* http:\/\/backend-a\/ timeout=300/).with_content(/## Proxy rules/) } - end - context 'proxy_dest_match' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'proxy_dest_match' => '/' - } - end - it { is_expected.to contain_concat__fragment('rspec.example.com-proxy').with_content(/## Proxy rules/) } - end - context 'not everything can be set together...' do - let :params do - { - 'access_log_pipe' => '/dev/null', - 'error_log_pipe' => '/dev/null', - 'docroot' => '/var/www/foo', - 'ensure' => 'absent', - 'manage_docroot' => true, - 'logroot' => '/tmp/logroot', - 'logroot_ensure' => 'absent', - 'directories' => [ - { - 'path' => '/var/www/files', - 'provider' => 'files', - 'allow' => [ 'from 127.0.0.1', 'from 127.0.0.2', ], - 'deny' => [ 'from 127.0.0.3', 'from 127.0.0.4', ], - 'satisfy' => 'any', - }, - { - 'path' => '/var/www/foo', - 'provider' => 'files', - 'allow' => 'from 127.0.0.5', - 'deny' => 'from all', - 'order' => 'deny,allow', - }, - ], - - } - end - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :kernelversion => '3.6.2', - :is_pe => false, - } - end - - it { is_expected.to compile } - it { is_expected.to_not contain_class('apache::mod::ssl') } - it { is_expected.to_not contain_class('apache::mod::mime') } - it { is_expected.to_not contain_class('apache::mod::vhost_alias') } - it { is_expected.to_not contain_class('apache::mod::wsgi') } - it { is_expected.to_not contain_class('apache::mod::passenger') } - it { is_expected.to_not contain_class('apache::mod::suexec') } - it { is_expected.to_not contain_class('apache::mod::rewrite') } - it { is_expected.to_not contain_class('apache::mod::alias') } - it { is_expected.to_not contain_class('apache::mod::proxy') } - it { is_expected.to_not contain_class('apache::mod::proxy_http') } - it { is_expected.to_not contain_class('apache::mod::passenger') } - it { is_expected.to_not contain_class('apache::mod::headers') } - it { is_expected.to contain_file('/var/www/foo') } - it { is_expected.to contain_file('/tmp/logroot').with({ - 'ensure' => 'absent', - }) - } - it { is_expected.to contain_concat('25-rspec.example.com.conf').with({ - 'ensure' => 'absent', - }) - } - it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') } - it { is_expected.to contain_concat__fragment('rspec.example.com-docroot') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-aliases') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-itk') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-fallbackresource') } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories') } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Allow from 127\.0\.0\.1$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Allow from 127\.0\.0\.2$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Allow from 127\.0\.0\.5$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Deny from 127\.0\.0\.3$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Deny from 127\.0\.0\.4$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Deny from all$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Satisfy any$/ ) } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Order deny,allow$/ ) } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-additional_includes') } - it { is_expected.to contain_concat__fragment('rspec.example.com-logging') } - it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') } - it { is_expected.to contain_concat__fragment('rspec.example.com-access_log') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-action') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-block') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-error_document') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-proxy') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-rack') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-redirect') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-rewrite') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-scriptalias') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-serveralias') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-setenv') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-ssl') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-sslproxy') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-suphp') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-php_admin') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-header') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-requestheader') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-wsgi') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-custom_fragment') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-fastcgi') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-suexec') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-charsets') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-limits') } - it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') } - end - context 'wsgi_application_group should set apache::mod::wsgi' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'wsgi_application_group' => '%{GLOBAL}', - } - end - it { is_expected.to contain_class("apache::mod::wsgi") } - end - context 'wsgi_daemon_process should set apache::mod::wsgi' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'wsgi_daemon_process' => 'wsgi', - } - end - it { is_expected.to contain_class("apache::mod::wsgi") } - end - context 'wsgi_import_script on its own should not set apache::mod::wsgi' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'wsgi_import_script' => '/var/www/demo.wsgi', - } - end - it { is_expected.not_to contain_class("apache::mod::wsgi") } - end - context 'wsgi_import_script_options on its own should not set apache::mod::wsgi' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'wsgi_import_script_options' => { - 'process-group' => 'wsgi', - 'application-group' => '%{GLOBAL}' - }, - } - end - it { is_expected.not_to contain_class("apache::mod::wsgi") } - end - context 'wsgi_import_script and wsgi_import_script_options should set apache::mod::wsgi' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'wsgi_import_script' => '/var/www/demo.wsgi', - 'wsgi_import_script_options' => { - 'process-group' => 'wsgi', - 'application-group' => '%{GLOBAL}' - }, - } - end - it { is_expected.to contain_class("apache::mod::wsgi") } - end - context 'wsgi_process_group should set apache::mod::wsgi' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'wsgi_daemon_process' => 'wsgi', - } - end - it { is_expected.to contain_class("apache::mod::wsgi") } - end - context 'wsgi_script_aliases with non-empty aliases should set apache::mod::wsgi' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'wsgi_script_aliases' => { - '/' => '/var/www/demo.wsgi' - }, - } - end - it { is_expected.to contain_class("apache::mod::wsgi") } - end - context 'wsgi_script_aliases with empty aliases should set apache::mod::wsgi' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'wsgi_script_aliases' => { }, - } - end - it { is_expected.not_to contain_class("apache::mod::wsgi") } - end - context 'wsgi_pass_authorization should set apache::mod::wsgi' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'wsgi_pass_authorization' => 'On', - } - end - it { is_expected.to contain_class("apache::mod::wsgi") } - end - context 'when not setting nor managing the docroot' do - let :params do - { - 'docroot' => false, - 'manage_docroot' => false, - } - end - it { is_expected.to compile } - it { is_expected.not_to contain_concat__fragment('rspec.example.com-docroot') } - end - context 'ssl_proxyengine without ssl' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'ssl' => false, - 'ssl_proxyengine' => true, - } - end - it { is_expected.to compile } - it { is_expected.not_to contain_concat__fragment('rspec.example.com-ssl') } - it { is_expected.to contain_concat__fragment('rspec.example.com-sslproxy') } - end - context 'ssl_proxy_protocol without ssl_proxyengine' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'ssl' => true, - 'ssl_proxyengine' => false, - 'ssl_proxy_protocol' => 'TLSv1.2', - } - end - it { is_expected.to compile } - it { is_expected.to contain_concat__fragment('rspec.example.com-ssl') } - it { is_expected.not_to contain_concat__fragment('rspec.example.com-sslproxy') } - end - end - describe 'access logs' do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context 'single log file' do - let(:params) do - { - 'docroot' => '/rspec/docroot', - 'access_log_file' => 'my_log_file', - } - end - it { is_expected.to contain_concat__fragment('rspec.example.com-access_log').with( - :content => /^\s+CustomLog.*my_log_file" combined\s*$/ - )} - end - context 'single log file with environment' do - let(:params) do - { - 'docroot' => '/rspec/docroot', - 'access_log_file' => 'my_log_file', - 'access_log_env_var' => 'prod' - } - end - it { is_expected.to contain_concat__fragment('rspec.example.com-access_log').with( - :content => /^\s+CustomLog.*my_log_file" combined\s+env=prod$/ - )} - end - context 'multiple log files' do - let(:params) do - { - 'docroot' => '/rspec/docroot', - 'access_logs' => [ - { 'file' => '/tmp/log1', 'env' => 'dev' }, - { 'file' => 'log2' }, - { 'syslog' => 'syslog', 'format' => '%h %l' } - ], - } - end - it { is_expected.to contain_concat__fragment('rspec.example.com-access_log').with( - :content => /^\s+CustomLog "\/tmp\/log1"\s+combined\s+env=dev$/ - )} - it { is_expected.to contain_concat__fragment('rspec.example.com-access_log').with( - :content => /^\s+CustomLog "\/var\/log\/httpd\/log2"\s+combined\s*$/ - )} - it { is_expected.to contain_concat__fragment('rspec.example.com-access_log').with( - :content => /^\s+CustomLog "syslog" "%h %l"\s*$/ - )} - end - end # access logs - describe 'validation' do - let :default_facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - context 'bad ensure' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'ensure' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad suphp_engine' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'suphp_engine' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad ip_based' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'ip_based' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad access_log' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'access_log' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad error_log' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'error_log' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad_ssl' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'ssl' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad default_vhost' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'default_vhost' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad ssl_proxyengine' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'ssl_proxyengine' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad rewrites' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'rewrites' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad rewrites 2' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'rewrites' => ['bogus'], - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'empty rewrites' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'rewrites' => [], - } - end - let :facts do default_facts end - it { is_expected.to compile } - end - context 'bad suexec_user_group' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'suexec_user_group' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad wsgi_script_alias' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'wsgi_script_alias' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad wsgi_daemon_process_options' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'wsgi_daemon_process_options' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad wsgi_import_script_alias' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'wsgi_import_script_alias' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad itk' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'itk' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad logroot_ensure' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'log_level' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad log_level' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'log_level' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'access_log_file and access_log_pipe' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'access_log_file' => 'bogus', - 'access_log_pipe' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'error_log_file and error_log_pipe' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'error_log_file' => 'bogus', - 'error_log_pipe' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad fallbackresource' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'fallbackresource' => 'bogus', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad custom_fragment' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'custom_fragment' => true, - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'bad access_logs' do - let :params do - { - 'docroot' => '/rspec/docroot', - 'access_logs' => '/var/log/somewhere', - } - end - let :facts do default_facts end - it { expect { is_expected.to compile }.to raise_error } - end - context 'default of require all granted' do - let :params do - { - 'docroot' => '/var/www/foo', - 'directories' => [ - { - 'path' => '/var/www/foo/files', - 'provider' => 'files', - }, - ], - - } - end - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '7', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :kernelversion => '3.19.2', - :is_pe => false, - } - end - - it { is_expected.to compile } - it { is_expected.to contain_concat('25-rspec.example.com.conf') } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories') } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Require all granted$/ ) } - end - context 'require unmanaged' do - let :params do - { - 'docroot' => '/var/www/foo', - 'directories' => [ - { - 'path' => '/var/www/foo', - 'require' => 'unmanaged', - }, - ], - - } - end - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '7', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :kernelversion => '3.19.2', - :is_pe => false, - } - end - - it { is_expected.to compile } - it { is_expected.to contain_concat('25-rspec.example.com.conf') } - it { is_expected.to contain_concat__fragment('rspec.example.com-directories') } - it { is_expected.to_not contain_concat__fragment('rspec.example.com-directories').with( - :content => /^\s+Require all granted$/ ) - } - end - describe "redirectmatch_*" do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '6', - :concat_basedir => '/dne', - :operatingsystem => 'RedHat', - :id => 'root', - :kernel => 'Linux', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :is_pe => false, - } - end - let :dparams do - { - :docroot => '/rspec/docroot', - :port => '84', - } - end - context "status" do - let (:params) { dparams.merge({:redirectmatch_status => "404"}) } - it { is_expected.to contain_class("apache::mod::alias")} - end - context "dest" do - let (:params) { dparams.merge({:redirectmatch_dest => "http://other.example.com$1.jpg"}) } - it { is_expected.to contain_class("apache::mod::alias")} - end - context "regexp" do - let (:params) { dparams.merge({:redirectmatch_regexp => "(.*)\.gif$"}) } - it { is_expected.to contain_class("apache::mod::alias")} - end - context "none" do - let (:params) { dparams } - it { is_expected.to_not contain_class("apache::mod::alias") } - end - end - end -end diff --git a/modules/apache/spec/fixtures/files/negotiation.conf b/modules/apache/spec/fixtures/files/negotiation.conf deleted file mode 100644 index c0bb8b9..0000000 --- a/modules/apache/spec/fixtures/files/negotiation.conf +++ /dev/null @@ -1,4 +0,0 @@ -# This is a file only for spec testing - -LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW -ForceLanguagePriority Prefer Fallback diff --git a/modules/apache/spec/fixtures/files/spec b/modules/apache/spec/fixtures/files/spec deleted file mode 100644 index 76e9a14..0000000 --- a/modules/apache/spec/fixtures/files/spec +++ /dev/null @@ -1 +0,0 @@ -# This is a file only for spec testing diff --git a/modules/apache/spec/fixtures/site_apache/templates/fake.conf.erb b/modules/apache/spec/fixtures/site_apache/templates/fake.conf.erb deleted file mode 100644 index 019debf..0000000 --- a/modules/apache/spec/fixtures/site_apache/templates/fake.conf.erb +++ /dev/null @@ -1 +0,0 @@ -Fake template for rspec. diff --git a/modules/apache/spec/fixtures/templates/negotiation.conf.erb b/modules/apache/spec/fixtures/templates/negotiation.conf.erb deleted file mode 100644 index 5575022..0000000 --- a/modules/apache/spec/fixtures/templates/negotiation.conf.erb +++ /dev/null @@ -1,4 +0,0 @@ -# This is a template only for spec testing - -LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW -ForceLanguagePriority Prefer Fallback diff --git a/modules/apache/spec/spec_helper.rb b/modules/apache/spec/spec_helper.rb deleted file mode 100644 index 22d5d68..0000000 --- a/modules/apache/spec/spec_helper.rb +++ /dev/null @@ -1,8 +0,0 @@ -#This file is generated by ModuleSync, do not edit. -require 'puppetlabs_spec_helper/module_spec_helper' - -# put local configuration and setup into spec_helper_local -begin - require 'spec_helper_local' -rescue LoadError -end diff --git a/modules/apache/spec/spec_helper_acceptance.rb b/modules/apache/spec/spec_helper_acceptance.rb deleted file mode 100644 index 39e47a8..0000000 --- a/modules/apache/spec/spec_helper_acceptance.rb +++ /dev/null @@ -1,123 +0,0 @@ -require 'beaker-rspec/spec_helper' -require 'beaker-rspec/helpers/serverspec' -require 'beaker/puppet_install_helper' -require 'beaker/module_install_helper' - -def install_bolt_on(hosts) - on(hosts, "/opt/puppetlabs/puppet/bin/gem install --source http://rubygems.delivery.puppetlabs.net bolt -v '> 0.0.1'", acceptable_exit_codes: [0, 1]).stdout -end - -def pe_install? - ENV['PUPPET_INSTALL_TYPE'] =~ %r{pe}i -end - -def puppet_version - (on default, puppet('--version')).output.chomp -end - -run_puppet_install_helper -install_bolt_on(hosts) unless pe_install? -install_module_on(hosts) -install_module_dependencies_on(hosts) - -DEFAULT_PASSWORD = if default[:hypervisor] == 'vagrant' - 'vagrant' - elsif default[:hypervisor] == 'vcloud' - 'Qu@lity!' - end - -def run_puppet_access_login(user:, password: '~!@#$%^*-/ aZ', lifetime: '5y') - on(master, puppet('access', 'login', '--username', user, '--lifetime', lifetime), stdin: password) -end - -def run_task(task_name:, params: nil, password: DEFAULT_PASSWORD) - if pe_install? - run_puppet_task(task_name: task_name, params: params) - else - run_bolt_task(task_name: task_name, params: params, password: password) - end -end - -def run_bolt_task(task_name:, params: nil, password: DEFAULT_PASSWORD) - on(master, "/opt/puppetlabs/puppet/bin/bolt task run #{task_name} --modules /etc/puppetlabs/code/modules/service --nodes localhost --password #{password} #{params}", acceptable_exit_codes: [0, 1]).stdout # rubocop:disable Metrics/LineLength -end - -def run_puppet_task(task_name:, params: nil) - on(master, puppet('task', 'run', task_name, '--nodes', fact_on(master, 'fqdn'), params.to_s), acceptable_exit_codes: [0, 1]).stdout -end - -def expect_multiple_regexes(result:, regexes:) - regexes.each do |regex| - expect(result).to match(regex) - end -end - -RSpec.configure do |c| - c.filter_run :focus => true - c.run_all_when_everything_filtered = true - # apache on Ubuntu 10.04 and 12.04 doesn't like IPv6 VirtualHosts, so we skip ipv6 tests on those systems - if fact('operatingsystem') == 'Ubuntu' and (fact('operatingsystemrelease') == '10.04' or fact('operatingsystemrelease') == '12.04') - c.filter_run_excluding :ipv6 => true - end - - # Readable test descriptions - c.formatter = :documentation - - # detect the situation where PUP-5016 is triggered and skip the idempotency tests in that case - # also note how fact('puppetversion') is not available because of PUP-4359 - if fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') == '8' && shell('puppet --version').stdout =~ /^4\.2/ - c.filter_run_excluding :skip_pup_5016 => true - end - - # Configure all nodes in nodeset - c.before :suite do - run_puppet_access_login(user: 'admin') if pe_install? - # net-tools required for netstat utility being used by be_listening - if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7' - pp = <<-EOS - package { 'net-tools': ensure => installed } - EOS - - apply_manifest_on(agents, pp, :catch_failures => false) - end - - if fact('osfamily') == 'Debian' - # Make sure snake-oil certs are installed. - shell 'apt-get install -y ssl-cert' - end - - # Install module and dependencies - hosts.each do |host| - # Required for mod_passenger tests. - if fact('osfamily') == 'RedHat' - on host, puppet('module','install','stahnma/epel') - on host, puppet('module','install','puppetlabs/inifile') - #we need epel installed, so we can get plugins, wsgi, mime ... - pp = <<-EOS - class { 'epel': } - EOS - - apply_manifest_on(host, pp, :catch_failures => true) - end - - # Required for manifest to make mod_pagespeed repository available - if fact('osfamily') == 'Debian' - on host, puppet('module','install','puppetlabs-apt') - end - - # Make sure selinux is disabled so the tests work. - on host, puppet('apply', '-e', - %{"exec { 'setenforce 0': path => '/bin:/sbin:/usr/bin:/usr/sbin', onlyif => 'which setenforce && getenforce | grep Enforcing', }"}) - end - end -end - -shared_examples "a idempotent resource" do - it 'should apply with no errors' do - apply_manifest(pp, :catch_failures => true) - end - - it 'should apply a second time without changes', :skip_pup_5016 do - apply_manifest(pp, :catch_changes => true) - end -end diff --git a/modules/apache/spec/spec_helper_local.rb b/modules/apache/spec/spec_helper_local.rb deleted file mode 100644 index d861a1c..0000000 --- a/modules/apache/spec/spec_helper_local.rb +++ /dev/null @@ -1,39 +0,0 @@ -RSpec.configure do |c| - c.before :each do - # Ensure that we don't accidentally cache facts and environment - # between test cases. - Facter::Util::Loader.any_instance.stubs(:load_all) - Facter.clear - Facter.clear_messages - end -end - -RSpec.configure do |config| - config.filter_run focus: true - config.run_all_when_everything_filtered = true - #as soon as psh is updated, the following line can be removed - config.mock_with :rspec -end - -shared_examples :compile, :compile => true do - it { should compile.with_all_deps } -end - -shared_examples 'a mod class, without including apache' do - let :facts do - { - :id => 'root', - :lsbdistcodename => 'squeeze', - :kernel => 'Linux', - :osfamily => 'Debian', - :operatingsystem => 'Debian', - :operatingsystemrelease => '6', - :operatingsystemmajrelease => nil, - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :concat_basedir => '/dne', - :is_pe => false, - :hardwaremodel => 'x86_64', - } - end - it { should compile.with_all_deps } -end diff --git a/modules/apache/spec/unit/apache_version_spec.rb b/modules/apache/spec/unit/apache_version_spec.rb deleted file mode 100644 index 2036449..0000000 --- a/modules/apache/spec/unit/apache_version_spec.rb +++ /dev/null @@ -1,33 +0,0 @@ -require 'spec_helper' - -describe Facter::Util::Fact do - before do - Facter.clear - end - - describe 'apache_version' do - context 'with value' do - before :each do - expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true } - expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') {'Server version: Apache/2.4.16 (Unix) - Server built: Jul 31 2015 15:53:26'} - end - it do - expect(Facter.fact(:apache_version).value).to eq('2.4.16') - end - end - end - - describe 'apache_version with empty OS' do - context 'with value' do - before :each do - expect(Facter::Util::Resolution).to receive(:which).with('apachectl') { true } - expect(Facter::Util::Resolution).to receive(:exec).with('apachectl -v 2>&1') {'Server version: Apache/2.4.6 () - Server built: Nov 21 2015 05:34:59' } - end - it do - expect(Facter.fact(:apache_version).value).to eq('2.4.6') - end - end - end -end diff --git a/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb b/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb deleted file mode 100644 index 1bccc94..0000000 --- a/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb +++ /dev/null @@ -1,182 +0,0 @@ -require 'spec_helper' - -provider_class = Puppet::Type.type(:a2mod).provider(:gentoo) - -describe provider_class do - before :each do - provider_class.clear - end - - [:conf_file, :instances, :modules, :initvars, :conf_file, :clear].each do |method| - it "should respond to the class method #{method}" do - expect(provider_class).to respond_to(method) - end - end - - describe "when fetching modules" do - before do - @filetype = double() - end - - it "should return a sorted array of the defined parameters" do - expect(@filetype).to receive(:read) { %Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n} } - expect(provider_class).to receive(:filetype) { @filetype } - - expect(provider_class.modules).to eq(%w{bar baz foo}) - end - - it "should cache the module list" do - expect(@filetype).to receive(:read).once { %Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n} } - expect(provider_class).to receive(:filetype).once { @filetype } - - 2.times { expect(provider_class.modules).to eq(%w{bar baz foo}) } - end - - it "should normalize parameters" do - @filetype.expects(:read).returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAR"\n}) - provider_class.expects(:filetype).returns(@filetype) - - expect(provider_class.modules).to eq(%w{bar foo}) - end - end - - describe "when prefetching" do - it "should match providers to resources" do - provider = double("ssl_provider", :name => "ssl") - resource = double("ssl_resource") - resource.expects(:provider=).with(provider) - - expect(provider_class).to receive(:instances) { [provider] } - provider_class.prefetch("ssl" => resource) - end - end - - describe "when flushing" do - before :each do - @filetype = double() - allow(@filetype).to receive(:backup) - allow(provider_class).to receive(:filetype).at_least(:once) { @filetype } - - @info = double() - allow(@info).to receive(:[]).with(:name) { "info" } - allow(@info).to receive(:provider=) - - @mpm = double() - allow(@mpm).to receive(:[]).with(:name) { "mpm" } - allow(@mpm).to receive(:provider=) - - @ssl = double() - allow(@ssl).to receive(:[]).with(:name) { "ssl" } - allow(@ssl).to receive(:provider=) - end - - it "should add modules whose ensure is present" do - expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS=""} } - expect(@filetype).to receive(:write).with(%Q{APACHE2_OPTS="-D INFO"}) - - allow(@info).to receive(:should).with(:ensure) { :present } - provider_class.prefetch("info" => @info) - - provider_class.flush - end - - it "should remove modules whose ensure is present" do - expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS="-D INFO"} } - expect(@filetype).to receive(:write).with(%Q{APACHE2_OPTS=""}) - - allow(@info).to receive(:should).with(:ensure) { :absent } - allow(@info).to receive(:provider=) - provider_class.prefetch("info" => @info) - - provider_class.flush - end - - it "should not modify providers without resources" do - expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS="-D INFO -D MPM"} } - expect(@filetype).to receive(:write).with(%Q{APACHE2_OPTS="-D MPM -D SSL"}) - - allow(@info).to receive(:should).with(:ensure) { :absent } - provider_class.prefetch("info" => @info) - - allow(@ssl).to receive(:should).with(:ensure) { :present } - provider_class.prefetch("ssl" => @ssl) - - provider_class.flush - end - - it "should write the modules in sorted order" do - expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS=""} } - expect(@filetype).to receive(:write).with(%Q{APACHE2_OPTS="-D INFO -D MPM -D SSL"}) - - allow(@mpm).to receive(:should).with(:ensure) { :present } - provider_class.prefetch("mpm" => @mpm) - allow(@info).to receive(:should).with(:ensure) { :present } - provider_class.prefetch("info" => @info) - allow(@ssl).to receive(:should).with(:ensure) { :present } - provider_class.prefetch("ssl" => @ssl) - - provider_class.flush - end - - it "should write the records back once" do - expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS=""} } - expect(@filetype).to receive(:write).once.with(%Q{APACHE2_OPTS="-D INFO -D SSL"}) - - allow(@info).to receive(:should).with(:ensure) { :present } - provider_class.prefetch("info" => @info) - - allow(@ssl).to receive(:should).with(:ensure) { :present } - provider_class.prefetch("ssl" => @ssl) - - provider_class.flush - end - - it "should only modify the line containing APACHE2_OPTS" do - expect(@filetype).to receive(:read).at_least(:once) { %Q{# Comment\nAPACHE2_OPTS=""\n# Another comment} } - expect(@filetype).to receive(:write).once.with(%Q{# Comment\nAPACHE2_OPTS="-D INFO"\n# Another comment}) - - allow(@info).to receive(:should).with(:ensure) { :present } - provider_class.prefetch("info" => @info) - provider_class.flush - end - - it "should restore any arbitrary arguments" do - expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS="-Y -D MPM -X"} } - expect(@filetype).to receive(:write).once.with(%Q{APACHE2_OPTS="-Y -X -D INFO -D MPM"}) - - allow(@info).to receive(:should).with(:ensure) { :present } - provider_class.prefetch("info" => @info) - provider_class.flush - end - - it "should backup the file once if changes were made" do - expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS=""} } - expect(@filetype).to receive(:write).once.with(%Q{APACHE2_OPTS="-D INFO -D SSL"}) - - allow(@info).to receive(:should).with(:ensure) { :present } - provider_class.prefetch("info" => @info) - - allow(@ssl).to receive(:should).with(:ensure) { :present } - provider_class.prefetch("ssl" => @ssl) - - @filetype.unstub(:backup) - @filetype.expects(:backup) - provider_class.flush - end - - it "should not write the file or run backups if no changes were made" do - expect(@filetype).to receive(:read).at_least(:once) { %Q{APACHE2_OPTS="-X -D INFO -D SSL -Y"} } - expect(@filetype).to receive(:write).never - - allow(@info).to receive(:should).with(:ensure) { :present } - provider_class.prefetch("info" => @info) - - allow(@ssl).to receive(:should).with(:ensure) { :present } - provider_class.prefetch("ssl" => @ssl) - - @filetype.unstub(:backup) - @filetype.expects(:backup).never - provider_class.flush - end - end -end diff --git a/modules/apache/spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb b/modules/apache/spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb deleted file mode 100644 index 3e2f75c..0000000 --- a/modules/apache/spec/unit/puppet/parser/functions/apache_pw_hash_spec.rb +++ /dev/null @@ -1,32 +0,0 @@ -require 'spec_helper' - -describe "the apache_pw_hash function" do - let(:scope) { PuppetlabsSpec::PuppetInternals.scope } - - it "should exist" do - expect(Puppet::Parser::Functions.function("apache_pw_hash")).to eq("function_apache_pw_hash") - end - - it "should raise a ParseError if there is less than 1 arguments" do - expect { scope.function_apache_pw_hash([]) }.to( raise_error(Puppet::ParseError)) - end - - it "should raise an Puppet::ParseError if argument is an empty string" do - expect { scope.function_apache_pw_hash(['']) }.to( raise_error(Puppet::ParseError)) - end - - context "when argument is not a string" do - it { expect { scope.function_apache_pw_hash([1]) }.to( raise_error(Puppet::ParseError)) } - it { expect { scope.function_apache_pw_hash([true]) }.to( raise_error(Puppet::ParseError)) } - it { expect { scope.function_apache_pw_hash([{}]) }.to( raise_error(Puppet::ParseError)) } - it { expect { scope.function_apache_pw_hash([[]]) }.to( raise_error(Puppet::ParseError)) } - end - - it "should raise an Puppet::ParseError if argument is not a string" do - expect { scope.function_apache_pw_hash([1]) }.to( raise_error(Puppet::ParseError)) - end - - it "should return proper hash" do - expect(scope.function_apache_pw_hash(['test'])).to(eq('{SHA}qUqP5cyxm6YcTAhz05Hph5gvu9M=')) - end -end diff --git a/modules/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb b/modules/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb deleted file mode 100644 index 19d35e5..0000000 --- a/modules/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb +++ /dev/null @@ -1,53 +0,0 @@ -require 'spec_helper' - -describe "the bool2httpd function" do - let(:scope) { PuppetlabsSpec::PuppetInternals.scope } - - it "should exist" do - expect(Puppet::Parser::Functions.function("bool2httpd")).to eq("function_bool2httpd") - end - - it "should raise a ParseError if there is less than 1 arguments" do - expect { scope.function_bool2httpd([]) }.to( raise_error(Puppet::ParseError)) - end - - it "should convert true to 'On'" do - result = scope.function_bool2httpd([true]) - expect(result).to(eq('On')) - end - - it "should convert true to a string" do - result = scope.function_bool2httpd([true]) - expect(result.class).to(eq(String)) - end - - it "should convert false to 'Off'" do - result = scope.function_bool2httpd([false]) - expect(result).to(eq('Off')) - end - - it "should convert false to a string" do - result = scope.function_bool2httpd([false]) - expect(result.class).to(eq(String)) - end - - it "should accept (and return) any string" do - result = scope.function_bool2httpd(["mail"]) - expect(result).to(eq('mail')) - end - - it "should accept a nil value (and return Off)" do - result = scope.function_bool2httpd([nil]) - expect(result).to(eq('Off')) - end - - it "should accept an undef value (and return 'Off')" do - result = scope.function_bool2httpd([:undef]) - expect(result).to(eq('Off')) - end - - it "should return a default value on non-matches" do - result = scope.function_bool2httpd(['foo']) - expect(result).to(eq('foo')) - end -end diff --git a/modules/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb b/modules/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb deleted file mode 100644 index dfef66e..0000000 --- a/modules/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb +++ /dev/null @@ -1,39 +0,0 @@ -#! /usr/bin/env ruby -S rspec -require 'spec_helper' - -describe "the validate_apache_log_level function" do - let(:scope) { PuppetlabsSpec::PuppetInternals.scope } - - it "should exist" do - expect(Puppet::Parser::Functions.function("validate_apache_log_level")).to eq("function_validate_apache_log_level") - end - - it "should raise a ParseError if there is less than 1 arguments" do - expect { scope.function_validate_apache_log_level([]) }.to( raise_error(Puppet::ParseError) ) - end - - it "should raise a ParseError when given garbage" do - expect { scope.function_validate_apache_log_level(['garbage']) }.to( raise_error(Puppet::ParseError) ) - end - - it "should not raise a ParseError when given a plain log level" do - expect { scope.function_validate_apache_log_level(['info']) }.to_not raise_error - end - - it "should not raise a ParseError when given a log level and module log level" do - expect { scope.function_validate_apache_log_level(['warn ssl:info']) }.to_not raise_error - end - - it "should not raise a ParseError when given a log level and module log level" do - expect { scope.function_validate_apache_log_level(['warn mod_ssl.c:info']) }.to_not raise_error - end - - it "should not raise a ParseError when given a log level and module log level" do - expect { scope.function_validate_apache_log_level(['warn ssl_module:info']) }.to_not raise_error - end - - it "should not raise a ParseError when given a trace level" do - expect { scope.function_validate_apache_log_level(['trace4']) }.to_not raise_error - end - -end diff --git a/modules/apache/tasks/init.json b/modules/apache/tasks/init.json deleted file mode 100644 index 0d0ceae..0000000 --- a/modules/apache/tasks/init.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "description": "Allows you to perform apache service functions", - "input_method": "stdin", - "parameters": { - "action": { - "description": "Action to perform ", - "type": "Enum[reload]" - } - } -} diff --git a/modules/apache/tasks/init.rb b/modules/apache/tasks/init.rb deleted file mode 100755 index a6a474d..0000000 --- a/modules/apache/tasks/init.rb +++ /dev/null @@ -1,23 +0,0 @@ -#!/opt/puppetlabs/puppet/bin/ruby -require 'json' -require 'open3' -require 'puppet' - -def service(action) - cmd_string = "service apache2 #{action}" - stdout, stderr, status = Open3.capture3(cmd_string) - raise Puppet::Error, stderr if status != 0 - { status: "#{action} successful" } -end - -params = JSON.parse(STDIN.read) -action = params['action'] - -begin - result = service(action) - puts result.to_json - exit 0 -rescue Puppet::Error => e - puts({ status: 'failure', error: e.message }.to_json) - exit 1 -end diff --git a/modules/apache/templates/confd/no-accf.conf.erb b/modules/apache/templates/confd/no-accf.conf.erb deleted file mode 100644 index 10e5164..0000000 --- a/modules/apache/templates/confd/no-accf.conf.erb +++ /dev/null @@ -1,4 +0,0 @@ - - AcceptFilter http none - AcceptFilter https none - diff --git a/modules/apache/templates/fastcgi/server.erb b/modules/apache/templates/fastcgi/server.erb deleted file mode 100644 index bae56d4..0000000 --- a/modules/apache/templates/fastcgi/server.erb +++ /dev/null @@ -1,22 +0,0 @@ -<% - timeout = " -idle-timeout #{@timeout}" - flush = "" - if @flush - flush = " -flush" - end - if @socket - host_or_socket = " -socket #{@socket}" - else - host_or_socket = " -host #{@host}" - end - - pass_header = "" - if @pass_header and ! @pass_header.empty? - pass_header = " -pass-header #{@pass_header}" - end - - options = timeout + flush + host_or_socket + pass_header --%> -FastCGIExternalServer <%= @faux_path %><%= options %> -Alias <%= @fcgi_alias %> <%= @faux_path %> -Action <%= @file_type %> <%= @fcgi_alias %> diff --git a/modules/apache/templates/httpd.conf.erb b/modules/apache/templates/httpd.conf.erb deleted file mode 100755 index ddb40b5..0000000 --- a/modules/apache/templates/httpd.conf.erb +++ /dev/null @@ -1,157 +0,0 @@ -# Security -ServerTokens <%= @server_tokens %> -ServerSignature <%= scope.function_bool2httpd([@server_signature]) %> -TraceEnable <%= scope.function_bool2httpd([@trace_enable]) %> - -ServerName "<%= @servername %>" -ServerRoot "<%= @server_root %>" -PidFile <%= @pidfile %> -Timeout <%= @timeout %> -KeepAlive <%= @keepalive %> -MaxKeepAliveRequests <%= @max_keepalive_requests %> -KeepAliveTimeout <%= @keepalive_timeout %> -LimitRequestFieldSize <%= @limitreqfieldsize %> -<%# Actually >= 2.4.24, but the minor version is not provided -%> -<%- if @http_protocol_options and scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> -HttpProtocolOptions <%= @http_protocol_options %> -<%- end -%> - -<%- if @rewrite_lock and scope.function_versioncmp([@apache_version, '2.2']) <= 0 -%> -RewriteLock <%= @rewrite_lock %> -<%- end -%> - -User <%= @user %> -Group <%= @group %> - -AccessFileName .htaccess - -<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> - Require all denied -<%- else -%> - Order allow,deny - Deny from all - Satisfy all -<%- end -%> - - - - Options <%= Array(@root_directory_options).join(' ') %> - AllowOverride None -<%- if @root_directory_secured -%> -<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> - Require all denied -<%- else -%> - Order deny,allow - Deny from all -<%- end -%> -<%- end -%> - - -<% if @default_charset -%> -AddDefaultCharset <%= @default_charset %> -<% end -%> - -<%- if scope.function_versioncmp([@apache_version, '2.4']) < 0 -%> -DefaultType <%= @default_type %> -<%- end -%> -HostnameLookups Off -<%- if /^[|\/]/.match(@error_log) || /^syslog:/.match(@error_log) -%> -ErrorLog "<%= @error_log %>" -<%- else -%> -ErrorLog "<%= @logroot %>/<%= @error_log %>" -<%- end -%> -LogLevel <%= @log_level %> -EnableSendfile <%= @sendfile %> -<%- if @allow_encoded_slashes -%> -AllowEncodedSlashes <%= @allow_encoded_slashes %> -<%- end -%> -<%- if @file_e_tag -%> -FileETag <%= @file_e_tag %> -<%- end -%> - -#Listen 80 - -<% if @apxs_workaround -%> -# Workaround: without this hack apxs would be confused about where to put -# LoadModule directives and fail entire procedure of apache package -# installation/reinstallation. This problem was observed on FreeBSD (apache22). -#LoadModule fake_module libexec/apache22/mod_fake.so -<% end -%> - -Include "<%= @mod_load_dir %>/*.load" -<% if @mod_load_dir != @confd_dir and @mod_load_dir != @vhost_load_dir -%> -Include "<%= @mod_load_dir %>/*.conf" -<% end -%> -Include "<%= @ports_file %>" - -<% unless @log_formats.has_key?('combined') -%> -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined -<% end -%> -<% unless @log_formats.has_key?('common') -%> -LogFormat "%h %l %u %t \"%r\" %>s %b" common -<% end -%> -<% unless @log_formats.has_key?('referer') -%> -LogFormat "%{Referer}i -> %U" referer -<% end -%> -<% unless @log_formats.has_key?('agent') -%> -LogFormat "%{User-agent}i" agent -<% end -%> -<% unless @log_formats.has_key?('forwarded') -%> -LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded -<% end -%> -<% if @log_formats and !@log_formats.empty? -%> - <%- @log_formats.sort.each do |nickname,format| -%> -LogFormat "<%= format -%>" <%= nickname %> - <%- end -%> -<% end -%> - -<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> -IncludeOptional "<%= @confd_dir %>/*.conf" -<%- else -%> -Include "<%= @confd_dir %>/*.conf" -<%- end -%> -<% if @vhost_load_dir != @confd_dir -%> -<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> -IncludeOptional "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>" -<%- else -%> -Include "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>" -<%- end -%> -<% end -%> - -<% if @error_documents -%> -# /usr/share/apache2/error on debian -Alias /error/ "<%= @error_documents_path %>/" - -"> - AllowOverride None - Options IncludesNoExec - AddOutputFilter Includes html - AddHandler type-map var -<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> - Require all granted -<%- else -%> - Order allow,deny - Allow from all -<%- end -%> - LanguagePriority en cs de es fr it nl sv pt-br ro - ForceLanguagePriority Prefer Fallback - - -ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var -ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var -ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var -ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var -ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var -ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var -ErrorDocument 410 /error/HTTP_GONE.html.var -ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var -ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var -ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var -ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var -ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var -ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var -ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var -ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var -ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var -ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var -<% end -%> diff --git a/modules/apache/templates/listen.erb b/modules/apache/templates/listen.erb deleted file mode 100644 index 8fc871b..0000000 --- a/modules/apache/templates/listen.erb +++ /dev/null @@ -1,6 +0,0 @@ -<%# Listen should always be one of: - - - - : - - [ --%> -Listen <%= @listen_addr_port %> diff --git a/modules/apache/templates/mod/alias.conf.erb b/modules/apache/templates/mod/alias.conf.erb deleted file mode 100644 index 8580f70..0000000 --- a/modules/apache/templates/mod/alias.conf.erb +++ /dev/null @@ -1,13 +0,0 @@ - -Alias /icons/ "<%= @icons_path %>/" -"> - Options <%= @icons_options %> - AllowOverride None -<%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%> - Require all granted -<%- else -%> - Order allow,deny - Allow from all -<%- end -%> - - diff --git a/modules/apache/templates/mod/auth_cas.conf.erb b/modules/apache/templates/mod/auth_cas.conf.erb deleted file mode 100644 index b59c535..0000000 --- a/modules/apache/templates/mod/auth_cas.conf.erb +++ /dev/null @@ -1,58 +0,0 @@ -CASCookiePath <%= @cas_cookie_path %> -CASLoginURL <%= @cas_login_url %> -CASValidateURL <%= @cas_validate_url %> - -CASVersion <%= @cas_version %> -CASDebug <%= @cas_debug %> - -<% if @cas_certificate_path -%> -CASCertificatePath <%= @cas_certificate_path %> -<% end -%> -<% if @cas_proxy_validate_url -%> -CASProxyValidateURL <%= @cas_proxy_validate_url %> -<% end -%> -<% if @cas_validate_server -%> -CASValidateServer <%= @cas_validate_server %> -<% end -%> -<% if @cas_validate_depth -%> -CASValidateDepth <%= @cas_validate_depth %> -<% end -%> -<% if @cas_root_proxied_as -%> -CASRootProxiedAs <%= @cas_root_proxied_as %> -<% end -%> -<% if @cas_cookie_entropy -%> -CASCookieEntropy <%= @cas_cookie_entropy %> -<% end -%> -<% if @cas_timeout -%> -CASTimeout <%= @cas_timeout %> -<% end -%> -<% if @cas_idle_timeout -%> -CASIdleTimeout <%= @cas_idle_timeout %> -<% end -%> -<% if @cas_cache_clean_interval -%> -CASCacheCleanInterval <%= @cas_cache_clean_interval %> -<% end -%> -<% if @cas_cookie_domain -%> -CASCookieDomain <%= @cas_cookie_domain %> -<% end -%> -<% if @cas_cookie_http_only -%> -CASCookieHttpOnly <%= @cas_cookie_http_only %> -<% end -%> -<% if @cas_authoritative -%> -CASAuthoritative <%= @cas_authoritative %> -<% end -%> -<%- if @cas_sso_enabled -%> -CASSSOEnabled On -<%- end -%> -<%- if @cas_validate_saml -%> -CASValidateSAML On -<%- end -%> -<%- if @cas_attribute_prefix -%> -CASAttributePrefix <%= @cas_attribute_prefix %> -<%- end -%> -<%- if @cas_attribute_delimiter -%> -CASAttributeDelimiter <%= @cas_attribute_delimiter %> -<%- end -%> -<%- if @cas_scrub_request_headers -%> -CASAttributeDelimiter On -<%- end -%> diff --git a/modules/apache/templates/mod/auth_mellon.conf.erb b/modules/apache/templates/mod/auth_mellon.conf.erb deleted file mode 100644 index e36a733..0000000 --- a/modules/apache/templates/mod/auth_mellon.conf.erb +++ /dev/null @@ -1,21 +0,0 @@ -<%- if @mellon_cache_size -%> -MellonCacheSize <%= @mellon_cache_size %> -<%- end -%> -<%- if @mellon_cache_entry_size -%> -MellonCacheEntrySize <%= @mellon_cache_entry_size %> -<%- end -%> -<%- if @mellon_lock_file -%> -MellonLockFile "<%= @mellon_lock_file %>" -<%- end -%> -<%- if @mellon_post_directory -%> -MellonPostDirectory "<%= @mellon_post_directory %>" -<%- end -%> -<%- if @mellon_post_ttl -%> -MellonPostTTL <%= @mellon_post_ttl %> -<%- end -%> -<%- if @mellon_post_size -%> -MellonPostSize <%= @mellon_post_size %> -<%- end -%> -<%- if @mellon_post_count -%> -MellonPostCount <%= @mellon_post_count %> -<%- end -%> diff --git a/modules/apache/templates/mod/authn_dbd.conf.erb b/modules/apache/templates/mod/authn_dbd.conf.erb deleted file mode 100644 index e04fb3e..0000000 --- a/modules/apache/templates/mod/authn_dbd.conf.erb +++ /dev/null @@ -1,17 +0,0 @@ -#Database Management -DBDriver <%= @authn_dbd_dbdriver %> - -#Connection string: database name and login credentials -DBDParams "<%= @authn_dbd_params %>" - -#Parameters for Connection Pool Management -DBDMin <%= @authn_dbd_min %> -DBDMax <%= @authn_dbd_max %> -DBDKeep <%= @authn_dbd_keep %> -DBDExptime <%= @authn_dbd_exptime %> - -<%- if @authn_dbd_alias -%> -> - AuthDBDUserPWQuery "<%= @authn_dbd_query %>" - -<%- end -%> diff --git a/modules/apache/templates/mod/authnz_ldap.conf.erb b/modules/apache/templates/mod/authnz_ldap.conf.erb deleted file mode 100644 index ed1334e..0000000 --- a/modules/apache/templates/mod/authnz_ldap.conf.erb +++ /dev/null @@ -1,5 +0,0 @@ -<% if @verify_server_cert == true -%> -LDAPVerifyServerCert On -<% else -%> -LDAPVerifyServerCert Off -<% end -%> diff --git a/modules/apache/templates/mod/autoindex.conf.erb b/modules/apache/templates/mod/autoindex.conf.erb deleted file mode 100644 index ef6bbeb..0000000 --- a/modules/apache/templates/mod/autoindex.conf.erb +++ /dev/null @@ -1,56 +0,0 @@ -IndexOptions FancyIndexing VersionSort HTMLTable NameWidth=* DescriptionWidth=* Charset=UTF-8 -AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip x-bzip2 - -AddIconByType (TXT,/icons/text.gif) text/* -AddIconByType (IMG,/icons/image2.gif) image/* -AddIconByType (SND,/icons/sound2.gif) audio/* -AddIconByType (VID,/icons/movie.gif) video/* - -AddIcon /icons/binary.gif .bin .exe -AddIcon /icons/binhex.gif .hqx -AddIcon /icons/tar.gif .tar -AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv -AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip -AddIcon /icons/a.gif .ps .ai .eps -AddIcon /icons/layout.gif .html .shtml .htm .pdf -AddIcon /icons/text.gif .txt -AddIcon /icons/c.gif .c -AddIcon /icons/p.gif .pl .py -AddIcon /icons/f.gif .for -AddIcon /icons/dvi.gif .dvi -AddIcon /icons/uuencoded.gif .uu -AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl -AddIcon /icons/tex.gif .tex -AddIcon /icons/bomb.gif /core -AddIcon (SND,/icons/sound2.gif) .ogg -AddIcon (VID,/icons/movie.gif) .ogm - -AddIcon /icons/back.gif .. -AddIcon /icons/hand.right.gif README -AddIcon /icons/folder.gif ^^DIRECTORY^^ -AddIcon /icons/blank.gif ^^BLANKICON^^ - -AddIcon /icons/odf6odt-20x22.png .odt -AddIcon /icons/odf6ods-20x22.png .ods -AddIcon /icons/odf6odp-20x22.png .odp -AddIcon /icons/odf6odg-20x22.png .odg -AddIcon /icons/odf6odc-20x22.png .odc -AddIcon /icons/odf6odf-20x22.png .odf -AddIcon /icons/odf6odb-20x22.png .odb -AddIcon /icons/odf6odi-20x22.png .odi -AddIcon /icons/odf6odm-20x22.png .odm - -AddIcon /icons/odf6ott-20x22.png .ott -AddIcon /icons/odf6ots-20x22.png .ots -AddIcon /icons/odf6otp-20x22.png .otp -AddIcon /icons/odf6otg-20x22.png .otg -AddIcon /icons/odf6otc-20x22.png .otc -AddIcon /icons/odf6otf-20x22.png .otf -AddIcon /icons/odf6oti-20x22.png .oti -AddIcon /icons/odf6oth-20x22.png .oth - -DefaultIcon /icons/unknown.gif -ReadmeName README.html -HeaderName HEADER.html - -IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t diff --git a/modules/apache/templates/mod/cgid.conf.erb b/modules/apache/templates/mod/cgid.conf.erb deleted file mode 100644 index 5f82d74..0000000 --- a/modules/apache/templates/mod/cgid.conf.erb +++ /dev/null @@ -1 +0,0 @@ -ScriptSock "<%= @cgisock_path %>" diff --git a/modules/apache/templates/mod/cluster.conf.erb b/modules/apache/templates/mod/cluster.conf.erb deleted file mode 100644 index 58229a8..0000000 --- a/modules/apache/templates/mod/cluster.conf.erb +++ /dev/null @@ -1,26 +0,0 @@ -Listen <%= @ip %>:<%= @port %> -:<%= @port %>> - - Order deny,allow - Deny from all - Allow from <%= @allowed_network %> - - - KeepAliveTimeout <%= @keep_alive_timeout %> - MaxKeepAliveRequests <%= @max_keep_alive_requests %> - EnableMCPMReceive <%= scope.function_bool2httpd([@enable_mcpm_receive]) %> - - ManagerBalancerName <%= @balancer_name %> - ServerAdvertise <%= scope.function_bool2httpd([@server_advertise]) %> - <%- if @server_advertise == true and @advertise_frequency != nil -%> - AdvertiseFrequency <%= @advertise_frequency %> - <%- end -%> - - - SetHandler mod_cluster-manager - Order deny,allow - Deny from all - Allow from <%= @manager_allowed_network %> - - - diff --git a/modules/apache/templates/mod/dav_fs.conf.erb b/modules/apache/templates/mod/dav_fs.conf.erb deleted file mode 100644 index 3c53e9e..0000000 --- a/modules/apache/templates/mod/dav_fs.conf.erb +++ /dev/null @@ -1 +0,0 @@ -DAVLockDB "<%= @dav_lock %>" diff --git a/modules/apache/templates/mod/deflate.conf.erb b/modules/apache/templates/mod/deflate.conf.erb deleted file mode 100644 index ede8b2e..0000000 --- a/modules/apache/templates/mod/deflate.conf.erb +++ /dev/null @@ -1,7 +0,0 @@ -<%- @types.sort.each do |type| -%> -AddOutputFilterByType DEFLATE <%= type %> -<%- end -%> - -<%- @notes.sort.each do |type,note| -%> -DeflateFilterNote <%= type %> <%=note %> -<%- end -%> diff --git a/modules/apache/templates/mod/dir.conf.erb b/modules/apache/templates/mod/dir.conf.erb deleted file mode 100644 index 741f6ae..0000000 --- a/modules/apache/templates/mod/dir.conf.erb +++ /dev/null @@ -1 +0,0 @@ -DirectoryIndex <%= @indexes.join(' ') %> diff --git a/modules/apache/templates/mod/disk_cache.conf.erb b/modules/apache/templates/mod/disk_cache.conf.erb deleted file mode 100644 index b1b460e..0000000 --- a/modules/apache/templates/mod/disk_cache.conf.erb +++ /dev/null @@ -1,4 +0,0 @@ -CacheEnable disk / -CacheRoot "<%= @_cache_root %>" -CacheDirLevels 2 -CacheDirLength 1 diff --git a/modules/apache/templates/mod/dumpio.conf.erb b/modules/apache/templates/mod/dumpio.conf.erb deleted file mode 100644 index 29c34e2..0000000 --- a/modules/apache/templates/mod/dumpio.conf.erb +++ /dev/null @@ -1,3 +0,0 @@ -# https://httpd.apache.org/docs/2.4/mod/mod_dumpio.html -DumpIOInput "<%= @dump_io_input %>" -DumpIOOutput "<%= @dump_io_output %>" diff --git a/modules/apache/templates/mod/event.conf.erb b/modules/apache/templates/mod/event.conf.erb deleted file mode 100644 index bca707c..0000000 --- a/modules/apache/templates/mod/event.conf.erb +++ /dev/null @@ -1,33 +0,0 @@ - - <%- if @serverlimit -%> - ServerLimit <%= @serverlimit %> - <%- end -%> - <%- if @startservers -%> - StartServers <%= @startservers %> - <%- end -%> - <%- if @maxrequestworkers -%> - MaxRequestWorkers <%= @maxrequestworkers %> - <%- elsif @maxclients -%> - MaxClients <%= @maxclients %> - <%- end -%> - <%- if @minsparethreads -%> - MinSpareThreads <%= @minsparethreads %> - <%- end -%> - <%- if @maxsparethreads -%> - MaxSpareThreads <%= @maxsparethreads %> - <%- end -%> - <%- if @threadsperchild -%> - ThreadsPerChild <%= @threadsperchild %> - <%- end -%> - <%- if @maxconnectionsperchild -%> - MaxConnectionsPerChild <%= @maxconnectionsperchild %> - <%- elsif @maxrequestsperchild -%> - MaxRequestsPerChild <%= @maxrequestsperchild %> - <%- end -%> - <%- if @threadlimit -%> - ThreadLimit <%= @threadlimit %> - <%- end -%> - <%- if @listenbacklog -%> - ListenBacklog <%= @listenbacklog %> - <%- end -%> - diff --git a/modules/apache/templates/mod/expires.conf.erb b/modules/apache/templates/mod/expires.conf.erb deleted file mode 100644 index 7660cfc..0000000 --- a/modules/apache/templates/mod/expires.conf.erb +++ /dev/null @@ -1,11 +0,0 @@ -ExpiresActive <%= scope.function_bool2httpd([@expires_active]) %> -<%- if ! @expires_default.nil? and ! @expires_default.empty? -%> -ExpiresDefault "<%= @expires_default %>" -<%- end -%> -<%- if ! @expires_by_type.nil? and ! @expires_by_type.empty? -%> -<%- [@expires_by_type].flatten.each do |line| -%> -<%- line.map do |type, seconds| -%> -ExpiresByType <%= type %> "<%= seconds -%>" -<%- end -%> -<%- end -%> -<%- end -%> diff --git a/modules/apache/templates/mod/ext_filter.conf.erb b/modules/apache/templates/mod/ext_filter.conf.erb deleted file mode 100644 index 67f98fd..0000000 --- a/modules/apache/templates/mod/ext_filter.conf.erb +++ /dev/null @@ -1,6 +0,0 @@ -# mod_ext_filter definitions -<%- if @ext_filter_define.length >= 1 -%> -<%- @ext_filter_define.keys.sort.each do |name| -%> -ExtFilterDefine <%= name %> <%= @ext_filter_define[name] %> -<%- end -%> -<%- end -%> diff --git a/modules/apache/templates/mod/fastcgi.conf.erb b/modules/apache/templates/mod/fastcgi.conf.erb deleted file mode 100644 index 93c8d86..0000000 --- a/modules/apache/templates/mod/fastcgi.conf.erb +++ /dev/null @@ -1,8 +0,0 @@ -# The Fastcgi Apache module configuration file is being -# managed by Puppet and changes will be overwritten. - - - SetHandler fastcgi-script - - FastCgiIpcDir "<%= @fastcgi_lib_path %>" - diff --git a/modules/apache/templates/mod/fcgid.conf.erb b/modules/apache/templates/mod/fcgid.conf.erb deleted file mode 100644 index a82bc30..0000000 --- a/modules/apache/templates/mod/fcgid.conf.erb +++ /dev/null @@ -1,5 +0,0 @@ - -<% @options.sort_by {|key, value| key}.each do |key, value| -%> - <%= key %> <%= value %> -<% end -%> - diff --git a/modules/apache/templates/mod/geoip.conf.erb b/modules/apache/templates/mod/geoip.conf.erb deleted file mode 100644 index 00e61d9..0000000 --- a/modules/apache/templates/mod/geoip.conf.erb +++ /dev/null @@ -1,25 +0,0 @@ -GeoIPEnable <%= scope.function_bool2httpd([@enable]) %> - -<%- if @db_file and ! [ false, 'false', '' ].include?(@db_file) -%> - <%- if @db_file.kind_of?(Array) -%> - <%- Array(@db_file).each do |file| -%> -GeoIPDBFile <%= file %> <%= @flag %> - <%- end -%> - <%- else -%> -GeoIPDBFile <%= @db_file %> <%= @flag %> - <%- end -%> -<%- end -%> -GeoIPOutput <%= @output %> -<% if ! @enable_utf8.nil? -%> -GeoIPEnableUTF8 <%= scope.function_bool2httpd([@enable_utf8]) %> -<% end -%> -<% if ! @scan_proxy_headers.nil? -%> -GeoIPScanProxyHeaders <%= scope.function_bool2httpd([@scan_proxy_headers]) %> -<% end -%> -<% if ! @scan_proxy_header_field.nil? -%> -GeoIPScanProxyHeaderField <%= @scan_proxy_header_field %> -<% end -%> -<% if ! @use_last_xforwarededfor_ip.nil? -%> -GeoIPUseLastXForwardedForIP <%= scope.function_bool2httpd([@use_last_xforwarededfor_ip]) %> -<% end -%> - diff --git a/modules/apache/templates/mod/info.conf.erb b/modules/apache/templates/mod/info.conf.erb deleted file mode 100644 index c661a23..0000000 --- a/modules/apache/templates/mod/info.conf.erb +++ /dev/null @@ -1,19 +0,0 @@ -> - SetHandler server-info -<%- if @restrict_access -%> - <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%> - Require ip <%= Array(@allow_from).join(" ") %> - <%- else -%> - Order deny,allow - Deny from all - <%- if @allow_from and ! @allow_from.empty? -%> - <%- @allow_from.each do |allowed| -%> - Allow from <%= allowed %> - <%- end -%> - <%- else -%> - Allow from 127.0.0.1 - Allow from ::1 - <%- end -%> - <%- end -%> -<%- end -%> - diff --git a/modules/apache/templates/mod/itk.conf.erb b/modules/apache/templates/mod/itk.conf.erb deleted file mode 100644 index f45f2b3..0000000 --- a/modules/apache/templates/mod/itk.conf.erb +++ /dev/null @@ -1,8 +0,0 @@ - - StartServers <%= @startservers %> - MinSpareServers <%= @minspareservers %> - MaxSpareServers <%= @maxspareservers %> - ServerLimit <%= @serverlimit %> - MaxClients <%= @maxclients %> - MaxRequestsPerChild <%= @maxrequestsperchild %> - diff --git a/modules/apache/templates/mod/jk.conf.erb b/modules/apache/templates/mod/jk.conf.erb deleted file mode 100644 index c0d5bc2..0000000 --- a/modules/apache/templates/mod/jk.conf.erb +++ /dev/null @@ -1,167 +0,0 @@ -# This file is generated automatically by Puppet - DO NOT EDIT -# Any manual changes will be overwritten - - - <%- if @workers_file -%> - JkWorkersFile <%= @workers_file %> - <%- end -%> - <%- if @worker_property -%> - <%- @worker_property.sort.each do |property,value| -%> - JkWorkerProperty <%= property %>=<%= value %> - <%- end -%> - <%- end -%> - <%- if @shm_path -%> - JkShmFile <%= @shm_path %> - <%- end -%> - <%- if @shm_size -%> - JkShmSize <%= @shm_size %> - <%- end -%> - <%- if @mount_file -%> - JkMountFile <%= @mount_file %> - <%- end -%> - <%- if @mount_file_reload -%> - JkMountFileReload <%= @mount_file_reload %> - <%- end -%> - <%- if @mount -%> - <%- @mount.sort.each do |url_prefix,worker_name| -%> - JkMount <%= url_prefix %> <%= worker_name %> - <%- end -%> - <%- end -%> - <%- if @un_mount -%> - <%- @un_mount.sort.each do |url_prefix,worker_name| -%> - JkUnMount <%= url_prefix %> <%= worker_name %> - <%- end -%> - <%- end -%> - <%- if @auto_alias -%> - JkAutoAlias <%= @auto_alias %> - <%- end -%> - <%- if @mount_copy -%> - JkMountCopy <%= @mount_copy %> - <%- end -%> - <%- if @worker_indicator -%> - JkWorkerIndicator <%= @worker_indicator %> - <%- end -%> - <%- if @watchdog_interval -%> - JkWatchdogInterval <%= @watchdog_interval %> - <%- end -%> - <%- if @log_path -%> - JkLogFile <%= @log_path %> - <%- end -%> - <%- if @log_level -%> - JkLogLevel <%= @log_level %> - <%- end -%> - <%- if @log_stamp_format -%> - JkLogStampFormat <%= @log_stamp_format %> - <%- end -%> - <%- if @request_log_format -%> - JkRequestLogFormat <%= @request_log_format %> - <%- end -%> - <%- if @extract_ssl -%> - JkExtractSSL <%= @extract_ssl %> - <%- end -%> - <%- if @https_indicator -%> - JkHTTPSIndicator <%= @https_indicator %> - <%- end -%> - <%- if @sslprotocol_indicator -%> - JkSSLPROTOCOLIndicator <%= @sslprotocol_indicator %> - <%- end -%> - <%- if @certs_indicator -%> - JkCERTSIndicator <%= @certs_indicator %> - <%- end -%> - <%- if @cipher_indicator -%> - JkCIPHERIndicator <%= @cipher_indicator %> - <%- end -%> - <%- if @certchain_prefix -%> - JkCERTCHAINPrefix <%= @certchain_prefix %> - <%- end -%> - <%- if @session_indicator -%> - JkSESSIONIndicator <%= @session_indicator %> - <%- end -%> - <%- if @keysize_indicator -%> - JkKEYSIZEIndicator <%= @keysize_indicator %> - <%- end -%> - <%- if @local_name_indicator -%> - JkLocalNameIndicator <%= @local_name_indicator %> - <%- end -%> - <%- if @ignore_cl_indicator -%> - JkIgnoreCLIndicator <%= @ignore_cl_indicator %> - <%- end -%> - <%- if @local_addr_indicator -%> - JkLocalAddrIndicator <%= @local_addr_indicator %> - <%- end -%> - <%- if @local_port_indicator -%> - JkLocalPortIndicator <%= @local_port_indicator %> - <%- end -%> - <%- if @remote_host_indicator -%> - JkRemoteHostIndicator <%= @remote_host_indicator %> - <%- end -%> - <%- if @remote_addr_indicator -%> - JkRemoteAddrIndicator <%= @remote_addr_indicator %> - <%- end -%> - <%- if @remote_port_indicator -%> - JkRemotePortIndicator <%= @remote_port_indicator %> - <%- end -%> - <%- if @remote_user_indicator -%> - JkRemoteUserIndicator <%= @remote_user_indicator %> - <%- end -%> - <%- if @auth_type_indicator -%> - JkAuthTypeIndicator <%= @auth_type_indicator %> - <%- end -%> - <%- if @options -%> - <%- @options.sort.each do |fwd_option| -%> - JkOptions <%= fwd_option %> - <%- end -%> - <%- end -%> - <%- if @env_var -%> - <%- @env_var.sort.each do |variable,value| -%> - JkEnvVar <%= variable %><% if not value.empty? -%> value<% end -%> - <%- end -%> - <%- end -%> - <%- if @strip_session -%> - JkStripSession <%= @strip_session %> - <%- end -%> - <%-# -%> - <%-# Global locations for mod_jk are defined in array location_list -%> - <%-# Each array item is a hash with quoted* property name as key -%> - <%-# and value as value itself -%> - <%-# You can define a comment in a special 'comment' key -%> - <%-# -%> - <%-# Example: -%> - <%-# -%> - <%-# # Configures jkstatus -%> - <%-# JkMount status -%> - <%-# Order deny,allow -%> - <%-# Deny from all -%> - <%-# Allow from 127.0.0.1 -%> - <%-# -%> - <%-# -%> - <%-# Is defined as: -%> - <%-# location_list = [ -%> - <%-# { -%> - <%-# 'Location' => '/jkstatus/', -%> - <%-# 'Comment' => 'Configures jkstatus', -%> - <%-# 'JkMount' => 'status', -%> - <%-# 'Order' => 'deny,allow', -%> - <%-# 'Deny from' => 'all', -%> - <%-# 'Allow from' => '127.0.0.1', -%> - <%-# }, -%> - <%-# ] -%> - <%-# * Keys must be quoted to allow arbitrary case and/or multi-word keys -%> - <%-# (BTW, note the case of 'Location' and 'Comment' keys) -%> - <%-# -%> - <%- if @location_list -%> - <%- @location_list.each do |location_tag| -%> - - > - <%- if location_tag.has_key?('Comment') -%> - # <%= location_tag['Comment'] %> - <%- end -%> - <%- location_tag.each do |property,value| -%> - <%- if property != 'Comment' and property != 'Location' -%> - <%= property %> <%= value %> - <%- end -%> - <%- end -%> - - <%- end -%> - <%- end -%> - diff --git a/modules/apache/templates/mod/jk/uriworkermap.properties.erb b/modules/apache/templates/mod/jk/uriworkermap.properties.erb deleted file mode 100644 index 4d9eac0..0000000 --- a/modules/apache/templates/mod/jk/uriworkermap.properties.erb +++ /dev/null @@ -1,40 +0,0 @@ -# This file is generated automatically by Puppet - DO NOT EDIT -# Any manual changes will be overwritten -<%# -%> -<%# mount_file_content should be a hash which keys are workers names -%> -<%# and values are new hashes with two items: -%> -<%# uri_list - Array with URIs to be mapped to worker -%> -<%# comment - Optional comment line -%> -<%# -%> -<%# Example: -%> -<%# # Worker 1 -%> -<%# /context_1/ = worker_1 -%> -<%# /context_1/* = worker_1 -%> -<%# -%> -<%# # Worker 2 -%> -<%# / = worker_2 -%> -<%# /context_2/ = worker_2 -%> -<%# /context_2/* = worker_2 -%> -<%# -%> -<%# should be parameterized as: -%> -<%# $mount_file_content = { -%> -<%# worker_1 => { -%> -<%# uri_list => ['/context_1/', '/context_1/*'], -%> -<%# comment => 'Worker 1', -%> -<%# }, -%> -<%# worker_2 => { -%> -<%# uri_list => ['/context_2/', '/context_2/*'], -%> -<%# comment => 'Worker 2', -%> -<%# }, -%> -<%# }, -%> -<%# -%> -<% @mount_file_content.sort.each do |worker,directives| -%> - -<%# Places comment before worker mappings -%> -<% if directives.has_key?('comment') -%> -# <%= directives['comment'] %> -<% end -%> -<% directives['uri_list'].sort.each do |uri| -%> -<%= uri %> = <%= worker %> -<% end -%> -<% end -%> diff --git a/modules/apache/templates/mod/jk/workers.properties.erb b/modules/apache/templates/mod/jk/workers.properties.erb deleted file mode 100644 index ed3eb61..0000000 --- a/modules/apache/templates/mod/jk/workers.properties.erb +++ /dev/null @@ -1,62 +0,0 @@ -# This file is generated automatically by Puppet - DO NOT EDIT -# Any manual changes will be overwritten -<%# -%> -<%# workers_file_content should be a hash which keys are workers names -%> -<%# and values are new hashes with properties and values -%> -<%# Two keys are special (and reserved!): -%> -<%# worker_lists - Array of comma-separated worker names lists -%> -<%# Each list is an item of the array and will be placed in one line -%> -<%# worker_mantain - Numeric string -%> -<%# -%> -<%# Example: -%> -<%# worker.list = status -%> -<%# worker.list = some_name,other_name -%> -<%# worker.mantain = 60 -%> -<%# # Optional comment -%> -<%# worker.some_name.type=ajp13 -%> -<%# worker.some_name.socket_keepalive=true -%> -<%# # I just like comments -%> -<%# worker.other_name.type=ajp12 (why would you?) -%> -<%# worker.other_name.socket_keepalive=false -%> -<%# -%> -<%# should be parameterized as: -%> -<%# $workers_file_content = { -%> -<%# worker_lists => ['status', 'some_name,other_name'], -%> -<%# worker_mantain => '60', -%> -<%# some_name => { -%> -<%# type => 'ajp13', -%> -<%# socket_keepalive => 'true', -%> -<%# comment => 'Optional comment', -%> -<%# }, -%> -<%# other_name => { -%> -<%# type => 'ajp12', -%> -<%# socket_keepalive => 'false', -%> -<%# comment => 'I just like comments', -%> -<%# }, -%> -<%# }, -%> -<%# -%> -<% if @workers_file_content.has_key?('worker_lists') -%> - -<% @workers_file_content['worker_lists'].sort.each do |list| -%> -worker.list = <%= list %> -<% end -%> -<% end -%> -<% if @workers_file_content.has_key?('worker_mantain') -%> - -worker.maintain = <%= @workers_file_content['worker_mantain'] %> -<% end -%> -<% @workers_file_content.sort.each do |name,directives| -%> -<%# Skip hash items with the reserved keys -%> -<% if not ['worker_lists', 'worker_mantain'].include?(name) -%> - -<%# Places comment before worker directives -%> -<% if directives.has_key?('comment') -%> -# <%= directives['comment'] %> -<% end -%> -<% directives.sort.each do |property,value| -%> -<% if property != 'comment' -%> -worker.<%= name %>.<%= property %>=<%= value %> -<% end -%> -<% end -%> -<% end -%> -<% end -%> diff --git a/modules/apache/templates/mod/ldap.conf.erb b/modules/apache/templates/mod/ldap.conf.erb deleted file mode 100644 index 5ac0c1c..0000000 --- a/modules/apache/templates/mod/ldap.conf.erb +++ /dev/null @@ -1,29 +0,0 @@ - - SetHandler ldap-status - <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%> - Require ip 127.0.0.1 ::1 - <%- else -%> - Order deny,allow - Deny from all - Allow from 127.0.0.1 ::1 - Satisfy all - <%- end -%> - -<% if @ldap_trusted_global_cert_file -%> -LDAPTrustedGlobalCert <%= @ldap_trusted_global_cert_type %> <%= @ldap_trusted_global_cert_file %> -<% end -%> -<%- if @ldap_shared_cache_size -%> -LDAPSharedCacheSize <%= @ldap_shared_cache_size %> -<%- end -%> -<%- if @ldap_cache_entries -%> -LDAPCacheEntries <%= @ldap_cache_entries %> -<%- end -%> -<%- if @ldap_cache_ttl -%> -LDAPCacheTTL <%= @ldap_cache_ttl %> -<%- end -%> -<%- if @ldap_opcache_entries -%> -LDAPOpCacheEntries <%= @ldap_opcache_entries %> -<%- end -%> -<%- if @ldap_opcache_ttl -%> -LDAPOpCacheTTL <%= @ldap_opcache_ttl %> -<%- end -%> diff --git a/modules/apache/templates/mod/load.erb b/modules/apache/templates/mod/load.erb deleted file mode 100644 index 51f45ed..0000000 --- a/modules/apache/templates/mod/load.erb +++ /dev/null @@ -1,7 +0,0 @@ -<% if @loadfiles -%> -<% Array(@loadfiles).each do |loadfile| -%> -LoadFile <%= loadfile %> -<% end -%> - -<% end -%> -LoadModule <%= @_id %> <%= @_path %> diff --git a/modules/apache/templates/mod/mime.conf.erb b/modules/apache/templates/mod/mime.conf.erb deleted file mode 100644 index 46d021c..0000000 --- a/modules/apache/templates/mod/mime.conf.erb +++ /dev/null @@ -1,38 +0,0 @@ -TypesConfig <%= @mime_types_config %> - -AddType application/x-compress .Z -AddType application/x-gzip .gz .tgz -AddType application/x-bzip2 .bz2 - -AddLanguage ca .ca -AddLanguage cs .cz .cs -AddLanguage da .dk -AddLanguage de .de -AddLanguage el .el -AddLanguage en .en -AddLanguage eo .eo -AddLanguage es .es -AddLanguage et .et -AddLanguage fr .fr -AddLanguage he .he -AddLanguage hr .hr -AddLanguage it .it -AddLanguage ja .ja -AddLanguage ko .ko -AddLanguage ltz .ltz -AddLanguage nl .nl -AddLanguage nn .nn -AddLanguage no .no -AddLanguage pl .po -AddLanguage pt .pt -AddLanguage pt-BR .pt-br -AddLanguage ru .ru -AddLanguage sv .sv -AddLanguage zh-CN .zh-cn -AddLanguage zh-TW .zh-tw - -<%- @_mime_types_additional.sort.each do |add_mime, config| -%> - <%- config.each do |type, extension| %> -<%= add_mime %> <%= type %> <%= extension%> - <%- end -%> -<% end %> diff --git a/modules/apache/templates/mod/mime_magic.conf.erb b/modules/apache/templates/mod/mime_magic.conf.erb deleted file mode 100644 index cbc173d..0000000 --- a/modules/apache/templates/mod/mime_magic.conf.erb +++ /dev/null @@ -1 +0,0 @@ -MIMEMagicFile "<%= @_magic_file %>" diff --git a/modules/apache/templates/mod/mpm_event.conf.erb b/modules/apache/templates/mod/mpm_event.conf.erb deleted file mode 100644 index eb6f1ff..0000000 --- a/modules/apache/templates/mod/mpm_event.conf.erb +++ /dev/null @@ -1,9 +0,0 @@ - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 150 - MaxRequestsPerChild 0 - diff --git a/modules/apache/templates/mod/negotiation.conf.erb b/modules/apache/templates/mod/negotiation.conf.erb deleted file mode 100644 index 2fb4700..0000000 --- a/modules/apache/templates/mod/negotiation.conf.erb +++ /dev/null @@ -1,2 +0,0 @@ -LanguagePriority <%= Array(@language_priority).join(' ') %> -ForceLanguagePriority <%= Array(@force_language_priority).join(' ') %> diff --git a/modules/apache/templates/mod/nss.conf.erb b/modules/apache/templates/mod/nss.conf.erb deleted file mode 100644 index 36f83d8..0000000 --- a/modules/apache/templates/mod/nss.conf.erb +++ /dev/null @@ -1,228 +0,0 @@ -# -# This is the Apache server configuration file providing SSL support using. -# the mod_nss plugin. It contains the configuration directives to instruct -# the server how to serve pages over an https connection. -# -# 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. -# - -#LoadModule nss_module modules/libmodnss.so - -# -# When we also provide SSL we have to listen to the -# standard HTTP port (see above) and to the HTTPS port -# -# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two -# Listen directives: "Listen [::]:8443" and "Listen 0.0.0.0:443" -# -Listen <%= @port %> - -## -## SSL Global Context -## -## All SSL configuration in this context applies both to -## the main server and all SSL-enabled virtual hosts. -## - -# -# Some MIME-types for downloading Certificates and CRLs -# -AddType application/x-x509-ca-cert .crt -AddType application/x-pkcs7-crl .crl - -# Pass Phrase Dialog: -# Configure the pass phrase gathering process. -# The filtering dialog program (`builtin' is a internal -# terminal dialog) has to provide the pass phrase on stdout. -<% if @passwd_file -%> -NSSPassPhraseDialog "file:<%= @passwd_file %>" -<% else -%> -NSSPassPhraseDialog builtin -<% end -%> - -# Pass Phrase Helper: -# This helper program stores the token password pins between -# restarts of Apache. -NSSPassPhraseHelper /usr/sbin/nss_pcache - -# Configure the SSL Session Cache. -# NSSSessionCacheSize is the number of entries in the cache. -# NSSSessionCacheTimeout is the SSL2 session timeout (in seconds). -# NSSSession3CacheTimeout is the SSL3/TLS session timeout (in seconds). -NSSSessionCacheSize 10000 -NSSSessionCacheTimeout 100 -NSSSession3CacheTimeout 86400 - -# -# Pseudo Random Number Generator (PRNG): -# Configure one or more sources to seed the PRNG of the SSL library. -# The seed data should be of good random quality. -# WARNING! On some platforms /dev/random blocks if not enough entropy -# is available. Those platforms usually also provide a non-blocking -# device, /dev/urandom, which may be used instead. -# -# This does not support seeding the RNG with each connection. - -NSSRandomSeed startup builtin -#NSSRandomSeed startup file:/dev/random 512 -#NSSRandomSeed startup file:/dev/urandom 512 - -# -# TLS Negotiation configuration under RFC 5746 -# -# Only renegotiate if the peer's hello bears the TLS renegotiation_info -# extension. Default off. -NSSRenegotiation off - -# Peer must send Signaling Cipher Suite Value (SCSV) or -# Renegotiation Info (RI) extension in ALL handshakes. Default: off -NSSRequireSafeNegotiation off - -## -## SSL Virtual Host Context -## - -> - -# General setup for the virtual host -#DocumentRoot "/etc/httpd/htdocs" -#ServerName www.example.com:8443 -#ServerAdmin you@example.com - -# mod_nss can log to separate log files, you can choose to do that if you'd like -# LogLevel is not inherited from httpd.conf. -ErrorLog "<%= @error_log %>" -TransferLog "<%= @transfer_log %>" -LogLevel warn - -# SSL Engine Switch: -# Enable/Disable SSL for this virtual host. -NSSEngine on - -# SSL Cipher Suite: -# List the ciphers that the client is permitted to negotiate. -# See the mod_nss documentation for a complete list. - -# SSL 3 ciphers. SSL 2 is disabled by default. -NSSCipherSuite +rsa_rc4_128_md5,+rsa_rc4_128_sha,+rsa_3des_sha,-rsa_des_sha,-rsa_rc4_40_md5,-rsa_rc2_40_md5,-rsa_null_md5,-rsa_null_sha,+fips_3des_sha,-fips_des_sha,-fortezza,-fortezza_rc4_128_sha,-fortezza_null,-rsa_des_56_sha,-rsa_rc4_56_sha,+rsa_aes_128_sha,+rsa_aes_256_sha - -# SSL 3 ciphers + ECC ciphers. SSL 2 is disabled by default. -# -# Comment out the NSSCipherSuite line above and use the one below if you have -# ECC enabled NSS and mod_nss and want to use Elliptical Curve Cryptography -#NSSCipherSuite +rsa_rc4_128_md5,+rsa_rc4_128_sha,+rsa_3des_sha,-rsa_des_sha,-rsa_rc4_40_md5,-rsa_rc2_40_md5,-rsa_null_md5,-rsa_null_sha,+fips_3des_sha,-fips_des_sha,-fortezza,-fortezza_rc4_128_sha,-fortezza_null,-rsa_des_56_sha,-rsa_rc4_56_sha,+rsa_aes_128_sha,+rsa_aes_256_sha,-ecdh_ecdsa_null_sha,+ecdh_ecdsa_rc4_128_sha,+ecdh_ecdsa_3des_sha,+ecdh_ecdsa_aes_128_sha,+ecdh_ecdsa_aes_256_sha,-ecdhe_ecdsa_null_sha,+ecdhe_ecdsa_rc4_128_sha,+ecdhe_ecdsa_3des_sha,+ecdhe_ecdsa_aes_128_sha,+ecdhe_ecdsa_aes_256_sha,-ecdh_rsa_null_sha,+ecdh_rsa_128_sha,+ecdh_rsa_3des_sha,+ecdh_rsa_aes_128_sha,+ecdh_rsa_aes_256_sha,-echde_rsa_null,+ecdhe_rsa_rc4_128_sha,+ecdhe_rsa_3des_sha,+ecdhe_rsa_aes_128_sha,+ecdhe_rsa_aes_256_sha - -# SSL Protocol: -# Cryptographic protocols that provide communication security. -# NSS handles the specified protocols as "ranges", and automatically -# negotiates the use of the strongest protocol for a connection starting -# with the maximum specified protocol and downgrading as necessary to the -# minimum specified protocol that can be used between two processes. -# Since all protocol ranges are completely inclusive, and no protocol in the -# middle of a range may be excluded, the entry "NSSProtocol TLSv1.0,TLSv1.2" -# is identical to the entry "NSSProtocol TLSv1.0,TLSv1.1,TLSv1.2". -NSSProtocol TLSv1.0,TLSv1.1 - -# SSL Certificate Nickname: -# The nickname of the RSA server certificate you are going to use. -NSSNickname Server-Cert - -# SSL Certificate Nickname: -# The nickname of the ECC server certificate you are going to use, if you -# have an ECC-enabled version of NSS and mod_nss -#NSSECCNickname Server-Cert-ecc - -# Server Certificate Database: -# The NSS security database directory that holds the certificates and -# keys. The database consists of 3 files: cert8.db, key3.db and secmod.db. -# Provide the directory that these files exist. -NSSCertificateDatabase "<%= @httpd_dir -%>/alias" - -# Database Prefix: -# In order to be able to store multiple NSS databases in one directory -# they need unique names. This option sets the database prefix used for -# cert8.db and key3.db. -#NSSDBPrefix my-prefix- - -# Client Authentication (Type): -# Client certificate verification type. Types are none, optional and -# require. -#NSSVerifyClient none - -# -# Online Certificate Status Protocol (OCSP). -# Verify that certificates have not been revoked before accepting them. -#NSSOCSP off - -# -# Use a default OCSP responder. If enabled this will be used regardless -# of whether one is included in a client certificate. Note that the -# server certificate is verified during startup. -# -# NSSOCSPDefaultURL defines the service URL of the OCSP responder -# NSSOCSPDefaultName is the nickname of the certificate to trust to -# sign the OCSP responses. -#NSSOCSPDefaultResponder on -#NSSOCSPDefaultURL http://example.com/ocsp/status -#NSSOCSPDefaultName ocsp-nickname - -# Access Control: -# With SSLRequire you can do per-directory access control based -# on arbitrary complex boolean expressions containing server -# variable checks and other lookup directives. The syntax is a -# mixture between C and Perl. See the mod_nss documentation -# for more details. -# -#NSSRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \ -# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \ -# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \ -# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \ -# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \ -# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/ -# - -# SSL Engine Options: -# Set various options for the SSL engine. -# o FakeBasicAuth: -# Translate the client X.509 into a Basic Authorisation. This means that -# the standard Auth/DBMAuth methods can be used for access control. The -# user name is the `one line' version of the client's X.509 certificate. -# Note that no password is obtained from the user. Every entry in the user -# file needs this password: `xxj31ZMTZzkVA'. -# o ExportCertData: -# This exports two additional environment variables: SSL_CLIENT_CERT and -# SSL_SERVER_CERT. These contain the PEM-encoded certificates of the -# server (always existing) and the client (only existing when client -# authentication is used). This can be used to import the certificates -# into CGI scripts. -# o StdEnvVars: -# This exports the standard SSL/TLS related `SSL_*' environment variables. -# Per default this exportation is switched off for performance reasons, -# because the extraction step is an expensive operation and is usually -# useless for serving static content. So one usually enables the -# exportation for CGI and SSI requests only. -# o StrictRequire: -# This denies access when "NSSRequireSSL" or "NSSRequire" applied even -# under a "Satisfy any" situation, i.e. when it applies access is denied -# and no other module can change it. -# o OptRenegotiate: -# This enables optimized SSL connection renegotiation handling when SSL -# directives are used in per-directory context. -#NSSOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire - - NSSOptions +StdEnvVars - - - NSSOptions +StdEnvVars - - -# Per-Server Logging: -# The home of a custom SSL log file. Use this when you want a -# compact non-error SSL logfile on a virtual host basis. -#CustomLog /home/rcrit/redhat/apache/logs/ssl_request_log \ -# "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" - - - diff --git a/modules/apache/templates/mod/pagespeed.conf.erb b/modules/apache/templates/mod/pagespeed.conf.erb deleted file mode 100644 index 56e72fe..0000000 --- a/modules/apache/templates/mod/pagespeed.conf.erb +++ /dev/null @@ -1,102 +0,0 @@ -ModPagespeed on - -ModPagespeedInheritVHostConfig <%= @inherit_vhost_config %> -AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html -<% if @filter_xhtml -%> -AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER application/xhtml+xml -<% end -%> -ModPagespeedFileCachePath "<%= @cache_path %>" -ModPagespeedLogDir "<%= @log_dir %>" - -<% @memcache_servers.each do |server| -%> -ModPagespeedMemcachedServers <%= server %> -<% end -%> - -ModPagespeedRewriteLevel <%= @rewrite_level -%> - -<% @disable_filters.each do |filter| -%> -ModPagespeedDisableFilters <%= filter %> -<% end -%> - -<% @enable_filters.each do |filter| -%> -ModPagespeedEnableFilters <%= filter %> -<% end -%> - -<% @forbid_filters.each do |filter| -%> -ModPagespeedForbidFilters <%= filter %> -<% end -%> - -ModPagespeedRewriteDeadlinePerFlushMs <%= @rewrite_deadline_per_flush_ms %> - -<% if @additional_domains -%> -ModPagespeedDomain <%= @additional_domains -%> -<% end -%> - -ModPagespeedFileCacheSizeKb <%= @file_cache_size_kb %> -ModPagespeedFileCacheCleanIntervalMs <%= @file_cache_clean_interval_ms %> -ModPagespeedLRUCacheKbPerProcess <%= @lru_cache_per_process %> -ModPagespeedLRUCacheByteLimit <%= @lru_cache_byte_limit %> -ModPagespeedCssFlattenMaxBytes <%= @css_flatten_max_bytes %> -ModPagespeedCssInlineMaxBytes <%= @css_inline_max_bytes %> -ModPagespeedCssImageInlineMaxBytes <%= @css_image_inline_max_bytes %> -ModPagespeedImageInlineMaxBytes <%= @image_inline_max_bytes %> -ModPagespeedJsInlineMaxBytes <%= @js_inline_max_bytes %> -ModPagespeedCssOutlineMinBytes <%= @css_outline_min_bytes %> -ModPagespeedJsOutlineMinBytes <%= @js_outline_min_bytes %> - - -ModPagespeedFileCacheInodeLimit <%= @inode_limit %> -ModPagespeedImageMaxRewritesAtOnce <%= @image_max_rewrites_at_once %> - -ModPagespeedNumRewriteThreads <%= @num_rewrite_threads %> -ModPagespeedNumExpensiveRewriteThreads <%= @num_expensive_rewrite_threads %> - -ModPagespeedStatistics <%= @collect_statistics %> - - - # You may insert other "Allow from" lines to add hosts you want to - # allow to look at generated statistics. Another possibility is - # to comment out the "Order" and "Allow" options from the config - # file, to allow any client that can reach your server to examine - # statistics. This might be appropriate in an experimental setup or - # if the Apache server is protected by a reverse proxy that will - # filter URLs in some fashion. - <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%> - Require ip 127.0.0.1 ::1 <%= Array(@allow_view_stats).join(" ") %> - <%- else -%> - Order allow,deny - Allow from 127.0.0.1 ::1 <%= Array(@allow_view_stats).join(" ") %> - <%- end -%> - SetHandler mod_pagespeed_statistics - - -ModPagespeedStatisticsLogging <%= @statistics_logging %> - - <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%> - Require ip 127.0.0.1 ::1 <%= Array(@allow_pagespeed_console).join(" ") %> - <%- else -%> - Order allow,deny - Allow from 127.0.0.1 ::1 <%= Array(@allow_pagespeed_console).join(" ") %> - <%- end -%> - SetHandler pagespeed_console - - -ModPagespeedMessageBufferSize <%= @message_buffer_size %> - - - <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%> - Require ip 127.0.0.1 ::1 <%= Array(@allow_pagespeed_message).join(" ") %> - <%- else -%> - Order allow,deny - Allow from 127.0.0.1 ::1 <%= Array(@allow_pagespeed_message).join(" ") %> - <%- end -%> - SetHandler mod_pagespeed_message - - -<% if @additional_configuration.is_a? Array -%> -<%= @additional_configuration.join("\n") %> -<% else -%> -<% @additional_configuration.each_pair do |key, value| -%> -<%= key %> <%= value %> -<% end -%> -<% end -%> diff --git a/modules/apache/templates/mod/passenger.conf.erb b/modules/apache/templates/mod/passenger.conf.erb deleted file mode 100644 index 03ff534..0000000 --- a/modules/apache/templates/mod/passenger.conf.erb +++ /dev/null @@ -1,61 +0,0 @@ -# The Passenger Apache module configuration file is being -# managed by Puppet and changes will be overwritten. - - <%- if @passenger_root -%> - PassengerRoot "<%= @passenger_root %>" - <%- end -%> - <%- if @passenger_ruby -%> - PassengerRuby "<%= @passenger_ruby %>" - <%- end -%> - <%- if @passenger_default_ruby -%> - PassengerDefaultRuby "<%= @passenger_default_ruby %>" - <%- end -%> - <%- if @passenger_high_performance -%> - PassengerHighPerformance <%= @passenger_high_performance %> - <%- end -%> - <%- if @passenger_max_pool_size -%> - PassengerMaxPoolSize <%= @passenger_max_pool_size %> - <%- end -%> - <%- if @passenger_min_instances -%> - PassengerMinInstances <%= @passenger_min_instances %> - <%- end -%> - <%- if @passenger_max_instances_per_app -%> - PassengerMaxInstancesPerApp <%= @passenger_max_instances_per_app %> - <%- end -%> - <%- if @passenger_pool_idle_time -%> - PassengerPoolIdleTime <%= @passenger_pool_idle_time %> - <%- end -%> - <%- if @passenger_max_request_queue_size -%> - PassengerMaxRequestQueueSize <%= @passenger_max_request_queue_size %> - <%- end -%> - <%- if @passenger_max_requests -%> - PassengerMaxRequests <%= @passenger_max_requests %> - <%- end -%> - <%- if @passenger_spawn_method -%> - PassengerSpawnMethod <%= @passenger_spawn_method %> - <%- end -%> - <%- if @passenger_stat_throttle_rate -%> - PassengerStatThrottleRate <%= @passenger_stat_throttle_rate %> - <%- end -%> - <%- if @rack_autodetect -%> - RackAutoDetect <%= @rack_autodetect %> - <%- end -%> - <%- if @rails_autodetect -%> - RailsAutoDetect <%= @rails_autodetect %> - <%- end -%> - <%- if @passenger_use_global_queue -%> - PassengerUseGlobalQueue <%= @passenger_use_global_queue %> - <%- end -%> - <%- if @passenger_app_env -%> - PassengerAppEnv <%= @passenger_app_env %> - <%- end -%> - <%- if @passenger_log_file -%> - PassengerLogFile <%= @passenger_log_file %> - <%- end -%> - <%- if @passenger_log_level -%> - PassengerLogLevel <%= @passenger_log_level %> - <%- end -%> - <%- if @passenger_data_buffer_dir -%> - PassengerDataBufferDir <%= @passenger_data_buffer_dir %> - <%- end -%> - diff --git a/modules/apache/templates/mod/peruser.conf.erb b/modules/apache/templates/mod/peruser.conf.erb deleted file mode 100644 index 13c8d70..0000000 --- a/modules/apache/templates/mod/peruser.conf.erb +++ /dev/null @@ -1,12 +0,0 @@ - - MinSpareProcessors <%= @minspareprocessors %> - MinProcessors <%= @minprocessors %> - MaxProcessors <%= @maxprocessors %> - MaxClients <%= @maxclients %> - MaxRequestsPerChild <%= @maxrequestsperchild %> - IdleTimeout <%= @idletimeout %> - ExpireTimeout <%= @expiretimeout %> - KeepAlive <%= @keepalive %> - Include "<%= @mod_dir %>/peruser/multiplexers/*.conf" - Include "<%= @mod_dir %>/peruser/processors/*.conf" - diff --git a/modules/apache/templates/mod/php.conf.erb b/modules/apache/templates/mod/php.conf.erb deleted file mode 100644 index 9e684fe..0000000 --- a/modules/apache/templates/mod/php.conf.erb +++ /dev/null @@ -1,23 +0,0 @@ -# -# PHP is an HTML-embedded scripting language which attempts to make it -# easy for developers to write dynamically generated webpages. -# - -# -# Cause the PHP interpreter to handle files with a .php extension. -# -)$"> - SetHandler application/x-httpd-php - - -# -# Add index.php to the list of files that will be served as directory -# indexes. -# -DirectoryIndex index.php - -# -# Uncomment the following line to allow PHP to pretty-print .phps -# files as PHP source code: -# -#AddType application/x-httpd-php-source .phps diff --git a/modules/apache/templates/mod/prefork.conf.erb b/modules/apache/templates/mod/prefork.conf.erb deleted file mode 100644 index ab4a871..0000000 --- a/modules/apache/templates/mod/prefork.conf.erb +++ /dev/null @@ -1,16 +0,0 @@ - - StartServers <%= @startservers %> - MinSpareServers <%= @minspareservers %> - MaxSpareServers <%= @maxspareservers %> - ServerLimit <%= @serverlimit %> - <%- if @maxrequestworkers -%> - MaxRequestWorkers <%= @maxrequestworkers %> - <%- elsif @maxclients -%> - MaxClients <%= @maxclients %> - <%- end -%> - <%- if @maxconnectionsperchild -%> - MaxConnectionsPerChild <%= @maxconnectionsperchild %> - <%- elsif @maxrequestsperchild -%> - MaxRequestsPerChild <%= @maxrequestsperchild %> - <%- end -%> - diff --git a/modules/apache/templates/mod/proxy.conf.erb b/modules/apache/templates/mod/proxy.conf.erb deleted file mode 100644 index d023c14..0000000 --- a/modules/apache/templates/mod/proxy.conf.erb +++ /dev/null @@ -1,27 +0,0 @@ -# -# Proxy Server directives. Uncomment the following lines to -# enable the proxy server: -# - - # Do not enable proxying with ProxyRequests until you have secured your - # server. Open proxy servers are dangerous both to your network and to the - # Internet at large. - ProxyRequests <%= @proxy_requests %> - - <% if @proxy_requests != 'Off' or ( @allow_from and ! @allow_from.empty? ) -%> - - <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%> - Require ip <%= Array(@allow_from).join(" ") %> - <%- else -%> - Order deny,allow - Deny from all - Allow from <%= Array(@allow_from).join(" ") %> - <%- end -%> - - <% end -%> - - # Enable/disable the handling of HTTP/1.1 "Via:" headers. - # ("Full" adds the server version; "Block" removes all outgoing Via: headers) - # Set to one of: Off | On | Full | Block - ProxyVia <%= @proxy_via %> - diff --git a/modules/apache/templates/mod/proxy_balancer.conf.erb b/modules/apache/templates/mod/proxy_balancer.conf.erb deleted file mode 100644 index c1f37be..0000000 --- a/modules/apache/templates/mod/proxy_balancer.conf.erb +++ /dev/null @@ -1,10 +0,0 @@ -> - SetHandler balancer-manager - <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> - Require ip <%= Array(@allow_from).join(" ") %> - <%- else -%> - Order deny,allow - Deny from all - Allow from <%= Array(@allow_from).join(" ") %> - <%- end -%> - diff --git a/modules/apache/templates/mod/proxy_html.conf.erb b/modules/apache/templates/mod/proxy_html.conf.erb deleted file mode 100644 index f2f0bc0..0000000 --- a/modules/apache/templates/mod/proxy_html.conf.erb +++ /dev/null @@ -1,19 +0,0 @@ -ProxyHTMLLinks a href -ProxyHTMLLinks area href -ProxyHTMLLinks link href -ProxyHTMLLinks img src longdesc usemap -ProxyHTMLLinks object classid codebase data usemap -ProxyHTMLLinks q cite -ProxyHTMLLinks blockquote cite -ProxyHTMLLinks ins cite -ProxyHTMLLinks del cite -ProxyHTMLLinks form action -ProxyHTMLLinks input src usemap -ProxyHTMLLinks head profileProxyHTMLLinks base href -ProxyHTMLLinks script src for -ProxyHTMLLinks base href - -ProxyHTMLEvents onclick ondblclick onmousedown onmouseup \ - onmouseover onmousemove onmouseout onkeypress \ - onkeydown onkeyup onfocus onblur onload \ - onunload onsubmit onreset onselect onchange diff --git a/modules/apache/templates/mod/remoteip.conf.erb b/modules/apache/templates/mod/remoteip.conf.erb deleted file mode 100644 index e10ebb5..0000000 --- a/modules/apache/templates/mod/remoteip.conf.erb +++ /dev/null @@ -1,23 +0,0 @@ -# Declare the header field which should be parsed for useragent IP addresses -RemoteIPHeader <%= @header %> - -<%- if @proxy_ips -%> -# Declare client intranet IP addresses trusted to present -# the RemoteIPHeader value -<%- [@proxy_ips].flatten.each do |proxy| -%> -RemoteIPInternalProxy <%= proxy %> -<%- end -%> -<%- end -%> - -<%- if @proxies_header -%> -# Declare the header field which will record all intermediate IP addresses -RemoteIPProxiesHeader <%= @proxies_header %> -<%- end -%> - -<%- if @trusted_proxy_ips -%> -# Declare client intranet IP addresses trusted to present -# the RemoteIPHeader value - <%- [@trusted_proxy_ips].flatten.each do |proxy| -%> -RemoteIPTrustedProxy <%= proxy %> - <%- end -%> -<%- end -%> diff --git a/modules/apache/templates/mod/reqtimeout.conf.erb b/modules/apache/templates/mod/reqtimeout.conf.erb deleted file mode 100644 index 6ffc5ff..0000000 --- a/modules/apache/templates/mod/reqtimeout.conf.erb +++ /dev/null @@ -1,3 +0,0 @@ -<% Array(@timeouts).each do |timeout| -%> -RequestReadTimeout <%= timeout %> -<%- end -%> diff --git a/modules/apache/templates/mod/rpaf.conf.erb b/modules/apache/templates/mod/rpaf.conf.erb deleted file mode 100644 index 56e2398..0000000 --- a/modules/apache/templates/mod/rpaf.conf.erb +++ /dev/null @@ -1,15 +0,0 @@ -# Enable reverse proxy add forward -RPAFenable On -# RPAFsethostname will, when enabled, take the incoming X-Host header and -# update the virtual host settings accordingly. This allows to have the same -# hostnames as in the "real" configuration for the forwarding proxy. -<% if @sethostname -%> -RPAFsethostname On -<% else -%> -RPAFsethostname Off -<% end -%> -# Which IPs are forwarding requests to us -RPAFproxy_ips <%= Array(@proxy_ips).join(" ") %> -# Setting RPAFheader allows you to change the header name to parse from the -# default X-Forwarded-For to something of your choice. -RPAFheader <%= @header %> diff --git a/modules/apache/templates/mod/security.conf.erb b/modules/apache/templates/mod/security.conf.erb deleted file mode 100644 index 638332e..0000000 --- a/modules/apache/templates/mod/security.conf.erb +++ /dev/null @@ -1,80 +0,0 @@ - - # Default recommended configuration - SecRuleEngine <%= @modsec_secruleengine %> - SecRequestBodyAccess On - SecRule REQUEST_HEADERS:Content-Type "text/xml" \ - "id:'200000',phase:1,t:none,t:lowercase,pass,nolog,ctl:requestBodyProcessor=XML" - SecRequestBodyLimit <%= @secrequestbodylimit %> - SecRequestBodyNoFilesLimit <%= @secrequestbodynofileslimit %> - SecRequestBodyInMemoryLimit <%= @secrequestbodyinmemorylimit %> - SecRequestBodyLimitAction Reject - SecRule REQBODY_ERROR "!@eq 0" \ - "id:'200001', phase:2,t:none,log,deny,status:400,msg:'Failed to parse request body.',logdata:'%{reqbody_error_msg}',severity:2" - SecRule MULTIPART_STRICT_ERROR "!@eq 0" \ - "id:'200002',phase:2,t:none,log,deny,status:44,msg:'Multipart request body failed strict validation: \ - PE %{REQBODY_PROCESSOR_ERROR}, \ - BQ %{MULTIPART_BOUNDARY_QUOTED}, \ - BW %{MULTIPART_BOUNDARY_WHITESPACE}, \ - DB %{MULTIPART_DATA_BEFORE}, \ - DA %{MULTIPART_DATA_AFTER}, \ - HF %{MULTIPART_HEADER_FOLDING}, \ - LF %{MULTIPART_LF_LINE}, \ - SM %{MULTIPART_MISSING_SEMICOLON}, \ - IQ %{MULTIPART_INVALID_QUOTING}, \ - IP %{MULTIPART_INVALID_PART}, \ - IH %{MULTIPART_INVALID_HEADER_FOLDING}, \ - FL %{MULTIPART_FILE_LIMIT_EXCEEDED}'" - - SecRule &REQUEST_HEADERS:Proxy "@gt 0" "id:1000005,log,deny,msg:'httpoxy denied'" - - - SecRule MULTIPART_UNMATCHED_BOUNDARY "!@eq 0" \ - "id:'200003',phase:2,t:none,log,deny,status:44,msg:'Multipart parser detected a possible unmatched boundary.'" - - SecPcreMatchLimit <%= @secpcrematchlimit %> - SecPcreMatchLimitRecursion <%= @secpcrematchlimitrecursion %> - - SecRule TX:/^MSC_/ "!@streq 0" \ - "id:'200004',phase:2,t:none,deny,msg:'ModSecurity internal error flagged: %{MATCHED_VAR_NAME}'" - - SecResponseBodyAccess Off - SecResponseBodyMimeType text/plain text/html text/xml - SecResponseBodyLimit 524288 - SecResponseBodyLimitAction ProcessPartial - SecDebugLogLevel 0 - SecAuditEngine RelevantOnly - SecAuditLogRelevantStatus "<%= @audit_log_relevant_status %>" - SecAuditLogParts <%= @audit_log_parts %> - SecAuditLogType Serial - SecArgumentSeparator & - SecCookieFormat 0 -<%- if scope.lookupvar('::osfamily') == 'Debian' -%> - SecDebugLog <%= @logroot %>/modsec_debug.log - SecAuditLog <%= @logroot %>/modsec_audit.log - SecTmpDir /var/cache/modsecurity - SecDataDir /var/cache/modsecurity - SecUploadDir /var/cache/modsecurity -<%- elsif scope.lookupvar('::osfamily') == 'Suse' -%> - SecDebugLog /var/log/apache2/modsec_debug.log - SecAuditLog /var/log/apache2/modsec_audit.log - SecTmpDir /var/lib/mod_security - SecDataDir /var/lib/mod_security - SecUploadDir /var/lib/mod_security -<% else -%> - SecDebugLog <%= @logroot %>/modsec_debug.log - SecAuditLog <%= @logroot %>/modsec_audit.log - SecTmpDir /var/lib/mod_security - SecDataDir /var/lib/mod_security - SecUploadDir /var/lib/mod_security -<% end -%> - SecUploadKeepFiles Off - - # ModSecurity Core Rules Set configuration -<%- if scope.function_versioncmp([scope.lookupvar('::apache::apache_version'), '2.4']) >= 0 -%> - IncludeOptional <%= @modsec_dir %>/*.conf - IncludeOptional <%= @modsec_dir %>/activated_rules/*.conf -<%- else -%> - Include <%= @modsec_dir %>/*.conf - Include <%= @modsec_dir %>/activated_rules/*.conf -<%- end -%> - diff --git a/modules/apache/templates/mod/security_crs.conf.erb b/modules/apache/templates/mod/security_crs.conf.erb deleted file mode 100644 index 641daac..0000000 --- a/modules/apache/templates/mod/security_crs.conf.erb +++ /dev/null @@ -1,436 +0,0 @@ -# --------------------------------------------------------------- -# Core ModSecurity Rule Set ver.2.2.9 -# Copyright (C) 2006-2012 Trustwave All rights reserved. -# -# The OWASP ModSecurity Core Rule Set is distributed under -# Apache Software License (ASL) version 2 -# Please see the enclosed LICENCE file for full details. -# --------------------------------------------------------------- - - -# -# -- [[ Recommended Base Configuration ]] ------------------------------------------------- -# -# The configuration directives/settings in this file are used to control -# the OWASP ModSecurity CRS. These settings do **NOT** configure the main -# ModSecurity settings such as: -# -# - SecRuleEngine -# - SecRequestBodyAccess -# - SecAuditEngine -# - SecDebugLog -# -# You should use the modsecurity.conf-recommended file that comes with the -# ModSecurity source code archive. -# -# Ref: https://github.com/SpiderLabs/ModSecurity/blob/master/modsecurity.conf-recommended -# - - -# -# -- [[ Rule Version ]] ------------------------------------------------------------------- -# -# Rule version data is added to the "Producer" line of Section H of the Audit log: -# -# - Producer: ModSecurity for Apache/2.7.0-rc1 (http://www.modsecurity.org/); OWASP_CRS/2.2.4. -# -# Ref: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#wiki-SecComponentSignature -# -SecComponentSignature "OWASP_CRS/2.2.9" - - -# -# -- [[ Modes of Operation: Self-Contained vs. Collaborative Detection ]] ----------------- -# -# Each detection rule uses the "block" action which will inherit the SecDefaultAction -# specified below. Your settings here will determine which mode of operation you use. -# -# -- [[ Self-Contained Mode ]] -- -# Rules inherit the "deny" disruptive action. The first rule that matches will block. -# -# -- [[ Collaborative Detection Mode ]] -- -# This is a "delayed blocking" mode of operation where each matching rule will inherit -# the "pass" action and will only contribute to anomaly scores. Transactional blocking -# can be applied -# -# -- [[ Alert Logging Control ]] -- -# You have three options - -# -# - To log to both the Apache error_log and ModSecurity audit_log file use: "log" -# - To log *only* to the ModSecurity audit_log file use: "nolog,auditlog" -# - To log *only* to the Apache error_log file use: "log,noauditlog" -# -# Ref: http://blog.spiderlabs.com/2010/11/advanced-topic-of-the-week-traditional-vs-anomaly-scoring-detection-modes.html -# Ref: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#wiki-SecDefaultAction -# -SecDefaultAction "phase:1,<%= @_secdefaultaction -%>" -SecDefaultAction "phase:2,<%= @_secdefaultaction -%>" - -# -# -- [[ Collaborative Detection Severity Levels ]] ---------------------------------------- -# -# These are the default scoring points for each severity level. You may -# adjust these to you liking. These settings will be used in macro expansion -# in the rules to increment the anomaly scores when rules match. -# -# These are the default Severity ratings (with anomaly scores) of the individual rules - -# -# - 2: Critical - Anomaly Score of 5. -# Is the highest severity level possible without correlation. It is -# normally generated by the web attack rules (40 level files). -# - 3: Error - Anomaly Score of 4. -# Is generated mostly from outbound leakage rules (50 level files). -# - 4: Warning - Anomaly Score of 3. -# Is generated by malicious client rules (35 level files). -# - 5: Notice - Anomaly Score of 2. -# Is generated by the Protocol policy and anomaly files. -# -SecAction \ - "id:'900001', \ - phase:1, \ - t:none, \ - setvar:tx.critical_anomaly_score=<%= @critical_anomaly_score -%>, \ - setvar:tx.error_anomaly_score=<%= @error_anomaly_score -%>, \ - setvar:tx.warning_anomaly_score=<%= @warning_anomaly_score -%>, \ - setvar:tx.notice_anomaly_score=<%= @notice_anomaly_score -%>, \ - nolog, \ - pass" - - -# -# -- [[ Collaborative Detection Scoring Initialization and Threshold Levels ]] ------------------------------ -# -# These variables are used in macro expansion in the 49 inbound blocking and 59 -# outbound blocking files. -# -# **MUST HAVE** ModSecurity v2.5.12 or higher to use macro expansion in numeric -# operators. If you have an earlier version, edit the 49/59 files directly to -# set the appropriate anomaly score levels. -# -# You should set the score level (rule 900003) to the proper threshold you -# would prefer. If set to "5" it will work similarly to previous Mod CRS rules -# and will create an event in the error_log file if there are any rules that -# match. If you would like to lessen the number of events generated in the -# error_log file, you should increase the anomaly score threshold to something -# like "20". This would only generate an event in the error_log file if there -# are multiple lower severity rule matches or if any 1 higher severity item matches. -# -SecAction \ - "id:'900002', \ - phase:1, \ - t:none, \ - setvar:tx.anomaly_score=0, \ - setvar:tx.sql_injection_score=0, \ - setvar:tx.xss_score=0, \ - setvar:tx.inbound_anomaly_score=0, \ - setvar:tx.outbound_anomaly_score=0, \ - nolog, \ - pass" - - -SecAction \ - "id:'900003', \ - phase:1, \ - t:none, \ - setvar:tx.inbound_anomaly_score_level=<%= @inbound_anomaly_threshold -%>, \ - setvar:tx.outbound_anomaly_score_level=<%= @outbound_anomaly_threshold -%>, \ - nolog, \ - pass" - - -# -# -- [[ Collaborative Detection Blocking ]] ----------------------------------------------- -# -# This is a collaborative detection mode where each rule will increment an overall -# anomaly score for the transaction. The scores are then evaluated in the following files: -# -# Inbound anomaly score - checked in the modsecurity_crs_49_inbound_blocking.conf file -# Outbound anomaly score - checked in the modsecurity_crs_59_outbound_blocking.conf file -# -# If you want to use anomaly scoring mode, then uncomment this line. -# -SecAction \ - "id:'900004', \ - phase:1, \ - t:none, \ - setvar:tx.anomaly_score_blocking=<%= @anomaly_score_blocking -%>, \ - nolog, \ - pass" - - -# -# -- [[ GeoIP Database ]] ----------------------------------------------------------------- -# -# There are some rulesets that need to inspect the GEO data of the REMOTE_ADDR data. -# -# You must first download the MaxMind GeoIP Lite City DB - -# -# http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz -# -# You then need to define the proper path for the SecGeoLookupDb directive -# -# Ref: http://blog.spiderlabs.com/2010/10/detecting-malice-with-modsecurity-geolocation-data.html -# Ref: http://blog.spiderlabs.com/2010/11/detecting-malice-with-modsecurity-ip-forensics.html -# -#SecGeoLookupDb /opt/modsecurity/lib/GeoLiteCity.dat - -# -# -- [[ Regression Testing Mode ]] -------------------------------------------------------- -# -# If you are going to run the regression testing mode, you should uncomment the -# following rule. It will enable DetectionOnly mode for the SecRuleEngine and -# will enable Response Header tagging so that the client testing script can see -# which rule IDs have matched. -# -# You must specify the your source IP address where you will be running the tests -# from. -# -#SecRule REMOTE_ADDR "@ipMatch 192.168.1.100" \ - "id:'900005', \ - phase:1, \ - t:none, \ - ctl:ruleEngine=DetectionOnly, \ - setvar:tx.regression_testing=1, \ - nolog, \ - pass" - - -# -# -- [[ HTTP Policy Settings ]] ---------------------------------------------------------- -# -# Set the following policy settings here and they will be propagated to the 23 rules -# file (modsecurity_common_23_request_limits.conf) by using macro expansion. -# If you run into false positives, you can adjust the settings here. -# -# Only the max number of args is uncommented by default as there are a high rate -# of false positives. Uncomment the items you wish to set. -# -# -# -- Maximum number of arguments in request limited -SecAction \ - "id:'900006', \ - phase:1, \ - t:none, \ - setvar:tx.max_num_args=<%= @secrequestmaxnumargs %>, \ - nolog, \ - pass" - -# -# -- Limit argument name length -#SecAction \ - "id:'900007', \ - phase:1, \ - t:none, \ - setvar:tx.arg_name_length=100, \ - nolog, \ - pass" - -# -# -- Limit value name length -#SecAction \ - "id:'900008', \ - phase:1, \ - t:none, \ - setvar:tx.arg_length=400, \ - nolog, \ - pass" - -# -# -- Limit arguments total length -#SecAction \ - "id:'900009', \ - phase:1, \ - t:none, \ - setvar:tx.total_arg_length=64000, \ - nolog, \ - pass" - -# -# -- Individual file size is limited -#SecAction \ - "id:'900010', \ - phase:1, \ - t:none, \ - setvar:tx.max_file_size=1048576, \ - nolog, \ - pass" - -# -# -- Combined file size is limited -#SecAction \ - "id:'900011', \ - phase:1, \ - t:none, \ - setvar:tx.combined_file_sizes=1048576, \ - nolog, \ - pass" - - -# -# Set the following policy settings here and they will be propagated to the 30 rules -# file (modsecurity_crs_30_http_policy.conf) by using macro expansion. -# If you run into false positves, you can adjust the settings here. -# -SecAction \ - "id:'900012', \ - phase:1, \ - t:none, \ - setvar:'tx.allowed_methods=<%= @allowed_methods -%>', \ - setvar:'tx.allowed_request_content_type=<%= @content_types -%>', \ - setvar:'tx.allowed_http_versions=HTTP/0.9 HTTP/1.0 HTTP/1.1', \ - setvar:'tx.restricted_extensions=<%= @restricted_extensions -%>', \ - setvar:'tx.restricted_headers=<%= @restricted_headers -%>', \ - nolog, \ - pass" - - -# -# -- [[ Content Security Policy (CSP) Settings ]] ----------------------------------------- -# -# The purpose of these settings is to send CSP response headers to -# Mozilla FireFox users so that you can enforce how dynamic content -# is used. CSP usage helps to prevent XSS attacks against your users. -# -# Reference Link: -# -# https://developer.mozilla.org/en/Security/CSP -# -# Uncomment this SecAction line if you want use CSP enforcement. -# You need to set the appropriate directives and settings for your site/domain and -# and activate the CSP file in the experimental_rules directory. -# -# Ref: http://blog.spiderlabs.com/2011/04/modsecurity-advanced-topic-of-the-week-integrating-content-security-policy-csp.html -# -#SecAction \ - "id:'900013', \ - phase:1, \ - t:none, \ - setvar:tx.csp_report_only=1, \ - setvar:tx.csp_report_uri=/csp_violation_report, \ - setenv:'csp_policy=allow \'self\'; img-src *.yoursite.com; media-src *.yoursite.com; style-src *.yoursite.com; frame-ancestors *.yoursite.com; script-src *.yoursite.com; report-uri %{tx.csp_report_uri}', \ - nolog, \ - pass" - - -# -# -- [[ Brute Force Protection ]] --------------------------------------------------------- -# -# If you are using the Brute Force Protection rule set, then uncomment the following -# lines and set the following variables: -# - Protected URLs: resources to protect (e.g. login pages) - set to your login page -# - Burst Time Slice Interval: time interval window to monitor for bursts -# - Request Threshold: request # threshold to trigger a burst -# - Block Period: temporary block timeout -# -#SecAction \ - "id:'900014', \ - phase:1, \ - t:none, \ - setvar:'tx.brute_force_protected_urls=#/login.jsp# #/partner_login.php#', \ - setvar:'tx.brute_force_burst_time_slice=60', \ - setvar:'tx.brute_force_counter_threshold=10', \ - setvar:'tx.brute_force_block_timeout=300', \ - nolog, \ - pass" - - -# -# -- [[ DoS Protection ]] ---------------------------------------------------------------- -# -# If you are using the DoS Protection rule set, then uncomment the following -# lines and set the following variables: -# - Burst Time Slice Interval: time interval window to monitor for bursts -# - Request Threshold: request # threshold to trigger a burst -# - Block Period: temporary block timeout -# -SecAction \ - "id:'900015', \ - phase:1, \ - t:none, \ - setvar:'tx.dos_burst_time_slice=60', \ - setvar:'tx.dos_counter_threshold=100', \ - setvar:'tx.dos_block_timeout=600', \ - nolog, \ - pass" - - -# -# -- [[ Check UTF enconding ]] ----------------------------------------------------------- -# -# We only want to apply this check if UTF-8 encoding is actually used by the site, otherwise -# it will result in false positives. -# -# Uncomment this line if your site uses UTF8 encoding -#SecAction \ - "id:'900016', \ - phase:1, \ - t:none, \ - setvar:tx.crs_validate_utf8_encoding=1, \ - nolog, \ - pass" - - -# -# -- [[ Enable XML Body Parsing ]] ------------------------------------------------------- -# -# The rules in this file will trigger the XML parser upon an XML request -# -# Initiate XML Processor in case of xml content-type -# -SecRule REQUEST_HEADERS:Content-Type "text/xml" \ - "id:'900017', \ - phase:1, \ - t:none,t:lowercase, \ - nolog, \ - pass, \ - chain" - SecRule REQBODY_PROCESSOR "!@streq XML" \ - "ctl:requestBodyProcessor=XML" - - -# -# -- [[ Global and IP Collections ]] ----------------------------------------------------- -# -# Create both Global and IP collections for rules to use -# There are some CRS rules that assume that these two collections -# have already been initiated. -# -SecRule REQUEST_HEADERS:User-Agent "^(.*)$" \ - "id:'900018', \ - phase:1, \ - t:none,t:sha1,t:hexEncode, \ - setvar:tx.ua_hash=%{matched_var}, \ - nolog, \ - pass" - - -SecRule REQUEST_HEADERS:x-forwarded-for "^\b(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\b" \ - "id:'900019', \ - phase:1, \ - t:none, \ - capture, \ - setvar:tx.real_ip=%{tx.1}, \ - nolog, \ - pass" - - -SecRule &TX:REAL_IP "!@eq 0" \ - "id:'900020', \ - phase:1, \ - t:none, \ - initcol:global=global, \ - initcol:ip=%{tx.real_ip}_%{tx.ua_hash}, \ - nolog, \ - pass" - - -SecRule &TX:REAL_IP "@eq 0" \ - "id:'900021', \ - phase:1, \ - t:none, \ - initcol:global=global, \ - initcol:ip=%{remote_addr}_%{tx.ua_hash}, \ - setvar:tx.real_ip=%{remote_addr}, \ - nolog, \ - pass" - diff --git a/modules/apache/templates/mod/setenvif.conf.erb b/modules/apache/templates/mod/setenvif.conf.erb deleted file mode 100644 index d31c79f..0000000 --- a/modules/apache/templates/mod/setenvif.conf.erb +++ /dev/null @@ -1,34 +0,0 @@ -# -# The following directives modify normal HTTP response behavior to -# handle known problems with browser implementations. -# -BrowserMatch "Mozilla/2" nokeepalive -BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 -BrowserMatch "RealPlayer 4\.0" force-response-1.0 -BrowserMatch "Java/1\.0" force-response-1.0 -BrowserMatch "JDK/1\.0" force-response-1.0 - -# -# The following directive disables redirects on non-GET requests for -# a directory that does not include the trailing slash. This fixes a -# problem with Microsoft WebFolders which does not appropriately handle -# redirects for folders with DAV methods. -# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV. -# -BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully -BrowserMatch "MS FrontPage" redirect-carefully -BrowserMatch "^WebDrive" redirect-carefully -BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully -BrowserMatch "^gnome-vfs/1.0" redirect-carefully -BrowserMatch "^gvfs/1" redirect-carefully -BrowserMatch "^XML Spy" redirect-carefully -BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully -BrowserMatch " Konqueror/4" redirect-carefully - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - diff --git a/modules/apache/templates/mod/ssl.conf.erb b/modules/apache/templates/mod/ssl.conf.erb deleted file mode 100644 index 5fa7bb9..0000000 --- a/modules/apache/templates/mod/ssl.conf.erb +++ /dev/null @@ -1,44 +0,0 @@ - - SSLRandomSeed startup builtin - SSLRandomSeed startup file:/dev/urandom <%= @ssl_random_seed_bytes %> - SSLRandomSeed connect builtin - SSLRandomSeed connect file:/dev/urandom <%= @ssl_random_seed_bytes %> - - AddType application/x-x509-ca-cert .crt - AddType application/x-pkcs7-crl .crl - - SSLPassPhraseDialog <%= @ssl_pass_phrase_dialog %> - SSLSessionCache "shmcb:<%= @ssl_sessioncache %>" - SSLSessionCacheTimeout <%= @ssl_sessioncachetimeout %> - <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%> - Mutex <%= @_ssl_mutex %> - <%- if @ssl_compression -%> - SSLCompression <%= scope.function_bool2httpd([@ssl_compression]) %> - <%- end -%> - <%- else -%> - SSLMutex <%= @_ssl_mutex %> - <%- end -%> - SSLCryptoDevice <%= @ssl_cryptodevice %> - SSLHonorCipherOrder <%= scope.function_bool2httpd([@_ssl_honorcipherorder]) %> - <%- if @ssl_ca -%> - SSLCACertificateFile "<%= @ssl_ca %>" - <%- end -%> -<% if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%> - SSLUseStapling <%= scope.function_bool2httpd([@ssl_stapling]) %> - <%- if not @ssl_stapling_return_errors.nil? -%> - SSLStaplingReturnResponderErrors <%= scope.function_bool2httpd([@ssl_stapling_return_errors]) %> - <%- end -%> - SSLStaplingCache "shmcb:<%= @stapling_cache %>" -<% end -%> - SSLCipherSuite <%= @ssl_cipher %> - SSLProtocol <%= @ssl_protocol.compact.join(' ') %> -<% if not @ssl_proxy_protocol.empty? -%> - SSLProxyProtocol <%= @ssl_proxy_protocol.compact.join(' ') %> -<% end -%> -<% if @ssl_options -%> - SSLOptions <%= @ssl_options.compact.join(' ') %> -<% end -%> -<%- if @ssl_openssl_conf_cmd -%> - SSLOpenSSLConfCmd <%= @ssl_openssl_conf_cmd %> -<%- end -%> - diff --git a/modules/apache/templates/mod/status.conf.erb b/modules/apache/templates/mod/status.conf.erb deleted file mode 100644 index 6a6b3da..0000000 --- a/modules/apache/templates/mod/status.conf.erb +++ /dev/null @@ -1,16 +0,0 @@ -> - SetHandler server-status - <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%> - Require ip <%= Array(@allow_from).join(" ") %> - <%- else -%> - Order deny,allow - Deny from all - Allow from <%= Array(@allow_from).join(" ") %> - <%- end -%> - -ExtendedStatus <%= @extended_status %> - - - # Show Proxy LoadBalancer status in mod_status - ProxyStatus On - diff --git a/modules/apache/templates/mod/suphp.conf.erb b/modules/apache/templates/mod/suphp.conf.erb deleted file mode 100644 index 95fbf97..0000000 --- a/modules/apache/templates/mod/suphp.conf.erb +++ /dev/null @@ -1,19 +0,0 @@ - - AddType application/x-httpd-suphp .php .php3 .php4 .php5 .phtml - suPHP_AddHandler application/x-httpd-suphp - - - suPHP_Engine on - - - # By default, disable suPHP for debian packaged web applications as files - # are owned by root and cannot be executed by suPHP because of min_uid. - - suPHP_Engine off - - -# # Use a specific php config file (a dir which contains a php.ini file) -# suPHP_ConfigPath /etc/php4/cgi/suphp/ -# # Tells mod_suphp NOT to handle requests with the type . -# suPHP_RemoveHandler - diff --git a/modules/apache/templates/mod/userdir.conf.erb b/modules/apache/templates/mod/userdir.conf.erb deleted file mode 100644 index edf994c..0000000 --- a/modules/apache/templates/mod/userdir.conf.erb +++ /dev/null @@ -1,27 +0,0 @@ - -<% if @disable_root -%> - UserDir disabled root -<% end -%> - UserDir <%= @_path %> - - "> - AllowOverride <%= @overrides.join(' ') %> - Options <%= @options.join(' ') %> - - <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%> - Require all granted - <%- else -%> - Order allow,deny - Allow from all - <%- end -%> - - - <%- if scope.function_versioncmp([@_apache_version, '2.4']) >= 0 -%> - Require all granted - <%- else -%> - Order allow,deny - Allow from all - <%- end -%> - - - diff --git a/modules/apache/templates/mod/worker.conf.erb b/modules/apache/templates/mod/worker.conf.erb deleted file mode 100644 index 8ad6451..0000000 --- a/modules/apache/templates/mod/worker.conf.erb +++ /dev/null @@ -1,11 +0,0 @@ - - ServerLimit <%= @serverlimit %> - StartServers <%= @startservers %> - ThreadLimit <%= @threadlimit %> - MaxClients <%= @maxclients %> - MinSpareThreads <%= @minsparethreads %> - MaxSpareThreads <%= @maxsparethreads %> - ThreadsPerChild <%= @threadsperchild %> - MaxRequestsPerChild <%= @maxrequestsperchild %> - ListenBacklog <%= @listenbacklog %> - diff --git a/modules/apache/templates/mod/wsgi.conf.erb b/modules/apache/templates/mod/wsgi.conf.erb deleted file mode 100644 index 1d83e5a..0000000 --- a/modules/apache/templates/mod/wsgi.conf.erb +++ /dev/null @@ -1,16 +0,0 @@ -# The WSGI Apache module configuration file is being -# managed by Puppet an changes will be overwritten. - - <%- if @wsgi_restrict_embedded -%> - WSGIRestrictEmbedded <%= scope.function_bool2httpd([@wsgi_restrict_embedded]) %> - <%- end -%> - <%- if @wsgi_socket_prefix -%> - WSGISocketPrefix <%= @wsgi_socket_prefix %> - <%- end -%> - <%- if @wsgi_python_home -%> - WSGIPythonHome "<%= @wsgi_python_home %>" - <%- end -%> - <%- if @wsgi_python_path -%> - WSGIPythonPath "<%= @wsgi_python_path %>" - <%- end -%> - diff --git a/modules/apache/templates/namevirtualhost.erb b/modules/apache/templates/namevirtualhost.erb deleted file mode 100644 index cf76768..0000000 --- a/modules/apache/templates/namevirtualhost.erb +++ /dev/null @@ -1,8 +0,0 @@ -<%# NameVirtualHost should always be one of: - - * - - *: - - _default_: - - - - : --%> -NameVirtualHost <%= @addr_port %> diff --git a/modules/apache/templates/ports_header.erb b/modules/apache/templates/ports_header.erb deleted file mode 100644 index 4908db4..0000000 --- a/modules/apache/templates/ports_header.erb +++ /dev/null @@ -1,5 +0,0 @@ -# ************************************ -# Listen & NameVirtualHost resources in module puppetlabs-apache -# Managed by Puppet -# ************************************ - diff --git a/modules/apache/templates/vhost/_access_log.erb b/modules/apache/templates/vhost/_access_log.erb deleted file mode 100644 index 894daa7..0000000 --- a/modules/apache/templates/vhost/_access_log.erb +++ /dev/null @@ -1,21 +0,0 @@ -<% @_access_logs.each do |log| -%> -<% env ||= "env=#{log['env']}" if log['env'] -%> -<% env ||= '' -%> -<% format ||= "\"#{log['format']}\"" if log['format'] -%> -<% format ||= 'combined' -%> -<% if log['file'] -%> -<% if log['file'].chars.first == '/' -%> -<% destination = "#{log['file']}" -%> -<% else -%> -<% destination = "#{@logroot}/#{log['file']}" -%> -<% end -%> -<% elsif log['syslog'] -%> -<% destination = log['syslog'] -%> -<% elsif log['pipe'] -%> -<% destination = log['pipe'] -%> -<% else -%> -<% destination ||= "#{@logroot}/#{@name}_access_ssl.log" if @ssl -%> -<% destination ||= "#{@logroot}/#{@name}_access.log" -%> -<% end -%> - CustomLog "<%= destination %>" <%= format %> <%= env %> -<% end -%> diff --git a/modules/apache/templates/vhost/_action.erb b/modules/apache/templates/vhost/_action.erb deleted file mode 100644 index 8a02290..0000000 --- a/modules/apache/templates/vhost/_action.erb +++ /dev/null @@ -1,4 +0,0 @@ -<% if @action -%> - - Action <%= @action %> /cgi-bin virtual -<% end -%> diff --git a/modules/apache/templates/vhost/_additional_includes.erb b/modules/apache/templates/vhost/_additional_includes.erb deleted file mode 100644 index a07bb81..0000000 --- a/modules/apache/templates/vhost/_additional_includes.erb +++ /dev/null @@ -1,9 +0,0 @@ -<% Array(@additional_includes).each do |include| -%> - - ## Load additional static includes -<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 && @use_optional_includes -%> - IncludeOptional "<%= include %>" -<%- else -%> - Include "<%= include %>" -<%- end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_aliases.erb b/modules/apache/templates/vhost/_aliases.erb deleted file mode 100644 index f9771bc..0000000 --- a/modules/apache/templates/vhost/_aliases.erb +++ /dev/null @@ -1,16 +0,0 @@ -<% if @aliases and ! @aliases.empty? -%> - ## Alias declarations for resources outside the DocumentRoot - <%- [@aliases].flatten.compact.each do |alias_statement| -%> - <%- if alias_statement["path"] != '' -%> - <%- if alias_statement["alias"] and alias_statement["alias"] != '' -%> - Alias <%= alias_statement["alias"] %> "<%= alias_statement["path"] %>" - <%- elsif alias_statement["aliasmatch"] and alias_statement["aliasmatch"] != '' -%> - AliasMatch <%= alias_statement["aliasmatch"] %> "<%= alias_statement["path"] %>" - <%- elsif alias_statement["scriptalias"] and alias_statement["scriptalias"] != '' -%> - ScriptAlias <%= alias_statement["scriptalias"] %> "<%= alias_statement["path"] %>" - <%- elsif alias_statement["scriptaliasmatch"] and alias_statement["scriptaliasmatch"] != '' -%> - ScriptAliasMatch <%= alias_statement["scriptaliasmatch"] %> "<%= alias_statement["path"] %>" - <%- end -%> - <%- end -%> - <%- end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_allow_encoded_slashes.erb b/modules/apache/templates/vhost/_allow_encoded_slashes.erb deleted file mode 100644 index 40c7343..0000000 --- a/modules/apache/templates/vhost/_allow_encoded_slashes.erb +++ /dev/null @@ -1,4 +0,0 @@ -<%- if @allow_encoded_slashes -%> - - AllowEncodedSlashes <%= @allow_encoded_slashes %> -<%- end -%> diff --git a/modules/apache/templates/vhost/_auth_cas.erb b/modules/apache/templates/vhost/_auth_cas.erb deleted file mode 100644 index 2f4787b..0000000 --- a/modules/apache/templates/vhost/_auth_cas.erb +++ /dev/null @@ -1,65 +0,0 @@ -<% if @cas_enabled -%> - <%- if @cas_cookie_path -%> - CASCookiePath <%= @cas_cookie_path %> - <%- end -%> - <%- if @cas_login_url -%> - CASLoginURL <%= @cas_login_url %> - <%- end -%> - <%- if @cas_validate_url -%> - CASValidateURL <%= @cas_validate_url %> - <%- end -%> - <%- if @cas_version -%> - CASVersion <%= @cas_version %> - <%- end -%> - <%- if @cas_debug -%> - CASDebug <%= @cas_debug %> - <%- end -%> - <%- if @cas_certificate_path -%> - CASCertificatePath <%= @cas_certificate_path %> - <%- end -%> - <%- if @cas_proxy_validate_url -%> - CASProxyValidateURL <%= @cas_proxy_validate_url %> - <%- end -%> - <%- if @cas_validate_depth -%> - CASValidateDepth <%= @cas_validate_depth %> - <%- end -%> - <%- if @cas_root_proxied_as -%> - CASRootProxiedAs <%= @cas_root_proxied_as %> - <%- end -%> - <%- if @cas_cookie_entropy -%> - CASCookieEntropy <%= @cas_cookie_entropy %> - <%- end -%> - <%- if @cas_timeout -%> - CASTimeout <%= @cas_timeout %> - <%- end -%> - <%- if @cas_idle_timeout -%> - CASIdleTimeout <%= @cas_idle_timeout %> - <%- end -%> - <%- if @cas_cache_clean_interval -%> - CASCacheCleanInterval <%= @cas_cache_clean_interval %> - <%- end -%> - <%- if @cas_cookie_domain -%> - CASCookieDomain <%= @cas_cookie_domain %> - <%- end -%> - <%- if @cas_cookie_http_only -%> - CASCookieHttpOnly <%= @cas_cookie_http_only %> - <%- end -%> - <%- if @cas_authoritative -%> - CASAuthoritative <%= @cas_authoritative %> - <%- end -%> - <%- if @cas_sso_enabled -%> - CASSSOEnabled On - <%- end -%> - <%- if @cas_validate_saml -%> - CASValidateSAML On - <%- end -%> - <%- if @cas_attribute_prefix -%> - CASAttributePrefix <%= @cas_attribute_prefix %> - <%- end -%> - <%- if @cas_attribute_delimiter -%> - CASAttributeDelimiter <%= @cas_attribute_delimiter %> - <%- end -%> - <%- if @cas_scrub_request_headers -%> - CASAttributeDelimiter On - <%- end -%> -<%- end -%> diff --git a/modules/apache/templates/vhost/_auth_kerb.erb b/modules/apache/templates/vhost/_auth_kerb.erb deleted file mode 100644 index 97f4c1f..0000000 --- a/modules/apache/templates/vhost/_auth_kerb.erb +++ /dev/null @@ -1,32 +0,0 @@ -<% if @auth_kerb -%> - - ## Kerberos directives - <%- if @krb_method_negotiate -%> - KrbMethodNegotiate <%= @krb_method_negotiate %> - <%- end -%> - <%- if @krb_method_k5passwd -%> - KrbMethodK5Passwd <%= @krb_method_k5passwd %> - <%- end -%> - <%- if @krb_authoritative -%> - KrbAuthoritative <%= @krb_authoritative %> - <%- end -%> - <%- if @krb_auth_realms and @krb_auth_realms.length >= 1 -%> - KrbAuthRealms <%= @krb_auth_realms.join(' ') %> - <%- end -%> - <%- if @krb_5keytab -%> - Krb5Keytab <%= @krb_5keytab %> - <%- end -%> - <%- if @krb_local_user_mapping -%> - KrbLocalUserMapping <%= @krb_local_user_mapping %> - <%- end -%> - <%- if @krb_verify_kdc -%> - KrbVerifyKDC <%= @krb_verify_kdc %> - <%- end -%> - <%- if @krb_servicename -%> - KrbServiceName <%= @krb_servicename %> - <%- end -%> - <%- if @krb_save_credentials -%> - KrbSaveCredentials <%= @krb_save_credentials -%> - <%- end -%> - -<% end -%> diff --git a/modules/apache/templates/vhost/_block.erb b/modules/apache/templates/vhost/_block.erb deleted file mode 100644 index b07f685..0000000 --- a/modules/apache/templates/vhost/_block.erb +++ /dev/null @@ -1,14 +0,0 @@ -<% if @block and ! @block.empty? -%> - - ## Block access statements -<% if @block.include? 'scm' -%> - # Block access to SCM directories. - - <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> - Require all denied - <%- else -%> - Deny From All - <%- end -%> - -<% end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_charsets.erb b/modules/apache/templates/vhost/_charsets.erb deleted file mode 100644 index ef83def..0000000 --- a/modules/apache/templates/vhost/_charsets.erb +++ /dev/null @@ -1,4 +0,0 @@ -<% if @add_default_charset -%> - - AddDefaultCharset <%= @add_default_charset %> -<% end -%> diff --git a/modules/apache/templates/vhost/_custom_fragment.erb b/modules/apache/templates/vhost/_custom_fragment.erb deleted file mode 100644 index 35c264a..0000000 --- a/modules/apache/templates/vhost/_custom_fragment.erb +++ /dev/null @@ -1,5 +0,0 @@ -<% if @custom_fragment -%> - - ## Custom fragment - <%= @custom_fragment %> -<% end -%> diff --git a/modules/apache/templates/vhost/_directories.erb b/modules/apache/templates/vhost/_directories.erb deleted file mode 100644 index e4a7d77..0000000 --- a/modules/apache/templates/vhost/_directories.erb +++ /dev/null @@ -1,378 +0,0 @@ -<% if @_directories and ! @_directories.empty? -%> - - <%- scope.setvar('_template_scope', {}) -%> - ## Directories, there should at least be a declaration for <%= @docroot %> - <%- [@_directories].flatten.compact.each do |directory| -%> - <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> - <%- if directory['allow'] and ! [ false, 'false', '' ].include?(directory['allow']) -%> - <%- scope.function_warning(["Apache::Vhost: Using allow is deprecated in your Apache version"]) -%> - <%- end -%> - <%- if directory['deny'] and ! [ false, 'false', '' ].include?(directory['deny']) -%> - <%- scope.function_warning(["Apache::Vhost: Using deny is deprecated in your Apache version"]) -%> - <%- end -%> - <%- if directory['order'] and ! [ false, 'false', '' ].include?(directory['order']) -%> - <%- scope.function_warning(["Apache::Vhost: Using order is deprecated in your Apache version"]) -%> - <%- end -%> - <%- if directory['satisfy'] and ! [ false, 'false', '' ].include?(directory['satisfy']) -%> - <%- scope.function_warning(["Apache::Vhost: Using satisfy is deprecated in your Apache version"]) -%> - <%- end -%> - <%- end -%> - <%- if directory['path'] and directory['path'] != '' -%> - <%- if directory['provider'] and directory['provider'].match('(directory|location|files|proxy)') -%> - <%- if /^(.*)match$/ =~ directory['provider'] -%> - <%- provider = $1.capitalize + 'Match' -%> - <%- else -%> - <%- provider = directory['provider'].capitalize -%> - <%- end -%> - <%- else -%> - <%- provider = 'Directory' -%> - <%- end -%> - <%- path = directory['path'] -%> - - <<%= provider %> "<%= path %>"> - <%- if directory['headers'] -%> - <%- Array(directory['headers']).each do |header| -%> - Header <%= header %> - <%- end -%> - <%- end -%> - <%- if ! directory['geoip_enable'].nil? -%> - GeoIPEnable <%= scope.function_bool2httpd([directory['geoip_enable']]) %> - <%- end -%> - <%- if directory['options'] -%> - Options <%= Array(directory['options']).join(' ') %> - <%- end -%> - <%- if provider == 'Directory' -%> - <%- if directory['index_options'] -%> - IndexOptions <%= Array(directory['index_options']).join(' ') %> - <%- end -%> - <%- if directory['index_order_default'] -%> - IndexOrderDefault <%= Array(directory['index_order_default']).join(' ') %> - <%- end -%> - <%- if directory['index_style_sheet'] -%> - IndexStyleSheet '<%= directory['index_style_sheet'] %>' - <%- end -%> - <%- if directory['allow_override'] -%> - AllowOverride <%= Array(directory['allow_override']).join(' ') %> - <%- elsif provider == 'Directory' -%> - AllowOverride None - <%- end -%> - <%- end -%> - <%- scope.lookupvar('_template_scope')[:item] = directory -%> -<%= scope.function_template(["apache/vhost/_require.erb"]) -%> - <%- if directory['limit'] && directory['limit'] != '' -%> - <%- Array(directory['limit']).each do |lim| -%> - > - <%- scope.lookupvar('_template_scope')[:item] = lim -%> - <%= scope.function_template(["apache/vhost/_require.erb"]) -%> - - <%- end -%> - <%- end -%> - <%- if directory['limit_except'] && directory['limit_except'] != '' -%> - <%- Array(directory['limit_except']).each do |lim| -%> - > - <%- scope.lookupvar('_template_scope')[:item] = lim -%> - <%= scope.function_template(["apache/vhost/_require.erb"]) -%> - - <%- end -%> - <%- end -%> - <%- if directory['addhandlers'] and ! directory['addhandlers'].empty? -%> - <%- [directory['addhandlers']].flatten.compact.each do |addhandler| -%> - )$"> - SetHandler <%= addhandler['handler'] %> - - <%- end -%> - <%- end -%> - <%- if directory['sethandler'] and directory['sethandler'] != '' -%> - SetHandler <%= directory['sethandler'] %> - <%- end -%> - <%- if directory['passenger_enabled'] and directory['passenger_enabled'] != '' -%> - PassengerEnabled <%= directory['passenger_enabled'] %> - <%- end -%> - <%- if directory['php_flags'] and ! directory['php_flags'].empty? -%> - <%- directory['php_flags'].sort.each do |flag,value| -%> - <%- value = if value =~ /true|yes|on|1/i then 'on' else 'off' end -%> - php_flag <%= "#{flag} #{value}" %> - <%- end -%> - <%- end -%> - <%- if directory['php_values'] and ! directory['php_values'].empty? -%> - <%- directory['php_values'].sort.each do |key,value| -%> - php_value <%= "#{key} #{value}" %> - <%- end -%> - <%- end -%> - <%- if directory['php_admin_flags'] and ! directory['php_admin_flags'].empty? -%> - <%- directory['php_admin_flags'].sort.each do |flag,value| -%> - <%- value = if value =~ /true|yes|on|1/i then 'on' else 'off' end -%> - php_admin_flag <%= "#{flag} #{value}" %> - <%- end -%> - <%- end -%> - <%- if directory['php_admin_values'] and ! directory['php_admin_values'].empty? -%> - <%- directory['php_admin_values'].sort.each do |key,value| -%> - php_admin_value <%= "#{key} #{value}" %> - <%- end -%> - <%- end -%> - <%- if directory['directoryindex'] and directory['directoryindex'] != '' -%> - DirectoryIndex <%= directory['directoryindex'] %> - <%- end -%> - <%- if directory['additional_includes'] and ! directory['additional_includes'].empty? -%> - <%- directory['additional_includes'].each do |include| -%> - Include '<%= "#{include}" %>' - <%- end -%> - <%- end -%> - <%- if directory['error_documents'] and ! directory['error_documents'].empty? -%> - <%- [directory['error_documents']].flatten.compact.each do |error_document| -%> - ErrorDocument <%= error_document['error_code'] %> <%= error_document['document'] %> - <%- end -%> - <%- end -%> - <%- if directory['dav'] -%> - Dav <%= directory['dav'] %> - <%- if directory['dav_depth_infinity'] -%> - DavDepthInfinity <%= scope.function_bool2httpd([directory['dav_depth_infinity']]) %> - <%- end -%> - <%- if directory['dav_min_timeout'] -%> - DavMinTimeout <%= directory['dav_min_timeout'] %> - <%- end -%> - <%- end -%> - <%- if directory['auth_type'] -%> - AuthType <%= directory['auth_type'] %> - <%- end -%> - <%- if directory['auth_name'] -%> - AuthName "<%= directory['auth_name'] %>" - <%- end -%> - <%- if directory['auth_digest_algorithm'] -%> - AuthDigestAlgorithm <%= directory['auth_digest_algorithm'] %> - <%- end -%> - <%- if directory['auth_digest_domain'] -%> - AuthDigestDomain <%= Array(directory['auth_digest_domain']).join(' ') %> - <%- end -%> - <%- if directory['auth_digest_nonce_lifetime'] -%> - AuthDigestNonceLifetime <%= directory['auth_digest_nonce_lifetime'] %> - <%- end -%> - <%- if directory['auth_digest_provider'] -%> - AuthDigestProvider <%= directory['auth_digest_provider'] %> - <%- end -%> - <%- if directory['auth_digest_qop'] -%> - AuthDigestQop <%= directory['auth_digest_qop'] %> - <%- end -%> - <%- if directory['auth_digest_shmem_size'] -%> - AuthDigestShmemSize <%= directory['auth_digest_shmem_size'] %> - <%- end -%> - <%- if directory['auth_basic_authoritative'] -%> - AuthBasicAuthoritative <%= directory['auth_basic_authoritative'] %> - <%- end -%> - <%- if directory['auth_basic_fake'] -%> - AuthBasicFake <%= directory['auth_basic_fake'] %> - <%- end -%> - <%- if directory['auth_basic_provider'] -%> - AuthBasicProvider <%= directory['auth_basic_provider'] %> - <%- end -%> - <%- if directory['auth_user_file'] -%> - AuthUserFile <%= directory['auth_user_file'] %> - <%- end -%> - <%- if directory['auth_group_file'] -%> - AuthGroupFile <%= directory['auth_group_file'] %> - <%- end -%> - <%- if directory['auth_merging'] -%> - AuthMerging <%= directory['auth_merging'] %> - <%- end -%> - <%- if directory['auth_ldap_url'] -%> - AuthLDAPURL <%= directory['auth_ldap_url'] %> - <%- end -%> - <%- if directory['auth_ldap_bind_dn'] -%> - AuthLDAPBindDN <%= directory['auth_ldap_bind_dn'] %> - <%- end -%> - <%- if directory['auth_ldap_bind_password'] -%> - AuthLDAPBindPassword <%= directory['auth_ldap_bind_password'] %> - <%- end -%> - <%- if directory['auth_ldap_group_attribute'] -%> - <%- Array(directory['auth_ldap_group_attribute']).each do |groupattr| -%> - AuthLDAPGroupAttribute <%= groupattr %> - <%- end -%> - <%- end -%> - <%- if directory['auth_ldap_group_attribute_is_dn'] == 'off' -%> - AuthLDAPGroupAttributeIsDN Off - <%- end -%> - <%- if directory['auth_ldap_group_attribute_is_dn'] == 'on' -%> - AuthLDAPGroupAttributeIsDN On - <%- end -%> - <%- if directory['fallbackresource'] -%> - FallbackResource <%= directory['fallbackresource'] %> - <%- end -%> - <%- if directory['expires_active'] -%> - ExpiresActive <%= directory['expires_active'] %> - <%- end -%> - <%- if directory['expires_default'] -%> - ExpiresDefault <%= directory['expires_default'] %> - <%- end -%> - <%- if directory['expires_by_type'] -%> - <%- Array(directory['expires_by_type']).each do |rule| -%> - ExpiresByType <%= rule %> - <%- end -%> - <%- end -%> - <%- if directory['ext_filter_options'] -%> - ExtFilterOptions <%= directory['ext_filter_options'] %> - <%- end -%> - <%- if directory['force_type'] -%> - ForceType <%= directory['force_type'] %> - <%- end -%> - <%- if directory['add_charset'] -%> - AddCharset <%= directory['add_charset'] %> - <%- end -%> - <%- if directory['ssl_options'] -%> - SSLOptions <%= Array(directory['ssl_options']).join(' ') %> - <%- end -%> - <%- if directory['suphp'] and @suphp_engine == 'on' -%> - suPHP_UserGroup <%= directory['suphp']['user'] %> <%= directory['suphp']['group'] %> - <%- end -%> - <%- if directory['fcgiwrapper'] -%> - FcgidWrapper <%= directory['fcgiwrapper']['command'] %> <%= directory['fcgiwrapper']['suffix'] %> <%= directory['fcgiwrapper']['virtual'] %> - <%- end -%> - <%- if directory['rewrites'] -%> - # Rewrite rules - RewriteEngine On - <%- directory['rewrites'].flatten.compact.each do |rewrite_details| -%> - <%- if rewrite_details['comment'] -%> - #<%= rewrite_details['comment'] %> - <%- end -%> - <%- if rewrite_details['rewrite_base'] -%> - RewriteBase <%= rewrite_details['rewrite_base'] %> - <%- end -%> - <%- if rewrite_details['rewrite_cond'] -%> - <%- Array(rewrite_details['rewrite_cond']).each do |commands| -%> - <%- Array(commands).each do |command| -%> - RewriteCond <%= command %> - <%- end -%> - <%- end -%> - <%- end -%> - <%- Array(rewrite_details['rewrite_rule']).each do |commands| -%> - <%- Array(commands).each do |command| -%> - RewriteRule <%= command %> - <%- end -%> - <%- end -%> - <%- end -%> - <%- end -%> - <%- if directory['setenv'] -%> - <%- Array(directory['setenv']).each do |setenv| -%> - SetEnv <%= setenv %> - <%- end -%> - <%- end -%> - <%- if directory['set_output_filter'] -%> - SetOutputFilter <%= directory['set_output_filter'] %> - <%- end -%> - <%- if @shibboleth_enabled -%> - <%- if directory['shib_require_session'] and ! directory['shib_require_session'].empty? -%> - ShibRequireSession <%= directory['shib_require_session'] %> - <%- end -%> - <%- if directory['shib_request_settings'] and ! directory['shib_request_settings'].empty? -%> - <%- directory['shib_request_settings'].each do |key,value| -%> - ShibRequestSetting <%= key %> <%= value %> - <%- end -%> - <%- end -%> - <%- if directory['shib_use_headers'] and ! directory['shib_use_headers'].empty? -%> - ShibUseHeaders <%= directory['shib_use_headers'] %> - <%- end -%> - <%- end -%> - <%- if @cas_enabled -%> - <%- if directory['cas_scope'] -%> - CASScope <%= directory['cas_scope'] %> - <%- end -%> - <%- if directory['cas_renew'] -%> - CASRenew <%= directory['cas_renew'] %> - <%- end -%> - <%- if directory['cas_gateway'] -%> - CASGateway <%= directory['cas_gateway'] %> - <%- end -%> - <%- if directory['cas_cookie'] -%> - CASCookie <%= directory['cas_cookie'] %> - <%- end -%> - <%- if directory['cas_secure_cookie'] -%> - CASSecureCookie <%= directory['cas_secure_cookie'] %> - <%- end -%> - <%- if directory['cas_gateway_cookie'] -%> - CASGatewayCookie <%= directory['cas_gateway_cookie'] %> - <%- end -%> - <%- if directory['cas_authn_header'] -%> - CASAuthNHeader <%= directory['cas_authn_header'] %> - <%- end -%> - <%- end -%> - <%- if directory['mellon_enable'] -%> - MellonEnable "<%= directory['mellon_enable'] %>" - <%- if directory['mellon_endpoint_path'] -%> - MellonEndpointPath "<%= directory['mellon_endpoint_path'] %>" - <%- end -%> - <%- if directory['mellon_sp_private_key_file'] -%> - MellonSPPrivateKeyFile "<%= directory['mellon_sp_private_key_file'] %>" - <%- end -%> - <%- if directory['mellon_sp_cert_file'] -%> - MellonSPCertFile "<%= directory['mellon_sp_cert_file'] %>" - <%- end -%> - <%- if directory['mellon_sp_metadata_file'] -%> - MellonSPMetadataFile "<%= directory['mellon_sp_metadata_file'] %>" - <%- end -%> - <%- if directory['mellon_idp_metadata_file'] -%> - MellonIDPMetadataFile "<%= directory['mellon_idp_metadata_file'] %>" - <%- end -%> - <%- if directory['mellon_set_env_no_prefix'] -%> - <%- directory['mellon_set_env_no_prefix'].each do |key, value| -%> - MellonSetEnvNoPrefix "<%= key %>" "<%= value %>" - <%- end -%> - <%- end -%> - <%- if directory['mellon_user'] -%> - MellonUser "<%= directory['mellon_user'] %>" - <%- end -%> - <%- if directory['mellon_saml_response_dump'] -%> - MellonSamlResponseDump "<%= directory['mellon_saml_response_dump'] %>" - <%- end -%> - <%- if directory['mellon_cond'] -%> - <%- Array(directory['mellon_cond']).each do |cond| -%> - MellonCond <%= cond %> - <%- end -%> - <%- end -%> - <%- end -%> - <%- if directory['request_headers'] and ! directory['request_headers'].empty? -%> - ## Request Header rules - <%- Array(directory['request_headers']).each do |request_statement| -%> - <%- if request_statement != '' -%> - RequestHeader <%= request_statement %> - <%- end -%> - <%- end -%> - <%- end -%> - <%- if directory['proxy_pass'] and directory['provider'] and directory['provider'].match('location') -%> - <%- directory['proxy_pass'].flatten.compact.each do |proxy| -%> - ProxyPass <%= proxy['url'] %> - <%- if proxy['params'] -%> - <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%> - <%- end -%> - <%- end -%> - <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%> - <%- end %> - <%- if not proxy['reverse_cookies'].nil? -%> - <%- Array(proxy['reverse_cookies']).each do |reverse_cookies| -%> - <%- if reverse_cookies['path'] -%> - ProxyPassReverseCookiePath <%= reverse_cookies['path'] %> <%= reverse_cookies['url'] %> - <%- end -%> - <%- if reverse_cookies['domain'] -%> - ProxyPassReverseCookieDomain <%= reverse_cookies['domain'] %> <%= reverse_cookies['url'] %> - <%- end -%> - <%- end -%> - <%- end -%> - <%- if proxy['reverse_urls'].nil? -%> - ProxyPassReverse <%= proxy['url'] %> - <%- else -%> - <%- Array(proxy['reverse_urls']).each do |reverse_url| -%> - ProxyPassReverse <%= reverse_url %> - <%- end -%> - <%- end -%> - <%- if proxy['setenv'] -%> - <%- Array(proxy['setenv']).each do |setenv_var| -%> - SetEnv <%= setenv_var %> - <%- end -%> - <%- end -%> - <% end -%> - <%- end -%> - <%- if directory['custom_fragment'] -%> - <%= directory['custom_fragment'] %> - <%- end -%> - > - <%- end -%> - <%- end -%> -<%- end -%> diff --git a/modules/apache/templates/vhost/_docroot.erb b/modules/apache/templates/vhost/_docroot.erb deleted file mode 100644 index b67998b..0000000 --- a/modules/apache/templates/vhost/_docroot.erb +++ /dev/null @@ -1,7 +0,0 @@ - - ## Vhost docroot -<% if @virtual_docroot -%> - VirtualDocumentRoot "<%= @virtual_docroot %>" -<% elsif @docroot -%> - DocumentRoot "<%= @docroot %>" -<% end -%> diff --git a/modules/apache/templates/vhost/_error_document.erb b/modules/apache/templates/vhost/_error_document.erb deleted file mode 100644 index 654e72c..0000000 --- a/modules/apache/templates/vhost/_error_document.erb +++ /dev/null @@ -1,7 +0,0 @@ -<% if @error_documents and ! @error_documents.empty? -%> - <%- [@error_documents].flatten.compact.each do |error_document| -%> - <%- if error_document["error_code"] != '' and error_document["document"] != '' -%> - ErrorDocument <%= error_document["error_code"] %> <%= error_document["document"] %> - <%- end -%> - <%- end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_fallbackresource.erb b/modules/apache/templates/vhost/_fallbackresource.erb deleted file mode 100644 index f1e4c35..0000000 --- a/modules/apache/templates/vhost/_fallbackresource.erb +++ /dev/null @@ -1,4 +0,0 @@ -<% if @fallbackresource -%> - - FallbackResource <%= @fallbackresource %> -<% end -%> diff --git a/modules/apache/templates/vhost/_fastcgi.erb b/modules/apache/templates/vhost/_fastcgi.erb deleted file mode 100644 index b471839..0000000 --- a/modules/apache/templates/vhost/_fastcgi.erb +++ /dev/null @@ -1,23 +0,0 @@ -<% if @fastcgi_server -%> - - FastCgiExternalServer <%= @fastcgi_server %> -socket <%= @fastcgi_socket -%> -<% unless @fastcgi_idle_timeout.nil? %> -idle-timeout <%= @fastcgi_idle_timeout %><% end %> -<% end -%> -<% if @fastcgi_dir -%> - - "> - Options +ExecCGI - AllowOverride All - SetHandler fastcgi-script - <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> - Require all granted - <%- else -%> - Order allow,deny - Allow From All - <%- end -%> - AuthBasicAuthoritative Off - - - AllowEncodedSlashes On - ServerSignature Off -<% end -%> diff --git a/modules/apache/templates/vhost/_file_footer.erb b/modules/apache/templates/vhost/_file_footer.erb deleted file mode 100644 index 84035ef..0000000 --- a/modules/apache/templates/vhost/_file_footer.erb +++ /dev/null @@ -1 +0,0 @@ - diff --git a/modules/apache/templates/vhost/_file_header.erb b/modules/apache/templates/vhost/_file_header.erb deleted file mode 100644 index 4cf7629..0000000 --- a/modules/apache/templates/vhost/_file_header.erb +++ /dev/null @@ -1,12 +0,0 @@ -# ************************************ -# Vhost template in module puppetlabs-apache -# Managed by Puppet -# ************************************ - -> -<% if @servername and not @servername.empty? -%> - ServerName <%= @servername %> -<% end -%> -<% if @serveradmin -%> - ServerAdmin <%= @serveradmin %> -<% end -%> diff --git a/modules/apache/templates/vhost/_filters.erb b/modules/apache/templates/vhost/_filters.erb deleted file mode 100644 index b862597..0000000 --- a/modules/apache/templates/vhost/_filters.erb +++ /dev/null @@ -1,10 +0,0 @@ -<% if @filters and ! @filters.empty? -%> - - ## Filter module rules - ## as per http://httpd.apache.org/docs/2.2/mod/mod_filter.html - <%- Array(@filters).each do |filter| -%> - <%- if filter != '' -%> - <%= filter %> - <%- end -%> - <%- end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_header.erb b/modules/apache/templates/vhost/_header.erb deleted file mode 100644 index c0f68c8..0000000 --- a/modules/apache/templates/vhost/_header.erb +++ /dev/null @@ -1,10 +0,0 @@ -<% if @headers and ! @headers.empty? -%> - - ## Header rules - ## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#header - <%- Array(@headers).each do |header_statement| -%> - <%- if header_statement != '' -%> - Header <%= header_statement %> - <%- end -%> - <%- end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_http_protocol_options.erb b/modules/apache/templates/vhost/_http_protocol_options.erb deleted file mode 100644 index efad7e6..0000000 --- a/modules/apache/templates/vhost/_http_protocol_options.erb +++ /dev/null @@ -1 +0,0 @@ -HttpProtocolOptions <%= @http_protocol_options %> diff --git a/modules/apache/templates/vhost/_itk.erb b/modules/apache/templates/vhost/_itk.erb deleted file mode 100644 index 803a73d..0000000 --- a/modules/apache/templates/vhost/_itk.erb +++ /dev/null @@ -1,29 +0,0 @@ -<% if @itk and ! @itk.empty? -%> - - ## ITK statement - - <%- if @itk["user"] and @itk["group"] -%> - AssignUserId <%= @itk["user"] %> <%= @itk["group"] %> - <%- end -%> - <%- if @itk["assignuseridexpr"] -%> - AssignUserIdExpr <%= @itk["assignuseridexpr"] %> - <%- end -%> - <%- if @itk["assigngroupidexpr"] -%> - AssignGroupIdExpr <%= @itk["assigngroupidexpr"] %> - <%- end -%> - <%- if @itk["maxclientvhost"] -%> - MaxClientsVHost <%= @itk["maxclientvhost"] %> - <%- end -%> - <%- if @itk["nice"] -%> - NiceValue <%= @itk["nice"] %> - <%- end -%> - <%- if @kernelversion >= '3.5.0' -%> - <%- if @itk["limituidrange"] -%> - LimitUIDRange <%= @itk["limituidrange"] %> - <%- end -%> - <%- if @itk["limitgidrange"] -%> - LimitGIDRange <%= @itk["limitgidrange"] %> - <%- end -%> - <%- end -%> - -<% end -%> diff --git a/modules/apache/templates/vhost/_jk_mounts.erb b/modules/apache/templates/vhost/_jk_mounts.erb deleted file mode 100644 index 8cb1d11..0000000 --- a/modules/apache/templates/vhost/_jk_mounts.erb +++ /dev/null @@ -1,12 +0,0 @@ -<% if @jk_mounts and not @jk_mounts.empty? -%> - - <%- @jk_mounts.each do |jk| -%> - <%- if jk.is_a?(Hash) -%> - <%- if jk.has_key?('mount') and jk.has_key?('worker') -%> - JkMount <%= jk['mount'] %> <%= jk['worker'] %> - <%- elsif jk.has_key?('unmount') and jk.has_key?('worker') -%> - JkUnMount <%= jk['unmount'] %> <%= jk['worker'] %> - <%- end -%> - <%- end -%> - <%- end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_keepalive_options.erb b/modules/apache/templates/vhost/_keepalive_options.erb deleted file mode 100644 index d14f5ed..0000000 --- a/modules/apache/templates/vhost/_keepalive_options.erb +++ /dev/null @@ -1,9 +0,0 @@ -<%- if @keepalive -%> - KeepAlive <%= @keepalive %> -<%- end -%> -<%- if @keepalive_timeout -%> - KeepAliveTimeout <%= @keepalive_timeout %> -<%- end -%> -<%- if @max_keepalive_requests -%> - MaxKeepAliveRequests <%= @max_keepalive_requests %> -<%- end -%> diff --git a/modules/apache/templates/vhost/_logging.erb b/modules/apache/templates/vhost/_logging.erb deleted file mode 100644 index 35a924d..0000000 --- a/modules/apache/templates/vhost/_logging.erb +++ /dev/null @@ -1,10 +0,0 @@ -<% if @error_log or @log_level -%> - - ## Logging -<% end -%> -<% if @error_log -%> - ErrorLog "<%= @error_log_destination %>" -<% end -%> -<% if @log_level -%> - LogLevel <%= @log_level %> -<% end -%> diff --git a/modules/apache/templates/vhost/_passenger.erb b/modules/apache/templates/vhost/_passenger.erb deleted file mode 100644 index 46e5376..0000000 --- a/modules/apache/templates/vhost/_passenger.erb +++ /dev/null @@ -1,39 +0,0 @@ -<% if @passenger_spawn_method -%> - PassengerSpawnMethod <%= @passenger_spawn_method %> -<% end -%> -<% if @passenger_app_root -%> - PassengerAppRoot <%= @passenger_app_root %> -<% end -%> -<% if @passenger_app_env -%> - PassengerAppEnv <%= @passenger_app_env %> -<% end -%> -<% if @passenger_ruby -%> - PassengerRuby <%= @passenger_ruby %> -<% end -%> -<% if @passenger_min_instances -%> - PassengerMinInstances <%= @passenger_min_instances %> -<% end -%> -<% if @passenger_max_requests -%> - PassengerMaxRequests <%= @passenger_max_requests %> -<% end -%> -<% if @passenger_start_timeout -%> - PassengerStartTimeout <%= @passenger_start_timeout %> -<% end -%> -<% if @passenger_pre_start -%> - PassengerPreStart <%= @passenger_pre_start %> -<% end -%> -<% if @passenger_user -%> - PassengerUser <%= @passenger_user %> -<% end -%> -<% if @passenger_high_performance -%> - PassengerHighPerformance <%= scope.function_bool2httpd([@passenger_high_performance]) %> -<% end -%> -<% if @passenger_nodejs -%> - PassengerNodejs <%= @passenger_nodejs -%> -<% end -%> -<% if @passenger_sticky_sessions -%> - PassengerStickySessions <%= scope.function_bool2httpd([@passenger_sticky_sessions]) %> -<% end -%> -<% if @passenger_startup_file -%> - PassengerStartupFile <%= @passenger_startup_file -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_passenger_base_uris.erb b/modules/apache/templates/vhost/_passenger_base_uris.erb deleted file mode 100644 index f3ef5aa..0000000 --- a/modules/apache/templates/vhost/_passenger_base_uris.erb +++ /dev/null @@ -1,7 +0,0 @@ -<% if @passenger_base_uris -%> - - ## Enable passenger base uris -<% Array(@passenger_base_uris).each do |uri| -%> - PassengerBaseURI <%= uri %> -<% end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_php.erb b/modules/apache/templates/vhost/_php.erb deleted file mode 100644 index 8032a1a..0000000 --- a/modules/apache/templates/vhost/_php.erb +++ /dev/null @@ -1,16 +0,0 @@ -<% if @php_values and not @php_values.empty? -%> - <%- @php_values.sort.each do |key,value| -%> - <%- if value.is_a? String -%> - php_value <%= key %> "<%= value %>" - <%- else -%> - php_value <%= key %> <%= value %> - <%- end -%> - <%- end -%> -<% end -%> -<% if @php_flags and not @php_flags.empty? -%> - <%- @php_flags.sort.each do |key,flag| -%> - <%-# normalize flag -%> - <%- if flag =~ /true|yes|on|1/i then flag = 'on' else flag = 'off' end -%> - php_flag <%= key %> <%= flag %> - <%- end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_php_admin.erb b/modules/apache/templates/vhost/_php_admin.erb deleted file mode 100644 index c0c8dd6..0000000 --- a/modules/apache/templates/vhost/_php_admin.erb +++ /dev/null @@ -1,12 +0,0 @@ -<% if @php_admin_values and not @php_admin_values.empty? -%> - <%- @php_admin_values.sort.each do |key,value| -%> - php_admin_value <%= key %> <%= value %> - <%- end -%> -<% end -%> -<% if @php_admin_flags and not @php_admin_flags.empty? -%> - <%- @php_admin_flags.sort.each do |key,flag| -%> - <%-# normalize flag -%> - <%- if flag =~ /true|yes|on|1/i then flag = 'on' else flag = 'off' end -%> - php_admin_flag <%= key %> <%= flag %> - <%- end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_proxy.erb b/modules/apache/templates/vhost/_proxy.erb deleted file mode 100644 index 79f36cf..0000000 --- a/modules/apache/templates/vhost/_proxy.erb +++ /dev/null @@ -1,98 +0,0 @@ -<% if @proxy_dest or @proxy_pass or @proxy_pass_match or @proxy_dest_match -%> - - ## Proxy rules - ProxyRequests Off -<%- end -%> -<% if @proxy_preserve_host -%> - ProxyPreserveHost On -<% else -%> - ProxyPreserveHost Off -<%- end -%> -<%- if defined?(@proxy_add_headers) -%> - <%- if @proxy_add_headers -%> - ProxyAddHeaders On - <%- else -%> - ProxyAddHeaders Off - <%- end -%> -<%- end -%> -<% if @proxy_error_override -%> - ProxyErrorOverride On -<%- end -%> -<%- [@proxy_pass].flatten.compact.each do |proxy| -%> - <%- Array(proxy['no_proxy_uris']).each do |uri| -%> - ProxyPass <%= uri %> ! - <%- end -%> - <%- Array(proxy['no_proxy_uris_match']).each do |uri| -%> - ProxyPassMatch <%= uri %> ! - <%- end -%> - ProxyPass <%= proxy['path'] %> <%= proxy['url'] -%> - <%- if proxy['params'] -%> - <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%> - <%- end -%> - <%- end -%> - <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%> - <%- end %> - <%- if not proxy['reverse_cookies'].nil? -%> - <%- Array(proxy['reverse_cookies']).each do |reverse_cookies| -%> - <%- if reverse_cookies['path'] -%> - ProxyPassReverseCookiePath <%= reverse_cookies['path'] %> <%= reverse_cookies['url'] %> - <%- end -%> - <%- if reverse_cookies['domain'] -%> - ProxyPassReverseCookieDomain <%= reverse_cookies['domain'] %> <%= reverse_cookies['url'] %> - <%- end -%> - <%- end -%> - <%- end -%> - <%- if proxy['reverse_urls'].nil? -%> - ProxyPassReverse <%= proxy['path'] %> <%= proxy['url'] %> - <%- else -%> - <%- Array(proxy['reverse_urls']).each do |reverse_url| -%> - ProxyPassReverse <%= proxy['path'] %> <%= reverse_url %> - <%- end -%> - <%- end -%> - <%- if proxy['setenv'] -%> - <%- Array(proxy['setenv']).each do |setenv_var| -%> - SetEnv <%= setenv_var %> - <%- end -%> - <%- end -%> -<% end -%> -<% [@proxy_pass_match].flatten.compact.each do |proxy| %> - <%- Array(proxy['no_proxy_uris']).each do |uri| -%> - ProxyPass <%= uri %> ! - <%- end -%> - <%- Array(proxy['no_proxy_uris_match']).each do |uri| -%> - ProxyPassMatch <%= uri %> ! - <%- end -%> - ProxyPassMatch <%= proxy['path'] %> <%= proxy['url'] -%> - <%- if proxy['params'] -%> - <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%> - <%- end -%> - <%- end -%> - <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%> - <%- end %> - <%- if proxy['reverse_urls'].nil? -%> - ProxyPassReverse <%= proxy['path'] %> <%= proxy['url'] %> - <%- else -%> - <%- Array(proxy['reverse_urls']).each do |reverse_url| -%> - ProxyPassReverse <%= proxy['path'] %> <%= reverse_url %> - <%- end -%> - <%- end -%> - <%- if proxy['setenv'] -%> - <%- Array(proxy['setenv']).each do |setenv_var| -%> - SetEnv <%= setenv_var %> - <%- end -%> - <%- end -%> -<% end -%> -<% if @proxy_dest -%> -<%- Array(@no_proxy_uris).each do |uri| -%> - ProxyPass <%= uri %> ! -<% end -%> - ProxyPass / <%= @proxy_dest %>/ - ProxyPassReverse / <%= @proxy_dest %>/ -<% end -%> -<% if @proxy_dest_match -%> -<%- Array(@no_proxy_uris_match).each do |uri| -%> - ProxyPassMatch <%= uri %> ! -<% end -%> - ProxyPassMatch / <%= @proxy_dest_match %>/ - ProxyPassReverse / <%= @proxy_dest_reverse_match %>/ -<% end -%> diff --git a/modules/apache/templates/vhost/_rack.erb b/modules/apache/templates/vhost/_rack.erb deleted file mode 100644 index 4a5b5f1..0000000 --- a/modules/apache/templates/vhost/_rack.erb +++ /dev/null @@ -1,7 +0,0 @@ -<% if @rack_base_uris -%> - - ## Enable rack -<% Array(@rack_base_uris).each do |uri| -%> - RackBaseURI <%= uri %> -<% end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_redirect.erb b/modules/apache/templates/vhost/_redirect.erb deleted file mode 100644 index 209da64..0000000 --- a/modules/apache/templates/vhost/_redirect.erb +++ /dev/null @@ -1,35 +0,0 @@ -<% if @redirect_source and @redirect_dest -%> -<% @redirect_dest_a = Array(@redirect_dest) -%> -<% @redirect_source_a = Array(@redirect_source) -%> -<% @redirect_status_a = Array(@redirect_status) -%> - - ## Redirect rules - <%- @redirect_source_a.each_with_index do |source, i| -%> -<% @redirect_dest_a[i] ||= @redirect_dest_a[0] -%> -<% @redirect_status_a[i] ||= @redirect_status_a[0] -%> - Redirect <%= "#{@redirect_status_a[i]} " %><%= source %> <%= @redirect_dest_a[i] %> - <%- end -%> -<% end -%> -<%- if @redirectmatch_status and @redirectmatch_regexp and @redirectmatch_dest -%> -<% @redirectmatch_status_a = Array(@redirectmatch_status) -%> -<% @redirectmatch_regexp_a = Array(@redirectmatch_regexp) -%> -<% @redirectmatch_dest_a = Array(@redirectmatch_dest) -%> - - ## RedirectMatch rules - <%- @redirectmatch_status_a.each_with_index do |status, i| -%> -<% @redirectmatch_status_a[i] ||= @redirectmatch_status_a[0] -%> -<% @redirectmatch_regexp_a[i] ||= @redirectmatch_regexp_a[0] -%> -<% @redirectmatch_dest_a[i] ||= @redirectmatch_dest_a[0] -%> - RedirectMatch <%= "#{@redirectmatch_status_a[i]} " %> <%= @redirectmatch_regexp_a[i] %> <%= @redirectmatch_dest_a[i] %> - <%- end -%> -<%- elsif @redirectmatch_regexp and @redirectmatch_dest -%> -<% @redirectmatch_regexp_a = Array(@redirectmatch_regexp) -%> -<% @redirectmatch_dest_a = Array(@redirectmatch_dest) -%> - - ## RedirectMatch rules - <%- @redirectmatch_regexp_a.each_with_index do |status, i| -%> -<% @redirectmatch_regexp_a[i] ||= @redirectmatch_regexp_a[0] -%> -<% @redirectmatch_dest_a[i] ||= @redirectmatch_dest_a[0] -%> - RedirectMatch <%= @redirectmatch_regexp_a[i] %> <%= @redirectmatch_dest_a[i] %> - <%- end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_requestheader.erb b/modules/apache/templates/vhost/_requestheader.erb deleted file mode 100644 index 9f17505..0000000 --- a/modules/apache/templates/vhost/_requestheader.erb +++ /dev/null @@ -1,10 +0,0 @@ -<% if @request_headers and ! @request_headers.empty? -%> - - ## Request header rules - ## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader - <%- Array(@request_headers).each do |request_statement| -%> - <%- if request_statement != '' -%> - RequestHeader <%= request_statement %> - <%- end -%> - <%- end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_require.erb b/modules/apache/templates/vhost/_require.erb deleted file mode 100644 index 9ad7805..0000000 --- a/modules/apache/templates/vhost/_require.erb +++ /dev/null @@ -1,62 +0,0 @@ -<%- _item = scope.lookupvar('_template_scope')[:item] -%> -<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> - <%- if _item['require'] && _item['require'] != '' && _item['require'] !~ /unmanaged/i -%> - <%- if _item['require'].is_a?(Hash) -%> - <%- case _item['require']['enforce'].downcase - when 'all','none','any' then -%> - > - <%- Array(_item['require']['requires']).each do |req| -%> - Require <%= req.strip %> - <%- end -%> - > - <%- else -%> - <%- scope.function_warning(["Apache::Vhost: Require can only overwritten with all, none or any."]) -%> - <%- end -%> - <%- else -%> - <%- Array(_item['require']).each do |req| -%> - Require <%= req %> - <%- end -%> - <%- end -%> - <%- end -%> - <%- if _item['auth_require'] -%> - Require <%= _item['auth_require'] %> - <%- end -%> - <%- if !(_item['require'] && _item['require'] != '') && _item['require'] !~ /unmanaged/i && !(_item['auth_require']) -%> - Require all granted - <%- end -%> -<%- else -%> - <%- if _item['auth_require'] -%> - Require <%= _item['auth_require'] %> - <%- end -%> - <%- if _item['order'] and _item['order'] != '' -%> - Order <%= Array(_item['order']).join(',') %> - <%- else -%> - Order allow,deny - <%- end -%> - <%- if _item['deny'] and ! [ false, 'false', '' ].include?(_item['deny']) -%> - <%- if _item['deny'].kind_of?(Array) -%> - <%- Array(_item['deny']).each do |restrict| -%> - Deny <%= restrict %> - <%- end -%> - <%- else -%> - Deny <%= _item['deny'] %> - <%- end -%> - <%- end -%> - <%- if _item['allow'] and ! [ false, 'false', '' ].include?(_item['allow']) -%> - <%- if _item['allow'].kind_of?(Array) -%> - <%- Array(_item['allow']).each do |access| -%> - Allow <%= access %> - <%- end -%> - <%- else -%> - Allow <%= _item['allow'] %> - <%- end -%> - <%- elsif [ 'from all', 'from All' ].include?(_item['deny']) -%> - <%- elsif ! _item['deny'] and [ false, 'false', '' ].include?(_item['allow']) -%> - Deny from all - <%- else -%> - Allow from all - <%- end -%> - <%- if _item['satisfy'] and _item['satisfy'] != '' -%> - Satisfy <%= _item['satisfy'] %> - <%- end -%> -<%- end -%> diff --git a/modules/apache/templates/vhost/_rewrite.erb b/modules/apache/templates/vhost/_rewrite.erb deleted file mode 100644 index 2827337..0000000 --- a/modules/apache/templates/vhost/_rewrite.erb +++ /dev/null @@ -1,53 +0,0 @@ -<%- if @rewrites -%> - ## Rewrite rules - RewriteEngine On - <%- if @rewrite_inherit -%> - RewriteOptions Inherit - <%- end -%> - <%- if @rewrite_base -%> - RewriteBase <%= @rewrite_base %> - <%- end -%> - - <%- [@rewrites].flatten.compact.each do |rewrite_details| -%> - <%- if rewrite_details['comment'] -%> - #<%= rewrite_details['comment'] %> - <%- end -%> - <%- if rewrite_details['rewrite_base'] -%> - RewriteBase <%= rewrite_details['rewrite_base'] %> - <%- end -%> - <%- if rewrite_details['rewrite_cond'] -%> - <%- Array(rewrite_details['rewrite_cond']).each do |commands| -%> - <%- Array(commands).each do |command| -%> - RewriteCond <%= command %> - <%- end -%> - <%- end -%> - <%- end -%> - <%- if rewrite_details['rewrite_map'] -%> - <%- Array(rewrite_details['rewrite_map']).each do |commands| -%> - <%- Array(commands).each do |command| -%> - RewriteMap <%= command %> - <%- end -%> - <%- end -%> - <%- end -%> - <%- Array(rewrite_details['rewrite_rule']).each do |commands| -%> - <%- Array(commands).each do |command| -%> - RewriteRule <%= command %> - <%- end -%> - - <%- end -%> - <%- end -%> -<%- end -%> -<%# reverse compatibility -%> -<% if @rewrite_rule and !@rewrites -%> - ## Rewrite rules - RewriteEngine On - <%- if @rewrite_base -%> - RewriteBase <%= @rewrite_base %> - <%- end -%> - <%- if @rewrite_cond -%> - <%- Array(@rewrite_cond).each do |cond| -%> - RewriteCond <%= cond %> - <%- end -%> - <%- end -%> - RewriteRule <%= @rewrite_rule %> -<%- end -%> diff --git a/modules/apache/templates/vhost/_scriptalias.erb b/modules/apache/templates/vhost/_scriptalias.erb deleted file mode 100644 index bb4f6b3..0000000 --- a/modules/apache/templates/vhost/_scriptalias.erb +++ /dev/null @@ -1,24 +0,0 @@ -<%- if @scriptaliases.is_a?(Array) -%> -<%- aliases = @scriptaliases -%> -<%- elsif @scriptaliases.is_a?(Hash) -%> -<%- aliases = [@scriptaliases] -%> -<%- else -%> -<%- # Nothing to do with any other data type -%> -<%- aliases = [] -%> -<%- end -%> -<%- if @scriptalias or !aliases.empty? -%> - ## Script alias directives -<%# Combine scriptalais and scriptaliases into a single data structure -%> -<%# for backward compatibility and ease of implementation -%> -<%- aliases << { 'alias' => '/cgi-bin', 'path' => @scriptalias } if @scriptalias -%> -<%- aliases.flatten.compact! -%> -<%- aliases.each do |salias| -%> - <%- if salias["path"] != '' -%> - <%- if salias["alias"] and salias["alias"] != '' -%> - ScriptAlias <%= salias['alias'] %> "<%= salias['path'] %>" - <%- elsif salias["aliasmatch"] and salias["aliasmatch"] != '' -%> - ScriptAliasMatch <%= salias['aliasmatch'] %> "<%= salias['path'] %>" - <%- end -%> - <%- end -%> -<%- end -%> -<%- end -%> diff --git a/modules/apache/templates/vhost/_security.erb b/modules/apache/templates/vhost/_security.erb deleted file mode 100644 index dc35c78..0000000 --- a/modules/apache/templates/vhost/_security.erb +++ /dev/null @@ -1,43 +0,0 @@ - -<% if @modsec_disable_vhost -%> - SecRuleEngine Off -<% end -%> -<% if @modsec_audit_log_destination -%> - SecAuditLog "<%= @modsec_audit_log_destination %>" -<% end -%> -<% if @_modsec_disable_ids.is_a?(Hash) -%> -<% @_modsec_disable_ids.each do |location,rules| -%> - > -<% Array(rules).each do |rule| -%> - SecRuleRemoveById <%= rule %> -<% end -%> - -<% end -%> -<% end -%> -<% ips = Array(@modsec_disable_ips).join(',') %> -<% if ips != '' %> - SecRule REMOTE_ADDR "<%= ips %>" "nolog,allow,id:1234123455" - SecAction "phase:2,pass,nolog,id:1234123456" -<% end -%> -<% if @_modsec_disable_msgs.is_a?(Hash) -%> -<% @_modsec_disable_msgs.each do |location,rules| -%> - > -<% Array(rules).each do |rule| -%> - SecRuleRemoveByMsg "<%= rule %>" -<% end -%> - -<% end -%> -<% end -%> -<% if @_modsec_disable_tags.is_a?(Hash) -%> -<% @_modsec_disable_tags.each do |location,rules| -%> - > -<% Array(rules).each do |rule| -%> - SecRuleRemoveByTag "<%= rule %>" -<% end -%> - -<% end -%> -<% end -%> -<% if @modsec_body_limit -%> - SecRequestBodyLimit <%= @modsec_body_limit %> -<% end -%> - diff --git a/modules/apache/templates/vhost/_serveralias.erb b/modules/apache/templates/vhost/_serveralias.erb deleted file mode 100644 index e08a55e..0000000 --- a/modules/apache/templates/vhost/_serveralias.erb +++ /dev/null @@ -1,7 +0,0 @@ -<% if @serveraliases and ! @serveraliases.empty? -%> - - ## Server aliases - <%- Array(@serveraliases).each do |serveralias| -%> - ServerAlias <%= serveralias %> - <%- end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_serversignature.erb b/modules/apache/templates/vhost/_serversignature.erb deleted file mode 100644 index ff13aaf..0000000 --- a/modules/apache/templates/vhost/_serversignature.erb +++ /dev/null @@ -1 +0,0 @@ - ServerSignature Off diff --git a/modules/apache/templates/vhost/_setenv.erb b/modules/apache/templates/vhost/_setenv.erb deleted file mode 100644 index 476a6b1..0000000 --- a/modules/apache/templates/vhost/_setenv.erb +++ /dev/null @@ -1,17 +0,0 @@ -<% if @setenv and ! @setenv.empty? -%> - - ## SetEnv/SetEnvIf for environment variables - <%- Array(@setenv).each do |envvar| -%> - SetEnv <%= envvar %> - <%- end -%> -<% end -%> -<% if @setenvif and ! @setenvif.empty? -%> - <%- Array(@setenvif).each do |envifvar| -%> - SetEnvIf <%= envifvar %> - <%- end -%> -<% end -%> -<% if @setenvifnocase and ! @setenvifnocase.empty? -%> - <%- Array(@setenvifnocase).each do |envifncvar| -%> - SetEnvIfNoCase <%= envifncvar %> - <%- end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_ssl.erb b/modules/apache/templates/vhost/_ssl.erb deleted file mode 100644 index 826a99b..0000000 --- a/modules/apache/templates/vhost/_ssl.erb +++ /dev/null @@ -1,55 +0,0 @@ -<% if @ssl -%> - - ## SSL directives - SSLEngine on - SSLCertificateFile "<%= @ssl_cert %>" - SSLCertificateKeyFile "<%= @ssl_key %>" - <%- if @ssl_chain -%> - SSLCertificateChainFile "<%= @ssl_chain %>" - <%- end -%> - <%- if @ssl_protocol -%> - SSLProtocol <%= [@ssl_protocol].flatten.compact.join(' ') %> - <%- end -%> - <%- if @ssl_cipher -%> - SSLCipherSuite <%= @ssl_cipher %> - <%- end -%> - <%- if @ssl_honorcipherorder -%> - SSLHonorCipherOrder <%= @ssl_honorcipherorder %> - <%- end -%> - <%- if @ssl_verify_client -%> - SSLVerifyClient <%= @ssl_verify_client %> - <%- if @ssl_certs_dir && @ssl_certs_dir != '' -%> - SSLCACertificatePath "<%= @ssl_certs_dir %>" - <%- end -%> - <%- if @ssl_ca -%> - SSLCACertificateFile "<%= @ssl_ca %>" - <%- end -%> - <%- if @ssl_crl_path -%> - SSLCARevocationPath "<%= @ssl_crl_path %>" - <%- end -%> - <%- if @ssl_crl -%> - SSLCARevocationFile "<%= @ssl_crl %>" - <%- end -%> - <%- if @ssl_verify_depth -%> - SSLVerifyDepth <%= @ssl_verify_depth %> - <%- end -%> - <%- if @ssl_crl_check && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> - SSLCARevocationCheck "<%= @ssl_crl_check %>" - <%- end -%> - <%- end -%> - <%- if @ssl_options -%> - SSLOptions <%= Array(@ssl_options).join(' ') %> - <%- end -%> - <%- if @ssl_openssl_conf_cmd -%> - SSLOpenSSLConfCmd <%= @ssl_openssl_conf_cmd %> - <%- end -%> - <%- if (not @ssl_stapling.nil?) && (scope.function_versioncmp([@apache_version, '2.4']) >= 0) -%> - SSLUseStapling <%= scope.function_bool2httpd([@ssl_stapling]) %> - <%- end -%> - <%- if @ssl_stapling_timeout && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> - SSLStaplingResponderTimeout <%= @ssl_stapling_timeout %> - <%- end -%> - <%- if (not @ssl_stapling_return_errors.nil?) && (scope.function_versioncmp([@apache_version, '2.4']) >= 0) -%> - SSLStaplingReturnResponderErrors <%= scope.function_bool2httpd([@ssl_stapling_return_errors]) %> - <%- end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_sslproxy.erb b/modules/apache/templates/vhost/_sslproxy.erb deleted file mode 100644 index 6cb9216..0000000 --- a/modules/apache/templates/vhost/_sslproxy.erb +++ /dev/null @@ -1,29 +0,0 @@ -<% if @ssl_proxyengine -%> - - # SSL Proxy directives - SSLProxyEngine On - <%- if @ssl_proxy_verify -%> - SSLProxyVerify <%= @ssl_proxy_verify %> - <%- end -%> - <%- if @ssl_proxy_verify_depth -%> - SSLProxyVerifyDepth <%= @ssl_proxy_verify_depth %> - <%- end -%> - <%- if @ssl_proxy_ca_cert -%> - SSLProxyCACertificateFile "<%= @ssl_proxy_ca_cert %>" - <%- end -%> - <%- if @ssl_proxy_check_peer_cn -%> - SSLProxyCheckPeerCN <%= @ssl_proxy_check_peer_cn %> - <%- end -%> - <%- if @ssl_proxy_check_peer_name -%> - SSLProxyCheckPeerName <%= @ssl_proxy_check_peer_name %> - <%- end -%> - <%- if @ssl_proxy_check_peer_expire -%> - SSLProxyCheckPeerExpire <%= @ssl_proxy_check_peer_expire %> - <%- end -%> - <%- if @ssl_proxy_machine_cert -%> - SSLProxyMachineCertificateFile "<%= @ssl_proxy_machine_cert %>" - <%- end -%> - <%- if @ssl_proxy_protocol -%> - SSLProxyProtocol <%= [@ssl_proxy_protocol].flatten.compact.join(' ') %> - <%- end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_suexec.erb b/modules/apache/templates/vhost/_suexec.erb deleted file mode 100644 index 8a7ae0f..0000000 --- a/modules/apache/templates/vhost/_suexec.erb +++ /dev/null @@ -1,4 +0,0 @@ -<% if @suexec_user_group -%> - - SuexecUserGroup <%= @suexec_user_group %> -<% end -%> diff --git a/modules/apache/templates/vhost/_suphp.erb b/modules/apache/templates/vhost/_suphp.erb deleted file mode 100644 index e394b6f..0000000 --- a/modules/apache/templates/vhost/_suphp.erb +++ /dev/null @@ -1,11 +0,0 @@ -<% if @suphp_engine == 'on' -%> - <%- if @suphp_addhandler -%> - suPHP_AddHandler <%= @suphp_addhandler %> - <%- end -%> - <%- if @suphp_engine -%> - suPHP_Engine <%= @suphp_engine %> - <%- end -%> - <%- if @suphp_configpath -%> - suPHP_ConfigPath "<%= @suphp_configpath %>" - <%- end -%> -<% end -%> diff --git a/modules/apache/templates/vhost/_wsgi.erb b/modules/apache/templates/vhost/_wsgi.erb deleted file mode 100644 index 12c7826..0000000 --- a/modules/apache/templates/vhost/_wsgi.erb +++ /dev/null @@ -1,38 +0,0 @@ -<% if @wsgi_application_group -%> - WSGIApplicationGroup <%= @wsgi_application_group %> -<% end -%> -<% if @wsgi_daemon_process and @wsgi_daemon_process_options -%> - WSGIDaemonProcess <%= @wsgi_daemon_process %> <%= @wsgi_daemon_process_options.collect { |k,v| "#{k}=#{v}"}.sort.join(' ') %> -<% elsif @wsgi_daemon_process and !@wsgi_daemon_process_options -%> - WSGIDaemonProcess <%= @wsgi_daemon_process %> -<% end -%> -<% if @wsgi_import_script and @wsgi_import_script_options -%> - WSGIImportScript <%= @wsgi_import_script %> <%= @wsgi_import_script_options.collect { |k,v| "#{k}=#{v}"}.sort.join(' ') %> -<% end -%> -<% if @wsgi_process_group -%> - WSGIProcessGroup <%= @wsgi_process_group %> -<% end -%> -<% if @wsgi_script_aliases_match and ! @wsgi_script_aliases_match.empty? -%> - <%- @wsgi_script_aliases_match.keys.sort.each do |key| -%> - <%- if key != '' and @wsgi_script_aliases_match[key] != ''-%> - WSGIScriptAliasMatch <%= key %> "<%= @wsgi_script_aliases_match[key] %>" - <%- end -%> - <%- end -%> -<% end -%> -<% if @wsgi_script_aliases and ! @wsgi_script_aliases.empty? -%> - <%- @wsgi_script_aliases.keys.sort.each do |key| -%> - <%- if key != '' and @wsgi_script_aliases[key] != ''-%> - <%- if @wsgi_script_aliases[key].is_a? Array -%> - WSGIScriptAlias <%= key %> <%= @wsgi_script_aliases[key].join(' ') %> - <%- else -%> - WSGIScriptAlias <%= key %> "<%= @wsgi_script_aliases[key] %>" - <%- end -%> - <%- end -%> - <%- end -%> -<% end -%> -<% if @wsgi_pass_authorization -%> - WSGIPassAuthorization <%= @wsgi_pass_authorization %> -<% end -%> -<% if @wsgi_chunked_request -%> - WSGIChunkedRequest <%= @wsgi_chunked_request %> -<% end -%> diff --git a/modules/concat/CHANGELOG.md b/modules/concat/CHANGELOG.md deleted file mode 100644 index 19272c7..0000000 --- a/modules/concat/CHANGELOG.md +++ /dev/null @@ -1,381 +0,0 @@ -## Supported Releases 4.1.0 -### Summary - -This release is a rollup of changes. The most notable change being the addition of the 'format' attribute which allows output in JSON and YAML formats, and the 'force' attribute which if true forces a merge of duplicate keys for these formats. - -#### Features: -- Format and force attributes added. -- Deprecated is_string in favour of puppet language. -- Unsupported Ubuntu releases removed from compatibility list. -- Debian 9 added and Debian 6 removed from compatibility list. - -#### Bug Fixes: -- (MODULES-4359) Fix native types so they can be used directly. -- Update to tests to handle errors containing quote marks. -- Update to tests to follow rspec-puppet pattern. - -## Supported Releases 4.0.1 -### Summary - -This is a small release that updates regex in a test due to changes made in Puppet. - -#### Bugfixes - -- (MODULES-5085) Ensure that replace test handles qoutes in change message - -## Supported Releases 3.0.0 & 4.0.0 -### Summary - -This double release adds new Puppet 4 data types. The 3.0.0 release is fully backwards compatible to -existing Puppet 4 configurations and provides you with [deprecation warnings](https://github.com/puppetlabs/puppetlabs-stdlib#deprecation) for every argument that -will not work as expected with the final 4.0.0 release. See the [stdlib docs](https://github.com/puppetlabs/puppetlabs-stdlib#validate_legacy) for an in-depth discussion of this. - -If you're still running Puppet 3, remain on the latest puppetlabs-concat 2.x release for now, and see the documentation to [upgrade to Puppet 4](https://docs.puppet.com/puppet/4.6/reference/upgrade_major_pre.html). - -#### Added -- puppet-strings documentation -- Puppet 4 data types and deprecation warnings - -#### Changed -- stdlib dependency changed to 4.13.1 -- supported Puppet version changed to 4.7. - -## Supported Release 2.2.1 -### Summary - -This is a backwards compatible bugfix release. - -#### Bugfixes - -- (MODULES-4350) Makes :path the namevar for concat_file -- (MODULES-4351) Prevents the :order parameter from accepting arbitrary values in concat_file -- (MODULES-4352) Restricts the :replace parameter to values accepted by file -- (MODULES-4474) Drops auto requirement of fragments -- (MODULES-3900) Improves error messages in concat::fragment -- Uses the whole fragment title when sorting - -## Supported Release 2.2.0 -### Summary - -This release includes support for Debian 8 and Ubuntu 16.04 in addition to numerous bugfixes. - -#### Features -- Adds Debian 8 support -- Adds Ubuntu 16.04 support - -#### Bugfixes -- Fixes the stdlib lower dependency. -- (MODULES-3027) Fixes escaping the '*' character in tag creation. -- (MODULES-3097) Fixes fragment sorting by alpha -- Correctly propagates 'validate_cmd' parameter to generated file resource -- Correctly escapes disallowed characters in fragment tag creation -- (MODULES-3332) Correct the target path validation -- (MODULES-3463) Properly passes metaparams to generated resource - -## Supported Release 2.1.0 -### Summary - -This is a re-release of concat as a resource type. This release also includes new features and bugfixes on top of the previously YANKED 2.0.1 release. - -#### Features -- Adds the show_diff property. -- Adds the selinux related file params. -- Allows integer UID/GID values to be passed into `$owner` and `$group` - -#### Bugfixes -- Adds a workaround to PUP-1963: generated resources never receiving dependency edges. -- Fixes occassional failure to find directory environment. - -## Supported Release 1.2.5 -### Summary - -Small release for support of newer PE versions. This increments the version of PE in the metadata.json file. - -## 2015-07-21 - Supported Release 1.2.4 -### Summary - -This release includes some ruby path and lint fixes. - -#### Bugfixes -- Use correct ruby path with PE and AIO -- Lint fixes -- Use correct ruby path on FreeBSD -- Test fixes - -## 2015-06-02 - Supported Release 2.0.1 [YANKED] -### Summary - -This is a bugfix release. - -#### Bugfixes -- Fixes dependency graphing with concurrent modification of the same file. -- Fixes handling fragment target. -- Fixes the defaulted force behavior to handle empty concats correctly. - -## 2015-06-02 - Supported Release 1.2.3 -### Summary - -This release includes a README fix to document correct behavior of fragment target parameter. - -#### Bugfixes -- README Fix to correctly document how a fragment $target param should work. - -## 2015-05-12 - Supported Release 2.0.0 [YANKED] -### Summary - -This is a major release. Includes re-implementation of concat to use native Type and Providers, resulting in significantly improved performance and testability. Also includes a bugfix to alpha ordering of fragments. - -#### Features -- Re-implementation of concat to use native Type and Providers. - -#### Bugfixes -- Fixes a bug in alpha ordering of fragments. - -## 2015-05-12 - Supported Release 1.2.2 -### Summary - -This release includes a bugfix. - -#### Bugfixes -- Fixes a bug introduced by MODULES-1700, in handling default retrieval of fragment backup parameter. - -## 2015-04-14 - Supported Release 1.2.1 -### Summary - -This release includes bugfixes, test improvements, and a rewritten README. - -#### Bugfixes - -- Verifies existence of $is_pe before using it. -- Adds validation for $order param to not allow restricted characters. -- Sets the group id on Fragments for versions of Facter that contain the $gid fact. -- Sets the script group to 0 if the script is owned by root. -- Explicitly sets script and concat directories to the same owner and group. -- Re-adds support for fragment backup, so that static compiler can work with filebucket (MODULES-1700). - -## 2015-02-17 - Supported Release 1.2.0 -### Summary - -This release includes a number of bugfixes and adds support for running a validation command when using puppet >= 3.5.0. - -#### Features -- Support running a validation command for Puppet >= 3.5.0 - -#### Bugfixes -- Reset poisoned defaults from Exec -- Use concatfragments.rb on AIX since it doesn't support print0 -- Make sure ruby is in the path for PE (MODULES-1456) -- Fix missing method for check_is_owned_by for windows (MODULES-1764) -- Fix sort by numeric - -## 2014-10-28 - Supported Release 1.1.2 -### Summary - -This release includes bugfixes and test improvements. The module was tested against SLES10 and SLES12 and found to work against those platforms with no module improvements. Metadata was updated to include those as supported platforms. - -#### Bugfixes -- newline didn't work for Windows and Solaris. This has been fixed. -- Install certs on Windows for acceptance tests -- Update tests to work with strict variables (no module updates were required) -- Update tests to work on Windows -- Fix typo in CHANGELOG.md - -## 2014-09-10 - Supported Release 1.1.1 -### Summary - -This is a bugfix release, and the first supported release of the 1.1.x series. - -#### Bugfixes -- Make the `$order` parameter default to a string and be validated as an integer - or a string -- Use the ruby script on Solaris to not break Sol10 support -- Add quotes to the ruby script location for Windows -- Fix typos in README.md -- Make regex in concat::setup case-insensitive to make it work on Windows -- Make sure concat fragments are always replaced -- Fix validation to allow `$backup` to be a boolean -- Remove dependency on stdlib 4.x -- Fix for lack of idempotency with `ensure => 'absent'` -- Fix tests and spec_helper -- Synchronized files for more consistency across modules via modulesync - -## 2014-05-14 - Release 1.1.0 -### Summary - -This release is primarily a bugfix release since 1.1.0-rc1. - -#### Features -- Improved testing, with tests moved to beaker - -#### Bugfixes -- No longer attempts to set fragment owner and mode on Windows -- Fix numeric sorting -- Fix incorrect quoting -- Fix newlines - -## 2014-01-03 - Release 1.1.0-rc1 -### Summary - -This release of concat was 90% written by Joshua Hoblitt, and the module team -would like to thank him for the huge amount of work he put into this release. - -This module deprecates a bunch of old parameters and usage patterns, modernizes -much of the manifest code, simplifies a whole bunch of logic and makes -improvements to almost all parts of the module. - -The other major feature is windows support, courtesy of luisfdez, with an -alternative version of the concat bash script in ruby. We've attempted to -ensure that there are no backwards incompatible changes, all users of 1.0.0 -should be able to use 1.1.0 without any failures, but you may find deprecation -warnings and we'll be aggressively moving for a 2.0 to remove those too. - -For further information on deprecations, please read: -https://github.com/puppetlabs/puppetlabs-concat/blob/master/README.md#api-deprecations - -#### Removed -- Puppet 0.24 support. -- Filebucket backup of all file resources except the target concatenated file. -- Default owner/user/group values. -- Purging of long unused /usr/local/bin/concatfragments.sh - -### Features -- Windows support via a ruby version of the concat bash script. -- Huge amount of acceptance testing work added. -- Documentation (README) completely rewritten. -- New parameters in concat: - - `ensure`: Controls if the file should be present/absent at all. - - Remove requirement to include concat::setup in manifests. - - Made `gnu` parameter deprecated. - - Added parameter validation. - -### Bugfixes - - Ensure concat::setup runs before concat::fragment in all cases. - - Pluginsync references updated for modern Puppet. - - Fix incorrect group parameter. - - Use $owner instead of $id to avoid confusion with $::id - - Compatibility fixes for Puppet 2.7/ruby 1.8.7 - - Use LC_ALL=C instead of LANG=C - - Always exec the concatfragments script as root when running as root. - - Syntax and other cleanup changes. - -## 2014-06-25 - Supported Release 1.0.4 -### Summary - -This release has test fixes. - -#### Features -- Added test support for OSX. - -#### Bugfixes - -#### Known bugs - -* Not supported on Windows. - -## 2014-06-04 - Release 1.0.3 -### Summary - -This release adds compatibility for PE3.3 and fixes tests. - -#### Features -- Added test support for Ubuntu Trusty. - -#### Bugfixes - -#### Known bugs - -*Not supported on Windows. - -## 2014-03-04 - Supported Release 1.0.2 -### Summary - -This is a supported release. No functional changes were made from 1.0.1. - -#### Features -- Huge amount of tests backported from 1.1. -- Documentation rewrite. - -#### Bugfixes - -#### Known Bugs - -* Not supported on Windows. - - -## 2014-02-12 - 1.0.1 -### Summary - -Minor bugfixes for sorting of fragments and ordering of resources. - -#### Bugfixes -- LANG => C replaced with LC_ALL => C to reduce spurious recreation of -fragments. -- Corrected pluginsync documentation. -- Ensure concat::setup always runs before fragments. - - -## 2013-08-09 - 1.0.0 -### Summary - -Many new features and bugfixes in this release, and if you're a heavy concat -user you should test carefully before upgrading. The features should all be -backwards compatible but only light testing has been done from our side before -this release. - -#### Features -- New parameters in concat: - - `replace`: specify if concat should replace existing files. - - `ensure_newline`: controls if fragments should contain a newline at the end. -- Improved README documentation. -- Add rspec:system tests (rake spec:system to test concat) - -#### Bugfixes -- Gracefully handle \n in a fragment resource name. -- Adding more helpful message for 'pluginsync = true' -- Allow passing `source` and `content` directly to file resource, rather than -defining resource defaults. -- Added -r flag to read so that filenames with \ will be read correctly. -- sort always uses LANG=C. -- Allow WARNMSG to contain/start with '#'. -- Replace while-read pattern with for-do in order to support Solaris. - -#### CHANGELOG: -- 2010/02/19 - initial release -- 2010/03/12 - add support for 0.24.8 and newer - - make the location of sort configurable - - add the ability to add shell comment based warnings to - top of files - - add the ablity to create empty files -- 2010/04/05 - fix parsing of WARN and change code style to match rest - of the code - - Better and safer boolean handling for warn and force - - Don't use hard coded paths in the shell script, set PATH - top of the script - - Use file{} to copy the result and make all fragments owned - by root. This means we can chnage the ownership/group of the - resulting file at any time. - - You can specify ensure => "/some/other/file" in concat::fragment - to include the contents of a symlink into the final file. -- 2010/04/16 - Add more cleaning of the fragment name - removing / from the $name -- 2010/05/22 - Improve documentation and show the use of ensure => -- 2010/07/14 - Add support for setting the filebucket behavior of files -- 2010/10/04 - Make the warning message configurable -- 2010/12/03 - Add flags to make concat work better on Solaris - thanks Jonathan Boyett -- 2011/02/03 - Make the shell script more portable and add a config option for root group -- 2011/06/21 - Make base dir root readable only for security -- 2011/06/23 - Set base directory using a fact instead of hardcoding it -- 2011/06/23 - Support operating as non privileged user -- 2011/06/23 - Support dash instead of bash or sh -- 2011/07/11 - Better solaris support -- 2011/12/05 - Use fully qualified variables -- 2011/12/13 - Improve Nexenta support -- 2012/04/11 - Do not use any GNU specific extensions in the shell script -- 2012/03/24 - Comply to community style guides -- 2012/05/23 - Better errors when basedir isnt set -- 2012/05/31 - Add spec tests -- 2012/07/11 - Include concat::setup in concat improving UX -- 2012/08/14 - Puppet Lint improvements -- 2012/08/30 - The target path can be different from the $name -- 2012/08/30 - More Puppet Lint cleanup -- 2012/09/04 - RELEASE 0.2.0 -- 2012/12/12 - Added (file) $replace parameter to concat diff --git a/modules/concat/CONTRIBUTING.md b/modules/concat/CONTRIBUTING.md deleted file mode 100644 index 1a9fb3a..0000000 --- a/modules/concat/CONTRIBUTING.md +++ /dev/null @@ -1,271 +0,0 @@ -# Contributing to Puppet modules - -So you want to contribute to a Puppet module: Great! Below are some instructions to get you started doing -that very thing while setting expectations around code quality as well as a few tips for making the -process as easy as possible. - -### Table of Contents - -1. [Getting Started](#getting-started) -1. [Commit Checklist](#commit-checklist) -1. [Submission](#submission) -1. [More about commits](#more-about-commits) -1. [Testing](#testing) - - [Running Tests](#running-tests) - - [Writing Tests](#writing-tests) -1. [Get Help](#get-help) - -## Getting Started - -- Fork the module repository on GitHub and clone to your workspace - -- Make your changes! - -## Commit Checklist - -### The Basics - -- [x] my commit is a single logical unit of work - -- [x] I have checked for unnecessary whitespace with "git diff --check" - -- [x] my commit does not include commented out code or unneeded files - -### The Content - -- [x] my commit includes tests for the bug I fixed or feature I added - -- [x] my commit includes appropriate documentation changes if it is introducing a new feature or changing existing functionality - -- [x] my code passes existing test suites - -### The Commit Message - -- [x] the first line of my commit message includes: - - - [x] an issue number (if applicable), e.g. "(MODULES-xxxx) This is the first line" - - - [x] a short description (50 characters is the soft limit, excluding ticket number(s)) - -- [x] the body of my commit message: - - - [x] is meaningful - - - [x] uses the imperative, present tense: "change", not "changed" or "changes" - - - [x] includes motivation for the change, and contrasts its implementation with the previous behavior - -## Submission - -### Pre-requisites - -- Make sure you have a [GitHub account](https://github.com/join) - -- [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for. - -### Push and PR - -- Push your changes to your fork - -- [Open a Pull Request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) against the repository in the puppetlabs organization - -## More about commits - - 1. Make separate commits for logically separate changes. - - Please break your commits down into logically consistent units - which include new or changed tests relevant to the rest of the - change. The goal of doing this is to make the diff easier to - read for whoever is reviewing your code. In general, the easier - your diff is to read, the more likely someone will be happy to - review it and get it into the code base. - - If you are going to refactor a piece of code, please do so as a - separate commit from your feature or bug fix changes. - - We also really appreciate changes that include tests to make - sure the bug is not re-introduced, and that the feature is not - accidentally broken. - - Describe the technical detail of the change(s). If your - description starts to get too long, that is a good sign that you - probably need to split up your commit into more finely grained - pieces. - - Commits which plainly describe the things which help - reviewers check the patch and future developers understand the - code are much more likely to be merged in with a minimum of - bike-shedding or requested changes. Ideally, the commit message - would include information, and be in a form suitable for - inclusion in the release notes for the version of Puppet that - includes them. - - Please also check that you are not introducing any trailing - whitespace or other "whitespace errors". You can do this by - running "git diff --check" on your changes before you commit. - - 2. Sending your patches - - To submit your changes via a GitHub pull request, we _highly_ - recommend that you have them on a topic branch, instead of - directly on "master". - It makes things much easier to keep track of, especially if - you decide to work on another thing before your first change - is merged in. - - GitHub has some pretty good - [general documentation](http://help.github.com/) on using - their site. They also have documentation on - [creating pull requests](https://help.github.com/articles/creating-a-pull-request-from-a-fork/). - - In general, after pushing your topic branch up to your - repository on GitHub, you can switch to the branch in the - GitHub UI and click "Pull Request" towards the top of the page - in order to open a pull request. - - 3. Update the related JIRA issue. - - If there is a JIRA issue associated with the change you - submitted, then you should update the ticket to include the - location of your branch, along with any other commentary you - may wish to make. - -# Testing - -## Getting Started - -Our Puppet modules provide [`Gemfile`](./Gemfile)s, which can tell a Ruby package manager such as [bundler](http://bundler.io/) what Ruby packages, -or Gems, are required to build, develop, and test this software. - -Please make sure you have [bundler installed](http://bundler.io/#getting-started) on your system, and then use it to -install all dependencies needed for this project in the project root by running - -```shell -% bundle install --path .bundle/gems -Fetching gem metadata from https://rubygems.org/........ -Fetching gem metadata from https://rubygems.org/.. -Using rake (10.1.0) -Using builder (3.2.2) --- 8><-- many more --><8 -- -Using rspec-system-puppet (2.2.0) -Using serverspec (0.6.3) -Using rspec-system-serverspec (1.0.0) -Using bundler (1.3.5) -Your bundle is complete! -Use `bundle show [gemname]` to see where a bundled gem is installed. -``` - -NOTE: some systems may require you to run this command with sudo. - -If you already have those gems installed, make sure they are up-to-date: - -```shell -% bundle update -``` - -## Running Tests - -With all dependencies in place and up-to-date, run the tests: - -### Unit Tests - -```shell -% bundle exec rake spec -``` - -This executes all the [rspec tests](http://rspec-puppet.com/) in the directories defined [here](https://github.com/puppetlabs/puppetlabs_spec_helper/blob/699d9fbca1d2489bff1736bb254bb7b7edb32c74/lib/puppetlabs_spec_helper/rake_tasks.rb#L17) and so on. -rspec tests may have the same kind of dependencies as the module they are testing. Although the module defines these dependencies in its [metadata.json](./metadata.json), -rspec tests define them in [.fixtures.yml](./fixtures.yml). - -### Acceptance Tests - -Some Puppet modules also come with acceptance tests, which use [beaker][]. These tests spin up a virtual machine under -[VirtualBox](https://www.virtualbox.org/), controlled with [Vagrant](http://www.vagrantup.com/), to simulate scripted test -scenarios. In order to run these, you need both Virtualbox and Vagrant installed on your system. - -Run the tests by issuing the following command - -```shell -% bundle exec rake spec_clean -% bundle exec rspec spec/acceptance -``` - -This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml), -install Puppet, copy this module, and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb) -and then run all the tests under [spec/acceptance](./spec/acceptance). - -## Writing Tests - -### Unit Tests - -When writing unit tests for Puppet, [rspec-puppet][] is your best friend. It provides tons of helper methods for testing your manifests against a -catalog (e.g. contain_file, contain_package, with_params, etc). It would be ridiculous to try and top rspec-puppet's [documentation][rspec-puppet_docs] -but here's a tiny sample: - -Sample manifest: - -```puppet -file { "a test file": - ensure => present, - path => "/etc/sample", -} -``` - -Sample test: - -```ruby -it 'does a thing' do - expect(subject).to contain_file("a test file").with({:path => "/etc/sample"}) -end -``` - -### Acceptance Tests - -Writing acceptance tests for Puppet involves [beaker][] and its cousin [beaker-rspec][]. A common pattern for acceptance tests is to create a test manifest, apply it -twice to check for idempotency or errors, then run expectations. - -```ruby -it 'does an end-to-end thing' do - pp = <<-EOF - file { 'a test file': - ensure => present, - path => "/etc/sample", - content => "test string", - } - - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - -end - -describe file("/etc/sample") do - it { is_expected.to contain "test string" } -end - -``` - -# If you have commit access to the repository - -Even if you have commit access to the repository, you still need to go through the process above, and have someone else review and merge -in your changes. The rule is that **all changes must be reviewed by a project developer that did not write the code to ensure that -all changes go through a code review process.** - -The record of someone performing the merge is the record that they performed the code review. Again, this should be someone other than the author of the topic branch. - -# Get Help - -### On the web -* [Puppet help messageboard](http://puppet.com/community/get-help) -* [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing) -* [General GitHub documentation](http://help.github.com/) -* [GitHub pull request documentation](http://help.github.com/send-pull-requests/) - -### On chat -* Slack (slack.puppet.com) #forge-modules, #puppet-dev, #windows, #voxpupuli -* IRC (freenode) #puppet-dev, #voxpupuli - - -[rspec-puppet]: http://rspec-puppet.com/ -[rspec-puppet_docs]: http://rspec-puppet.com/documentation/ -[beaker]: https://github.com/puppetlabs/beaker -[beaker-rspec]: https://github.com/puppetlabs/beaker-rspec diff --git a/modules/concat/Gemfile b/modules/concat/Gemfile deleted file mode 100644 index e8318e5..0000000 --- a/modules/concat/Gemfile +++ /dev/null @@ -1,157 +0,0 @@ -#This file is generated by ModuleSync, do not edit. - -source ENV['GEM_SOURCE'] || "https://rubygems.org" - -# Determines what type of gem is requested based on place_or_version. -def gem_type(place_or_version) - if place_or_version =~ /^git:/ - :git - elsif place_or_version =~ /^file:/ - :file - else - :gem - end -end - -# Find a location or specific version for a gem. place_or_version can be a -# version, which is most often used. It can also be git, which is specified as -# `git://somewhere.git#branch`. You can also use a file source location, which -# is specified as `file://some/location/on/disk`. -def location_for(place_or_version, fake_version = nil) - if place_or_version =~ /^(git[:@][^#]*)#(.*)/ - [fake_version, { :git => $1, :branch => $2, :require => false }].compact - elsif place_or_version =~ /^file:\/\/(.*)/ - ['>= 0', { :path => File.expand_path($1), :require => false }] - else - [place_or_version, { :require => false }] - end -end - -# Used for gem conditionals -supports_windows = true -ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments -minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}" - -# The following gems are not included by default as they require DevKit on Windows. -# You should probably include them in a Gemfile.local or a ~/.gemfile -#gem 'pry' #this may already be included in the gemfile -#gem 'pry-stack_explorer', :require => false -#if RUBY_VERSION =~ /^2/ -# gem 'pry-byebug' -#else -# gem 'pry-debugger' -#end - -group :development do - gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby" - gem "puppet-module-win-default-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] - gem "puppet-module-posix-dev-r#{minor_version}", :require => false, :platforms => "ruby" - gem "puppet-module-win-dev-r#{minor_version}", '0.0.7', :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] - gem "json_pure", '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') - gem "fast_gettext", '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0') - gem "fast_gettext", :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') -end - -group :system_tests do - gem "puppet-module-posix-system-r#{minor_version}", :require => false, :platforms => "ruby" - gem "puppet-module-win-system-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] - gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3') - gem "beaker-pe", :require => false - gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION']) - gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION']) - gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1') - gem "puppet-blacksmith", '~> 3.4', :require => false -end - -gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION']) - -# Only explicitly specify Facter/Hiera if a version has been specified. -# Otherwise it can lead to strange bundler behavior. If you are seeing weird -# gem resolution behavior, try setting `DEBUG_RESOLVER` environment variable -# to `1` and then run bundle install. -gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION'] -gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION'] - -# For Windows dependencies, these could be required based on the version of -# Puppet you are requiring. Anything greater than v3.5.0 is going to have -# Windows-specific dependencies dictated by the gem itself. The other scenario -# is when you are faking out Puppet to use a local file path / git path. -explicitly_require_windows_gems = false -puppet_gem_location = gem_type(ENV['PUPPET_GEM_VERSION']) -# This is not a perfect answer to the version check -if puppet_gem_location != :gem || (ENV['PUPPET_GEM_VERSION'] && Gem::Version.correct?(ENV['PUPPET_GEM_VERSION']) && Gem::Requirement.new('< 3.5.0').satisfied_by?(Gem::Version.new(ENV['PUPPET_GEM_VERSION'].dup))) - if Gem::Platform.local.os == 'mingw32' - explicitly_require_windows_gems = true - end - if puppet_gem_location == :gem - # If facterversion hasn't been specified and we are - # looking for a Puppet Gem version less than 3.5.0, we - # need to ensure we get a good Facter for specs. - gem "facter",">= 1.6.11","<= 1.7.5",:require => false unless ENV['FACTER_GEM_VERSION'] - # If hieraversion hasn't been specified and we are - # looking for a Puppet Gem version less than 3.5.0, we - # need to ensure we get a good Hiera for specs. - gem "hiera",">= 1.0.0","<= 1.3.0",:require => false unless ENV['HIERA_GEM_VERSION'] - end -end - -if explicitly_require_windows_gems - # This also means Puppet Gem less than 3.5.0 - this has been tested back - # to 3.0.0. Any further back is likely not supported. - if puppet_gem_location == :gem - gem "ffi", "1.9.0", :require => false - gem "win32-eventlog", "0.5.3","<= 0.6.5", :require => false - gem "win32-process", "0.6.5","<= 0.7.5", :require => false - gem "win32-security", "~> 0.1.2","<= 0.2.5", :require => false - gem "win32-service", "0.7.2","<= 0.8.8", :require => false - gem "minitar", "0.5.4", :require => false - else - gem "ffi", "~> 1.9.0", :require => false - gem "win32-eventlog", "~> 0.5","<= 0.6.5", :require => false - gem "win32-process", "~> 0.6","<= 0.7.5", :require => false - gem "win32-security", "~> 0.1","<= 0.2.5", :require => false - gem "win32-service", "~> 0.7","<= 0.8.8", :require => false - gem "minitar", "~> 0.5.4", :require => false - end - - gem "win32-dir", "~> 0.3","<= 0.4.9", :require => false - gem "win32console", "1.3.2", :require => false if RUBY_VERSION =~ /^1\./ - - # sys-admin was removed in Puppet 3.7.0+, and doesn't compile - # under Ruby 2.3 - so restrict it to Ruby 1.x - gem "sys-admin", "1.5.6", :require => false if RUBY_VERSION =~ /^1\./ - - # Puppet less than 3.7.0 requires these. - # Puppet 3.5.0+ will control the actual requirements. - # These are listed in formats that work with all versions of - # Puppet from 3.0.0 to 3.6.x. After that, these were no longer used. - # We do not want to allow newer versions than what came out after - # 3.6.x to be used as they constitute some risk in breaking older - # functionality. So we set these to exact versions. - gem "win32-api", "1.4.8", :require => false - gem "win32-taskscheduler", "0.2.2", :require => false - gem "windows-api", "0.4.3", :require => false - gem "windows-pr", "1.2.3", :require => false -else - if Gem::Platform.local.os == 'mingw32' - # If we're using a Puppet gem on windows, which handles its own win32-xxx gem dependencies (Pup 3.5.0 and above), set maximum versions - # Required due to PUP-6445 - gem "win32-dir", "<= 0.4.9", :require => false - gem "win32-eventlog", "<= 0.6.5", :require => false - gem "win32-process", "<= 0.7.5", :require => false - gem "win32-security", "<= 0.2.5", :require => false - gem "win32-service", "<= 0.8.8", :require => false - end -end - -# Evaluate Gemfile.local if it exists -if File.exists? "#{__FILE__}.local" - eval(File.read("#{__FILE__}.local"), binding) -end - -# Evaluate ~/.gemfile if it exists -if File.exists?(File.join(Dir.home, '.gemfile')) - eval(File.read(File.join(Dir.home, '.gemfile')), binding) -end - -# vim:ft=ruby diff --git a/modules/concat/LICENSE b/modules/concat/LICENSE deleted file mode 100644 index d645695..0000000 --- a/modules/concat/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/modules/concat/MAINTAINERS.md b/modules/concat/MAINTAINERS.md deleted file mode 100644 index 4cc8eec..0000000 --- a/modules/concat/MAINTAINERS.md +++ /dev/null @@ -1,6 +0,0 @@ -## Maintenance - -Maintainers: - - Puppet Forge Modules Team `forge-modules |at| puppet |dot| com` - -Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `concat`. diff --git a/modules/concat/NOTICE b/modules/concat/NOTICE deleted file mode 100644 index 89dd0b5..0000000 --- a/modules/concat/NOTICE +++ /dev/null @@ -1,15 +0,0 @@ -Puppet Module - puppetlabs-concat - -Copyright 2017 Puppet, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file diff --git a/modules/concat/README.md b/modules/concat/README.md deleted file mode 100644 index 2598d06..0000000 --- a/modules/concat/README.md +++ /dev/null @@ -1,492 +0,0 @@ -# concat - -#### Table of Contents - -1. [Overview](#overview) -2. [Module Description - What the module does and why it is useful](#module-description) -3. [Setup - The basics of getting started with concat](#setup) - * [What concat affects](#what-concat-affects) - * [Beginning with concat](#beginning-with-concat) -4. [Usage - Configuration options and additional functionality](#usage) -5. [Reference - An under-the-hood peek at what the module is doing and how](#reference) - * [Defines](#defines) - * [Parameters](#parameters) - * [Removed functionality](#removed-functionality) -6. [Limitations - OS compatibility, etc.](#limitations) -7. [Development - Guide for contributing to the module](#development) - -## Overview - -The concat module lets you construct files from multiple ordered fragments of text. - -## Module Description - -The concat module lets you gather `concat::fragment` resources from your other modules and order them into a coherent file through a single `concat` resource. - -### Beginning with concat - -To start using concat you need to create: - -* A concat{} resource for the final file. -* One or more concat::fragment{}s. - -A minimal example might be: - -~~~ -concat { '/tmp/file': - ensure => present, -} - -concat::fragment { 'tmpfile': - target => '/tmp/file', - content => 'test contents', - order => '01' -} -~~~ - -## Usage - -### Maintain a list of the major modules on a node - -To maintain an motd file that lists the modules on one of your nodes, first create a class to frame up the file: - -~~~ -class motd { - $motd = '/etc/motd' - - concat { $motd: - owner => 'root', - group => 'root', - mode => '0644' - } - - concat::fragment{ 'motd_header': - target => $motd, - content => "\nPuppet modules on this server:\n\n", - order => '01' - } - - # let local users add to the motd by creating a file called - # /etc/motd.local - concat::fragment{ 'motd_local': - target => $motd, - source => '/etc/motd.local', - order => '15' - } -} - -# let other modules register themselves in the motd -define motd::register($content="", $order='10') { - if $content == "" { - $body = $name - } else { - $body = $content - } - - concat::fragment{ "motd_fragment_$name": - target => '/etc/motd', - order => $order, - content => " -- $body\n" - } -} -~~~ - -Then, in the declarations for each module on the node, add `motd::register{ 'Apache': }` to register the module in the motd. - -~~~ -class apache { - include apache::install, apache::config, apache::service - - motd::register{ 'Apache': } -} -~~~ - -These two steps populate the /etc/motd file with a list of the installed and registered modules, which stays updated even if you just remove the registered modules' `include` lines. System administrators can append text to the list by writing to /etc/motd.local. - -When you're finished, the motd file will look something like this: - -~~~ - Puppet modules on this server: - - -- Apache - -- MySQL - - -~~~ - -## Reference - -### Defines -* `concat`: Manages a file, compiled from one or more text fragments. -* `concat::fragment`: Manages a fragment of text to be compiled into a file. - -### Types -* `concat_file`: Generates a file with content from fragments sharing a common unique tag. -* `concat_fragment`: Manages the fragment. - -### Parameters - -#### Define: `concat` - -All the parameters listed below are optional. - -##### `backup` - -Data type: Boolean, String. - -Specifies whether (and how) to back up the destination file before overwriting it. Your value gets passed on to Puppet's [native `file` resource](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-backup) for execution. Valid options: `true`, `false`, or a string representing either a target filebucket or a filename extension beginning with ".". - -Default value: 'puppet'. - -##### `ensure` - -Data type: String. - -Specifies whether the destination file should exist. Setting to 'absent' tells Puppet to delete the destination file if it exists, and negates the effect of any other parameters. Valid options: 'present' and 'absent'. - -Default value: 'present'. - -##### `ensure_newline` - -Data type: Boolean. - -Specifies whether to add a line break at the end of each fragment that doesn't already end in one. Valid options: `true` and `false`. - -Default value: `false`. - -##### `group` - -Optional. - -Data type: String, Integer. - -Specifies a permissions group for the destination file. Valid options: a string containing a group name. - -Default value: `undef`. - -##### `mode` - -Data type: String. - -Specifies the permissions mode of the destination file. Valid options: a string containing a permission mode value in octal notation. - -Default value: '0644'. - -##### `order` - -Data type: String. - -Specifies a method for sorting your fragments by name within the destination file. Valid options: 'alpha' (e.g., '1, 10, 2') or 'numeric' (e.g., '1, 2, 10'). - -You can override this setting for individual fragments by adjusting the `order` parameter in their `concat::fragment` declarations. - -Default value: 'alpha'. - -##### `owner` - -Optional. - -Data type: String, Integer. - -Specifies the owner of the destination file. Valid options: a string containing a username. - -Default value: `undef`. - -##### `path` - -Data type: Stdlib::AbsolutePath. - -Specifies a destination file for the combined fragments. Valid options: a string containing an absolute path. - -Default value: `namevar` - -##### `replace` - -Data type: Boolean. - -Specifies whether to overwrite the destination file if it already exists. Valid options: `true` and `false`. - -Default value: `true`. - -##### `show_diff` - -Data type: Boolean. - -Specifies whether to set the show_diff parameter for the file resource. Useful for hiding secrets stored in hiera from insecure reporting methods. Valid options: `true`. - -Default value: `true`. - -##### `validate_cmd` - -Optional. - -Data type: String. - -Specifies a validation command to apply to the destination file. Requires Puppet version 3.5 or newer. Valid options: a string to be passed to a file resource. - -Default value: `undef`. - -##### `warn` - -Data type: Boolean, String. - -Specifies whether to add a header message at the top of the destination file. Valid options: the booleans `true` and `false`, or a string to serve as the header. - -If you set 'warn' to `true`, `concat` adds the following line with an `order` of `0`: - -Default value: `false`. - -~~~ -# This file is managed by Puppet. DO NOT EDIT. -~~~ - -Before 2.0.0, this parameter would add a newline at the end of the warn -message. To improve flexibilty, this was removed. Please add it explicitly if -you need it. - -##### `selinux_ignore_defaults` - -See the `file` type's -[`selinux_ignore_defaults`](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-selinux_ignore_defaults) -documentention. - -##### `selrange` - -See the `file` type's -[`selrange`](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-selrange) -documentention. - -##### `selrole` - -See the `file` type's -[`selrole`](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-selrole) -documentention. - -##### `seltype` - -See the `file` type's -[`seltype`](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-seltype) -documentention. - -##### `seluser` - -See the `file` type's -[`seluser`](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-seluser) -documentention. - - -#### Define: `concat::fragment` - -Except where noted, all the below parameters are optional. - -##### `content` - -Data type: String. - -Supplies the content of the fragment. **Note**: You must supply either a `content` parameter or a `source` parameter. Valid options: a string. - -Default value: `undef`. - -##### `order` - -Data type: String, Integer. - -Reorders your fragments within the destination file. Fragments that share the same order number are ordered by name. Valid options: a string (recommended) or an integer. - -Default value: '10'. - -##### `source` - -Data type: String, Array. - -Specifies a file to read into the content of the fragment. **Note**: You must supply either a `content` parameter or a `source` parameter. Valid options: a string or an array, containing one or more Puppet URLs. - -Default value: `undef`. - -##### `target` - -*Required.* - -Data type: String. - -Specifies the destination file of the fragment. Valid options: a string containing the path or title of the parent `concat` resource. - - -#### Type: `concat_file` - -##### `backup` - -Data type: String, Boolean. - -Specifies whether (and how) to back up the destination file before overwriting it. Your value gets passed on to Puppet's [native `file` resource](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-backup) for execution. Valid options: `true`, `false`, or a string representing either a target filebucket or a filename extension beginning with ".". - -Default value: 'puppet'. - -##### `ensure` - -Data type: String. - -Specifies whether the destination file should exist. Setting to 'absent' tells Puppet to delete the destination file if it exists, and negates the effect of any other parameters. Valid options: 'present' and 'absent'. - -Default value: 'present'. - -##### `ensure_newline` - -Data type: Boolean. - -Specifies whether to add a line break at the end of each fragment that doesn't already end in one. Valid options: `true` and `false`. - -Default value: `false`. - -##### `group` - -Data type: String, Integer. - -Specifies a permissions group for the destination file. Valid options: a string containing a group name. - -Default value: `undef`. - -##### `mode` - -Data type: String. - -Specifies the permissions mode of the destination file. Valid options: a string containing a permission mode value in octal notation. - -Default value: '0644'. - -##### `order` - -Data type: String. - -Specifies a method for sorting your fragments by name within the destination file. Valid options: 'alpha' (e.g., '1, 10, 2') or 'numeric' (e.g., '1, 2, 10'). - -You can override this setting for individual fragments by adjusting the `order` parameter in their `concat::fragment` declarations. - -Default value: 'numeric'. - -##### `owner` - -Data type: String, Integer. - -Specifies the owner of the destination file. Valid options: a string containing a username. - -Default value: `undef`. - -##### `path` - -Data type: String. - -Specifies a destination file for the combined fragments. Valid options: a string containing an absolute path. Default value: the title of your declared resource. - -Default value: `namevar`. - -##### `replace` - -Data type: Boolean. - -Specifies whether to overwrite the destination file if it already exists. Valid options: `true` and `false`. - -Default value: `true`. - -##### `tag` - -Data type: String. - -*Required.* Specifies a unique tag reference to collect all concat_fragments with the same tag. - -##### `validate_cmd` - -Data type: String - -Specifies a validation command to apply to the destination file. Requires Puppet version 3.5 or newer. Valid options: a string to be passed to a file resource. - -Default value: `undef`. - -##### `format` - -Data type: String - -Specify what data type to merge the fragments as. Valid options: 'plain', 'yaml', 'json', 'json-pretty'. - -Default value: `plain`. - -##### `force` - -Data type: Boolean - -Specifies whether to merge data structures, keeping the values with higher order. Valid options: `true` and `false`. - -Default value: `false`. - -#### Type: `concat_fragment` - -##### `content` - -Data type: String. - -Supplies the content of the fragment. **Note**: You must supply either a `content` parameter or a `source` parameter. Valid options: a string. - -Default value: `undef`. - -##### `order` - -Data type: String, Integer. - -Reorders your fragments within the destination file. Fragments that share the same order number are ordered by name. Valid options: a string (recommended) or an integer. - -Default value: '10'. - -##### `source` - -Data type: String. - -Specifies a file to read into the content of the fragment. **Note**: You must supply either a `content` parameter or a `source` parameter. Valid options: a string or an array, containing one or more Puppet URLs. - -Default value: `undef`. - -##### `tag` - -Data type: String. - -*Required.* Specifies a unique tag to be used by concat_file to reference and collect content. - -##### `target` - -Data type: String. - -*Required.* Specifies the destination file of the fragment. Valid options: a string containing the path or title of the parent `concat_file` resource. - -### Removed functionality - -The following functionality existed in previous versions of the concat module, but was removed in version 2.0.0: - -Parameters removed from `concat::fragment`: -* `gnu` -* `backup` -* `group` -* `mode` -* `owner` - -The `concat::setup` class has also been removed. - -Prior to concat version 2.0.0, if you set the `warn` parameter to a string value of `true`, `false`, 'yes', 'no', 'on', or 'off', the module translated the string to the corresponding boolean value. In concat version 2.0.0 and newer, the `warn_header` parameter treats those values the same as other strings and uses them as the content of your header message. To avoid that, pass the `true` and `false` values as booleans instead of strings. - -## Limitations - -This module has been tested on [all PE-supported platforms](https://forge.puppetlabs.com/supported#compat-matrix), and no issues have been identified. - -## Development - -Puppet modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can't access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve. - -We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things. - -For more information, see our [module contribution guide.](https://docs.puppetlabs.com/forge/contributing.html) - -### Contributors - -Richard Pijnenburg ([@Richardp82](http://twitter.com/richardp82)) - -Joshua Hoblitt ([@jhoblitt](http://twitter.com/jhoblitt)) - -[More contributors.](https://github.com/puppetlabs/puppetlabs-concat/graphs/contributors) diff --git a/modules/concat/Rakefile b/modules/concat/Rakefile deleted file mode 100644 index d12d854..0000000 --- a/modules/concat/Rakefile +++ /dev/null @@ -1,37 +0,0 @@ -require 'puppetlabs_spec_helper/rake_tasks' -require 'puppet-lint/tasks/puppet-lint' -require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any? - -PuppetLint.configuration.fail_on_warnings = true -PuppetLint.configuration.send('relative') - -desc 'Generate pooler nodesets' -task :gen_nodeset do - require 'beaker-hostgenerator' - require 'securerandom' - require 'fileutils' - - agent_target = ENV['TEST_TARGET'] - if ! agent_target - STDERR.puts 'TEST_TARGET environment variable is not set' - STDERR.puts 'setting to default value of "redhat-64default."' - agent_target = 'redhat-64default.' - end - - master_target = ENV['MASTER_TEST_TARGET'] - if ! master_target - STDERR.puts 'MASTER_TEST_TARGET environment variable is not set' - STDERR.puts 'setting to default value of "redhat7-64mdcl"' - master_target = 'redhat7-64mdcl' - end - - targets = "#{master_target}-#{agent_target}" - cli = BeakerHostGenerator::CLI.new([targets]) - nodeset_dir = "tmp/nodesets" - nodeset = "#{nodeset_dir}/#{targets}-#{SecureRandom.uuid}.yaml" - FileUtils.mkdir_p(nodeset_dir) - File.open(nodeset, 'w') do |fh| - fh.print(cli.execute) - end - puts nodeset -end diff --git a/modules/concat/appveyor.yml b/modules/concat/appveyor.yml deleted file mode 100644 index fad0ccd..0000000 --- a/modules/concat/appveyor.yml +++ /dev/null @@ -1,50 +0,0 @@ -version: 1.1.x.{build} -skip_commits: - message: /^\(?doc\)?.*/ -clone_depth: 10 -init: -- SET -- 'mkdir C:\ProgramData\PuppetLabs\code && exit 0' -- 'mkdir C:\ProgramData\PuppetLabs\facter && exit 0' -- 'mkdir C:\ProgramData\PuppetLabs\hiera && exit 0' -- 'mkdir C:\ProgramData\PuppetLabs\puppet\var && exit 0' -environment: - matrix: - - PUPPET_GEM_VERSION: ~> 4.0 - RUBY_VER: 21 - - PUPPET_GEM_VERSION: ~> 4.0 - RUBY_VER: 21-x64 - - PUPPET_GEM_VERSION: ~> 4.0 - RUBY_VER: 23 - - PUPPET_GEM_VERSION: ~> 4.0 - RUBY_VER: 23-x64 -matrix: - fast_finish: true -install: -- SET PATH=C:\Ruby%RUBY_VER%\bin;%PATH% -- ps: | - # AppVeyor appears to have OpenSSL headers available already - # which msys2 would normally install with: - # pacman -S mingw-w64-x86_64-openssl --noconfirm - # - if ( $(ruby --version) -match "^ruby\s+2\.4" ) { - Write-Output "Building OpenSSL gem ~> 2.0.4 to fix Ruby 2.4 / AppVeyor issue" - gem install openssl --version '~> 2.0.4' --no-ri --no-rdoc - } - - gem list openssl - ruby -ropenssl -e 'puts \"OpenSSL Version - #{OpenSSL::OPENSSL_VERSION}\"; puts \"OpenSSL Library Version - #{OpenSSL::OPENSSL_LIBRARY_VERSION}\"' -- bundle install --jobs 4 --retry 2 --without system_tests -- type Gemfile.lock -build: off -test_script: -- bundle exec puppet -V -- ruby -v -- bundle exec rake spec SPEC_OPTS='--format documentation' -notifications: -- provider: Email - to: - - nobody@nowhere.com - on_build_success: false - on_build_failure: false - on_build_status_changed: false diff --git a/modules/concat/checksums.json b/modules/concat/checksums.json deleted file mode 100644 index d175071..0000000 --- a/modules/concat/checksums.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "CHANGELOG.md": "ffa9dc6aa3416e877b93488d14c48c46", - "CONTRIBUTING.md": "4d17f3c942e7c93d1577cc4438a231e4", - "Gemfile": "dda0eed6fd42a6a965ad10900a5b851c", - "LICENSE": "3b83ef96387f14655fc854ddc3c6bd57", - "MAINTAINERS.md": "c7098fb93e4b0bbeda9e9e2baf2b6476", - "NOTICE": "4a364fe76a22fc737554e108567f5602", - "README.md": "043354fc9cebce20560d16a669775027", - "Rakefile": "3851f083966b9bbd6d46e50dba5aa52a", - "appveyor.yml": "2335fb025c4fd4d89e986a3e77224cf4", - "examples/fragment.pp": "01096a870ef7d1a1425999745f64cc2d", - "examples/init.pp": "356477e6c25394550886bf1c1edb72a4", - "lib/puppet/type/concat_file.rb": "68ce3b435750997d764335ec7da9db1b", - "lib/puppet/type/concat_fragment.rb": "05832612051b845bcb8e2958aa983916", - "locales/config.yaml": "841206ffdcf2451b3c6f45ddf754c0fe", - "manifests/fragment.pp": "513b3401eb861b2dc0f526c9bd8eb8de", - "manifests/init.pp": "9518aa2f794c695d725d13ad2de966cd", - "metadata.json": "b84424574df82947e5ff097d0b824205", - "spec/acceptance/backup_spec.rb": "242ce4dce1efba5efb21850b9bb2a342", - "spec/acceptance/concat_spec.rb": "80fdb7d63a419b6bb9f9f42bc217171e", - "spec/acceptance/concurrency_spec.rb": "53984b19ec3a34d7084d7796f98f6857", - "spec/acceptance/force_spec.rb": "178d588df95f3c90d7a7d933e0a3cb47", - "spec/acceptance/format_spec.rb": "b4195e1b6f4e3cdfcfaf4f44c8b13254", - "spec/acceptance/fragment_source_spec.rb": "85deac6d359ffffd363c0e96bab173b3", - "spec/acceptance/fragments_are_always_replaced_spec.rb": "be39ed9ed30e7bb48aaccda2d7f730ac", - "spec/acceptance/native/backup_spec.rb": "ead1bfb7207c695ef65b77d2d2c870d3", - "spec/acceptance/native/concat_spec.rb": "3a98448a074ca76a2817bc03635dc898", - "spec/acceptance/native/concurrency_spec.rb": "f4ad7d5beafd2be0adcfe64c0f0409e1", - "spec/acceptance/native/fragment_source_spec.rb": "8e7c3f48fa671e41fa555a751f4e7454", - "spec/acceptance/native/fragments_are_always_replaced_spec.rb": "33d64efd4ef7af39b21ad53a99114456", - "spec/acceptance/native/newline_spec.rb": "b605fcd77b0369d6c94d55f99be570de", - "spec/acceptance/native/order_spec.rb": "ceaa22f059d9afb232d9e99f716363ac", - "spec/acceptance/native/pup-1963_spec.rb": "da19100a32ec28be571f5dac9665b8e4", - "spec/acceptance/native/quoted_paths_spec.rb": "c9eaf9a758209fb4b22a1ee6a460a32d", - "spec/acceptance/native/replace_spec.rb": "d76d176f8877cca0470fd91f0a91e4a3", - "spec/acceptance/native/symbolic_name_spec.rb": "7158d1b96736a72cddded27226e05f58", - "spec/acceptance/native/validation_spec.rb": "ad9178f3be3b7f3a274a66a864bc7d25", - "spec/acceptance/native/warnings_spec.rb": "8d7266cdb1e72765dfc3eb40f1efa80a", - "spec/acceptance/newline_spec.rb": "5aaf65972c4f8ed4fd1592cd863583f5", - "spec/acceptance/nodesets/centos-7-x64.yml": "a713f3abd3657f0ae2878829badd23cd", - "spec/acceptance/nodesets/debian-8-x64.yml": "d2d2977900989f30086ad251a14a1f39", - "spec/acceptance/nodesets/debian-9-x64.yml": "adab00029a0b8d577eb6ab89503c25ca", - "spec/acceptance/nodesets/default.yml": "a77662a1375bdf0dde4ed6bd798f2f45", - "spec/acceptance/nodesets/docker/centos-7.yml": "8a3892807bdd62306ae4774f41ba11ae", - "spec/acceptance/nodesets/docker/debian-8.yml": "ac8e871d1068c96de5e85a89daaec6df", - "spec/acceptance/nodesets/docker/ubuntu-14.04.yml": "dc42ee922a96908d85b8f0f08203ce58", - "spec/acceptance/order_spec.rb": "14e739dc02b4a4b48c5ed4d2c9bf1d17", - "spec/acceptance/pup-1963_spec.rb": "71e8a59d674f7a1dafeeba87438a0ca9", - "spec/acceptance/quoted_paths_spec.rb": "9cce52e33e894f10847b986f1d6e56d2", - "spec/acceptance/replace_spec.rb": "5807d3eb55c4503a99f37e81173774ef", - "spec/acceptance/specinfra_stubs.rb": "27839261403d8bbccf506552f9d8ef38", - "spec/acceptance/symbolic_name_spec.rb": "b40452adbfebb0ea9d56547d9daee700", - "spec/acceptance/validation_spec.rb": "e54226b10f46cfa9e89e57398eddbbd2", - "spec/acceptance/warn_header_spec.rb": "269e9329646674ec6975c34e0c58e8c1", - "spec/acceptance/warnings_spec.rb": "07ec0edb14f8d32fa0527c8232a73dfe", - "spec/defines/concat_fragment_spec.rb": "ded29825b61257dcdbe42a96f01a6417", - "spec/defines/concat_spec.rb": "20d9948f882afe266899cd931573303f", - "spec/spec_helper.rb": "b2db3bc02b4ac2fd5142a6621c641b07", - "spec/spec_helper_acceptance.rb": "92901e0df89487ebc734c72859bda65c", - "spec/spec_helper_local.rb": "0021f71be10254f58a4285efbc271ac8", - "spec/unit/type/concat_file_spec.rb": "c59eb34b70d2f55a46da511e4a561513", - "spec/unit/type/concat_fragment_spec.rb": "14499d231674681ac94c4aa69c55a0e3" -} \ No newline at end of file diff --git a/modules/concat/examples/fragment.pp b/modules/concat/examples/fragment.pp deleted file mode 100644 index 16bf3b6..0000000 --- a/modules/concat/examples/fragment.pp +++ /dev/null @@ -1,20 +0,0 @@ -concat { 'testconcat': - ensure => present, - path => '/tmp/concat', - owner => 'root', - group => 'root', - mode => '0664', - show_diff => true, -} - -concat::fragment { '1': - target => 'testconcat', - content => '1', - order => '01', -} - -concat::fragment { '2': - target => 'testconcat', - content => '2', - order => '02', -} diff --git a/modules/concat/examples/init.pp b/modules/concat/examples/init.pp deleted file mode 100644 index c7f1934..0000000 --- a/modules/concat/examples/init.pp +++ /dev/null @@ -1,6 +0,0 @@ -concat { '/tmp/concat': - ensure => present, - owner => 'root', - group => 'root', - mode => '0644', -} diff --git a/modules/concat/lib/puppet/type/concat_file.rb b/modules/concat/lib/puppet/type/concat_file.rb deleted file mode 100644 index 18a15f1..0000000 --- a/modules/concat/lib/puppet/type/concat_file.rb +++ /dev/null @@ -1,308 +0,0 @@ -require 'puppet/type/file/owner' -require 'puppet/type/file/group' -require 'puppet/type/file/mode' -require 'puppet/util/checksums' - -Puppet::Type.newtype(:concat_file) do - @doc = "Gets all the file fragments and puts these into the target file. - This will mostly be used with exported resources. - - example: - Concat_fragment <<| tag == 'unique_tag' |>> - - concat_file { '/tmp/file': - tag => 'unique_tag', # Optional. Default to undef - path => '/tmp/file', # Optional. If given it overrides the resource name - owner => 'root', # Optional. Default to undef - group => 'root', # Optional. Default to undef - mode => '0644' # Optional. Default to undef - order => 'numeric' # Optional, Default to 'numeric' - ensure_newline => false # Optional, Defaults to false - } - " - - ensurable do - defaultvalues - - defaultto { :present } - end - - def exists? - self[:ensure] == :present - end - - newparam(:tag) do - desc "Tag reference to collect all concat_fragment's with the same tag" - end - - newparam(:path, :namevar => true) do - desc "The output file" - - validate do |value| - unless (Puppet::Util.absolute_path?(value, :posix) or Puppet::Util.absolute_path?(value, :windows)) - raise ArgumentError, "File paths must be fully qualified, not '#{value}'" - end - end - end - - newparam(:owner, :parent => Puppet::Type::File::Owner) do - desc "Desired file owner." - end - - newparam(:group, :parent => Puppet::Type::File::Group) do - desc "Desired file group." - end - - newparam(:mode, :parent => Puppet::Type::File::Mode) do - desc "Desired file mode." - end - - newparam(:order) do - desc "Controls the ordering of fragments. Can be set to alpha or numeric." - - newvalues(:alpha, :numeric) - - defaultto :numeric - end - - newparam(:backup) do - desc "Controls the filebucketing behavior of the final file and see File type reference for its use." - - validate do |value| - unless [TrueClass, FalseClass, String].include?(value.class) - raise ArgumentError, 'Backup must be a Boolean or String' - end - end - end - - newparam(:replace, :boolean => true, :parent => Puppet::Parameter::Boolean) do - desc "Whether to replace a file that already exists on the local system." - defaultto :true - end - - newparam(:validate_cmd) do - desc "Validates file." - - validate do |value| - unless value.is_a?(String) - raise ArgumentError, 'Validate_cmd must be a String' - end - end - end - - newparam(:ensure_newline, :boolean => true, :parent => Puppet::Parameter::Boolean) do - desc "Whether to ensure there is a newline after each fragment." - defaultto :false - end - - newparam(:format) do - desc "What data type to merge the fragments as." - - newvalues(:plain, :yaml, :json, :'json-pretty') - - defaultto :plain - end - - newparam(:force, :boolean => true, :parent => Puppet::Parameter::Boolean) do - desc "Forcibly merge duplicate keys keeping values of the highest order." - - defaultto :false - end - - # Inherit File parameters - newparam(:selinux_ignore_defaults, :boolean => true, :parent => Puppet::Parameter::Boolean) - - newparam(:selrange) do - validate do |value| - raise ArgumentError, 'Selrange must be a String' unless value.is_a?(String) - end - end - - newparam(:selrole) do - validate do |value| - raise ArgumentError, 'Selrole must be a String' unless value.is_a?(String) - end - end - - newparam(:seltype) do - validate do |value| - raise ArgumentError, 'Seltype must be a String' unless value.is_a?(String) - end - end - - newparam(:seluser) do - validate do |value| - raise ArgumentError, 'Seluser must be a String' unless value.is_a?(String) - end - end - - newparam(:show_diff, :boolean => true, :parent => Puppet::Parameter::Boolean) - # End file parameters - - # Autorequire the file we are generating below - # Why is this necessary ? - autorequire(:file) do - [self[:path]] - end - - def fragments - # Collect fragments that target this resource by path, title or tag. - @fragments ||= catalog.resources.map do |resource| - next unless resource.is_a?(Puppet::Type.type(:concat_fragment)) - - if resource[:target] == self[:path] || resource[:target] == title || - (resource[:tag] && resource[:tag] == self[:tag]) - resource - end - end.compact - end - - def should_content - return @generated_content if @generated_content - @generated_content = "" - content_fragments = [] - - fragments.each do |r| - content_fragments << ["#{r[:order]}___#{r[:name]}", fragment_content(r)] - end - - if self[:order] == :numeric - sorted = content_fragments.sort do |a, b| - def decompound(d) - d.split('___', 2).map { |v| v =~ /^\d+$/ ? v.to_i : v } - end - - decompound(a[0]) <=> decompound(b[0]) - end - else - sorted = content_fragments.sort_by do |a| - a_order, a_name = a[0].split('__', 2) - [a_order, a_name] - end - end - - case self[:format] - when :plain - @generated_content = sorted.map { |cf| cf[1] }.join - when :yaml - content_array = sorted.map do |cf| - YAML.load(cf[1]) - end - content_hash = content_array.reduce({}) do |memo, current| - nested_merge(memo, current) - end - @generated_content = content_hash.to_yaml - when :json - content_array = sorted.map do |cf| - JSON.parse(cf[1]) - end - content_hash = content_array.reduce({}) do |memo, current| - nested_merge(memo, current) - end - # Convert Hash - @generated_content = content_hash.to_json - when :'json-pretty' - content_array = sorted.map do |cf| - JSON.parse(cf[1]) - end - content_hash = content_array.reduce({}) do |memo, current| - nested_merge(memo, current) - end - @generated_content = JSON.pretty_generate(content_hash) - end - - @generated_content - end - - def nested_merge(hash1, hash2) - # Deep-merge Hashes; higher order value is kept - hash1.merge(hash2) do |k, v1, v2| - if v1.is_a?(Hash) and v2.is_a?(Hash) - nested_merge(v1, v2) - elsif v1.is_a?(Array) and v2.is_a?(Array) - (v1+v2).uniq - else - # Fail if there are duplicate keys without force - unless v1 == v2 - unless self[:force] - err_message = [ - "Duplicate key '#{k}' found with values '#{v1}' and #{v2}'.", - 'Use \'force\' attribute to merge keys.', - ] - fail(err_message.join(' ')) - end - Puppet.debug("Key '#{k}': replacing '#{v2}' with '#{v1}'.") - end - v1 - end - end - end - - def fragment_content(r) - if r[:content].nil? == false - fragment_content = r[:content] - elsif r[:source].nil? == false - @source = nil - Array(r[:source]).each do |source| - if Puppet::FileServing::Metadata.indirection.find(source) - @source = source - break - end - end - self.fail "Could not retrieve source(s) #{r[:source].join(", ")}" unless @source - tmp = Puppet::FileServing::Content.indirection.find(@source) - fragment_content = tmp.content unless tmp.nil? - end - - if self[:ensure_newline] - fragment_content<<"\n" unless fragment_content =~ /\n$/ - end - - fragment_content - end - - def generate - file_opts = { - :ensure => self[:ensure] == :absent ? :absent : :file, - } - - [:path, - :owner, - :group, - :mode, - :replace, - :backup, - :selinux_ignore_defaults, - :selrange, - :selrole, - :seltype, - :seluser, - :validate_cmd, - :show_diff].each do |param| - unless self[param].nil? - file_opts[param] = self[param] - end - end - - metaparams = Puppet::Type.metaparams - excluded_metaparams = [ :before, :notify, :require, :subscribe, :tag ] - - metaparams.reject! { |param| excluded_metaparams.include? param } - - metaparams.each do |metaparam| - file_opts[metaparam] = self[metaparam] if self[metaparam] - end - - [Puppet::Type.type(:file).new(file_opts)] - end - - def eval_generate - content = should_content - - if !content.nil? and !content.empty? - catalog.resource("File[#{self[:path]}]")[:content] = content - end - - [ catalog.resource("File[#{self[:path]}]") ] - end -end diff --git a/modules/concat/lib/puppet/type/concat_fragment.rb b/modules/concat/lib/puppet/type/concat_fragment.rb deleted file mode 100644 index d74662f..0000000 --- a/modules/concat/lib/puppet/type/concat_fragment.rb +++ /dev/null @@ -1,81 +0,0 @@ -Puppet::Type.newtype(:concat_fragment) do - @doc = "Create a concat fragment to be used by concat. - the `concat_fragment` type creates a file fragment to be collected by concat based on the tag. - The example is based on exported resources. - - Example: - @@concat_fragment { \"uniqe_name_${::fqdn}\": - tag => 'unique_name', - order => 10, # Optional. Default to 10 - content => 'some content' # OR - content => template('template.erb') # OR - source => 'puppet:///path/to/file' - } - " - - newparam(:name, :namevar => true) do - desc "Unique name" - end - - newparam(:target) do - desc "Target" - - validate do |value| - raise ArgumentError, 'Target must be a String' unless value.is_a?(String) - end - end - - newparam(:content) do - desc "Content" - - validate do |value| - raise ArgumentError, 'Content must be a String' unless value.is_a?(String) - end - end - - newparam(:source) do - desc "Source" - - validate do |value| - raise ArgumentError, 'Content must be a String or Array' unless [String, Array].include?(value.class) - end - end - - newparam(:order) do - desc "Order" - defaultto '10' - validate do |val| - fail Puppet::ParseError, '$order is not a string or integer.' if !(val.is_a? String or val.is_a? Integer) - fail Puppet::ParseError, "Order cannot contain '/', ':', or '\n'." if val.to_s =~ /[:\n\/]/ - end - end - - newparam(:tag) do - desc "Tag name to be used by concat to collect all concat_fragments by tag name" - end - - autorequire(:file) do - found = catalog.resources.select do |resource| - next unless resource.is_a?(Puppet::Type.type(:concat_file)) - - resource[:path] == self[:target] || resource.title == self[:target] || - (resource[:tag] && resource[:tag] == self[:tag]) - end - - if found.empty? - tag_message = self[:tag] ? "or tag '#{self[:tag]} " : '' - warning "Target Concat_file with path or title '#{self[:target]}' #{tag_message}not found in the catalog" - end - end - - validate do - # Check if target is set - fail Puppet::ParseError, "No 'target' or 'tag' set" unless self[:target] || self[:tag] - - # Check if either source or content is set. raise error if none is set - fail Puppet::ParseError, "Set either 'source' or 'content'" if self[:source].nil? && self[:content].nil? - - # Check if both are set, if so rais error - fail Puppet::ParseError, "Can't use 'source' and 'content' at the same time" if !self[:source].nil? && !self[:content].nil? - end -end diff --git a/modules/concat/locales/config.yaml b/modules/concat/locales/config.yaml deleted file mode 100644 index b97d80b..0000000 --- a/modules/concat/locales/config.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# This is the project-specific configuration file for setting up -# fast_gettext for your project. -gettext: - # This is used for the name of the .pot and .po files; they will be - # called .pot? - project_name: puppetlabs-concat - # This is used in comments in the .pot and .po files to indicate what - # project the files belong to and should bea little more desctiptive than - # - package_name: puppetlabs-concat - # The locale that the default messages in the .pot file are in - default_locale: en - # The email used for sending bug reports. - bugs_address: docs@puppet.com - # The holder of the copyright. - copyright_holder: Puppet, Inc. - # This determines which comments in code should be eligible for translation. - # Any comments that start with this string will be externalized. (Leave - # empty to include all.) - comments_tag: TRANSLATOR - # Patterns for +Dir.glob+ used to find all files that might contain - # translatable content, relative to the project root directory - source_files: - - './lib/**/*.rb' - diff --git a/modules/concat/manifests/fragment.pp b/modules/concat/manifests/fragment.pp deleted file mode 100644 index 5cf8c09..0000000 --- a/modules/concat/manifests/fragment.pp +++ /dev/null @@ -1,37 +0,0 @@ -# Creates a concat_fragment in the catalogue -# -# @param target The file that these fragments belong to -# @param content If present puts the content into the file -# @param source If content was not specified, use the source -# @param order -# By default all files gets a 10_ prefix in the directory you can set it to -# anything else using this to influence the order of the content in the file -# -define concat::fragment( - String $target, - Optional[String] $content = undef, - Optional[Variant[String, Array]] $source = undef, - Variant[String, Integer] $order = '10', -) { - $resource = 'Concat::Fragment' - - if ($order =~ String and $order =~ /[:\n\/]/) { - fail("${resource}['${title}']: 'order' cannot contain '/', ':', or '\n'.") - } - - if ! ($content or $source) { - crit('No content, source or symlink specified') - } elsif ($content and $source) { - fail("${resource}['${title}']: Can't use 'source' and 'content' at the same time.") - } - - $safe_target_name = regsubst($target, '[/:~\n\s\+\*\(\)@]', '_', 'GM') - - concat_fragment { $name: - target => $target, - tag => $safe_target_name, - order => $order, - content => $content, - source => $source, - } -} diff --git a/modules/concat/manifests/init.pp b/modules/concat/manifests/init.pp deleted file mode 100644 index 1d76a7b..0000000 --- a/modules/concat/manifests/init.pp +++ /dev/null @@ -1,131 +0,0 @@ -# Sets up so that you can use fragments to build a final config file, -# -# @param ensure -# Present/Absent -# @param path -# The path to the final file. Use this in case you want to differentiate -# between the name of a resource and the file path. Note: Use the name you -# provided in the target of your fragments. -# @param owner -# Who will own the file -# @param group -# Who will own the file -# @param mode -# The mode of the final file -# @param show_diff -# Use metaparam for files to show/hide diffs for reporting when using eyaml -# secrets. Defaults to true -# @param warn -# Adds a normal shell style comment top of the file indicating that it is -# built by puppet. -# Before 2.0.0, this parameter would add a newline at the end of the warn -# message. To improve flexibilty, this was removed. Please add it explicitely -# if you need it. -# @param backup -# Controls the filebucketing behavior of the final file and see File type -# reference for its use. Defaults to 'puppet' -# @param replace -# Whether to replace a file that already exists on the local system -# @param order -# Select whether to order associated fragments by 'alpha' or 'numeric'. -# Defaults to 'alpha'. -# @param ensure_newline -# Specifies whether to ensure there's a new line at the end of each fragment. -# Valid options: 'true' and 'false'. Default value: 'false'. -# @param selinux_ignore_defaults -# @param selrange -# @param selrole -# @param seltype -# @param seluser -# @param validate_cmd -# Specifies a validation command to apply to the destination file. -# Requires Puppet version 3.5 or newer. Valid options: a string to be passed -# to a file resource. Default value: undefined. -# @param format -# Specify what data type to merge the fragments as. -# Valid options: 'plain', 'yaml', 'json', 'json-pretty'. Default value: `plain`. -# @param force -# Specifies whether to merge data structures, keeping the values with higher order. -# Used when format is specified as a value other than 'plain'. -# Valid options: `true` and `false`. Default value: `false`. -# -# -define concat( - Enum['present', 'absent'] $ensure = 'present', - Stdlib::Absolutepath $path = $name, - Optional[Variant[String, Integer]] $owner = undef, - Optional[Variant[String, Integer]] $group = undef, - String $mode = '0644', - Variant[Boolean, String] $warn = false, - Boolean $show_diff = true, - Variant[Boolean, String] $backup = 'puppet', - Boolean $replace = true, - Enum['alpha','numeric'] $order = 'alpha', - Boolean $ensure_newline = false, - Optional[String] $validate_cmd = undef, - Optional[Boolean] $selinux_ignore_defaults = undef, - Optional[String] $selrange = undef, - Optional[String] $selrole = undef, - Optional[String] $seltype = undef, - Optional[String] $seluser = undef, - Optional[String] $format = 'plain', - Optional[Boolean] $force = false, -) { - - $safe_name = regsubst($name, '[/:~\n\s\+\*\(\)@]', '_', 'G') - $default_warn_message = "# This file is managed by Puppet. DO NOT EDIT.\n" - - case $warn { - true: { - $warn_message = $default_warn_message - $_append_header = true - } - false: { - $warn_message = '' - $_append_header = false - } - default: { - $warn_message = $warn - $_append_header = true - } - } - - if $ensure == 'present' { - concat_file { $name: - tag => $safe_name, - path => $path, - owner => $owner, - group => $group, - mode => $mode, - selinux_ignore_defaults => $selinux_ignore_defaults, - selrange => $selrange, - selrole => $selrole, - seltype => $seltype, - seluser => $seluser, - replace => $replace, - backup => $backup, - show_diff => $show_diff, - order => $order, - ensure_newline => $ensure_newline, - validate_cmd => $validate_cmd, - format => $format, - force => $force, - } - - if $_append_header { - concat_fragment { "${name}_header": - target => $name, - tag => $safe_name, - content => $warn_message, - order => '0', - } - } - } else { - concat_file { $name: - ensure => $ensure, - tag => $safe_name, - path => $path, - backup => $backup, - } - } -} diff --git a/modules/concat/metadata.json b/modules/concat/metadata.json deleted file mode 100644 index ad2cb2b..0000000 --- a/modules/concat/metadata.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "name": "puppetlabs-concat", - "version": "4.1.0", - "author": "Puppet Labs", - "summary": "Construct files from multiple fragments.", - "license": "Apache-2.0", - "source": "https://github.com/puppetlabs/puppetlabs-concat", - "project_page": "https://github.com/puppetlabs/puppetlabs-concat", - "issues_url": "https://tickets.puppetlabs.com/browse/MODULES", - "dependencies": [ - { - "name": "puppetlabs/stdlib", - "version_requirement": ">= 4.13.1 < 5.0.0" - } - ], - "data_provider": null, - "operatingsystem_support": [ - { - "operatingsystem": "RedHat", - "operatingsystemrelease": [ - "5", - "6", - "7" - ] - }, - { - "operatingsystem": "CentOS", - "operatingsystemrelease": [ - "5", - "6", - "7" - ] - }, - { - "operatingsystem": "OracleLinux", - "operatingsystemrelease": [ - "5", - "6", - "7" - ] - }, - { - "operatingsystem": "Scientific", - "operatingsystemrelease": [ - "5", - "6", - "7" - ] - }, - { - "operatingsystem": "SLES", - "operatingsystemrelease": [ - "10 SP4", - "11 SP1", - "12" - ] - }, - { - "operatingsystem": "Debian", - "operatingsystemrelease": [ - "7", - "8", - "9" - ] - }, - { - "operatingsystem": "Ubuntu", - "operatingsystemrelease": [ - "14.04", - "16.04" - ] - }, - { - "operatingsystem": "Solaris", - "operatingsystemrelease": [ - "10", - "11" - ] - }, - { - "operatingsystem": "Windows", - "operatingsystemrelease": [ - "Server 2003 R2", - "Server 2008 R2", - "Server 2012", - "Server 2012 R2" - ] - }, - { - "operatingsystem": "AIX", - "operatingsystemrelease": [ - "5.3", - "6.1", - "7.1" - ] - }, - { - "operatingsystem": "OSX", - "operatingsystemrelease": [ - "10.9" - ] - } - ], - "requirements": [ - { - "name": "puppet", - "version_requirement": ">= 4.7.0 < 6.0.0" - } - ] -} diff --git a/modules/concat/spec/acceptance/backup_spec.rb b/modules/concat/spec/acceptance/backup_spec.rb deleted file mode 100644 index 0a737a5..0000000 --- a/modules/concat/spec/acceptance/backup_spec.rb +++ /dev/null @@ -1,115 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat backup parameter' do - basedir = default.tmpdir('concat') - context '=> puppet' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "old contents\n", - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - backup => 'puppet', - } - concat::fragment { 'new file': - target => '#{basedir}/file', - content => 'new contents', - } - EOS - - it 'applies the manifest twice with "Filebucketed" stdout and no stderr' do - apply_manifest(pp, :catch_failures => true) do |r| - expect(r.stdout).to match(/Filebucketed #{basedir}\/file to puppet with sum 0140c31db86293a1a1e080ce9b91305f/) - end - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { should match /new contents/ } - end - end - - context '=> .backup' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "old contents\n", - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - backup => '.backup', - } - concat::fragment { 'new file': - target => '#{basedir}/file', - content => 'new contents', - } - EOS - - # XXX Puppet doesn't mention anything about filebucketing with a given - # extension like .backup - it 'applies the manifest twice no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { should match /new contents/ } - end - describe file("#{basedir}/file.backup") do - it { should be_file } - its(:content) { should match /old contents/ } - end - end - - # XXX The backup parameter uses validate_string() and thus can't be the - # boolean false value, but the string 'false' has the same effect in Puppet 3 - context "=> 'false'" do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "old contents\n", - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - backup => '.backup', - } - concat::fragment { 'new file': - target => '#{basedir}/file', - content => 'new contents', - } - EOS - - it 'applies the manifest twice with no "Filebucketed" stdout and no stderr' do - apply_manifest(pp, :catch_failures => true) do |r| - expect(r.stdout).to_not match(/Filebucketed/) - end - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { should match /new contents/ } - end - end -end diff --git a/modules/concat/spec/acceptance/concat_spec.rb b/modules/concat/spec/acceptance/concat_spec.rb deleted file mode 100644 index 3e24a58..0000000 --- a/modules/concat/spec/acceptance/concat_spec.rb +++ /dev/null @@ -1,228 +0,0 @@ -require 'spec_helper_acceptance' - -case fact('osfamily') - when 'AIX' - username = 'root' - groupname = 'system' - scriptname = 'concatfragments.rb' - vardir = default.puppet['vardir'] - if vardir.nil? or vardir == '' - vardir = '/opt/puppetlabs/puppet/cache' - end - when 'Darwin' - username = 'root' - groupname = 'wheel' - scriptname = 'concatfragments.rb' - vardir = default.puppet['vardir'] - if vardir.nil? or vardir == '' - vardir = '/opt/puppetlabs/puppet/cache' - end - when 'windows' - username = 'Administrator' - groupname = 'Administrators' - scriptname = 'concatfragments.rb' - result = on default, "echo #{default.puppet['vardir']}" - vardir = result.raw_output.chomp - when 'Solaris' - username = 'root' - groupname = 'root' - scriptname = 'concatfragments.rb' - vardir = default.puppet['vardir'] - if vardir.nil? or vardir == '' - vardir = '/opt/puppetlabs/puppet/cache' - end - else - username = 'root' - groupname = 'root' - scriptname = 'concatfragments.rb' - vardir = default.puppet['vardir'] - if vardir.nil? or vardir == '' - vardir = '/opt/puppetlabs/puppet/cache' - end -end - -describe 'basic concat test' do - basedir = default.tmpdir('concat') - safe_basedir = basedir.gsub(/[\/:]/, '_') - - shared_examples 'successfully_applied' do |pp| - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - end - - context 'owner/group root' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - owner => '#{username}', - group => '#{groupname}', - mode => '0644', - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '1', - order => '01', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '2', - order => '02', - } - EOS - - it_behaves_like 'successfully_applied', pp - - describe file("#{basedir}/file") do - it { should be_file } - it { should be_owned_by username } - it("should be group", :unless => (fact('osfamily') == 'windows')) { should be_grouped_into groupname } - it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) { - should be_mode 644 - } - its(:content) { - should match '1' - should match '2' - } - end - end - - context 'ensure' do - context 'works when set to present with path set' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - pp=" - concat { 'file': - ensure => present, - path => '#{basedir}/file', - mode => '0644', - } - concat::fragment { '1': - target => 'file', - content => '1', - order => '01', - } - " - - it_behaves_like 'successfully_applied', pp - - describe file("#{basedir}/file") do - it { should be_file } - it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) { - should be_mode 644 - } - its(:content) { should match '1' } - end - end - context 'works when set to absent with path set' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - pp=" - concat { 'file': - ensure => absent, - path => '#{basedir}/file', - mode => '0644', - } - concat::fragment { '1': - target => 'file', - content => '1', - order => '01', - } - " - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should_not be_file } - end - end - context 'works when set to present with path that has special characters' do - filename = fact('osfamily') == 'windows' ? 'file(1)' : 'file(1:2)' - - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - pp=" - concat { '#{filename}': - ensure => present, - path => '#{basedir}/#{filename}', - mode => '0644', - } - concat::fragment { '1': - target => '#{filename}', - content => '1', - order => '01', - } - " - - it_behaves_like 'successfully_applied', pp - - describe file("#{basedir}/#{filename}") do - it { should be_file } - it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) { - should be_mode 644 - } - its(:content) { should match '1' } - end - end - context 'noop properly' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - pp=" - concat { 'file': - ensure => present, - path => '#{basedir}/file', - mode => '0644', - noop => true, - } - concat::fragment { '1': - target => 'file', - content => '1', - order => '01', - } - " - - it_behaves_like 'successfully_applied', pp - - describe file("#{basedir}/file") do - it { should_not be_file } - end - end - end -end diff --git a/modules/concat/spec/acceptance/concurrency_spec.rb b/modules/concat/spec/acceptance/concurrency_spec.rb deleted file mode 100644 index fcffdbd..0000000 --- a/modules/concat/spec/acceptance/concurrency_spec.rb +++ /dev/null @@ -1,37 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'with file recursive purge' do - basedir = default.tmpdir('concat') - context 'should still create concat file' do - pp = <<-EOS - file { '#{basedir}/bar': - ensure => directory, - purge => true, - recurse => true, - } - - concat { "foobar": - ensure => 'present', - path => '#{basedir}/bar/foobar', - } - - concat::fragment { 'foo': - target => 'foobar', - content => 'foo', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/bar/foobar") do - it { should be_file } - its(:content) { - should match 'foo' - } - end - end -end - diff --git a/modules/concat/spec/acceptance/force_spec.rb b/modules/concat/spec/acceptance/force_spec.rb deleted file mode 100644 index 1ae93cf..0000000 --- a/modules/concat/spec/acceptance/force_spec.rb +++ /dev/null @@ -1,178 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'force merge of' do - basedir = default.tmpdir('concat') - context 'file' do - context 'should not force' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "file exists\n" - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - format => 'yaml', - force => false, - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '{"one": "foo"}', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '{"one": "bar"}', - } - EOS - - it 'applies the manifest twice with stderr' do - expect(apply_manifest(pp, :catch_failures => true).stderr).to match("Duplicate key 'one' found with values 'foo' and bar'. Use 'force' attribute to merge keys.") - expect(apply_manifest(pp, :catch_failures => true).stderr).to match("Duplicate key 'one' found with values 'foo' and bar'. Use 'force' attribute to merge keys.") - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match 'file exists' - should_not match 'one: foo' - should_not match 'one: bar' - } - end - end - - context 'should not force by default' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "file exists\n" - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - format => 'yaml', - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '{"one": "foo"}', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '{"one": "bar"}', - } - EOS - - it 'applies the manifest twice with stderr' do - expect(apply_manifest(pp, :catch_failures => true).stderr).to match("Duplicate key 'one' found with values 'foo' and bar'. Use 'force' attribute to merge keys.") - expect(apply_manifest(pp, :catch_failures => true).stderr).to match("Duplicate key 'one' found with values 'foo' and bar'. Use 'force' attribute to merge keys.") - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match 'file exists' - should_not match 'one: foo' - should_not match 'one: bar' - } - end - end - - context 'should force' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "file exists\n" - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - format => 'yaml', - force => true, - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '{"one": "foo"}', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '{"one": "bar"}', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match 'one: foo' - } - end - end - - context 'should not force on plain' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "file exists\n" - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - force => true, - format => plain, - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '{"one": "foo"}', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '{"one": "bar"}', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match '{"one": "foo"}{"one": "bar"}' - } - end - end - - end -end diff --git a/modules/concat/spec/acceptance/format_spec.rb b/modules/concat/spec/acceptance/format_spec.rb deleted file mode 100644 index bfc83ea..0000000 --- a/modules/concat/spec/acceptance/format_spec.rb +++ /dev/null @@ -1,212 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'format of' do - basedir = default.tmpdir('concat') - context 'file' do - - context 'should default to plain' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "file exists\n" - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '{"one": "foo"}', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '{"one": "bar"}', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match '{"one": "foo"}{"one": "bar"}' - } - end - end - - context 'should output to plain format' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "file exists\n" - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - format => plain, - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '{"one": "foo"}', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '{"one": "bar"}', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match '{"one": "foo"}{"one": "bar"}' - } - end - end - - context 'should output to yaml format' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "file exists\n" - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - format => 'yaml', - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '{"one": "foo"}', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '{"two": "bar"}', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match 'one: foo\ntwo: bar' - } - end - end - - context 'should output to json format' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "file exists\n" - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - format => 'json', - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '{"one": "foo"}', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '{"two": "bar"}', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match '{"one":"foo","two":"bar"}' - } - end - end - - context 'should output to json-pretty format' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "file exists\n" - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - format => 'json-pretty', - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '{"one": "foo"}', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '{"two": "bar"}', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match '{\n "one": "foo",\n "two": "bar"\n}' - } - end - end - - end -end diff --git a/modules/concat/spec/acceptance/fragment_source_spec.rb b/modules/concat/spec/acceptance/fragment_source_spec.rb deleted file mode 100644 index b208979..0000000 --- a/modules/concat/spec/acceptance/fragment_source_spec.rb +++ /dev/null @@ -1,156 +0,0 @@ -require 'spec_helper_acceptance' - -case fact('osfamily') - when 'AIX' - username = 'root' - groupname = 'system' - when 'Darwin' - username = 'root' - groupname = 'wheel' - when 'windows' - username = 'Administrator' - groupname = 'Administrators' - else - username = 'root' - groupname = 'root' -end - -describe 'concat::fragment source' do - basedir = default.tmpdir('concat') - context 'should read file fragments from local system' do - pp = <<-EOS - file { '#{basedir}/file1': - content => "file1 contents\n" - } - file { '#{basedir}/file2': - content => "file2 contents\n" - } - concat { '#{basedir}/foo': } - - concat::fragment { '1': - target => '#{basedir}/foo', - source => '#{basedir}/file1', - require => File['#{basedir}/file1'], - } - concat::fragment { '2': - target => '#{basedir}/foo', - content => 'string1 contents', - } - concat::fragment { '3': - target => '#{basedir}/foo', - source => '#{basedir}/file2', - require => File['#{basedir}/file2'], - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/foo") do - it { should be_file } - its(:content) { - should match 'file1 contents' - should match 'string1 contents' - should match 'file2 contents' - } - end - end # should read file fragments from local system - - context 'should create files containing first match only.' do - pp = <<-EOS - file { '#{basedir}/file1': - content => "file1 contents\n" - } - file { '#{basedir}/file2': - content => "file2 contents\n" - } - concat { '#{basedir}/result_file1': - owner => '#{username}', - group => '#{groupname}', - mode => '0644', - } - concat { '#{basedir}/result_file2': - owner => '#{username}', - group => '#{groupname}', - mode => '0644', - } - concat { '#{basedir}/result_file3': - owner => '#{username}', - group => '#{groupname}', - mode => '0644', - } - - concat::fragment { '1': - target => '#{basedir}/result_file1', - source => [ '#{basedir}/file1', '#{basedir}/file2' ], - require => [ File['#{basedir}/file1'], File['#{basedir}/file2'] ], - order => '01', - } - concat::fragment { '2': - target => '#{basedir}/result_file2', - source => [ '#{basedir}/file2', '#{basedir}/file1' ], - require => [ File['#{basedir}/file1'], File['#{basedir}/file2'] ], - order => '01', - } - concat::fragment { '3': - target => '#{basedir}/result_file3', - source => [ '#{basedir}/file1', '#{basedir}/file2' ], - require => [ File['#{basedir}/file1'], File['#{basedir}/file2'] ], - order => '01', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - describe file("#{basedir}/result_file1") do - it { should be_file } - its(:content) { - should match 'file1 contents' - should_not match 'file2 contents' - } - end - describe file("#{basedir}/result_file2") do - it { should be_file } - its(:content) { - should match 'file2 contents' - should_not match 'file1 contents' - } - end - describe file("#{basedir}/result_file3") do - it { should be_file } - its(:content) { - should match 'file1 contents' - should_not match 'file2 contents' - } - end - end - - context 'should fail if no match on source.' do - pp = <<-EOS - concat { '#{basedir}/fail_no_source': - owner => '#{username}', - group => '#{groupname}', - mode => '0644', - } - - concat::fragment { '1': - target => '#{basedir}/fail_no_source', - source => [ '#{basedir}/nofilehere', '#{basedir}/nothereeither' ], - order => '01', - } - EOS - - it 'applies the manifest with resource failures' do - expect(apply_manifest(pp, :catch_failures => true).stderr).to match(/Failed to generate additional resources using 'eval_generate'/) - end - describe file("#{basedir}/fail_no_source") do - #FIXME: Serverspec::Type::File doesn't support exists? for some reason. so... hack. - it { should_not be_directory } - end - end -end - diff --git a/modules/concat/spec/acceptance/fragments_are_always_replaced_spec.rb b/modules/concat/spec/acceptance/fragments_are_always_replaced_spec.rb deleted file mode 100644 index 70d7382..0000000 --- a/modules/concat/spec/acceptance/fragments_are_always_replaced_spec.rb +++ /dev/null @@ -1,139 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat::fragment replace' do - basedir = default.tmpdir('concat') - - context 'should create fragment files' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - - pp1 = <<-EOS - concat { '#{basedir}/foo': } - - concat::fragment { '1': - target => '#{basedir}/foo', - content => 'caller has replace unset run 1', - } - EOS - pp2 = <<-EOS - concat { '#{basedir}/foo': } - - concat::fragment { '1': - target => '#{basedir}/foo', - content => 'caller has replace unset run 2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp1, :catch_failures => true) - apply_manifest(pp1, :catch_changes => true) - apply_manifest(pp2, :catch_failures => true) - apply_manifest(pp2, :catch_changes => true) - end - - describe file("#{basedir}/foo") do - it { should be_file } - its(:content) { - should_not match 'caller has replace unset run 1' - should match 'caller has replace unset run 2' - } - end - end # should create fragment files - - context 'should replace its own fragment files when caller has File { replace=>true } set' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - - pp1 = <<-EOS - File { replace=>true } - concat { '#{basedir}/foo': } - - concat::fragment { '1': - target => '#{basedir}/foo', - content => 'caller has replace true set run 1', - } - EOS - pp2 = <<-EOS - File { replace=>true } - concat { '#{basedir}/foo': } - - concat::fragment { '1': - target => '#{basedir}/foo', - content => 'caller has replace true set run 2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp1, :catch_failures => true) - apply_manifest(pp1, :catch_changes => true) - apply_manifest(pp2, :catch_failures => true) - apply_manifest(pp2, :catch_changes => true) - end - - describe file("#{basedir}/foo") do - it { should be_file } - its(:content) { - should_not match 'caller has replace true set run 1' - should match 'caller has replace true set run 2' - } - end - end # should replace its own fragment files when caller has File(replace=>true) set - - context 'should replace its own fragment files even when caller has File { replace=>false } set' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - - pp1 = <<-EOS - File { replace=>false } - concat { '#{basedir}/foo': } - - concat::fragment { '1': - target => '#{basedir}/foo', - content => 'caller has replace false set run 1', - } - EOS - pp2 = <<-EOS - File { replace=>false } - concat { '#{basedir}/foo': } - - concat::fragment { '1': - target => '#{basedir}/foo', - content => 'caller has replace false set run 2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp1, :catch_failures => true) - apply_manifest(pp1, :catch_changes => true) - apply_manifest(pp2, :catch_failures => true) - apply_manifest(pp2, :catch_changes => true) - end - - describe file("#{basedir}/foo") do - it { should be_file } - its(:content) { - should_not match 'caller has replace false set run 1' - should match 'caller has replace false set run 2' - } - end - end # should replace its own fragment files even when caller has File(replace=>false) set - -end diff --git a/modules/concat/spec/acceptance/native/backup_spec.rb b/modules/concat/spec/acceptance/native/backup_spec.rb deleted file mode 100644 index 09f8078..0000000 --- a/modules/concat/spec/acceptance/native/backup_spec.rb +++ /dev/null @@ -1,115 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat_file backup parameter' do - basedir = default.tmpdir('concat') - context '=> puppet' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "old contents\n", - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat_file { '#{basedir}/file': - backup => 'puppet', - } - concat_fragment { 'new file': - target => '#{basedir}/file', - content => 'new contents', - } - EOS - - it 'applies the manifest twice with "Filebucketed" stdout and no stderr' do - apply_manifest(pp, :catch_failures => true) do |r| - expect(r.stdout).to match(/Filebucketed #{basedir}\/file to puppet with sum 0140c31db86293a1a1e080ce9b91305f/) - end - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { should match /new contents/ } - end - end - - context '=> .backup' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "old contents\n", - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat_file { '#{basedir}/file': - backup => '.backup', - } - concat_fragment { 'new file': - target => '#{basedir}/file', - content => 'new contents', - } - EOS - - # XXX Puppet doesn't mention anything about filebucketing with a given - # extension like .backup - it 'applies the manifest twice no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { should match /new contents/ } - end - describe file("#{basedir}/file.backup") do - it { should be_file } - its(:content) { should match /old contents/ } - end - end - - # XXX The backup parameter uses validate_string() and thus can't be the - # boolean false value, but the string 'false' has the same effect in Puppet 3 - context "=> 'false'" do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "old contents\n", - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat_file { '#{basedir}/file': - backup => '.backup', - } - concat_fragment { 'new file': - target => '#{basedir}/file', - content => 'new contents', - } - EOS - - it 'applies the manifest twice with no "Filebucketed" stdout and no stderr' do - apply_manifest(pp, :catch_failures => true) do |r| - expect(r.stdout).to_not match(/Filebucketed/) - end - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { should match /new contents/ } - end - end -end diff --git a/modules/concat/spec/acceptance/native/concat_spec.rb b/modules/concat/spec/acceptance/native/concat_spec.rb deleted file mode 100644 index 0b5974f..0000000 --- a/modules/concat/spec/acceptance/native/concat_spec.rb +++ /dev/null @@ -1,228 +0,0 @@ -require 'spec_helper_acceptance' - -case fact('osfamily') - when 'AIX' - username = 'root' - groupname = 'system' - scriptname = 'concatfragments.rb' - vardir = default.puppet['vardir'] - if vardir.nil? or vardir == '' - vardir = '/opt/puppetlabs/puppet/cache' - end - when 'Darwin' - username = 'root' - groupname = 'wheel' - scriptname = 'concatfragments.rb' - vardir = default.puppet['vardir'] - if vardir.nil? or vardir == '' - vardir = '/opt/puppetlabs/puppet/cache' - end - when 'windows' - username = 'Administrator' - groupname = 'Administrators' - scriptname = 'concatfragments.rb' - result = on default, "echo #{default.puppet['vardir']}" - vardir = result.raw_output.chomp - when 'Solaris' - username = 'root' - groupname = 'root' - scriptname = 'concatfragments.rb' - vardir = default.puppet['vardir'] - if vardir.nil? or vardir == '' - vardir = '/opt/puppetlabs/puppet/cache' - end - else - username = 'root' - groupname = 'root' - scriptname = 'concatfragments.rb' - vardir = default.puppet['vardir'] - if vardir.nil? or vardir == '' - vardir = '/opt/puppetlabs/puppet/cache' - end -end - -describe 'basic concat_file test' do - basedir = default.tmpdir('concat') - safe_basedir = basedir.gsub(/[\/:]/, '_') - - shared_examples 'successfully_applied' do |pp| - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - end - - context 'owner/group root' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat_file { '#{basedir}/file': - owner => '#{username}', - group => '#{groupname}', - mode => '0644', - } - - concat_fragment { '1': - target => '#{basedir}/file', - content => '1', - order => '01', - } - - concat_fragment { '2': - target => '#{basedir}/file', - content => '2', - order => '02', - } - EOS - - it_behaves_like 'successfully_applied', pp - - describe file("#{basedir}/file") do - it { should be_file } - it { should be_owned_by username } - it("should be group", :unless => (fact('osfamily') == 'windows')) { should be_grouped_into groupname } - it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) { - should be_mode 644 - } - its(:content) { - should match '1' - should match '2' - } - end - end - - context 'ensure' do - context 'works when set to present with path set' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - pp=" - concat_file { 'file': - ensure => present, - path => '#{basedir}/file', - mode => '0644', - } - concat_fragment { '1': - target => 'file', - content => '1', - order => '01', - } - " - - it_behaves_like 'successfully_applied', pp - - describe file("#{basedir}/file") do - it { should be_file } - it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) { - should be_mode 644 - } - its(:content) { should match '1' } - end - end - context 'works when set to absent with path set' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - pp=" - concat_file { 'file': - ensure => absent, - path => '#{basedir}/file', - mode => '0644', - } - concat_fragment { '1': - target => 'file', - content => '1', - order => '01', - } - " - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should_not be_file } - end - end - context 'works when set to present with path that has special characters' do - filename = fact('osfamily') == 'windows' ? 'file(1)' : 'file(1:2)' - - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - pp=" - concat_file { '#{filename}': - ensure => present, - path => '#{basedir}/#{filename}', - mode => '0644', - } - concat_fragment { '1': - target => '#{filename}', - content => '1', - order => '01', - } - " - - it_behaves_like 'successfully_applied', pp - - describe file("#{basedir}/#{filename}") do - it { should be_file } - it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) { - should be_mode 644 - } - its(:content) { should match '1' } - end - end - context 'noop properly' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - pp=" - concat_file { 'file': - ensure => present, - path => '#{basedir}/file', - mode => '0644', - noop => true, - } - concat_fragment { '1': - target => 'file', - content => '1', - order => '01', - } - " - - it_behaves_like 'successfully_applied', pp - - describe file("#{basedir}/file") do - it { should_not be_file } - end - end - end -end diff --git a/modules/concat/spec/acceptance/native/concurrency_spec.rb b/modules/concat/spec/acceptance/native/concurrency_spec.rb deleted file mode 100644 index 0f5889b..0000000 --- a/modules/concat/spec/acceptance/native/concurrency_spec.rb +++ /dev/null @@ -1,37 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat_file with file recursive purge' do - basedir = default.tmpdir('concat') - context 'should still create concat file' do - pp = <<-EOS - file { '#{basedir}/bar': - ensure => directory, - purge => true, - recurse => true, - } - - concat_file { "foobar": - ensure => 'present', - path => '#{basedir}/bar/foobar', - } - - concat_fragment { 'foo': - target => 'foobar', - content => 'foo', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/bar/foobar") do - it { should be_file } - its(:content) { - should match 'foo' - } - end - end -end - diff --git a/modules/concat/spec/acceptance/native/fragment_source_spec.rb b/modules/concat/spec/acceptance/native/fragment_source_spec.rb deleted file mode 100644 index d0f6d67..0000000 --- a/modules/concat/spec/acceptance/native/fragment_source_spec.rb +++ /dev/null @@ -1,156 +0,0 @@ -require 'spec_helper_acceptance' - -case fact('osfamily') - when 'AIX' - username = 'root' - groupname = 'system' - when 'Darwin' - username = 'root' - groupname = 'wheel' - when 'windows' - username = 'Administrator' - groupname = 'Administrators' - else - username = 'root' - groupname = 'root' -end - -describe 'concat_fragment source' do - basedir = default.tmpdir('concat') - context 'should read file fragments from local system' do - pp = <<-EOS - file { '#{basedir}/file1': - content => "file1 contents\n" - } - file { '#{basedir}/file2': - content => "file2 contents\n" - } - concat_file { '#{basedir}/foo': } - - concat_fragment { '1': - target => '#{basedir}/foo', - source => '#{basedir}/file1', - require => File['#{basedir}/file1'], - } - concat_fragment { '2': - target => '#{basedir}/foo', - content => 'string1 contents', - } - concat_fragment { '3': - target => '#{basedir}/foo', - source => '#{basedir}/file2', - require => File['#{basedir}/file2'], - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/foo") do - it { should be_file } - its(:content) { - should match 'file1 contents' - should match 'string1 contents' - should match 'file2 contents' - } - end - end # should read file fragments from local system - - context 'should create files containing first match only.' do - pp = <<-EOS - file { '#{basedir}/file1': - content => "file1 contents\n" - } - file { '#{basedir}/file2': - content => "file2 contents\n" - } - concat_file { '#{basedir}/result_file1': - owner => '#{username}', - group => '#{groupname}', - mode => '0644', - } - concat_file { '#{basedir}/result_file2': - owner => '#{username}', - group => '#{groupname}', - mode => '0644', - } - concat_file { '#{basedir}/result_file3': - owner => '#{username}', - group => '#{groupname}', - mode => '0644', - } - - concat_fragment { '1': - target => '#{basedir}/result_file1', - source => [ '#{basedir}/file1', '#{basedir}/file2' ], - require => [ File['#{basedir}/file1'], File['#{basedir}/file2'] ], - order => '01', - } - concat_fragment { '2': - target => '#{basedir}/result_file2', - source => [ '#{basedir}/file2', '#{basedir}/file1' ], - require => [ File['#{basedir}/file1'], File['#{basedir}/file2'] ], - order => '01', - } - concat_fragment { '3': - target => '#{basedir}/result_file3', - source => [ '#{basedir}/file1', '#{basedir}/file2' ], - require => [ File['#{basedir}/file1'], File['#{basedir}/file2'] ], - order => '01', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - describe file("#{basedir}/result_file1") do - it { should be_file } - its(:content) { - should match 'file1 contents' - should_not match 'file2 contents' - } - end - describe file("#{basedir}/result_file2") do - it { should be_file } - its(:content) { - should match 'file2 contents' - should_not match 'file1 contents' - } - end - describe file("#{basedir}/result_file3") do - it { should be_file } - its(:content) { - should match 'file1 contents' - should_not match 'file2 contents' - } - end - end - - context 'should fail if no match on source.' do - pp = <<-EOS - concat_file { '#{basedir}/fail_no_source': - owner => '#{username}', - group => '#{groupname}', - mode => '0644', - } - - concat_fragment { '1': - target => '#{basedir}/fail_no_source', - source => [ '#{basedir}/nofilehere', '#{basedir}/nothereeither' ], - order => '01', - } - EOS - - it 'applies the manifest with resource failures' do - expect(apply_manifest(pp, :catch_failures => true).stderr).to match(/Failed to generate additional resources using 'eval_generate'/) - end - describe file("#{basedir}/fail_no_source") do - #FIXME: Serverspec::Type::File doesn't support exists? for some reason. so... hack. - it { should_not be_directory } - end - end -end - diff --git a/modules/concat/spec/acceptance/native/fragments_are_always_replaced_spec.rb b/modules/concat/spec/acceptance/native/fragments_are_always_replaced_spec.rb deleted file mode 100644 index b2fad60..0000000 --- a/modules/concat/spec/acceptance/native/fragments_are_always_replaced_spec.rb +++ /dev/null @@ -1,139 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat_fragment replace' do - basedir = default.tmpdir('concat') - - context 'should create fragment files' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - - pp1 = <<-EOS - concat_file { '#{basedir}/foo': } - - concat_fragment { '1': - target => '#{basedir}/foo', - content => 'caller has replace unset run 1', - } - EOS - pp2 = <<-EOS - concat_file { '#{basedir}/foo': } - - concat_fragment { '1': - target => '#{basedir}/foo', - content => 'caller has replace unset run 2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp1, :catch_failures => true) - apply_manifest(pp1, :catch_changes => true) - apply_manifest(pp2, :catch_failures => true) - apply_manifest(pp2, :catch_changes => true) - end - - describe file("#{basedir}/foo") do - it { should be_file } - its(:content) { - should_not match 'caller has replace unset run 1' - should match 'caller has replace unset run 2' - } - end - end # should create fragment files - - context 'should replace its own fragment files when caller has File { replace=>true } set' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - - pp1 = <<-EOS - File { replace=>true } - concat_file { '#{basedir}/foo': } - - concat_fragment { '1': - target => '#{basedir}/foo', - content => 'caller has replace true set run 1', - } - EOS - pp2 = <<-EOS - File { replace=>true } - concat_file { '#{basedir}/foo': } - - concat_fragment { '1': - target => '#{basedir}/foo', - content => 'caller has replace true set run 2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp1, :catch_failures => true) - apply_manifest(pp1, :catch_changes => true) - apply_manifest(pp2, :catch_failures => true) - apply_manifest(pp2, :catch_changes => true) - end - - describe file("#{basedir}/foo") do - it { should be_file } - its(:content) { - should_not match 'caller has replace true set run 1' - should match 'caller has replace true set run 2' - } - end - end # should replace its own fragment files when caller has File(replace=>true) set - - context 'should replace its own fragment files even when caller has File { replace=>false } set' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - EOS - apply_manifest(pp) - end - - pp1 = <<-EOS - File { replace=>false } - concat_file { '#{basedir}/foo': } - - concat_fragment { '1': - target => '#{basedir}/foo', - content => 'caller has replace false set run 1', - } - EOS - pp2 = <<-EOS - File { replace=>false } - concat_file { '#{basedir}/foo': } - - concat_fragment { '1': - target => '#{basedir}/foo', - content => 'caller has replace false set run 2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp1, :catch_failures => true) - apply_manifest(pp1, :catch_changes => true) - apply_manifest(pp2, :catch_failures => true) - apply_manifest(pp2, :catch_changes => true) - end - - describe file("#{basedir}/foo") do - it { should be_file } - its(:content) { - should_not match 'caller has replace false set run 1' - should match 'caller has replace false set run 2' - } - end - end # should replace its own fragment files even when caller has File(replace=>false) set - -end diff --git a/modules/concat/spec/acceptance/native/newline_spec.rb b/modules/concat/spec/acceptance/native/newline_spec.rb deleted file mode 100644 index f729513..0000000 --- a/modules/concat/spec/acceptance/native/newline_spec.rb +++ /dev/null @@ -1,67 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat_file ensure_newline parameter' do - basedir = default.tmpdir('concat') - context '=> false' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory - } - EOS - - apply_manifest(pp) - end - pp = <<-EOS - concat_file { '#{basedir}/file': - ensure_newline => false, - } - concat_fragment { '1': - target => '#{basedir}/file', - content => '1', - } - concat_fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { should match '12' } - end - end - - context '=> true' do - pp = <<-EOS - concat_file { '#{basedir}/file': - ensure_newline => true, - } - concat_fragment { '1': - target => '#{basedir}/file', - content => '1', - } - concat_fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match /1\n2\n/ - } - end - end -end diff --git a/modules/concat/spec/acceptance/native/order_spec.rb b/modules/concat/spec/acceptance/native/order_spec.rb deleted file mode 100644 index be6df59..0000000 --- a/modules/concat/spec/acceptance/native/order_spec.rb +++ /dev/null @@ -1,123 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat_file order' do - basedir = default.tmpdir('concat') - - context '=> ' do - shared_examples 'sortby' do |order_by, match_output| - pp = <<-EOS - concat_file { '#{basedir}/foo': - order => '#{order_by}' - } - concat_fragment { '1': - target => '#{basedir}/foo', - content => 'string1', - order => '1', - } - concat_fragment { '2': - target => '#{basedir}/foo', - content => 'string2', - order => '2', - } - concat_fragment { '10': - target => '#{basedir}/foo', - content => 'string10', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/foo") do - it { should be_file } - its(:content) { should match match_output } - end - end - - describe 'alpha' do - it_behaves_like 'sortby', 'alpha', /string1string10string2/ - end - - describe 'numeric' do - it_behaves_like 'sortby', 'numeric', /string1string2string10/ - end - end -end # concat order - -describe 'concat_fragment order' do - basedir = default.tmpdir('concat') - - context '=> reverse order' do - shared_examples 'order_by' do |order_by, match_output| - pp = <<-EOS - concat_file { '#{basedir}/foo': - order => '#{order_by}' - } - concat_fragment { '1': - target => '#{basedir}/foo', - content => 'string1', - order => '15', - } - concat_fragment { '2': - target => '#{basedir}/foo', - content => 'string2', - # default order 10 - } - concat_fragment { '3': - target => '#{basedir}/foo', - content => 'string3', - order => '1', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/foo") do - it { should be_file } - its(:content) { should match match_output } - end - end - describe 'alpha' do - it_should_behave_like 'order_by', 'alpha', /string3string2string1/ - end - describe 'numeric' do - it_should_behave_like 'order_by', 'numeric', /string3string2string1/ - end - end - - context '=> normal order' do - pp = <<-EOS - concat_file { '#{basedir}/foo': } - concat_fragment { '1': - target => '#{basedir}/foo', - content => 'string1', - order => '01', - } - concat_fragment { '2': - target => '#{basedir}/foo', - content => 'string2', - order => '02' - } - concat_fragment { '3': - target => '#{basedir}/foo', - content => 'string3', - order => '03', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/foo") do - it { should be_file } - its(:content) { should match /string1string2string3/ } - end - end -end # concat_fragment order diff --git a/modules/concat/spec/acceptance/native/pup-1963_spec.rb b/modules/concat/spec/acceptance/native/pup-1963_spec.rb deleted file mode 100644 index 3fe7035..0000000 --- a/modules/concat/spec/acceptance/native/pup-1963_spec.rb +++ /dev/null @@ -1,69 +0,0 @@ -require 'spec_helper_acceptance' - -case fact('osfamily') - when 'Windows' - command = 'cmd.exe /c echo triggered' - else - command = 'echo triggered' -end - -describe 'concat_file with metaparameters' do - describe 'with subscribed resources' do - basedir = default.tmpdir('concat') - - context 'should trigger refresh' do - pp = <<-EOS - concat_file { "foobar": - ensure => 'present', - path => '#{basedir}/foobar', - } - - concat_fragment { 'foo': - target => 'foobar', - content => 'foo', - } - - exec { 'trigger': - path => $::path, - command => "#{command}", - subscribe => Concat_file['foobar'], - refreshonly => true, - } - EOS - - it 'applies the manifest twice with stdout regex' do - expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/Triggered 'refresh'/) - expect(apply_manifest(pp, :catch_changes => true).stdout).to_not match(/Triggered 'refresh'/) - end - end - end - - describe 'with resources to notify' do - basedir = default.tmpdir('concat') - context 'should notify' do - pp = <<-EOS - exec { 'trigger': - path => $::path, - command => "#{command}", - refreshonly => true, - } - - concat_file { "foobar": - ensure => 'present', - path => '#{basedir}/foobar', - notify => Exec['trigger'], - } - - concat_fragment { 'foo': - target => 'foobar', - content => 'foo', - } - EOS - - it 'applies the manifest twice with stdout regex' do - expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/Triggered 'refresh'/) - expect(apply_manifest(pp, :catch_changes => true).stdout).to_not match(/Triggered 'refresh'/) - end - end - end -end diff --git a/modules/concat/spec/acceptance/native/quoted_paths_spec.rb b/modules/concat/spec/acceptance/native/quoted_paths_spec.rb deleted file mode 100644 index d7c5bfd..0000000 --- a/modules/concat/spec/acceptance/native/quoted_paths_spec.rb +++ /dev/null @@ -1,42 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat_file with quoted paths' do - basedir = default.tmpdir('concat') - - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/concat test': - ensure => directory, - } - EOS - apply_manifest(pp) - end - - context 'path with blanks' do - pp = <<-EOS - concat_file { '#{basedir}/concat test/foo': - } - concat_fragment { '1': - target => '#{basedir}/concat test/foo', - content => 'string1', - } - concat_fragment { '2': - target => '#{basedir}/concat test/foo', - content => 'string2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/concat test/foo") do - it { should be_file } - its(:content) { should match /string1string2/ } - end - end -end diff --git a/modules/concat/spec/acceptance/native/replace_spec.rb b/modules/concat/spec/acceptance/native/replace_spec.rb deleted file mode 100644 index f11d04c..0000000 --- a/modules/concat/spec/acceptance/native/replace_spec.rb +++ /dev/null @@ -1,261 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat_file' do - basedir = default.tmpdir('concat') - context 'file' do - context 'with replace => false' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "file exists\n" - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat_file { '#{basedir}/file': - replace => false, - } - - concat_fragment { '1': - target => '#{basedir}/file', - content => '1', - } - - concat_fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match 'file exists' - should_not match '1' - should_not match '2' - } - end - end - - context 'with replace => true' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "file exists\n" - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat_file { '#{basedir}/file': - replace => true, - } - - concat_fragment { '1': - target => '#{basedir}/file', - content => '1', - } - - concat_fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should_not match 'file exists' - should match '1' - should match '2' - } - end - end - end # file - - context 'symlink', :unless => (fact("osfamily") == "windows") do - context 'should not succeed' do - # XXX the core puppet file type will replace a symlink with a plain file - # when using ensure => present and source => ... but it will not when using - # ensure => present and content => ...; this is somewhat confusing behavior - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - ensure => link, - target => '#{basedir}/dangling', - } - EOS - apply_manifest(pp) - end - - pp = <<-EOS - concat_file { '#{basedir}/file': - replace => false, - } - - concat_fragment { '1': - target => '#{basedir}/file', - content => '1', - } - - concat_fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - # XXX specinfra doesn't support be_linked_to on AIX - describe file("#{basedir}/file"), :unless => (fact("osfamily") == "AIX" or fact("osfamily") == "windows") do - it { should be_linked_to "#{basedir}/dangling" } - end - - describe file("#{basedir}/dangling") do - # XXX serverspec does not have a matcher for 'exists' - it { should_not be_file } - it { should_not be_directory } - end - end - - context 'should succeed' do - # XXX the core puppet file type will replace a symlink with a plain file - # when using ensure => present and source => ... but it will not when using - # ensure => present and content => ...; this is somewhat confusing behavior - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - ensure => link, - target => '#{basedir}/dangling', - } - EOS - apply_manifest(pp) - end - - pp = <<-EOS - concat_file { '#{basedir}/file': - replace => true, - } - - concat_fragment { '1': - target => '#{basedir}/file', - content => '1', - } - - concat_fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match '1' - should match '2' - } - end - end - end # symlink - - context 'directory' do - context 'should not succeed' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - ensure => directory, - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat_file { '#{basedir}/file': } - - concat_fragment { '1': - target => '#{basedir}/file', - content => '1', - } - - concat_fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with stderr for changing to file' do - expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from '?directory'? to '?file'? failed/) - expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from '?directory'? to '?file'? failed/) - end - - describe file("#{basedir}/file") do - it { should be_directory } - end - end - - # XXX - # when there are no fragments, and the replace param will only replace - # files and symlinks, not directories. The semantics either need to be - # changed, extended, or a new param introduced to control directory - # replacement. - context 'should succeed', :pending => 'not yet implemented' do - pp = <<-EOS - concat_file { '#{basedir}/file': - } - - concat_fragment { '1': - target => '#{basedir}/file', - content => '1', - } - - concat_fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { should match '1' } - end - end - end # directory -end diff --git a/modules/concat/spec/acceptance/native/symbolic_name_spec.rb b/modules/concat/spec/acceptance/native/symbolic_name_spec.rb deleted file mode 100644 index 8eeaa18..0000000 --- a/modules/concat/spec/acceptance/native/symbolic_name_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat_file symbolic name' do - basedir = default.tmpdir('concat') - pp = <<-EOS - concat_file { 'not_abs_path': - path => '#{basedir}/file', - } - - concat_fragment { '1': - target => 'not_abs_path', - content => '1', - order => '01', - } - - concat_fragment { '2': - target => 'not_abs_path', - content => '2', - order => '02', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match '1' - should match '2' - } - end -end diff --git a/modules/concat/spec/acceptance/native/validation_spec.rb b/modules/concat/spec/acceptance/native/validation_spec.rb deleted file mode 100644 index 1f7c073..0000000 --- a/modules/concat/spec/acceptance/native/validation_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat_file validate_cmd parameter', :unless => (fact('kernel') != 'Linux') do - basedir = default.tmpdir('concat') - context '=> "/usr/bin/test -e %"' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory - } - EOS - - apply_manifest(pp) - end - pp = <<-EOS - concat_file { '#{basedir}/file': - validate_cmd => '/usr/bin/test -e %', - } - concat_fragment { 'content': - target => '#{basedir}/file', - content => 'content', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - it { should contain 'content' } - end - end -end diff --git a/modules/concat/spec/acceptance/native/warnings_spec.rb b/modules/concat/spec/acceptance/native/warnings_spec.rb deleted file mode 100644 index f66929a..0000000 --- a/modules/concat/spec/acceptance/native/warnings_spec.rb +++ /dev/null @@ -1,29 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat_fragment warnings' do - basedir = default.tmpdir('concat') - - shared_examples 'has_warning' do |pp, w| - it 'applies the manifest twice with a stderr regex' do - expect(apply_manifest(pp, :catch_failures => true).stderr).to match(/#{Regexp.escape(w)}/m) - expect(apply_manifest(pp, :catch_changes => true).stderr).to match(/#{Regexp.escape(w)}/m) - end - end - - context 'concat_fragment target not found' do - context 'target not found' do - pp = <<-EOS - concat_file { 'file': - path => '#{basedir}/file', - } - concat_fragment { 'foo': - target => '#{basedir}/bar', - content => 'bar', - } - EOS - w = 'not found in the catalog' - - it_behaves_like 'has_warning', pp, w - end - end -end diff --git a/modules/concat/spec/acceptance/newline_spec.rb b/modules/concat/spec/acceptance/newline_spec.rb deleted file mode 100644 index c1fa16a..0000000 --- a/modules/concat/spec/acceptance/newline_spec.rb +++ /dev/null @@ -1,67 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat ensure_newline parameter' do - basedir = default.tmpdir('concat') - context '=> false' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory - } - EOS - - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - ensure_newline => false, - } - concat::fragment { '1': - target => '#{basedir}/file', - content => '1', - } - concat::fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { should match '12' } - end - end - - context '=> true' do - pp = <<-EOS - concat { '#{basedir}/file': - ensure_newline => true, - } - concat::fragment { '1': - target => '#{basedir}/file', - content => '1', - } - concat::fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match /1\n2\n/ - } - end - end -end diff --git a/modules/concat/spec/acceptance/nodesets/centos-7-x64.yml b/modules/concat/spec/acceptance/nodesets/centos-7-x64.yml deleted file mode 100644 index 5eebdef..0000000 --- a/modules/concat/spec/acceptance/nodesets/centos-7-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-7-x64: - roles: - - agent - - default - platform: el-7-x86_64 - hypervisor: vagrant - box: puppetlabs/centos-7.2-64-nocm -CONFIG: - type: foss diff --git a/modules/concat/spec/acceptance/nodesets/debian-8-x64.yml b/modules/concat/spec/acceptance/nodesets/debian-8-x64.yml deleted file mode 100644 index fef6e63..0000000 --- a/modules/concat/spec/acceptance/nodesets/debian-8-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - debian-8-x64: - roles: - - agent - - default - platform: debian-8-amd64 - hypervisor: vagrant - box: puppetlabs/debian-8.2-64-nocm -CONFIG: - type: foss diff --git a/modules/concat/spec/acceptance/nodesets/debian-9-x64.yml b/modules/concat/spec/acceptance/nodesets/debian-9-x64.yml deleted file mode 100644 index 9f7d3ca..0000000 --- a/modules/concat/spec/acceptance/nodesets/debian-9-x64.yml +++ /dev/null @@ -1,20 +0,0 @@ -HOSTS: - debian-9-x64: - pe_dir: - pe_ver: - pe_upgrade_dir: - pe_upgrade_ver: - hypervisor: vmpooler - platform: debian-9-x64 - ruby_arch: x64 - template: debian-9-x86_64 - roles: - - agent - - master - - database - - dashboard - - default -CONFIG: - nfs_server: none - consoleport: 443 - pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/modules/concat/spec/acceptance/nodesets/default.yml b/modules/concat/spec/acceptance/nodesets/default.yml deleted file mode 100644 index 6f60231..0000000 --- a/modules/concat/spec/acceptance/nodesets/default.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -HOSTS: - windows2012-64-1: - pe_dir: - pe_ver: - pe_upgrade_dir: - pe_upgrade_ver: - hypervisor: vmpooler - platform: windows-2012-64 - ruby_arch: x64 - template: win-2012-x86_64 - roles: - - agent - - default -CONFIG: - nfs_server: none - consoleport: 443 - pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/modules/concat/spec/acceptance/nodesets/docker/centos-7.yml b/modules/concat/spec/acceptance/nodesets/docker/centos-7.yml deleted file mode 100644 index a3333aa..0000000 --- a/modules/concat/spec/acceptance/nodesets/docker/centos-7.yml +++ /dev/null @@ -1,12 +0,0 @@ -HOSTS: - centos-7-x64: - platform: el-7-x86_64 - hypervisor: docker - image: centos:7 - docker_preserve_image: true - docker_cmd: '["/usr/sbin/init"]' - # install various tools required to get the image up to usable levels - docker_image_commands: - - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts' -CONFIG: - trace_limit: 200 diff --git a/modules/concat/spec/acceptance/nodesets/docker/debian-8.yml b/modules/concat/spec/acceptance/nodesets/docker/debian-8.yml deleted file mode 100644 index df5c319..0000000 --- a/modules/concat/spec/acceptance/nodesets/docker/debian-8.yml +++ /dev/null @@ -1,11 +0,0 @@ -HOSTS: - debian-8-x64: - platform: debian-8-amd64 - hypervisor: docker - image: debian:8 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen' -CONFIG: - trace_limit: 200 diff --git a/modules/concat/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/modules/concat/spec/acceptance/nodesets/docker/ubuntu-14.04.yml deleted file mode 100644 index b1efa58..0000000 --- a/modules/concat/spec/acceptance/nodesets/docker/ubuntu-14.04.yml +++ /dev/null @@ -1,12 +0,0 @@ -HOSTS: - ubuntu-1404-x64: - platform: ubuntu-14.04-amd64 - hypervisor: docker - image: ubuntu:14.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - # ensure that upstart is booting correctly in the container - - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8' -CONFIG: - trace_limit: 200 diff --git a/modules/concat/spec/acceptance/order_spec.rb b/modules/concat/spec/acceptance/order_spec.rb deleted file mode 100644 index b746b1c..0000000 --- a/modules/concat/spec/acceptance/order_spec.rb +++ /dev/null @@ -1,123 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat order' do - basedir = default.tmpdir('concat') - - context '=> ' do - shared_examples 'sortby' do |order_by, match_output| - pp = <<-EOS - concat { '#{basedir}/foo': - order => '#{order_by}' - } - concat::fragment { '1': - target => '#{basedir}/foo', - content => 'string1', - order => '1', - } - concat::fragment { '2': - target => '#{basedir}/foo', - content => 'string2', - order => '2', - } - concat::fragment { '10': - target => '#{basedir}/foo', - content => 'string10', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/foo") do - it { should be_file } - its(:content) { should match match_output } - end - end - - describe 'alpha' do - it_behaves_like 'sortby', 'alpha', /string1string10string2/ - end - - describe 'numeric' do - it_behaves_like 'sortby', 'numeric', /string1string2string10/ - end - end -end # concat order - -describe 'concat::fragment order' do - basedir = default.tmpdir('concat') - - context '=> reverse order' do - shared_examples 'order_by' do |order_by, match_output| - pp = <<-EOS - concat { '#{basedir}/foo': - order => '#{order_by}' - } - concat::fragment { '1': - target => '#{basedir}/foo', - content => 'string1', - order => '15', - } - concat::fragment { '2': - target => '#{basedir}/foo', - content => 'string2', - # default order 10 - } - concat::fragment { '3': - target => '#{basedir}/foo', - content => 'string3', - order => '1', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/foo") do - it { should be_file } - its(:content) { should match match_output } - end - end - describe 'alpha' do - it_should_behave_like 'order_by', 'alpha', /string3string2string1/ - end - describe 'numeric' do - it_should_behave_like 'order_by', 'numeric', /string3string2string1/ - end - end - - context '=> normal order' do - pp = <<-EOS - concat { '#{basedir}/foo': } - concat::fragment { '1': - target => '#{basedir}/foo', - content => 'string1', - order => '01', - } - concat::fragment { '2': - target => '#{basedir}/foo', - content => 'string2', - order => '02' - } - concat::fragment { '3': - target => '#{basedir}/foo', - content => 'string3', - order => '03', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/foo") do - it { should be_file } - its(:content) { should match /string1string2string3/ } - end - end -end # concat::fragment order diff --git a/modules/concat/spec/acceptance/pup-1963_spec.rb b/modules/concat/spec/acceptance/pup-1963_spec.rb deleted file mode 100644 index c36fe41..0000000 --- a/modules/concat/spec/acceptance/pup-1963_spec.rb +++ /dev/null @@ -1,69 +0,0 @@ -require 'spec_helper_acceptance' - -case fact('osfamily') - when 'Windows' - command = 'cmd.exe /c echo triggered' - else - command = 'echo triggered' -end - -describe 'with metaparameters' do - describe 'with subscribed resources' do - basedir = default.tmpdir('concat') - - context 'should trigger refresh' do - pp = <<-EOS - concat { "foobar": - ensure => 'present', - path => '#{basedir}/foobar', - } - - concat::fragment { 'foo': - target => 'foobar', - content => 'foo', - } - - exec { 'trigger': - path => $::path, - command => "#{command}", - subscribe => Concat['foobar'], - refreshonly => true, - } - EOS - - it 'applies the manifest twice with stdout regex' do - expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/Triggered 'refresh'/) - expect(apply_manifest(pp, :catch_changes => true).stdout).to_not match(/Triggered 'refresh'/) - end - end - end - - describe 'with resources to notify' do - basedir = default.tmpdir('concat') - context 'should notify' do - pp = <<-EOS - exec { 'trigger': - path => $::path, - command => "#{command}", - refreshonly => true, - } - - concat { "foobar": - ensure => 'present', - path => '#{basedir}/foobar', - notify => Exec['trigger'], - } - - concat::fragment { 'foo': - target => 'foobar', - content => 'foo', - } - EOS - - it 'applies the manifest twice with stdout regex' do - expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/Triggered 'refresh'/) - expect(apply_manifest(pp, :catch_changes => true).stdout).to_not match(/Triggered 'refresh'/) - end - end - end -end diff --git a/modules/concat/spec/acceptance/quoted_paths_spec.rb b/modules/concat/spec/acceptance/quoted_paths_spec.rb deleted file mode 100644 index 6f9f9fd..0000000 --- a/modules/concat/spec/acceptance/quoted_paths_spec.rb +++ /dev/null @@ -1,42 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'quoted paths' do - basedir = default.tmpdir('concat') - - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/concat test': - ensure => directory, - } - EOS - apply_manifest(pp) - end - - context 'path with blanks' do - pp = <<-EOS - concat { '#{basedir}/concat test/foo': - } - concat::fragment { '1': - target => '#{basedir}/concat test/foo', - content => 'string1', - } - concat::fragment { '2': - target => '#{basedir}/concat test/foo', - content => 'string2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/concat test/foo") do - it { should be_file } - its(:content) { should match /string1string2/ } - end - end -end diff --git a/modules/concat/spec/acceptance/replace_spec.rb b/modules/concat/spec/acceptance/replace_spec.rb deleted file mode 100644 index c9e28ec..0000000 --- a/modules/concat/spec/acceptance/replace_spec.rb +++ /dev/null @@ -1,261 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'replacement of' do - basedir = default.tmpdir('concat') - context 'file' do - context 'should not succeed' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "file exists\n" - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - replace => false, - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '1', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match 'file exists' - should_not match '1' - should_not match '2' - } - end - end - - context 'should succeed' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - content => "file exists\n" - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - replace => true, - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '1', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should_not match 'file exists' - should match '1' - should match '2' - } - end - end - end # file - - context 'symlink', :unless => (fact("osfamily") == "windows") do - context 'should not succeed' do - # XXX the core puppet file type will replace a symlink with a plain file - # when using ensure => present and source => ... but it will not when using - # ensure => present and content => ...; this is somewhat confusing behavior - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - ensure => link, - target => '#{basedir}/dangling', - } - EOS - apply_manifest(pp) - end - - pp = <<-EOS - concat { '#{basedir}/file': - replace => false, - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '1', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - # XXX specinfra doesn't support be_linked_to on AIX - describe file("#{basedir}/file"), :unless => (fact("osfamily") == "AIX" or fact("osfamily") == "windows") do - it { should be_linked_to "#{basedir}/dangling" } - end - - describe file("#{basedir}/dangling") do - # XXX serverspec does not have a matcher for 'exists' - it { should_not be_file } - it { should_not be_directory } - end - end - - context 'should succeed' do - # XXX the core puppet file type will replace a symlink with a plain file - # when using ensure => present and source => ... but it will not when using - # ensure => present and content => ...; this is somewhat confusing behavior - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - ensure => link, - target => '#{basedir}/dangling', - } - EOS - apply_manifest(pp) - end - - pp = <<-EOS - concat { '#{basedir}/file': - replace => true, - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '1', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match '1' - should match '2' - } - end - end - end # symlink - - context 'directory' do - context 'should not succeed' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory, - } - file { '#{basedir}/file': - ensure => directory, - } - EOS - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '1', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with stderr for changing to file' do - expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from '?directory'? to '?file'? failed/) - expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from '?directory'? to '?file'? failed/) - end - - describe file("#{basedir}/file") do - it { should be_directory } - end - end - - # XXX - # when there are no fragments, and the replace param will only replace - # files and symlinks, not directories. The semantics either need to be - # changed, extended, or a new param introduced to control directory - # replacement. - context 'should succeed', :pending => 'not yet implemented' do - pp = <<-EOS - concat { '#{basedir}/file': - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '1', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '2', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { should match '1' } - end - end - end # directory -end diff --git a/modules/concat/spec/acceptance/specinfra_stubs.rb b/modules/concat/spec/acceptance/specinfra_stubs.rb deleted file mode 100644 index bae85ef..0000000 --- a/modules/concat/spec/acceptance/specinfra_stubs.rb +++ /dev/null @@ -1,19 +0,0 @@ -class Specinfra::Command::Windows::Base::File < Specinfra::Command::Windows::Base - class << self - def check_is_owned_by(file, owner) - Backend::PowerShell::Command.new do - exec "if((Get-Item '#{file}').GetAccessControl().Owner -match '#{owner}' - -or ((Get-Item '#{file}').GetAccessControl().Owner -match '#{owner}').Length -gt 0){ exit 0 } else { exit 1 }" - end - end - end -end - - -class Specinfra::Command::Base::File < Specinfra::Command::Base - class << self - def get_content(file) - "cat '#{file}' 2> /dev/null || echo -n" - end - end -end diff --git a/modules/concat/spec/acceptance/symbolic_name_spec.rb b/modules/concat/spec/acceptance/symbolic_name_spec.rb deleted file mode 100644 index df8d54f..0000000 --- a/modules/concat/spec/acceptance/symbolic_name_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'symbolic name' do - basedir = default.tmpdir('concat') - pp = <<-EOS - concat { 'not_abs_path': - path => '#{basedir}/file', - } - - concat::fragment { '1': - target => 'not_abs_path', - content => '1', - order => '01', - } - - concat::fragment { '2': - target => 'not_abs_path', - content => '2', - order => '02', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match '1' - should match '2' - } - end -end diff --git a/modules/concat/spec/acceptance/validation_spec.rb b/modules/concat/spec/acceptance/validation_spec.rb deleted file mode 100644 index c35871b..0000000 --- a/modules/concat/spec/acceptance/validation_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat validate_cmd parameter', :unless => (fact('kernel') != 'Linux') do - basedir = default.tmpdir('concat') - context '=> "/usr/bin/test -e %"' do - before(:all) do - pp = <<-EOS - file { '#{basedir}': - ensure => directory - } - EOS - - apply_manifest(pp) - end - pp = <<-EOS - concat { '#{basedir}/file': - validate_cmd => '/usr/bin/test -e %', - } - concat::fragment { 'content': - target => '#{basedir}/file', - content => 'content', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - it { should contain 'content' } - end - end -end diff --git a/modules/concat/spec/acceptance/warn_header_spec.rb b/modules/concat/spec/acceptance/warn_header_spec.rb deleted file mode 100644 index b73414e..0000000 --- a/modules/concat/spec/acceptance/warn_header_spec.rb +++ /dev/null @@ -1,104 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'concat warn =>' do - basedir = default.tmpdir('concat') - context 'true should enable default warning message' do - pp = <<-EOS - concat { '#{basedir}/file': - warn => true, - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '1', - order => '01', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '2', - order => '02', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match /# This file is managed by Puppet\. DO NOT EDIT\./ - should match /1/ - should match /2/ - } - end - end - context 'false should not enable default warning message' do - pp = <<-EOS - concat { '#{basedir}/file': - warn => false, - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '1', - order => '01', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '2', - order => '02', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should_not match /# This file is managed by Puppet\. DO NOT EDIT\./ - should match /1/ - should match /2/ - } - end - end - context '# foo should overide default warning message' do - pp = <<-EOS - concat { '#{basedir}/file': - warn => "# foo\n", - } - - concat::fragment { '1': - target => '#{basedir}/file', - content => '1', - order => '01', - } - - concat::fragment { '2': - target => '#{basedir}/file', - content => '2', - order => '02', - } - EOS - - it 'applies the manifest twice with no stderr' do - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe file("#{basedir}/file") do - it { should be_file } - its(:content) { - should match /# foo/ - should match /1/ - should match /2/ - } - end - end -end diff --git a/modules/concat/spec/acceptance/warnings_spec.rb b/modules/concat/spec/acceptance/warnings_spec.rb deleted file mode 100644 index c3f76bf..0000000 --- a/modules/concat/spec/acceptance/warnings_spec.rb +++ /dev/null @@ -1,29 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'warnings' do - basedir = default.tmpdir('concat') - - shared_examples 'has_warning' do |pp, w| - it 'applies the manifest twice with a stderr regex' do - expect(apply_manifest(pp, :catch_failures => true).stderr).to match(/#{Regexp.escape(w)}/m) - expect(apply_manifest(pp, :catch_changes => true).stderr).to match(/#{Regexp.escape(w)}/m) - end - end - - context 'concat::fragment target not found' do - context 'target not found' do - pp = <<-EOS - concat { 'file': - path => '#{basedir}/file', - } - concat::fragment { 'foo': - target => '#{basedir}/bar', - content => 'bar', - } - EOS - w = 'not found in the catalog' - - it_behaves_like 'has_warning', pp, w - end - end -end diff --git a/modules/concat/spec/defines/concat_fragment_spec.rb b/modules/concat/spec/defines/concat_fragment_spec.rb deleted file mode 100644 index ee2749b..0000000 --- a/modules/concat/spec/defines/concat_fragment_spec.rb +++ /dev/null @@ -1,157 +0,0 @@ -require 'spec_helper' - -describe 'concat::fragment' do - - shared_examples 'fragment' do |title, params| - params = {} if params.nil? - - p = { - :content => nil, - :source => nil, - :order => 10, - }.merge(params) - - let(:title) { title } - let(:params) { params } - let(:pre_condition) do - "concat{ '#{p[:target]}': }" - end - - it do - should contain_concat(p[:target]) - should contain_concat_file(p[:target]) - should contain_concat_fragment(title) - end - end - - context 'title' do - ['0', '1', 'a', 'z'].each do |title| - it_behaves_like 'fragment', title, { - :target => '/etc/motd', - :content => "content for #{title}" - } - end - end # title - - context 'target =>' do - ['./etc/motd', 'etc/motd', 'motd_header'].each do |target| - context target do - it_behaves_like 'fragment', target, { - :target => '/etc/motd', - :content => "content for #{target}" - } - end - end - - context 'false' do - let(:title) { 'motd_header' } - let(:params) {{ :target => false }} - - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /parameter 'target' expects a .*String.*/) - end - end - end # target => - - context 'content =>' do - ['', 'ashp is our hero'].each do |content| - context content do - it_behaves_like 'fragment', 'motd_header', { - :content => content, - :target => '/etc/motd', - } - end - end - - context 'false' do - let(:title) { 'motd_header' } - let(:params) {{ :content => false, :target => '/etc/motd' }} - - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /parameter 'content' expects a .*String.*/ ) - end - end - end # content => - - context 'source =>' do - ['', '/foo/bar', ['/foo/bar', '/foo/baz']].each do |source| - context source do - it_behaves_like 'fragment', 'motd_header', { - :source => source, - :target => '/etc/motd', - } - end - end - - context 'false' do - let(:title) { 'motd_header' } - let(:params) {{ :source => false, :target => '/etc/motd' }} - - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /parameter 'source' expects a .*String.*Array.*/) - end - end - end # source => - - context 'order =>' do - ['', '42', 'a', 'z'].each do |order| - context "'#{order}'" do - it_behaves_like 'fragment', 'motd_header', { - :order => order, - :target => '/etc/motd', - } - end - end - - context 'false' do - let(:title) { 'motd_header' } - let(:params) {{ :order => false, :target => '/etc/motd' }} - - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /Evaluation Error.*expects.*Boolean.*/) - end - end - - context '123:456' do - let(:title) { 'motd_header' } - let(:params) {{ :order => '123:456', :target => '/etc/motd' }} - - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /cannot contain/) - end - end - context '123/456' do - let(:title) { 'motd_header' } - let(:params) {{ :order => '123/456', :target => '/etc/motd' }} - - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /cannot contain/) - end - end - context '123\n456' do - let(:title) { 'motd_header' } - let(:params) {{ :order => "123\n456", :target => '/etc/motd' }} - - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /cannot contain/) - end - end - end # order => - - context 'more than one content source' do - context 'source and content' do - let(:title) { 'motd_header' } - let(:params) do - { - :target => '/etc/motd', - :source => '/foo', - :content => 'bar', - } - end - - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /Can\'t use \'source\' and \'content\' at the same time/m) - end - end - end # more than one content source -end diff --git a/modules/concat/spec/defines/concat_spec.rb b/modules/concat/spec/defines/concat_spec.rb deleted file mode 100644 index 8fc7ded..0000000 --- a/modules/concat/spec/defines/concat_spec.rb +++ /dev/null @@ -1,373 +0,0 @@ -require 'spec_helper' - -describe 'concat' do - - shared_examples 'concat' do |title, params, id| - params = {} if params.nil? - id = 'root' if id.nil? - - # default param values - p = { - :ensure => 'present', - :path => title, - :owner => nil, - :group => nil, - :mode => '0644', - :warn => false, - :backup => 'puppet', - :replace => true, - :force => false, - }.merge(params) - - file_defaults = { - :backup => p[:backup], - } - - let(:title) { title } - let(:params) { params } - let(:facts) do - { - :id => id, - :osfamily => 'Debian', - :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - :kernel => 'Linux', - :is_pe => false, - } - end - - if p[:ensure] == 'present' - it do - should contain_concat(title).with(file_defaults.merge({ - :ensure => 'present', - :owner => p[:owner], - :group => p[:group], - :mode => p[:mode], - :path => p[:path], - :backup => p[:backup], - :replace => p[:replace], - :selinux_ignore_defaults => p[:selinux_ignore_defaults], - :selrange => p[:selrange], - :selrole => p[:selrole], - :seltype => p[:seltype], - :seluser => p[:seluser], - :force => p[:force], - })) - end - else - it do - should contain_concat(title).with(file_defaults.merge({ - :ensure => 'absent', - :backup => p[:backup], - })) - end - end - end - - context 'title' do - context 'without path param' do - # title/name is the default value for the path param. therefore, the - # title must be an absolute path unless path is specified - ['/foo', '/foo/bar', '/foo/bar/baz'].each do |title| - context title do - it_behaves_like 'concat', '/etc/foo.bar' - end - end - - ['./foo', 'foo', 'foo/bar'].each do |title| - context title do - let(:title) { title } - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /Stdlib::Unixpath/) - end - end - end - end - - context 'with path param' do - ['/foo', 'foo', 'foo/bar'].each do |title| - context title do - it_behaves_like 'concat', title, { :path => '/etc/foo.bar' } - end - end - end - - context 'with special characters in title' do - ['foo:bar', 'foo*bar', 'foo(bar)', 'foo@bar'].each do |title| - context title do - it_behaves_like 'concat', title, { :path => '/etc/foo.bar' } - end - end - end - end # title => - - context 'as non-root user' do - it_behaves_like 'concat', '/etc/foo.bar', {}, 'bob' - end - - context 'ensure =>' do - ['present', 'absent'].each do |ens| - context ens do - it_behaves_like 'concat', '/etc/foo.bar', { :ensure => ens } - end - end - - context 'invalid' do - let(:title) { '/etc/foo.bar' } - let(:params) {{ :ensure => 'invalid' }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /expects a match for Enum\['absent', 'present'\]/) - end - end - end # ensure => - - context 'path =>' do - context '/foo' do - it_behaves_like 'concat', '/etc/foo.bar', { :path => '/foo' } - end - - context 'false' do - let(:title) { '/etc/foo.bar' } - let(:params) {{ :path => false }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /Stdlib::Unixpath/) - end - end - - ['./foo', 'foo', 'foo/bar'].each do |path| - context path do - let(:title) { '/etc/foo.bar' } - let(:params) {{ :path => path }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /Stdlib::Unixpath/) - end - end - end - end # path => - - context 'owner =>' do - ['apenney',1000,'1001'].each do |owner| - context owner do - it_behaves_like 'concat', '/etc/foo.bar', { :owner => owner } - end - end - - context 'false' do - let(:title) { '/etc/foo.bar' } - let(:params) {{ :owner => false }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /Evaluation Error.*expects.*String.*Boolean.*/) - end - end - end # owner => - - context 'group =>' do - ['apenney',1000,'1001'].each do |group| - context group do - it_behaves_like 'concat', '/etc/foo.bar', { :group => group } - end - end - - context 'false' do - let(:title) { '/etc/foo.bar' } - let(:params) {{ :group => false }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /Evaluation Error.*expects.*String.*Boolean.*/) - end - end - end # group => - - context 'mode =>' do - context '1755' do - it_behaves_like 'concat', '/etc/foo.bar', { :mode => '1755' } - end - - context 'false' do - let(:title) { '/etc/foo.bar' } - let(:params) {{ :mode => false }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /parameter 'mode' expects .*String.*/) - end - end - end # mode => - - context 'warn =>' do - [true, false, '# foo'].each do |warn| - context warn do - it_behaves_like 'concat', '/etc/foo.bar', { :warn => warn } - end - end - - context '(stringified boolean)' do - ['true', 'yes', 'on', 'false', 'no', 'off'].each do |warn| - context warn do - it_behaves_like 'concat', '/etc/foo.bar', { :warn => warn } - - it 'should create a warning' do - skip('rspec-puppet support for testing warning()') - end - end - end - end - - context '123' do - let(:title) { '/etc/foo.bar' } - let(:params) {{ :warn => 123 }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /parameter 'warn' expects .*Boolean.*String.*/) - end - end - end # warn => - - context 'show_diff =>' do - [true, false].each do |show_diff| - context show_diff do - it_behaves_like 'concat', '/etc/foo.bar', { :show_diff => show_diff } - end - end - - context '123' do - let(:title) { '/etc/foo.bar' } - let(:params) {{ :show_diff => 123 }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /parameter 'show_diff' expects .*Boolean.*/) - end - end - end # show_diff => - - context 'backup =>' do - ['reverse',false,true].each do |backup| - context "#{backup}" do - it_behaves_like 'concat', '/etc/foo.bar', { :backup => backup } - end - end - - context 'true' do - let(:title) { '/etc/foo.bar' } - let(:params) {{ :backup => [] }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /parameter 'backup' expects .*Boolean.*String.*/) - end - end - end # backup => - - context 'replace =>' do - [true, false].each do |replace| - context replace do - it_behaves_like 'concat', '/etc/foo.bar', { :replace => replace } - end - end - - context '123' do - let(:title) { '/etc/foo.bar' } - let(:params) {{ :replace => 123 }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /parameter 'replace' expects .*Boolean.*/) - end - end - end # replace => - - context 'force =>' do - [true, false].each do |force| - context force do - it_behaves_like 'concat', '/etc/foo.bar', { :force => force } - end - end - - context '123' do - let(:title) { '/etc/foo.bar' } - let(:params) {{ :force => 123 }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /parameter 'force' expects .*Boolean.*/) - end - end - end # force => - - context 'order =>' do - ['alpha', 'numeric'].each do |order| - context order do - it_behaves_like 'concat', '/etc/foo.bar', { :order => order } - end - end - - context 'invalid' do - let(:title) { '/etc/foo.bar' } - let(:params) {{ :order => 'invalid' }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /expects a match for Enum\['alpha', 'numeric'\]/) - end - end - end # order => - - context 'ensure_newline =>' do - [true, false].each do |ensure_newline| - context 'true' do - it_behaves_like 'concat', '/etc/foo.bar', { :ensure_newline => ensure_newline} - end - end - - context '123' do - let(:title) { '/etc/foo.bar' } - let(:params) {{ :ensure_newline => 123 }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /parameter 'ensure_newline' expects a Boolean value/) - end - end - end # ensure_newline => - - context 'validate_cmd =>' do - context '/usr/bin/test -e %' do - it_behaves_like 'concat', '/etc/foo.bar', { :validate_cmd => '/usr/bin/test -e %' } - end - - [ 1234, true ].each do |cmd| - context cmd do - let(:title) { '/etc/foo.bar' } - let(:params) {{ :validate_cmd => cmd }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /parameter 'validate_cmd' expects.*String.*/) - end - end - end - end # validate_cmd => - - context 'selinux_ignore_defaults =>' do - let(:title) { '/etc/foo.bar' } - - [true, false].each do |v| - context v do - it_behaves_like 'concat', '/etc/foo.bar', { :selinux_ignore_defaults => v } - end - end - - context '123' do - let(:title) { '/etc/foo.bar' } - let(:params) {{ :selinux_ignore_defaults => 123 }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /Evaluation Error.*expects.*Boolean.*/) - end - end - end # selinux_ignore_defaults => - - [ - :selrange, - :selrole, - :seltype, - :seluser, - ].each do |p| - context " #{p} =>" do - let(:title) { '/etc/foo.bar' } - - context 'foo' do - it_behaves_like 'concat', '/etc/foo.bar', { p => 'foo' } - end - - context 'false' do - let(:title) { '/etc/foo.bar' } - let(:params) {{ p => false }} - it 'should fail' do - expect { catalogue }.to raise_error(Puppet::Error, /parameter '#{p}' expects.*String.*/) - end - end - end # #{p} => - end -end diff --git a/modules/concat/spec/spec_helper.rb b/modules/concat/spec/spec_helper.rb deleted file mode 100644 index 22d5d68..0000000 --- a/modules/concat/spec/spec_helper.rb +++ /dev/null @@ -1,8 +0,0 @@ -#This file is generated by ModuleSync, do not edit. -require 'puppetlabs_spec_helper/module_spec_helper' - -# put local configuration and setup into spec_helper_local -begin - require 'spec_helper_local' -rescue LoadError -end diff --git a/modules/concat/spec/spec_helper_acceptance.rb b/modules/concat/spec/spec_helper_acceptance.rb deleted file mode 100644 index 269c1f3..0000000 --- a/modules/concat/spec/spec_helper_acceptance.rb +++ /dev/null @@ -1,24 +0,0 @@ -require 'beaker-rspec/spec_helper' -require 'beaker-rspec/helpers/serverspec' -require 'acceptance/specinfra_stubs' -require 'beaker/puppet_install_helper' -require 'beaker/module_install_helper' - -run_puppet_install_helper -install_ca_certs unless ENV['PUPPET_INSTALL_TYPE'] =~ /pe/i -install_module_on(hosts) -install_module_dependencies_on(hosts) - -RSpec.configure do |c| - # Readable test descriptions - c.formatter = :documentation - - c.before(:all) do - shell('mkdir -p /tmp/concat') - end - c.after(:all) do - shell('rm -rf /tmp/concat /var/lib/puppet/concat') - end - - c.treat_symbols_as_metadata_keys_with_true_values = true -end diff --git a/modules/concat/spec/spec_helper_local.rb b/modules/concat/spec/spec_helper_local.rb deleted file mode 100644 index 0d0eed0..0000000 --- a/modules/concat/spec/spec_helper_local.rb +++ /dev/null @@ -1,46 +0,0 @@ -shared_examples 'Puppet::Parameter::Boolean' do |parameter| - [true, :true, 'true', :yes, 'yes'].each do |value| - it "accepts #{value} (#{value.class}) as a value" do - resource[parameter] = value - expect(resource[parameter]).to eq(true) - end - end - - [false, :false, 'false', :no, 'no'].each do |value| - it "accepts #{value} (#{value.class}) as a value" do - resource[parameter] = value - expect(resource[parameter]).to eq(false) - end - end - - it 'does not accept "foo" as a value' do - expect { resource[parameter] = 'foo' }.to raise_error(%r{Invalid value "foo"}) - end -end - -shared_examples 'a parameter that accepts only string values' do |parameter| - it 'accepts a string value' do - resource[parameter] = 'foo' - expect(resource[parameter]).to eq('foo') - end - - it 'does not accept an array value' do - expect { resource[parameter] = %w(foo bar) }.to raise_error(%r{must be a String}) - end - - it 'does not accept a hash value' do - expect { resource[parameter] = { foo: 'bar' } }.to raise_error(%r{must be a String}) - end - - it 'does not accept an integer value' do - expect { resource[parameter] = 9001 }.to raise_error(%r{must be a String}) - end - - it 'does not accept a boolean true value' do - expect { resource[parameter] = true }.to raise_error(%r{must be a String}) - end - - it 'does not accept a boolean false value' do - expect { resource[parameter] = false }.to raise_error(%r{must be a String}) - end -end diff --git a/modules/concat/spec/unit/type/concat_file_spec.rb b/modules/concat/spec/unit/type/concat_file_spec.rb deleted file mode 100644 index c9c85ec..0000000 --- a/modules/concat/spec/unit/type/concat_file_spec.rb +++ /dev/null @@ -1,141 +0,0 @@ -require 'spec_helper' - -describe Puppet::Type.type(:concat_file) do - let(:resource) { described_class.new(name: '/foo/bar') } - - describe 'key attributes' do - let(:subject) { described_class.key_attributes } - - it 'contain only :path' do - is_expected.to eq([:path]) - end - end - - describe 'parameter :path' do - it 'does not accept unqualified paths' do - expect { resource[:path] = 'foo' }.to raise_error( - %r{File paths must be fully qualified} - ) - end - end - - describe 'parameter :owner' do - subject { described_class.attrclass(:owner) } - - it 'inherits Puppet::Type::File::Owner' do - is_expected.to be < Puppet::Type::File::Owner - end - end - - describe 'parameter :group' do - subject { described_class.attrclass(:group) } - - it 'inherits Puppet::Type::File::Group' do - is_expected.to be < Puppet::Type::File::Group - end - end - - describe 'parameter :mode' do - subject { described_class.attrclass(:mode) } - - it 'inherits Puppet::Type::File::Mode' do - is_expected.to be < Puppet::Type::File::Mode - end - end - - describe 'parameter :order' do - it 'accepts "alpha" as a value' do - resource[:order] = 'alpha' - expect(resource[:order]).to eq(:alpha) - end - - it 'accepts "numeric" as a value' do - resource[:order] = 'numeric' - expect(resource[:order]).to eq(:numeric) - end - - it 'does not accept "bar" as a value' do - expect { resource[:order] = 'bar' }.to raise_error(%r{Invalid value "bar"}) - end - end - - describe 'parameter :backup' do - it 'accepts true (TrueClass) as a value' do - resource[:backup] = true - expect(resource[:backup]).to eq(true) - end - - it 'accepts false (FalseClass) as a value' do - resource[:backup] = false - expect(resource[:backup]).to eq(false) - end - - it 'accepts "foo" as a value' do - resource[:backup] = 'foo' - expect(resource[:backup]).to eq('foo') - end - end - - describe 'parameter :selrange' do - it_behaves_like 'a parameter that accepts only string values', :selrange - end - - describe 'parameter :selrole' do - it_behaves_like 'a parameter that accepts only string values', :selrole - end - - describe 'parameter :seltype' do - it_behaves_like 'a parameter that accepts only string values', :seltype - end - - describe 'parameter :seluser' do - it_behaves_like 'a parameter that accepts only string values', :seluser - end - - describe 'parameter :replace' do - it_behaves_like 'Puppet::Parameter::Boolean', :replace - end - - describe 'parameter :ensure_newline' do - it_behaves_like 'Puppet::Parameter::Boolean', :ensure_newline - end - - describe 'parameter :show_diff' do - it_behaves_like 'Puppet::Parameter::Boolean', :show_diff - end - - describe 'parameter :selinux_ignore_defaults' do - it_behaves_like 'Puppet::Parameter::Boolean', :selinux_ignore_defaults - end - - describe 'parameter :force' do - it_behaves_like 'Puppet::Parameter::Boolean', :force - end - - describe 'parameter :format' do - it 'accepts "plain" as a value' do - resource[:format] = 'plain' - expect(resource[:format]).to eq(:plain) - end - - it 'accepts "yaml" as a value' do - resource[:format] = 'yaml' - expect(resource[:format]).to eq(:yaml) - end - - it 'accepts "json" as a value' do - resource[:format] = 'json' - expect(resource[:format]).to eq(:json) - end - - it 'accepts "json-pretty" as a value' do - resource[:format] = 'json-pretty' - expect(resource[:format]).to eq(:'json-pretty') - end - - it 'does not accept "bar" as a value' do - expect { resource[:format] = 'bar' }.to raise_error(%r{Invalid value "bar"}) - end - end - -end diff --git a/modules/concat/spec/unit/type/concat_fragment_spec.rb b/modules/concat/spec/unit/type/concat_fragment_spec.rb deleted file mode 100644 index b5d680e..0000000 --- a/modules/concat/spec/unit/type/concat_fragment_spec.rb +++ /dev/null @@ -1,111 +0,0 @@ -require 'spec_helper' - -describe Puppet::Type.type(:concat_fragment) do - let(:resource) do - described_class.new(name: 'foo', target: 'bar', content: 'baz') - end - - describe 'key attributes' do - let(:subject) { described_class.key_attributes } - - it 'contain only :name' do - is_expected.to eq([:name]) - end - end - - describe 'parameter :target' do - it_behaves_like 'a parameter that accepts only string values', :target - end - - describe 'parameter :content' do - it_behaves_like 'a parameter that accepts only string values', :content - end - - describe 'parameter :source' do - it 'accepts a string value' do - resource[:source] = 'foo' - expect(resource[:source]).to eq('foo') - end - - it 'accepts an array value' do - resource[:source] = %w(foo bar) - expect(resource[:source]).to eq(%w(foo bar)) - end - - it 'does not accept a hash value' do - expect { resource[:source] = { foo: 'bar' } }.to raise_error(%r{must be a String or Array}) - end - - it 'does not accept an integer value' do - expect { resource[:source] = 9001 }.to raise_error(%r{must be a String or Array}) - end - - it 'does not accept a boolean true value' do - expect { resource[:source] = true }.to raise_error(%r{must be a String or Array}) - end - - it 'does not accept a boolean false value' do - expect { resource[:source] = false }.to raise_error(%r{must be a String or Array}) - end - end - - describe 'parameter :order' do - it 'accepts a string value' do - resource[:order] = 'foo' - expect(resource[:order]).to eq('foo') - end - - it 'accepts an integer value' do - resource[:order] = 9001 - expect(resource[:order]).to eq(9001) - end - - it 'does not accept an array value' do - expect { resource[:order] = %w(foo bar) }.to raise_error(%r{is not a string or integer}) - end - - it 'does not accept a hash value' do - expect { resource[:order] = { foo: 'bar' } }.to raise_error(%r{is not a string or integer}) - end - - it 'does not accept a boolean true value' do - expect { resource[:order] = true }.to raise_error(%r{is not a string or integer}) - end - - it 'does not accept a boolean false value' do - expect { resource[:order] = false }.to raise_error(%r{is not a string or integer}) - end - - it 'does not accept a string with ":" in it/' do - expect { resource[:order] = ':foo' }.to raise_error(%r{Order cannot contain}) - end - - it 'does not accept a string with "\n" in it/' do - expect { resource[:order] = "\nfoo" }.to raise_error(%r{Order cannot contain}) - end - - it 'does not accept a string with "/" in it/' do - expect { resource[:order] = '/foo' }.to raise_error(%r{Order cannot contain}) - end - end - - context 'without a value set for :target or :tag' do - it 'throws an error' do - expect { described_class.new(name: 'foo', content: 'baz') }.to raise_error(%r{No 'target' or 'tag' set}) - end - end - - context 'without a value set for both :content and :source' do - it 'throws an error' do - expect { described_class.new(name: 'foo', target: 'bar') }.to raise_error(%r{Set either 'source' or 'content'}) - end - end - - context 'with a value set for both :content and :source' do - it 'throws an error' do - expect do - described_class.new(name: 'foo', target: 'bar', content: 'baz', source: 'qux') - end.to raise_error(%r{Can't use 'source' and 'content' at the same time}) - end - end -end diff --git a/modules/motd/CHANGELOG.md b/modules/motd/CHANGELOG.md deleted file mode 100644 index 89facd9..0000000 --- a/modules/motd/CHANGELOG.md +++ /dev/null @@ -1,67 +0,0 @@ -## Release 1.5.0 -### Summary -This release is a rollup of changes. - -#### Features: -- Support added for Solaris SunOS. -- Default MOTD message changed to provide greater out of the box usability. -- Removed support for deprecated versions of Ubuntu. -- Added a permissions mode for the file. - -#### Bug Fixes: -- Changed fact processor name. - -## Release 1.4.0 -### Summary -First Puppet Labs supported release of this module! Contains new features and bug fixes for tests. - -#### Features: -- New readme file added for tests. Also several new tests added. -- Addition of handling in tests to run with Debian 8. - -#### Bug Fixes: -- Tests tweaked to handle several Debian versions. -- Fixed acceptance tests for Windows. - - -## Release 1.3.0 -### Summary -This release adds documentation updates, test improvements, and os support. - -#### Features: -- Acceptance testing on Linux platforms. -- Rewritten documentation, inclusion of strings for automated documentation. -- Linting of manifest to conform to style guidelines. -- Adds support for several operating systems: - - Debian 6, 7 - - CentOS 5, 6, 7 - - Oracle Linux 6, 7 - - Scientific Linux 5, 6, 7 - -### 2014-10-31 Release 1.2.0 -### Summary -- Add content parameter to allow setting static motd content. - -## 2014-07-15 Release 1.1.1 -###Summary - -This release merely updates metadata.json so the module can be uninstalled and -upgraded via the puppet module command. - -## 2014-05-28 Release 1.1.0 -###Summary - -The main feature of this release is support for external templates. -It also includes documentation and testing improvements. - -####Features - -- Added class parameter to support external templates. -- Updated README documentation. -- Improved Testing. - -####Fixes - -- Add LICENSE file. - -####Known Bugs diff --git a/modules/motd/CONTRIBUTING.md b/modules/motd/CONTRIBUTING.md deleted file mode 100644 index 1a9fb3a..0000000 --- a/modules/motd/CONTRIBUTING.md +++ /dev/null @@ -1,271 +0,0 @@ -# Contributing to Puppet modules - -So you want to contribute to a Puppet module: Great! Below are some instructions to get you started doing -that very thing while setting expectations around code quality as well as a few tips for making the -process as easy as possible. - -### Table of Contents - -1. [Getting Started](#getting-started) -1. [Commit Checklist](#commit-checklist) -1. [Submission](#submission) -1. [More about commits](#more-about-commits) -1. [Testing](#testing) - - [Running Tests](#running-tests) - - [Writing Tests](#writing-tests) -1. [Get Help](#get-help) - -## Getting Started - -- Fork the module repository on GitHub and clone to your workspace - -- Make your changes! - -## Commit Checklist - -### The Basics - -- [x] my commit is a single logical unit of work - -- [x] I have checked for unnecessary whitespace with "git diff --check" - -- [x] my commit does not include commented out code or unneeded files - -### The Content - -- [x] my commit includes tests for the bug I fixed or feature I added - -- [x] my commit includes appropriate documentation changes if it is introducing a new feature or changing existing functionality - -- [x] my code passes existing test suites - -### The Commit Message - -- [x] the first line of my commit message includes: - - - [x] an issue number (if applicable), e.g. "(MODULES-xxxx) This is the first line" - - - [x] a short description (50 characters is the soft limit, excluding ticket number(s)) - -- [x] the body of my commit message: - - - [x] is meaningful - - - [x] uses the imperative, present tense: "change", not "changed" or "changes" - - - [x] includes motivation for the change, and contrasts its implementation with the previous behavior - -## Submission - -### Pre-requisites - -- Make sure you have a [GitHub account](https://github.com/join) - -- [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for. - -### Push and PR - -- Push your changes to your fork - -- [Open a Pull Request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) against the repository in the puppetlabs organization - -## More about commits - - 1. Make separate commits for logically separate changes. - - Please break your commits down into logically consistent units - which include new or changed tests relevant to the rest of the - change. The goal of doing this is to make the diff easier to - read for whoever is reviewing your code. In general, the easier - your diff is to read, the more likely someone will be happy to - review it and get it into the code base. - - If you are going to refactor a piece of code, please do so as a - separate commit from your feature or bug fix changes. - - We also really appreciate changes that include tests to make - sure the bug is not re-introduced, and that the feature is not - accidentally broken. - - Describe the technical detail of the change(s). If your - description starts to get too long, that is a good sign that you - probably need to split up your commit into more finely grained - pieces. - - Commits which plainly describe the things which help - reviewers check the patch and future developers understand the - code are much more likely to be merged in with a minimum of - bike-shedding or requested changes. Ideally, the commit message - would include information, and be in a form suitable for - inclusion in the release notes for the version of Puppet that - includes them. - - Please also check that you are not introducing any trailing - whitespace or other "whitespace errors". You can do this by - running "git diff --check" on your changes before you commit. - - 2. Sending your patches - - To submit your changes via a GitHub pull request, we _highly_ - recommend that you have them on a topic branch, instead of - directly on "master". - It makes things much easier to keep track of, especially if - you decide to work on another thing before your first change - is merged in. - - GitHub has some pretty good - [general documentation](http://help.github.com/) on using - their site. They also have documentation on - [creating pull requests](https://help.github.com/articles/creating-a-pull-request-from-a-fork/). - - In general, after pushing your topic branch up to your - repository on GitHub, you can switch to the branch in the - GitHub UI and click "Pull Request" towards the top of the page - in order to open a pull request. - - 3. Update the related JIRA issue. - - If there is a JIRA issue associated with the change you - submitted, then you should update the ticket to include the - location of your branch, along with any other commentary you - may wish to make. - -# Testing - -## Getting Started - -Our Puppet modules provide [`Gemfile`](./Gemfile)s, which can tell a Ruby package manager such as [bundler](http://bundler.io/) what Ruby packages, -or Gems, are required to build, develop, and test this software. - -Please make sure you have [bundler installed](http://bundler.io/#getting-started) on your system, and then use it to -install all dependencies needed for this project in the project root by running - -```shell -% bundle install --path .bundle/gems -Fetching gem metadata from https://rubygems.org/........ -Fetching gem metadata from https://rubygems.org/.. -Using rake (10.1.0) -Using builder (3.2.2) --- 8><-- many more --><8 -- -Using rspec-system-puppet (2.2.0) -Using serverspec (0.6.3) -Using rspec-system-serverspec (1.0.0) -Using bundler (1.3.5) -Your bundle is complete! -Use `bundle show [gemname]` to see where a bundled gem is installed. -``` - -NOTE: some systems may require you to run this command with sudo. - -If you already have those gems installed, make sure they are up-to-date: - -```shell -% bundle update -``` - -## Running Tests - -With all dependencies in place and up-to-date, run the tests: - -### Unit Tests - -```shell -% bundle exec rake spec -``` - -This executes all the [rspec tests](http://rspec-puppet.com/) in the directories defined [here](https://github.com/puppetlabs/puppetlabs_spec_helper/blob/699d9fbca1d2489bff1736bb254bb7b7edb32c74/lib/puppetlabs_spec_helper/rake_tasks.rb#L17) and so on. -rspec tests may have the same kind of dependencies as the module they are testing. Although the module defines these dependencies in its [metadata.json](./metadata.json), -rspec tests define them in [.fixtures.yml](./fixtures.yml). - -### Acceptance Tests - -Some Puppet modules also come with acceptance tests, which use [beaker][]. These tests spin up a virtual machine under -[VirtualBox](https://www.virtualbox.org/), controlled with [Vagrant](http://www.vagrantup.com/), to simulate scripted test -scenarios. In order to run these, you need both Virtualbox and Vagrant installed on your system. - -Run the tests by issuing the following command - -```shell -% bundle exec rake spec_clean -% bundle exec rspec spec/acceptance -``` - -This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml), -install Puppet, copy this module, and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb) -and then run all the tests under [spec/acceptance](./spec/acceptance). - -## Writing Tests - -### Unit Tests - -When writing unit tests for Puppet, [rspec-puppet][] is your best friend. It provides tons of helper methods for testing your manifests against a -catalog (e.g. contain_file, contain_package, with_params, etc). It would be ridiculous to try and top rspec-puppet's [documentation][rspec-puppet_docs] -but here's a tiny sample: - -Sample manifest: - -```puppet -file { "a test file": - ensure => present, - path => "/etc/sample", -} -``` - -Sample test: - -```ruby -it 'does a thing' do - expect(subject).to contain_file("a test file").with({:path => "/etc/sample"}) -end -``` - -### Acceptance Tests - -Writing acceptance tests for Puppet involves [beaker][] and its cousin [beaker-rspec][]. A common pattern for acceptance tests is to create a test manifest, apply it -twice to check for idempotency or errors, then run expectations. - -```ruby -it 'does an end-to-end thing' do - pp = <<-EOF - file { 'a test file': - ensure => present, - path => "/etc/sample", - content => "test string", - } - - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - -end - -describe file("/etc/sample") do - it { is_expected.to contain "test string" } -end - -``` - -# If you have commit access to the repository - -Even if you have commit access to the repository, you still need to go through the process above, and have someone else review and merge -in your changes. The rule is that **all changes must be reviewed by a project developer that did not write the code to ensure that -all changes go through a code review process.** - -The record of someone performing the merge is the record that they performed the code review. Again, this should be someone other than the author of the topic branch. - -# Get Help - -### On the web -* [Puppet help messageboard](http://puppet.com/community/get-help) -* [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing) -* [General GitHub documentation](http://help.github.com/) -* [GitHub pull request documentation](http://help.github.com/send-pull-requests/) - -### On chat -* Slack (slack.puppet.com) #forge-modules, #puppet-dev, #windows, #voxpupuli -* IRC (freenode) #puppet-dev, #voxpupuli - - -[rspec-puppet]: http://rspec-puppet.com/ -[rspec-puppet_docs]: http://rspec-puppet.com/documentation/ -[beaker]: https://github.com/puppetlabs/beaker -[beaker-rspec]: https://github.com/puppetlabs/beaker-rspec diff --git a/modules/motd/Gemfile b/modules/motd/Gemfile deleted file mode 100644 index e8318e5..0000000 --- a/modules/motd/Gemfile +++ /dev/null @@ -1,157 +0,0 @@ -#This file is generated by ModuleSync, do not edit. - -source ENV['GEM_SOURCE'] || "https://rubygems.org" - -# Determines what type of gem is requested based on place_or_version. -def gem_type(place_or_version) - if place_or_version =~ /^git:/ - :git - elsif place_or_version =~ /^file:/ - :file - else - :gem - end -end - -# Find a location or specific version for a gem. place_or_version can be a -# version, which is most often used. It can also be git, which is specified as -# `git://somewhere.git#branch`. You can also use a file source location, which -# is specified as `file://some/location/on/disk`. -def location_for(place_or_version, fake_version = nil) - if place_or_version =~ /^(git[:@][^#]*)#(.*)/ - [fake_version, { :git => $1, :branch => $2, :require => false }].compact - elsif place_or_version =~ /^file:\/\/(.*)/ - ['>= 0', { :path => File.expand_path($1), :require => false }] - else - [place_or_version, { :require => false }] - end -end - -# Used for gem conditionals -supports_windows = true -ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments -minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}" - -# The following gems are not included by default as they require DevKit on Windows. -# You should probably include them in a Gemfile.local or a ~/.gemfile -#gem 'pry' #this may already be included in the gemfile -#gem 'pry-stack_explorer', :require => false -#if RUBY_VERSION =~ /^2/ -# gem 'pry-byebug' -#else -# gem 'pry-debugger' -#end - -group :development do - gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby" - gem "puppet-module-win-default-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] - gem "puppet-module-posix-dev-r#{minor_version}", :require => false, :platforms => "ruby" - gem "puppet-module-win-dev-r#{minor_version}", '0.0.7', :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] - gem "json_pure", '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') - gem "fast_gettext", '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0') - gem "fast_gettext", :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') -end - -group :system_tests do - gem "puppet-module-posix-system-r#{minor_version}", :require => false, :platforms => "ruby" - gem "puppet-module-win-system-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] - gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3') - gem "beaker-pe", :require => false - gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION']) - gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION']) - gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1') - gem "puppet-blacksmith", '~> 3.4', :require => false -end - -gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION']) - -# Only explicitly specify Facter/Hiera if a version has been specified. -# Otherwise it can lead to strange bundler behavior. If you are seeing weird -# gem resolution behavior, try setting `DEBUG_RESOLVER` environment variable -# to `1` and then run bundle install. -gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION'] -gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION'] - -# For Windows dependencies, these could be required based on the version of -# Puppet you are requiring. Anything greater than v3.5.0 is going to have -# Windows-specific dependencies dictated by the gem itself. The other scenario -# is when you are faking out Puppet to use a local file path / git path. -explicitly_require_windows_gems = false -puppet_gem_location = gem_type(ENV['PUPPET_GEM_VERSION']) -# This is not a perfect answer to the version check -if puppet_gem_location != :gem || (ENV['PUPPET_GEM_VERSION'] && Gem::Version.correct?(ENV['PUPPET_GEM_VERSION']) && Gem::Requirement.new('< 3.5.0').satisfied_by?(Gem::Version.new(ENV['PUPPET_GEM_VERSION'].dup))) - if Gem::Platform.local.os == 'mingw32' - explicitly_require_windows_gems = true - end - if puppet_gem_location == :gem - # If facterversion hasn't been specified and we are - # looking for a Puppet Gem version less than 3.5.0, we - # need to ensure we get a good Facter for specs. - gem "facter",">= 1.6.11","<= 1.7.5",:require => false unless ENV['FACTER_GEM_VERSION'] - # If hieraversion hasn't been specified and we are - # looking for a Puppet Gem version less than 3.5.0, we - # need to ensure we get a good Hiera for specs. - gem "hiera",">= 1.0.0","<= 1.3.0",:require => false unless ENV['HIERA_GEM_VERSION'] - end -end - -if explicitly_require_windows_gems - # This also means Puppet Gem less than 3.5.0 - this has been tested back - # to 3.0.0. Any further back is likely not supported. - if puppet_gem_location == :gem - gem "ffi", "1.9.0", :require => false - gem "win32-eventlog", "0.5.3","<= 0.6.5", :require => false - gem "win32-process", "0.6.5","<= 0.7.5", :require => false - gem "win32-security", "~> 0.1.2","<= 0.2.5", :require => false - gem "win32-service", "0.7.2","<= 0.8.8", :require => false - gem "minitar", "0.5.4", :require => false - else - gem "ffi", "~> 1.9.0", :require => false - gem "win32-eventlog", "~> 0.5","<= 0.6.5", :require => false - gem "win32-process", "~> 0.6","<= 0.7.5", :require => false - gem "win32-security", "~> 0.1","<= 0.2.5", :require => false - gem "win32-service", "~> 0.7","<= 0.8.8", :require => false - gem "minitar", "~> 0.5.4", :require => false - end - - gem "win32-dir", "~> 0.3","<= 0.4.9", :require => false - gem "win32console", "1.3.2", :require => false if RUBY_VERSION =~ /^1\./ - - # sys-admin was removed in Puppet 3.7.0+, and doesn't compile - # under Ruby 2.3 - so restrict it to Ruby 1.x - gem "sys-admin", "1.5.6", :require => false if RUBY_VERSION =~ /^1\./ - - # Puppet less than 3.7.0 requires these. - # Puppet 3.5.0+ will control the actual requirements. - # These are listed in formats that work with all versions of - # Puppet from 3.0.0 to 3.6.x. After that, these were no longer used. - # We do not want to allow newer versions than what came out after - # 3.6.x to be used as they constitute some risk in breaking older - # functionality. So we set these to exact versions. - gem "win32-api", "1.4.8", :require => false - gem "win32-taskscheduler", "0.2.2", :require => false - gem "windows-api", "0.4.3", :require => false - gem "windows-pr", "1.2.3", :require => false -else - if Gem::Platform.local.os == 'mingw32' - # If we're using a Puppet gem on windows, which handles its own win32-xxx gem dependencies (Pup 3.5.0 and above), set maximum versions - # Required due to PUP-6445 - gem "win32-dir", "<= 0.4.9", :require => false - gem "win32-eventlog", "<= 0.6.5", :require => false - gem "win32-process", "<= 0.7.5", :require => false - gem "win32-security", "<= 0.2.5", :require => false - gem "win32-service", "<= 0.8.8", :require => false - end -end - -# Evaluate Gemfile.local if it exists -if File.exists? "#{__FILE__}.local" - eval(File.read("#{__FILE__}.local"), binding) -end - -# Evaluate ~/.gemfile if it exists -if File.exists?(File.join(Dir.home, '.gemfile')) - eval(File.read(File.join(Dir.home, '.gemfile')), binding) -end - -# vim:ft=ruby diff --git a/modules/motd/LICENSE b/modules/motd/LICENSE deleted file mode 100644 index d645695..0000000 --- a/modules/motd/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/modules/motd/MAINTAINERS.md b/modules/motd/MAINTAINERS.md deleted file mode 100644 index ca06cdd..0000000 --- a/modules/motd/MAINTAINERS.md +++ /dev/null @@ -1,6 +0,0 @@ -## Maintenance - -Maintainers: - - Puppet Forge Modules Team `forge-modules |at| puppet |dot| com` - -Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `motd`. diff --git a/modules/motd/NOTICE b/modules/motd/NOTICE deleted file mode 100644 index b28a78d..0000000 --- a/modules/motd/NOTICE +++ /dev/null @@ -1,15 +0,0 @@ -Puppet Module - puppetlabs-motd - -Copyright 2017 Puppet, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file diff --git a/modules/motd/README.md b/modules/motd/README.md deleted file mode 100644 index 6574322..0000000 --- a/modules/motd/README.md +++ /dev/null @@ -1,109 +0,0 @@ -# motd - -#### Table of Contents - -1. [Overview](#overview) -2. [Module Description - What the module does and why it is useful](#module-description) -3. [Setup - The basics of getting started with the motd module](#setup) - * [Beginning with the motd module](#beginning-with-the-motd-module) -4. [Usage - Configuration options and additional functionality](#usage) -5. [Reference - An under-the-hood peek at what the module is doing and how](#reference) -6. [Limitations - OS compatibility, etc.](#limitations) -7. [Development - Guide for contributing to the module](#development) - -## Module Description - -The motd module configures a system message of the day. The module includes a default message template. Alternatively, you can specify a different template or a static string. - -## Setup - -### Beginning with the motd module - -To configure motd on your system, include the `motd` class: `include motd`. - -## Usage - -The motd module configures the message of the day on a wide variety of systems. The module populates either `/etc/motd`, `/etc/issue` and `/etc/issue.net` (on POSIX systems) or a registry key (on Windows systems) with the contents of a basic template file. - -By default, the module populates motd using the included template. Alternatively, you can specify a different template or a static string. For example, to use a custom template you would set the template parameter: - -```puppet -class { 'motd': - template => 'mymodule/mytemplate.erb', -} -``` - -To specify a string as the message of the day: - -```puppet -class { 'motd': - content => "Hello world!/n", -} -``` - - -## Reference - -### Classes - -#### Public classes - -* `motd`: Configures the message of the day. - -#### Parameters - -The following parameters are available in `motd`. All parameters are optional. - -##### `template` - -Specifies a custom template. A template take precedence over `content`. Valid options: '/mymodule/mytemplate.erb'. Default: 'undef'. - -##### `content` - -Specifies a static string as the motd content. Valid options: A string, such as "Hello!\n", or "Please lock workstations when not in use\n". Default: 'undef'. - -##### `dynamic_motd` - -Enables or disables dynamic motd on Debian systems. Valid options: true or false. Default: true. - -##### `issue_template` - -Specifies a custom template to process and save to `/etc/issue`. A template take precedence over `issue_content`. Valid options: '/mymodule/mytemplate.erb'. Default: 'undef'. - -##### `issue_content` - -Specifies a static string as the `/etc/issue` content. Valid options: A string, such as "Hello!\n", or "Please lock workstations when not in use\n". Default: 'undef'. - -##### `issue_net_template` - -Specifies a custom template to process and save to `/etc/issue.net`. A template take precedence over `issue_net_content`. Valid options: '/mymodule/mytemplate.erb'. Default: 'undef'. - -##### `issue__net_content` - -Specifies a static string as the `/etc/issue.net` content. Valid options: A string, such as "Hello!\n", or "Please lock workstations when not in use\n". Default: 'undef'. - -## Limitations - -This module has been tested on the following platforms: - -* CentOS 5, 6, 7 -* Debian 6, 7, 8 -* Oracle 6, 7 -* Red Hat Enterprise Linux (RHEL) 5, 6, 7 -* SLES 10, 11, 12 -* Ubuntu 12.04, 12.10, 14.04 -* Windows 2008, 2008 R2, 2012, 2012 R2 - -Disabling dynamic motd is supported only on Debian. - -### A note on Windows - -On Windows systems, the motd module populates the contents of `HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\policies\system\legalnoticetext` and `HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\policies\system\legalnoticecaption`. The `legalnoticetext` registry key is shown before login on a Windows system. - -## Development - -Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad hardware, software, and deployment configurations that Puppet is intended to serve. We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things. For more information, see our [module contribution guide.](https://docs.puppetlabs.com/forge/contributing.html) - -## Contributors - -The list of contributors can be found at: [https://github.com/puppetlabs/puppetlabs-motd/graphs/contributors](https://github.com/puppetlabs/puppetlabs-motd/graphs/contributors). diff --git a/modules/motd/Rakefile b/modules/motd/Rakefile deleted file mode 100644 index d12d854..0000000 --- a/modules/motd/Rakefile +++ /dev/null @@ -1,37 +0,0 @@ -require 'puppetlabs_spec_helper/rake_tasks' -require 'puppet-lint/tasks/puppet-lint' -require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any? - -PuppetLint.configuration.fail_on_warnings = true -PuppetLint.configuration.send('relative') - -desc 'Generate pooler nodesets' -task :gen_nodeset do - require 'beaker-hostgenerator' - require 'securerandom' - require 'fileutils' - - agent_target = ENV['TEST_TARGET'] - if ! agent_target - STDERR.puts 'TEST_TARGET environment variable is not set' - STDERR.puts 'setting to default value of "redhat-64default."' - agent_target = 'redhat-64default.' - end - - master_target = ENV['MASTER_TEST_TARGET'] - if ! master_target - STDERR.puts 'MASTER_TEST_TARGET environment variable is not set' - STDERR.puts 'setting to default value of "redhat7-64mdcl"' - master_target = 'redhat7-64mdcl' - end - - targets = "#{master_target}-#{agent_target}" - cli = BeakerHostGenerator::CLI.new([targets]) - nodeset_dir = "tmp/nodesets" - nodeset = "#{nodeset_dir}/#{targets}-#{SecureRandom.uuid}.yaml" - FileUtils.mkdir_p(nodeset_dir) - File.open(nodeset, 'w') do |fh| - fh.print(cli.execute) - end - puts nodeset -end diff --git a/modules/motd/appveyor.yml b/modules/motd/appveyor.yml deleted file mode 100644 index 7e05880..0000000 --- a/modules/motd/appveyor.yml +++ /dev/null @@ -1,52 +0,0 @@ -version: 1.1.x.{build} -skip_commits: - message: /^\(?doc\)?.*/ -clone_depth: 10 -init: -- SET -- 'mkdir C:\ProgramData\PuppetLabs\code && exit 0' -- 'mkdir C:\ProgramData\PuppetLabs\facter && exit 0' -- 'mkdir C:\ProgramData\PuppetLabs\hiera && exit 0' -- 'mkdir C:\ProgramData\PuppetLabs\puppet\var && exit 0' -environment: - matrix: - - PUPPET_GEM_VERSION: ~> 4.0 - RUBY_VER: 21 - - PUPPET_GEM_VERSION: ~> 4.0 - RUBY_VER: 21-x64 - - PUPPET_GEM_VERSION: ~> 5.0 - RUBY_VER: 24 - - PUPPET_GEM_VERSION: ~> 5.0 - RUBY_VER: 24-x64 - - PUPPET_GEM_VERSION: 4.7.1 - RUBY_VER: 21-x64 -matrix: - fast_finish: true -install: -- SET PATH=C:\Ruby%RUBY_VER%\bin;%PATH% -- ps: | - # AppVeyor appears to have OpenSSL headers available already - # which msys2 would normally install with: - # pacman -S mingw-w64-x86_64-openssl --noconfirm - # - if ( $(ruby --version) -match "^ruby\s+2\.4" ) { - Write-Output "Building OpenSSL gem ~> 2.0.4 to fix Ruby 2.4 / AppVeyor issue" - gem install openssl --version '~> 2.0.4' --no-ri --no-rdoc - } - - gem list openssl - ruby -ropenssl -e 'puts \"OpenSSL Version - #{OpenSSL::OPENSSL_VERSION}\"; puts \"OpenSSL Library Version - #{OpenSSL::OPENSSL_LIBRARY_VERSION}\"' -- bundle install --jobs 4 --retry 2 --without system_tests -- type Gemfile.lock -build: off -test_script: -- bundle exec puppet -V -- ruby -v -- bundle exec rake spec SPEC_OPTS='--format documentation' -notifications: -- provider: Email - to: - - nobody@nowhere.com - on_build_success: false - on_build_failure: false - on_build_status_changed: false diff --git a/modules/motd/checksums.json b/modules/motd/checksums.json deleted file mode 100644 index 9887963..0000000 --- a/modules/motd/checksums.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "CHANGELOG.md": "fb2984044bd53b8f8b3a23a0182437ab", - "CONTRIBUTING.md": "4d17f3c942e7c93d1577cc4438a231e4", - "Gemfile": "dda0eed6fd42a6a965ad10900a5b851c", - "LICENSE": "3b83ef96387f14655fc854ddc3c6bd57", - "MAINTAINERS.md": "2a46efb4a7233669d2f7cab99188b828", - "NOTICE": "00d698c142148d6094704aaafdb7933d", - "README.md": "aaface1e77c2196b499c4c981b786f3f", - "Rakefile": "3851f083966b9bbd6d46e50dba5aa52a", - "appveyor.yml": "5bad9cb8e861bca53eeea6247eec5c60", - "locales/config.yaml": "941a537d5d6912edf31c83e57063bba0", - "manifests/init.pp": "48bcdda1891b635da6d58cfea2a62b1d", - "metadata.json": "1346a08ecbc208eaa3e09ed2c9dbda3d", - "spec/acceptance/motd_spec.rb": "6312deb9116a57ddae0ee1bc9e3f8ee8", - "spec/acceptance/nodesets/centos-7-x64.yml": "a713f3abd3657f0ae2878829badd23cd", - "spec/acceptance/nodesets/debian-8-x64.yml": "d2d2977900989f30086ad251a14a1f39", - "spec/acceptance/nodesets/default.yml": "a77662a1375bdf0dde4ed6bd798f2f45", - "spec/acceptance/nodesets/docker/centos-7.yml": "8a3892807bdd62306ae4774f41ba11ae", - "spec/acceptance/nodesets/docker/debian-8.yml": "ac8e871d1068c96de5e85a89daaec6df", - "spec/acceptance/nodesets/docker/ubuntu-14.04.yml": "dc42ee922a96908d85b8f0f08203ce58", - "spec/classes/motd_spec.rb": "f9a90fdc595276023c8fbf11f115ec77", - "spec/spec_helper.rb": "ffb7ae05597bd18f74611afa37a88a0d", - "spec/spec_helper_acceptance.rb": "321c9a805ae2c6370ec17a2eeae0df5f", - "templates/motd.erb": "d0fd3aedd3402ac057257c18a9486561", - "templates/spec.erb": "cad8f5ed937a14f8ecb735d82678df56", - "tests/README.md": "9d2ce86455b6f62d076b2a3b793cf9ca", - "tests/beaker/config/redhat-6-64mda": "e43036ade4a46de74a25337f7df7cdb8", - "tests/beaker/config/redhat-7-64mda": "1761c1d6e5937b66a5ec82848e34c0f1", - "tests/beaker/config/ubuntu-1204-64mda": "52378910461ec8922b29e717c18eda5b", - "tests/beaker/config/ubuntu-1404-64mda": "d6bca31dd7ffb0f8050397c61d95deef", - "tests/beaker/pre-suite/00_pe_install.rb": "15b9caedb1f04149f651895c26a11682", - "tests/beaker/pre-suite/01_motd_module_install.rb": "d7095cd6361553f39e2837091553da49", - "tests/beaker/test_run_scripts/run_test_with_ankeny.sh": "4841b432812063bfebf12a1ea8ad6c6c", - "tests/beaker/tests/01_create_motd_content.rb": "b68d7efabafbc5bf465bbf3ee6b282d5" -} \ No newline at end of file diff --git a/modules/motd/locales/config.yaml b/modules/motd/locales/config.yaml deleted file mode 100644 index 2135856..0000000 --- a/modules/motd/locales/config.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# This is the project-specific configuration file for setting up -# fast_gettext for your project. -gettext: - # This is used for the name of the .pot and .po files; they will be - # called .pot? - project_name: puppetlabs-motd - # This is used in comments in the .pot and .po files to indicate what - # project the files belong to and should bea little more desctiptive than - # - package_name: puppetlabs-motd - # The locale that the default messages in the .pot file are in - default_locale: en - # The email used for sending bug reports. - bugs_address: docs@puppet.com - # The holder of the copyright. - copyright_holder: Puppet, Inc. - # This determines which comments in code should be eligible for translation. - # Any comments that start with this string will be externalized. (Leave - # empty to include all.) - comments_tag: TRANSLATOR - # Patterns for +Dir.glob+ used to find all files that might contain - # translatable content, relative to the project root directory - source_files: - - './lib/**/*.rb' - diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp deleted file mode 100644 index 97b29ef..0000000 --- a/modules/motd/manifests/init.pp +++ /dev/null @@ -1,113 +0,0 @@ -# Class: motd -# -# This module manages the /etc/motd file using a template -# -# @param dynamic_motd [Bool] Enable or disable dynamic motd on Debian systems -# @param template [String] Allows for custom template location -# @param content [String] String to be used for motd, priority given to template -# @param issue_template [String] Allows for custom template location for /etc/issue -# @param issue_content [String] String to be used for /etc/issue, priority given to template -# @param issue_net_template [String] Allows for custom template location for /etc/issue.net -# @param issue_net_content [String] String to be used for /etc/issue.net, priority given to template -# -# @example -# include motd -# -class motd ( - $dynamic_motd = true, - $template = undef, - $content = undef, - $issue_template = undef, - $issue_content = undef, - $issue_net_template = undef, - $issue_net_content = undef, -) { - - if $template { - if $content { - warning('Both $template and $content parameters passed to motd, ignoring content') - } - $motd_content = template($template) - } elsif $content { - $motd_content = $content - } else { - $motd_content = template('motd/motd.erb') - } - - if $issue_template { - if $issue_content { - warning('Both $issue_template and $issue_content parameters passed to motd, ignoring issue_content') - } - $_issue_content = template($issue_template) - } elsif $issue_content { - $_issue_content = $issue_content - } else { - $_issue_content = false - } - - if $issue_net_template { - if $issue_net_content { - warning('Both $issue_net_template and $issue_net_content parameters passed to motd, ignoring issue_net_content') - } - $_issue_net_content = template($issue_net_template) - } elsif $issue_net_content { - $_issue_net_content = $issue_net_content - } else { - $_issue_net_content = false - } - - File { - mode => '0644', - } - - if ($::kernel == 'Linux') or ($::kernel == 'SunOS') { - file { '/etc/motd': - ensure => file, - backup => false, - content => $motd_content, - } - - if $_issue_content { - file { '/etc/issue': - ensure => file, - backup => false, - content => $_issue_content, - } - } - - if $_issue_net_content { - file { '/etc/issue.net': - ensure => file, - backup => false, - content => $_issue_net_content, - } - } - - if ($::osfamily == 'Debian') and ($dynamic_motd == false) { - if $::operatingsystem == 'Debian' and versioncmp($::operatingsystemmajrelease, '7') > 0 { - $_line_to_remove = 'session optional pam_motd.so motd=/run/motd.dynamic' - } elsif $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemmajrelease, '16.00') > 0 { - $_line_to_remove = 'session optional pam_motd.so motd=/run/motd.dynamic' - } else { - $_line_to_remove = 'session optional pam_motd.so motd=/run/motd.dynamic noupdate' - } - - file_line { 'dynamic_motd': - ensure => absent, - path => '/etc/pam.d/sshd', - line => $_line_to_remove, - } - } - } elsif $::kernel == 'windows' { - registry_value { 'HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\policies\system\legalnoticecaption': - ensure => present, - type => string, - data => 'Message of the day', - } - registry_value { 'HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\policies\system\legalnoticetext': - ensure => present, - type => string, - data => $motd_content, - } - } -} diff --git a/modules/motd/metadata.json b/modules/motd/metadata.json deleted file mode 100644 index f3f5b24..0000000 --- a/modules/motd/metadata.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "name": "puppetlabs-motd", - "version": "1.5.0", - "author": "puppetlabs", - "summary": "A simple module to demonstrate managing /etc/motd or Windows Logon Message as a template", - "license": "Apache-2.0", - "source": "https://github.com/puppetlabs/puppetlabs-motd", - "project_page": "https://github.com/puppetlabs/puppetlabs-motd", - "issues_url": "https://tickets.puppetlabs.com/browse/MODULES", - "dependencies": [ - { - "name": "puppetlabs/registry", - "version_requirement": ">= 1.0.0 < 2.0.0" - }, - { - "name": "puppetlabs/stdlib", - "version_requirement": ">= 2.1.0 < 5.0.0" - } - ], - "data_provider": null, - "description": "This module simply manages /etc/motd or the Windows Logon Message as a template, showing interpolation of system attributes", - "operatingsystem_support": [ - { - "operatingsystem": "RedHat", - "operatingsystemrelease": [ - "5", - "6", - "7" - ] - }, - { - "operatingsystem": "CentOS", - "operatingsystemrelease": [ - "5", - "6", - "7" - ] - }, - { - "operatingsystem": "OracleLinux", - "operatingsystemrelease": [ - "6", - "7" - ] - }, - { - "operatingsystem": "Scientific", - "operatingsystemrelease": [ - "5", - "6", - "7" - ] - }, - { - "operatingsystem": "Debian", - "operatingsystemrelease": [ - "7", - "8", - "9" - ] - }, - { - "operatingsystem": "Ubuntu", - "operatingsystemrelease": [ - "14.04", - "16.04" - ] - }, - { - "operatingsystem": "Windows", - "operatingsystemrelease": [ - "2008", - "2008 R2", - "2012", - "2012 R2" - ] - } - ], - "requirements": [ - { - "name": "puppet", - "version_requirement": ">= 4.7.0 < 6.0.0" - } - ] -} diff --git a/modules/motd/spec/acceptance/motd_spec.rb b/modules/motd/spec/acceptance/motd_spec.rb deleted file mode 100644 index fa85267..0000000 --- a/modules/motd/spec/acceptance/motd_spec.rb +++ /dev/null @@ -1,160 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'static message from content' do - it do - pp = <<-EOS - class { motd: - content => "Hello world!\n", - } - EOS - # Run it twice and test for idempotency - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - - if fact('osfamily') != 'windows' - describe file('/etc/motd') do - it { is_expected.to be_file } - it { should contain "Hello world!\n" } - end - end -end - -describe 'static message from template' do - it do - pp = <<-EOS - class { motd: - template => "motd/spec.erb", - } - EOS - # Run it twice and test for idempotency - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - - if fact('osfamily') != 'windows' - describe file('/etc/motd') do - it { is_expected.to be_file } - it { should contain "Test Template for Rspec" } - end - end -end - -describe 'static message from content in /etc/issue' do - it do - pp = <<-EOS - class { motd: - issue_content => "Hello world!\n", - content => "Hello world!\n", - } - EOS - # Run it twice and test for idempotency - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - - if fact('osfamily') != 'windows' - describe file('/etc/issue') do - it { is_expected.to be_file } - it { should contain "Hello world!\n" } - end - end -end - - -describe 'static message from template in /etc/issue' do - it do - pp = <<-EOS - class { motd: - issue_template => "motd/spec.erb", - content => "Hello world!\n", - } - EOS - # Run it twice and test for idempotency - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - - if fact('osfamily') != 'windows' - describe file('/etc/issue') do - it { is_expected.to be_file } - it { should contain "Test Template for Rspec" } - end - end -end - -describe 'static message from content in /etc/issue.net' do - it do - pp = <<-EOS - class { motd: - issue_net_content => "Hello world!\n", - content => "Hello world!\n", - } - EOS - # Run it twice and test for idempotency - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - - if fact('osfamily') != 'windows' - describe file('/etc/issue.net') do - it { is_expected.to be_file } - it { should contain "Hello world!\n" } - end - end -end - - -describe 'static message from template in /etc/issue.net' do - it do - pp = <<-EOS - class { motd: - issue_net_template => "motd/spec.erb", - content => "Hello world!\n", - } - EOS - # Run it twice and test for idempotency - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - - if fact('osfamily') != 'windows' - describe file('/etc/issue.net') do - it { is_expected.to be_file } - it { should contain "Test Template for Rspec" } - end - end -end - -describe 'disable dynamic motd settings on Debian', :if => fact('osfamily') == 'Debian' do - it do - pp = <<-EOS - class { motd: - dynamic_motd => false, - content => "Hello world!\n", - } - EOS - # Run it twice and test for idempotency - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - - describe file('/etc/motd') do - it { is_expected.to be_file } - it { should contain "Hello world!\n" } - end - - # Check that dynamic motd settings are unchanged on Debian. - if fact('osfamily') == 'Debian' - describe file('/etc/pam.d/sshd') do - its(:content) { should_not match /session optional pam_motd.so motd=\/run\/motd.dynamic/ } - end - end -end diff --git a/modules/motd/spec/acceptance/nodesets/centos-7-x64.yml b/modules/motd/spec/acceptance/nodesets/centos-7-x64.yml deleted file mode 100644 index 5eebdef..0000000 --- a/modules/motd/spec/acceptance/nodesets/centos-7-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-7-x64: - roles: - - agent - - default - platform: el-7-x86_64 - hypervisor: vagrant - box: puppetlabs/centos-7.2-64-nocm -CONFIG: - type: foss diff --git a/modules/motd/spec/acceptance/nodesets/debian-8-x64.yml b/modules/motd/spec/acceptance/nodesets/debian-8-x64.yml deleted file mode 100644 index fef6e63..0000000 --- a/modules/motd/spec/acceptance/nodesets/debian-8-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - debian-8-x64: - roles: - - agent - - default - platform: debian-8-amd64 - hypervisor: vagrant - box: puppetlabs/debian-8.2-64-nocm -CONFIG: - type: foss diff --git a/modules/motd/spec/acceptance/nodesets/default.yml b/modules/motd/spec/acceptance/nodesets/default.yml deleted file mode 100644 index 6f60231..0000000 --- a/modules/motd/spec/acceptance/nodesets/default.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -HOSTS: - windows2012-64-1: - pe_dir: - pe_ver: - pe_upgrade_dir: - pe_upgrade_ver: - hypervisor: vmpooler - platform: windows-2012-64 - ruby_arch: x64 - template: win-2012-x86_64 - roles: - - agent - - default -CONFIG: - nfs_server: none - consoleport: 443 - pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/modules/motd/spec/acceptance/nodesets/docker/centos-7.yml b/modules/motd/spec/acceptance/nodesets/docker/centos-7.yml deleted file mode 100644 index a3333aa..0000000 --- a/modules/motd/spec/acceptance/nodesets/docker/centos-7.yml +++ /dev/null @@ -1,12 +0,0 @@ -HOSTS: - centos-7-x64: - platform: el-7-x86_64 - hypervisor: docker - image: centos:7 - docker_preserve_image: true - docker_cmd: '["/usr/sbin/init"]' - # install various tools required to get the image up to usable levels - docker_image_commands: - - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts' -CONFIG: - trace_limit: 200 diff --git a/modules/motd/spec/acceptance/nodesets/docker/debian-8.yml b/modules/motd/spec/acceptance/nodesets/docker/debian-8.yml deleted file mode 100644 index df5c319..0000000 --- a/modules/motd/spec/acceptance/nodesets/docker/debian-8.yml +++ /dev/null @@ -1,11 +0,0 @@ -HOSTS: - debian-8-x64: - platform: debian-8-amd64 - hypervisor: docker - image: debian:8 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen' -CONFIG: - trace_limit: 200 diff --git a/modules/motd/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/modules/motd/spec/acceptance/nodesets/docker/ubuntu-14.04.yml deleted file mode 100644 index b1efa58..0000000 --- a/modules/motd/spec/acceptance/nodesets/docker/ubuntu-14.04.yml +++ /dev/null @@ -1,12 +0,0 @@ -HOSTS: - ubuntu-1404-x64: - platform: ubuntu-14.04-amd64 - hypervisor: docker - image: ubuntu:14.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - # ensure that upstart is booting correctly in the container - - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8' -CONFIG: - trace_limit: 200 diff --git a/modules/motd/spec/classes/motd_spec.rb b/modules/motd/spec/classes/motd_spec.rb deleted file mode 100644 index 8ee87a1..0000000 --- a/modules/motd/spec/classes/motd_spec.rb +++ /dev/null @@ -1,215 +0,0 @@ -require 'spec_helper' - -describe 'motd', type: :class do - describe 'On a non-linux system' do - let(:facts) { { kernel: 'Unknown' } } - it 'should not fail' do - expect do - subject - end.not_to raise_error - end - it { should_not contain_file('/etc/motd') } - it { should_not contain_file('/etc/issue') } - it { should_not contain_file('/etc/issue.net') } - end - - describe 'On Linux' do - let(:facts) do - { - kernel: 'Linux', - operatingsystem: 'TestOS', - operatingsystemrelease: 5, - osfamily: 'Debian', - architecture: 'x86_64', - processor0: 'intel awesome', - fqdn: 'test.example.com', - ipaddress: '123.23.243.1', - memoryfree: '1 KB' - } - end - context 'When neither template or source are specified' do - it do - should contain_File('/etc/motd').with( - ensure: 'file', - backup: 'false', - content: "TestOS 5 x86_64\n\nFQDN: test.example.com (123.23.243.1)\nProcessor: intel awesome\nKernel: Linux\nMemory Free: 1 KB\n" - ) - end - end - - context 'When both template and source are specified' do - let(:params) do - { - content: 'Hello!', - template: 'motd/spec.erb' - } - end - it do - should contain_File('/etc/motd').with( - ensure: 'file', - backup: 'false', - content: "Test Template for Rspec\n" - ) - end - end - - context 'When a source is specified' do - let(:params) { { content: 'Hello!' } } - it do - should contain_File('/etc/motd').with( - ensure: 'file', - backup: 'false', - content: 'Hello!' - ) - end - end - - context 'When an external template is specified' do - let(:params) { { template: 'motd/spec.erb' } } - it do - should contain_File('/etc/motd').with( - ensure: 'file', - backup: 'false', - content: "Test Template for Rspec\n" - ) - end - end - - context 'When a template is specified for /etc/issue' do - let(:params) { { issue_template: 'motd/spec.erb' } } - it do - should contain_File('/etc/issue').with( - ensure: 'file', - backup: 'false', - content: "Test Template for Rspec\n" - ) - end - end - - context 'When content is specified for /etc/issue' do - let(:params) { { issue_content: 'Hello!' } } - it do - should contain_File('/etc/issue').with( - ensure: 'file', - backup: 'false', - content: 'Hello!' - ) - end - end - - context 'When both content and template is specified for /etc/issue' do - # FIXME duplicate behaviour described in FM-5956 until I'm allowed to fix it - let(:params) do - { - issue_content: 'Hello!', - issue_template: 'motd/spec.erb' - } - end - it do - should contain_File('/etc/issue').with( - ensure: 'file', - backup: 'false', - content: "Test Template for Rspec\n" - ) - end - end - - context 'When a template is specified for /etc/issue.net' do - let(:params) { { issue_net_template: 'motd/spec.erb' } } - it do - should contain_File('/etc/issue.net').with( - ensure: 'file', - backup: 'false', - content: "Test Template for Rspec\n" - ) - end - end - - context 'When content is specified for /etc/issue.net' do - let(:params) { { issue_net_content: 'Hello!' } } - it do - should contain_File('/etc/issue.net').with( - ensure: 'file', - backup: 'false', - content: 'Hello!' - ) - end - end - - context 'When both content and template is specified for /etc/issue.net' do - # FIXME duplicate behaviour described in FM-5956 until I'm allowed to fix it - let(:params) do - { - issue_net_content: 'Hello!', - issue_net_template: 'motd/spec.erb' - } - end - it do - should contain_File('/etc/issue.net').with( - ensure: 'file', - backup: 'false', - content: "Test Template for Rspec\n" - ) - end - end - end - - describe 'On Debian based Operating Systems' do - let(:facts) do - { - kernel: 'Linux', - operatingsystem: 'Debian', - operatingsystemmajrelease: '7', - osfamily: 'Debian' - } - end - - context 'When dynamic motd is false' do - let(:params) { { dynamic_motd: false } } - it { should contain_file_line('dynamic_motd').with_line('session optional pam_motd.so motd=/run/motd.dynamic noupdate') } - end - - context 'When dynamic motd is true' do - let(:params) { { dynamic_motd: true } } - it { should_not contain_file_line('dynamic_motd') } - end - end - describe 'On Windows' do - let(:facts) do - { - kernel: 'windows', - operatingsystem: 'TestOS', - operatingsystemrelease: 5, - osfamily: 'windows', - architecture: 'x86_64', - processor0: 'intel awesome', - fqdn: 'test.example.com', - ipaddress: '123.23.243.1', - memoryfree: '1 KB' - } - end - context 'When neither template or source are specified' do - it do - should contain_Registry_value('HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\policies\system\legalnoticetext').with( - ensure: 'present', - type: 'string', - data: "TestOS 5 x86_64\n\nFQDN: test.example.com (123.23.243.1)\nProcessor: intel awesome\nKernel: windows\nMemory Free: 1 KB\n" - ) - end - end - context 'When content is specified' do - let(:params) do - { - content: 'Hello!' - } - end - it do - should contain_Registry_value('HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\policies\system\legalnoticetext').with( - ensure: 'present', - type: 'string', - data: 'Hello!' - ) - end - end - end -end diff --git a/modules/motd/spec/spec_helper.rb b/modules/motd/spec/spec_helper.rb deleted file mode 100644 index 05732d4..0000000 --- a/modules/motd/spec/spec_helper.rb +++ /dev/null @@ -1,16 +0,0 @@ -#This file is generated by ModuleSync, do not edit. -require 'puppetlabs_spec_helper/module_spec_helper' - -if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0 - RSpec.configure do |c| - c.before :each do - Puppet.settings[:strict] = :error - end - end -end - -# put local configuration and setup into spec_helper_local -begin - require 'spec_helper_local' -rescue LoadError -end diff --git a/modules/motd/spec/spec_helper_acceptance.rb b/modules/motd/spec/spec_helper_acceptance.rb deleted file mode 100644 index a679a03..0000000 --- a/modules/motd/spec/spec_helper_acceptance.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'beaker-rspec' -require 'beaker/puppet_install_helper' -require 'beaker/module_install_helper' - -run_puppet_install_helper -install_ca_certs unless ENV['PUPPET_INSTALL_TYPE'] =~ /pe/i -install_module_on(hosts) -install_module_dependencies_on(hosts) - -RSpec.configure do |c| - c.formatter = :documentation - - # Configure all nodes in nodeset - c.before :suite do - hosts.select { |host| host['platform'] =~ /windows/i }.each do |host| - on host, puppet('module','install','puppetlabs-registry') - end - end -end diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb deleted file mode 100644 index 902e575..0000000 --- a/modules/motd/templates/motd.erb +++ /dev/null @@ -1,6 +0,0 @@ -<%= @operatingsystem %> <%= @operatingsystemrelease %> <%= @architecture %> - -FQDN: <%= @fqdn %> (<%= @ipaddress %>) -Processor: <%= @processor0 %> -Kernel: <%= @kernel %> -Memory Free: <%= @memoryfree %> diff --git a/modules/motd/templates/spec.erb b/modules/motd/templates/spec.erb deleted file mode 100644 index c74f238..0000000 --- a/modules/motd/templates/spec.erb +++ /dev/null @@ -1 +0,0 @@ -Test Template for Rspec diff --git a/modules/motd/tests/README.md b/modules/motd/tests/README.md deleted file mode 100644 index 14697f5..0000000 --- a/modules/motd/tests/README.md +++ /dev/null @@ -1,54 +0,0 @@ -Test Levels -=========================== - -This folder contains tests at the acceptance and integration level for the "puppetlabs-motd" module. The unit -tests are in repository-level-folder/tests/beaker/tests directory. - -## Config Folder - -The "config" folder contains Beaker host configuration files for the various test platforms used by the test suites -under 'repository-level-fold/tests' directory. - -## File Folder - -The 'file' folder contains ERB template files used by the test suites under 'repository-level-fold/tests' directory. - -## Library Folder - -The "lib" folder contains Beaker helper library that assist in automated testing. - -## Pre-suite Folder - -The "pre-suite" folder contains Beaker pre-suite scripts for setting up environments for -'repository-level-folder/tests/beaker/tests' test suite. - -## Running Tests - -Included in the sub-folders is the "test_run_scripts" sub-folder for simple Bash scripts that will run suites of -Beaker tests. These scripts utilize environment variables for specifying test infrastructure. For security -reasons we do not provide examples from the Puppet Labs testing environment. Hopefully in the near future we will -be able to provide necessary infrastructure to the community to allow for contributors to run the test. - -### Running Tests - -To run tests use the "run_test_with_ankeny.sh" test run script. - -**Example: Run with RHEL6** -``` -./run_test_with_ankeny.sh redhat-6-64mda -``` - -**Example: Run with RHEL7** -``` -./run_test_with_ankeny.sh redhat-7-64mda -``` - -**Example: Run with UBUNTU 12.04** -``` -./run_test_with_ankeny.sh ubuntu-1204-64mda -``` - -**Example: Run with UBUNTU 14.04** -``` -./run_test_with_ankeny.sh ubuntu-1404-64mda -``` diff --git a/modules/motd/tests/beaker/config/redhat-6-64mda b/modules/motd/tests/beaker/config/redhat-6-64mda deleted file mode 100644 index a2c0786..0000000 --- a/modules/motd/tests/beaker/config/redhat-6-64mda +++ /dev/null @@ -1,23 +0,0 @@ -HOSTS: - redhat-6-x86_64: - roles: - - master - - dashboard - - database - - agent - platform: el-6-x86_64 - template: redhat-6-x86_64 - hypervisor: vcloud - redhat-6-x86_64-agent: - roles: - - agent - platform: el-6-x86_64 - template: redhat-6-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/modules/motd/tests/beaker/config/redhat-7-64mda b/modules/motd/tests/beaker/config/redhat-7-64mda deleted file mode 100644 index d7bac46..0000000 --- a/modules/motd/tests/beaker/config/redhat-7-64mda +++ /dev/null @@ -1,23 +0,0 @@ -HOSTS: - redhat-7-x86_64: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud - redhat-7-x86_64-agent: - roles: - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/modules/motd/tests/beaker/config/ubuntu-1204-64mda b/modules/motd/tests/beaker/config/ubuntu-1204-64mda deleted file mode 100644 index e18d692..0000000 --- a/modules/motd/tests/beaker/config/ubuntu-1204-64mda +++ /dev/null @@ -1,23 +0,0 @@ -HOSTS: - ubuntu-1204-amd64: - roles: - - master - - dashboard - - database - - agent - platform: ubuntu-12.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64 - hypervisor: vcloud - ubuntu-1204-agent: - roles: - - agent - platform: ubuntu-12.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/modules/motd/tests/beaker/config/ubuntu-1404-64mda b/modules/motd/tests/beaker/config/ubuntu-1404-64mda deleted file mode 100644 index 680c1ff..0000000 --- a/modules/motd/tests/beaker/config/ubuntu-1404-64mda +++ /dev/null @@ -1,23 +0,0 @@ -HOSTS: - ubuntu-1404-amd64: - roles: - - master - - dashboard - - database - - agent - platform: ubuntu-14.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1404-x86_64 - hypervisor: vcloud - ubuntu-1404-agent: - roles: - - agent - platform: ubuntu-14.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1404-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/modules/motd/tests/beaker/pre-suite/00_pe_install.rb b/modules/motd/tests/beaker/pre-suite/00_pe_install.rb deleted file mode 100755 index 2093b20..0000000 --- a/modules/motd/tests/beaker/pre-suite/00_pe_install.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'master_manipulator' -test_name 'FM-3918 - C61700 - Install Puppet Enterprise' - -# Init -step 'Install PE' -install_pe - -step 'Disable Node Classifier' -disable_node_classifier(master) - -step 'Disable Environment Caching' -disable_env_cache(master) - -step 'Restart Puppet Server' -restart_puppet_server(master) diff --git a/modules/motd/tests/beaker/pre-suite/01_motd_module_install.rb b/modules/motd/tests/beaker/pre-suite/01_motd_module_install.rb deleted file mode 100755 index 4516a3b..0000000 --- a/modules/motd/tests/beaker/pre-suite/01_motd_module_install.rb +++ /dev/null @@ -1,9 +0,0 @@ -test_name 'FM-3918 - C95871 - Install MOTD module' - -step 'Install MOTD Module' -proj_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../')) -staging = { :module_name => 'puppetlabs-motd' } -local = { :module_name => 'motd', :source => proj_root, :target_module_path => master['distmoduledir'] } - -# in CI install from staging forge, otherwise from local -install_dev_puppet_module_on(master, options[:forge_host] ? staging : local) diff --git a/modules/motd/tests/beaker/test_run_scripts/run_test_with_ankeny.sh b/modules/motd/tests/beaker/test_run_scripts/run_test_with_ankeny.sh deleted file mode 100755 index efeadbd..0000000 --- a/modules/motd/tests/beaker/test_run_scripts/run_test_with_ankeny.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Work-around for RE-5005 -export SSL_CERT_FILE=/usr/local/etc/openssl/cert.pem - -export pe_dist_dir="http://enterprise.delivery.puppetlabs.net/2015.3/ci-ready" - -export GEM_SOURCE=http://rubygems.delivery.puppetlabs.net - -bundle install --without build development test --path .bundle/gems - -bundle exec beaker \ - --preserve-host onfail\ - --host ../config/$1 \ - --debug \ - --pre-suite ../pre-suite \ - --tests ../tests \ - --keyfile ~/.ssh/id_rsa-acceptance \ - --load-path lib diff --git a/modules/motd/tests/beaker/tests/01_create_motd_content.rb b/modules/motd/tests/beaker/tests/01_create_motd_content.rb deleted file mode 100755 index 431038a..0000000 --- a/modules/motd/tests/beaker/tests/01_create_motd_content.rb +++ /dev/null @@ -1,30 +0,0 @@ -require 'master_manipulator' - -test_name 'FM-3918 - C95873 - Create /etc/motd file with content parameter' - -pp = <<-EOS -class { 'motd': - content => 'Hello, this is the /etc/motd file content generated by a beaker test\n', -} -include motd -EOS - -step 'Inject "site.pp" on Master' -site_pp = create_site_pp(master, :manifest => pp) -inject_site_pp(master, get_site_pp_path(master), site_pp) - -step 'Run Puppet Agent to apply the above manifest' -confine_block(:except, :roles => %w{master dashboard database}) do - agents.each do |agent| - on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result| - assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!') - end - step 'Verify the content of motd file:' - if fact_on(agent, 'osfamily') != 'Windows' - file_content = on(agent, "cat /etc/motd").stdout.strip - if file_content != "Hello, this is the /etc/motd file content generated by a beaker test" - fail_test "/etc/motd file content is empty or mismatch" - end - end - end -end diff --git a/modules/profile/manifests/base.pp b/modules/profile/manifests/base.pp deleted file mode 100644 index e22fb2e..0000000 --- a/modules/profile/manifests/base.pp +++ /dev/null @@ -1,6 +0,0 @@ -#profile/manifests/base.pp - - -class profile::base{ - include motd -} diff --git a/modules/role/manifests/default.pp b/modules/role/manifests/default.pp deleted file mode 100644 index 90d522d..0000000 --- a/modules/role/manifests/default.pp +++ /dev/null @@ -1,9 +0,0 @@ -#role/manifests/default.pp - - - -class role::defaut{ - - include profile::base - -}