From fdeb28e2469da3781fac0441eeaf41b4cd26f53a Mon Sep 17 00:00:00 2001 From: ts Date: Tue, 9 Oct 2018 09:09:10 +0100 Subject: [PATCH] Stretch update merge: mysql & php for stretch, module conflicts and general cleanup --- lib/schemas/vulnerability_metadata_schema.xsd | 1 + lib/templates/Vagrantfile.erb | 2 +- .../mysql/CHANGELOG.md | 66 +- .../mysql_stretch_compatible/mysql/Gemfile | 94 +- .../mysql_stretch_compatible/mysql/HISTORY.md | 894 ++++++ .../mysql_stretch_compatible/mysql/README.md | 926 +----- .../mysql/REFERENCE.md | 1180 +++++++ .../mysql_stretch_compatible/mysql/Rakefile | 74 +- .../mysql/checksums.json | 137 + .../mysql/examples/mysql_plugin.pp | 4 +- .../mysql/examples/mysql_user.pp | 8 +- .../mysql/lib/facter/mysqld_version.rb | 2 +- .../lib/puppet/functions/mysql/deepmerge.rb | 66 + .../lib/puppet/functions/mysql/dirname.rb | 20 + .../lib/puppet/functions/mysql/password.rb | 21 + .../lib/puppet/functions/mysql/strip_hash.rb | 19 + .../parser/functions/mysql_deepmerge.rb | 13 +- .../puppet/parser/functions/mysql_dirname.rb | 10 +- .../puppet/parser/functions/mysql_password.rb | 9 +- .../mysql/lib/puppet/provider/mysql.rb | 10 +- .../puppet/provider/mysql_datadir/mysql.rb | 6 +- .../lib/puppet/provider/mysql_user/mysql.rb | 22 +- .../mysql/lib/puppet/type/mysql_database.rb | 7 +- .../mysql/lib/puppet/type/mysql_datadir.rb | 7 +- .../mysql/lib/puppet/type/mysql_grant.rb | 8 +- .../mysql/lib/puppet/type/mysql_plugin.rb | 11 +- .../mysql/lib/puppet/type/mysql_user.rb | 7 +- .../mysql/manifests/backup/mysqlbackup.pp | 10 +- .../mysql/manifests/backup/mysqldump.pp | 7 +- .../mysql/manifests/backup/xtrabackup.pp | 11 +- .../mysql/manifests/bindings.pp | 70 +- .../mysql/manifests/bindings/client_dev.pp | 6 +- .../mysql/manifests/bindings/daemon_dev.pp | 6 +- .../mysql/manifests/bindings/java.pp | 6 +- .../mysql/manifests/bindings/perl.pp | 6 +- .../mysql/manifests/bindings/php.pp | 6 +- .../mysql/manifests/bindings/python.pp | 6 +- .../mysql/manifests/bindings/ruby.pp | 6 +- .../mysql/manifests/client.pp | 20 + .../mysql/manifests/client/install.pp | 6 +- .../mysql/manifests/db.pp | 49 +- .../mysql/manifests/params.pp | 49 +- .../mysql/manifests/server.pp | 69 +- .../manifests/server/account_security.pp | 6 +- .../mysql/manifests/server/backup.pp | 58 +- .../mysql/manifests/server/binarylog.pp | 8 +- .../mysql/manifests/server/config.pp | 12 +- .../mysql/manifests/server/install.pp | 4 + .../mysql/manifests/server/installdb.pp | 4 + .../mysql/manifests/server/monitor.pp | 13 +- .../mysql/manifests/server/mysqltuner.pp | 11 + .../mysql/manifests/server/providers.pp | 8 +- .../mysql/manifests/server/root_password.pp | 6 +- .../mysql/manifests/server/service.pp | 4 + .../mysql/metadata.json | 21 +- .../mysql_stretch_compatible/mysql/mysql.pp | 3 +- .../mysql/readmes/README_ja_JP.md | 983 +----- .../mysql/readmes/REFERENCE_ja_JP.md | 1180 +++++++ .../mysql/spec/acceptance/locales_spec.rb | 22 +- .../spec/acceptance/mysql_backup_spec.rb | 14 +- .../mysql/spec/acceptance/mysql_helper.rb | 2 +- .../spec/acceptance/mysql_server_spec.rb | 16 +- .../mysql/spec/acceptance/sql_task_spec.rb | 2 +- .../acceptance/types/mysql_database_spec.rb | 8 +- .../spec/acceptance/types/mysql_grant_spec.rb | 54 +- .../acceptance/types/mysql_plugin_spec.rb | 19 +- .../spec/acceptance/types/mysql_user_spec.rb | 14 +- .../mysql/spec/classes/mycnf_template_spec.rb | 2 +- .../mysql/spec/classes/mysql_bindings_spec.rb | 1 + .../mysql/spec/classes/mysql_client_spec.rb | 1 + .../spec/classes/mysql_server_monitor_spec.rb | 2 +- .../mysql/spec/classes/mysql_server_spec.rb | 4 +- .../mysql/spec/default_facts.yml | 2 +- .../mysql/spec/defines/mysql_db_spec.rb | 12 +- .../spec/functions/mysql_deepmerge_spec.rb | 94 + .../spec/functions/mysql_dirname_spec.rb | 19 + .../spec/functions/mysql_password_spec.rb | 27 + .../spec/functions/mysql_strip_hash_spec.rb | 27 + .../mysql/spec/spec_helper.rb | 21 + .../mysql/spec/spec_helper_acceptance.rb | 17 +- .../spec/unit/facter/mysqld_version_spec.rb | 2 +- .../puppet/functions/mysql_deepmerge_spec.rb | 6 +- .../puppet/functions/mysql_password_spec.rb | 4 +- .../provider/mysql_database/mysql_spec.rb | 3 +- .../puppet/provider/mysql_user/mysql_spec.rb | 13 +- .../spec/unit/puppet/type/mysql_grant_spec.rb | 4 +- .../spec/unit/puppet/type/mysql_user_spec.rb | 5 + .../mysql/templates/mysqlbackup.sh.erb | 11 + .../apache/CHANGELOG.md | 0 .../apache/CONTRIBUTING.md | 0 .../apache/Gemfile | 0 .../apache/LICENSE | 0 .../apache/MAINTAINERS.md | 0 .../apache/NOTICE | 0 .../apache/README.md | 0 .../apache/Rakefile | 0 .../apache/apache.pp | 0 .../apache/checksums.json | 0 .../apache/examples/apache.pp | 0 .../apache/examples/dev.pp | 0 .../apache/examples/init.pp | 0 .../apache/examples/mod_load_params.pp | 0 .../apache/examples/mods.pp | 0 .../apache/examples/mods_custom.pp | 0 .../apache/examples/php.pp | 0 .../apache/examples/vhost.pp | 0 .../apache/examples/vhost_directories.pp | 0 .../apache/examples/vhost_filter.pp | 0 .../apache/examples/vhost_ip_based.pp | 0 .../apache/examples/vhost_proxypass.pp | 0 .../apache/examples/vhost_ssl.pp | 0 .../apache/examples/vhosts_without_listen.pp | 0 .../apache/files/httpd | 0 .../apache/lib/facter/apache_version.rb | 0 .../lib/puppet/parser/functions/bool2httpd.rb | 0 .../functions/validate_apache_log_level.rb | 0 .../apache/lib/puppet/provider/a2mod.rb | 0 .../apache/lib/puppet/provider/a2mod/a2mod.rb | 0 .../lib/puppet/provider/a2mod/gentoo.rb | 0 .../lib/puppet/provider/a2mod/modfix.rb | 0 .../lib/puppet/provider/a2mod/redhat.rb | 0 .../apache/lib/puppet/type/a2mod.rb | 0 .../apache/locales/config.yaml | 0 .../apache/locales/puppetlabs-apache.pot | 0 .../apache/manifests/balancer.pp | 0 .../apache/manifests/balancermember.pp | 0 .../apache/manifests/confd/no_accf.pp | 0 .../apache/manifests/custom_config.pp | 0 .../apache/manifests/default_confd_files.pp | 0 .../apache/manifests/default_mods.pp | 0 .../apache/manifests/default_mods/load.pp | 0 .../apache/manifests/dev.pp | 0 .../apache/manifests/fastcgi/server.pp | 0 .../apache/manifests/init.pp | 0 .../apache/manifests/listen.pp | 0 .../apache/manifests/mod.pp | 0 .../apache/manifests/mod/actions.pp | 0 .../apache/manifests/mod/alias.pp | 0 .../apache/manifests/mod/auth_basic.pp | 0 .../apache/manifests/mod/auth_cas.pp | 0 .../apache/manifests/mod/auth_kerb.pp | 0 .../apache/manifests/mod/auth_mellon.pp | 0 .../apache/manifests/mod/authn_core.pp | 0 .../apache/manifests/mod/authn_dbd.pp | 0 .../apache/manifests/mod/authn_file.pp | 0 .../apache/manifests/mod/authnz_ldap.pp | 0 .../apache/manifests/mod/authnz_pam.pp | 0 .../apache/manifests/mod/authz_default.pp | 0 .../apache/manifests/mod/authz_user.pp | 0 .../apache/manifests/mod/autoindex.pp | 0 .../apache/manifests/mod/cache.pp | 0 .../apache/manifests/mod/cgi.pp | 0 .../apache/manifests/mod/cgid.pp | 0 .../apache/manifests/mod/cluster.pp | 0 .../apache/manifests/mod/dav.pp | 0 .../apache/manifests/mod/dav_fs.pp | 0 .../apache/manifests/mod/dav_svn.pp | 0 .../apache/manifests/mod/dbd.pp | 0 .../apache/manifests/mod/deflate.pp | 0 .../apache/manifests/mod/dev.pp | 0 .../apache/manifests/mod/dir.pp | 0 .../apache/manifests/mod/disk_cache.pp | 0 .../apache/manifests/mod/dumpio.pp | 0 .../apache/manifests/mod/env.pp | 0 .../apache/manifests/mod/event.pp | 0 .../apache/manifests/mod/expires.pp | 0 .../apache/manifests/mod/ext_filter.pp | 0 .../apache/manifests/mod/fastcgi.pp | 0 .../apache/manifests/mod/fcgid.pp | 0 .../apache/manifests/mod/filter.pp | 0 .../apache/manifests/mod/geoip.pp | 0 .../apache/manifests/mod/headers.pp | 0 .../apache/manifests/mod/include.pp | 0 .../apache/manifests/mod/info.pp | 0 .../manifests/mod/intercept_form_submit.pp | 0 .../apache/manifests/mod/itk.pp | 0 .../apache/manifests/mod/ldap.pp | 0 .../apache/manifests/mod/lookup_identity.pp | 0 .../apache/manifests/mod/mime.pp | 0 .../apache/manifests/mod/mime_magic.pp | 0 .../apache/manifests/mod/negotiation.pp | 0 .../apache/manifests/mod/nss.pp | 0 .../apache/manifests/mod/pagespeed.pp | 0 .../apache/manifests/mod/passenger.pp | 0 .../apache/manifests/mod/perl.pp | 0 .../apache/manifests/mod/peruser.pp | 0 .../apache/manifests/mod/php.pp | 0 .../apache/manifests/mod/prefork.pp | 0 .../apache/manifests/mod/proxy.pp | 0 .../apache/manifests/mod/proxy_ajp.pp | 0 .../apache/manifests/mod/proxy_balancer.pp | 0 .../apache/manifests/mod/proxy_connect.pp | 0 .../apache/manifests/mod/proxy_fcgi.pp | 0 .../apache/manifests/mod/proxy_html.pp | 0 .../apache/manifests/mod/proxy_http.pp | 0 .../apache/manifests/mod/proxy_wstunnel.pp | 0 .../apache/manifests/mod/python.pp | 0 .../apache/manifests/mod/remoteip.pp | 0 .../apache/manifests/mod/reqtimeout.pp | 0 .../apache/manifests/mod/rewrite.pp | 0 .../apache/manifests/mod/rpaf.pp | 0 .../apache/manifests/mod/security.pp | 0 .../apache/manifests/mod/setenvif.pp | 0 .../apache/manifests/mod/shib.pp | 0 .../apache/manifests/mod/socache_shmcb.pp | 0 .../apache/manifests/mod/speling.pp | 0 .../apache/manifests/mod/ssl.pp | 0 .../apache/manifests/mod/status.pp | 0 .../apache/manifests/mod/suexec.pp | 0 .../apache/manifests/mod/suphp.pp | 0 .../apache/manifests/mod/userdir.pp | 0 .../apache/manifests/mod/version.pp | 0 .../apache/manifests/mod/vhost_alias.pp | 0 .../apache/manifests/mod/worker.pp | 0 .../apache/manifests/mod/wsgi.pp | 0 .../apache/manifests/mod/xsendfile.pp | 0 .../apache/manifests/mpm.pp | 0 .../apache/manifests/namevirtualhost.pp | 0 .../apache/manifests/package.pp | 0 .../apache/manifests/params.pp | 0 .../apache/manifests/peruser/multiplexer.pp | 0 .../apache/manifests/peruser/processor.pp | 0 .../apache/manifests/php.pp | 0 .../apache/manifests/proxy.pp | 0 .../apache/manifests/python.pp | 0 .../apache/manifests/security/rule_link.pp | 0 .../apache/manifests/service.pp | 0 .../apache/manifests/ssl.pp | 0 .../apache/manifests/version.pp | 0 .../apache/manifests/vhost.pp | 0 .../apache/manifests/vhost/custom.pp | 0 .../apache/manifests/vhosts.pp | 0 .../apache/metadata.json | 0 .../apache/secgen_metadata.xml | 2 +- .../spec/acceptance/apache_parameters_spec.rb | 0 .../apache/spec/acceptance/apache_ssl_spec.rb | 0 .../apache/spec/acceptance/class_spec.rb | 0 .../spec/acceptance/custom_config_spec.rb | 0 .../spec/acceptance/default_mods_spec.rb | 0 .../apache/spec/acceptance/itk_spec.rb | 0 .../spec/acceptance/mod_dav_svn_spec.rb | 0 .../spec/acceptance/mod_deflate_spec.rb | 0 .../apache/spec/acceptance/mod_fcgid_spec.rb | 0 .../apache/spec/acceptance/mod_mime_spec.rb | 0 .../spec/acceptance/mod_negotiation_spec.rb | 0 .../spec/acceptance/mod_pagespeed_spec.rb | 0 .../spec/acceptance/mod_passenger_spec.rb | 0 .../apache/spec/acceptance/mod_php_spec.rb | 0 .../spec/acceptance/mod_proxy_html_spec.rb | 0 .../spec/acceptance/mod_security_spec.rb | 0 .../apache/spec/acceptance/mod_suphp_spec.rb | 0 .../spec/acceptance/nodesets/centos-7-x64.yml | 0 .../spec/acceptance/nodesets/debian-8-x64.yml | 0 .../spec/acceptance/nodesets/default.yml | 0 .../acceptance/nodesets/docker/centos-7.yml | 0 .../acceptance/nodesets/docker/debian-8.yml | 0 .../nodesets/docker/ubuntu-14.04.yml | 0 .../apache/spec/acceptance/nodesets/suse.yml | 0 .../spec/acceptance/prefork_worker_spec.rb | 0 .../apache/spec/acceptance/service_spec.rb | 0 .../apache/spec/acceptance/version.rb | 0 .../apache/spec/acceptance/vhost_spec.rb | 0 .../apache/spec/acceptance/vhosts_spec.rb | 0 .../apache/spec/classes/apache_spec.rb | 0 .../apache/spec/classes/dev_spec.rb | 0 .../apache/spec/classes/mod/alias_spec.rb | 0 .../apache/spec/classes/mod/auth_cas_spec.rb | 0 .../apache/spec/classes/mod/auth_kerb_spec.rb | 0 .../spec/classes/mod/auth_mellon_spec.rb | 0 .../apache/spec/classes/mod/authn_dbd_spec.rb | 0 .../spec/classes/mod/authnz_ldap_spec.rb | 0 .../spec/classes/mod/authnz_pam_spec.rb | 0 .../apache/spec/classes/mod/cluster_spec.rb | 0 .../apache/spec/classes/mod/dav_svn_spec.rb | 0 .../apache/spec/classes/mod/deflate_spec.rb | 0 .../apache/spec/classes/mod/dev_spec.rb | 0 .../apache/spec/classes/mod/dir_spec.rb | 0 .../spec/classes/mod/disk_cache_spec.rb | 0 .../apache/spec/classes/mod/dumpio_spec.rb | 0 .../apache/spec/classes/mod/event_spec.rb | 0 .../apache/spec/classes/mod/expires_spec.rb | 0 .../spec/classes/mod/ext_filter_spec.rb | 0 .../apache/spec/classes/mod/fastcgi_spec.rb | 0 .../apache/spec/classes/mod/fcgid_spec.rb | 0 .../apache/spec/classes/mod/info_spec.rb | 0 .../classes/mod/intercept_form_submit_spec.rb | 0 .../apache/spec/classes/mod/itk_spec.rb | 0 .../apache/spec/classes/mod/ldap_spec.rb | 0 .../spec/classes/mod/lookup_identity.rb | 0 .../spec/classes/mod/mime_magic_spec.rb | 0 .../apache/spec/classes/mod/mime_spec.rb | 0 .../spec/classes/mod/negotiation_spec.rb | 0 .../apache/spec/classes/mod/pagespeed_spec.rb | 0 .../apache/spec/classes/mod/passenger_spec.rb | 0 .../apache/spec/classes/mod/perl_spec.rb | 0 .../apache/spec/classes/mod/peruser_spec.rb | 0 .../apache/spec/classes/mod/php_spec.rb | 0 .../apache/spec/classes/mod/prefork_spec.rb | 0 .../spec/classes/mod/proxy_balancer_spec.rb | 0 .../spec/classes/mod/proxy_connect_spec.rb | 0 .../spec/classes/mod/proxy_html_spec.rb | 0 .../apache/spec/classes/mod/proxy_wstunnel.rb | 0 .../apache/spec/classes/mod/python_spec.rb | 0 .../apache/spec/classes/mod/remoteip_spec.rb | 0 .../spec/classes/mod/reqtimeout_spec.rb | 0 .../apache/spec/classes/mod/rpaf_spec.rb | 0 .../apache/spec/classes/mod/security_spec.rb | 0 .../apache/spec/classes/mod/shib_spec.rb | 0 .../apache/spec/classes/mod/speling_spec.rb | 0 .../apache/spec/classes/mod/ssl_spec.rb | 0 .../apache/spec/classes/mod/status_spec.rb | 0 .../apache/spec/classes/mod/suphp_spec.rb | 0 .../apache/spec/classes/mod/userdir_spec.rb | 0 .../apache/spec/classes/mod/worker_spec.rb | 0 .../apache/spec/classes/mod/wsgi_spec.rb | 0 .../apache/spec/classes/params_spec.rb | 0 .../apache/spec/classes/service_spec.rb | 0 .../apache/spec/classes/vhosts_spec.rb | 0 .../apache/spec/defines/balancer_spec.rb | 0 .../spec/defines/balancermember_spec.rb | 0 .../apache/spec/defines/custom_config_spec.rb | 0 .../spec/defines/fastcgi_server_spec.rb | 0 .../apache/spec/defines/mod_spec.rb | 0 .../apache/spec/defines/modsec_link_spec.rb | 0 .../apache/spec/defines/vhost_custom_spec.rb | 0 .../apache/spec/defines/vhost_spec.rb | 0 .../spec/fixtures/files/negotiation.conf | 0 .../apache/spec/fixtures/files/spec | 0 .../site_apache/templates/fake.conf.erb | 0 .../fixtures/templates/negotiation.conf.erb | 0 .../apache/spec/spec_helper.rb | 0 .../apache/spec/spec_helper_acceptance.rb | 0 .../apache/spec/spec_helper_local.rb | 0 .../apache/spec/unit/apache_version_spec.rb | 0 .../spec/unit/provider/a2mod/gentoo_spec.rb | 0 .../parser/functions/bool2httpd_spec.rb | 0 .../functions/validate_apache_log_level.rb | 0 .../apache/templates/confd/no-accf.conf.erb | 0 .../apache/templates/fastcgi/server.erb | 0 .../apache/templates/httpd.conf.erb | 0 .../apache/templates/listen.erb | 0 .../apache/templates/mod/alias.conf.erb | 0 .../apache/templates/mod/auth_cas.conf.erb | 0 .../apache/templates/mod/auth_mellon.conf.erb | 0 .../apache/templates/mod/authn_dbd.conf.erb | 0 .../apache/templates/mod/authnz_ldap.conf.erb | 0 .../apache/templates/mod/autoindex.conf.erb | 0 .../apache/templates/mod/cgid.conf.erb | 0 .../apache/templates/mod/cluster.conf.erb | 0 .../apache/templates/mod/dav_fs.conf.erb | 0 .../apache/templates/mod/deflate.conf.erb | 0 .../apache/templates/mod/dir.conf.erb | 0 .../apache/templates/mod/disk_cache.conf.erb | 0 .../apache/templates/mod/dumpio.conf.erb | 0 .../apache/templates/mod/event.conf.erb | 0 .../apache/templates/mod/expires.conf.erb | 0 .../apache/templates/mod/ext_filter.conf.erb | 0 .../apache/templates/mod/fastcgi.conf.erb | 0 .../apache/templates/mod/fcgid.conf.erb | 0 .../apache/templates/mod/geoip.conf.erb | 0 .../apache/templates/mod/info.conf.erb | 0 .../apache/templates/mod/itk.conf.erb | 0 .../apache/templates/mod/ldap.conf.erb | 0 .../apache/templates/mod/load.erb | 0 .../apache/templates/mod/mime.conf.erb | 0 .../apache/templates/mod/mime_magic.conf.erb | 0 .../apache/templates/mod/mpm_event.conf.erb | 0 .../apache/templates/mod/negotiation.conf.erb | 0 .../apache/templates/mod/nss.conf.erb | 0 .../apache/templates/mod/pagespeed.conf.erb | 0 .../apache/templates/mod/passenger.conf.erb | 0 .../apache/templates/mod/peruser.conf.erb | 0 .../apache/templates/mod/php.conf.erb | 0 .../apache/templates/mod/prefork.conf.erb | 0 .../apache/templates/mod/proxy.conf.erb | 0 .../templates/mod/proxy_balancer.conf.erb | 0 .../apache/templates/mod/proxy_html.conf.erb | 0 .../apache/templates/mod/remoteip.conf.erb | 0 .../apache/templates/mod/reqtimeout.conf.erb | 0 .../apache/templates/mod/rpaf.conf.erb | 0 .../apache/templates/mod/security.conf.erb | 0 .../templates/mod/security_crs.conf.erb | 0 .../apache/templates/mod/setenvif.conf.erb | 0 .../apache/templates/mod/ssl.conf.erb | 0 .../apache/templates/mod/status.conf.erb | 0 .../apache/templates/mod/suphp.conf.erb | 0 .../apache/templates/mod/userdir.conf.erb | 0 .../apache/templates/mod/worker.conf.erb | 0 .../apache/templates/mod/wsgi.conf.erb | 0 .../apache/templates/namevirtualhost.erb | 0 .../apache/templates/ports_header.erb | 0 .../apache/templates/vhost/_access_log.erb | 0 .../apache/templates/vhost/_action.erb | 0 .../templates/vhost/_additional_includes.erb | 0 .../apache/templates/vhost/_aliases.erb | 0 .../vhost/_allow_encoded_slashes.erb | 0 .../apache/templates/vhost/_auth_cas.erb | 0 .../apache/templates/vhost/_auth_kerb.erb | 0 .../apache/templates/vhost/_block.erb | 0 .../apache/templates/vhost/_charsets.erb | 0 .../templates/vhost/_custom_fragment.erb | 0 .../apache/templates/vhost/_directories.erb | 0 .../apache/templates/vhost/_docroot.erb | 0 .../templates/vhost/_error_document.erb | 0 .../templates/vhost/_fallbackresource.erb | 0 .../apache/templates/vhost/_fastcgi.erb | 0 .../apache/templates/vhost/_file_footer.erb | 0 .../apache/templates/vhost/_file_header.erb | 0 .../apache/templates/vhost/_filters.erb | 0 .../apache/templates/vhost/_header.erb | 0 .../vhost/_http_protocol_options.erb | 0 .../apache/templates/vhost/_itk.erb | 0 .../apache/templates/vhost/_jk_mounts.erb | 0 .../templates/vhost/_keepalive_options.erb | 0 .../apache/templates/vhost/_logging.erb | 0 .../apache/templates/vhost/_passenger.erb | 0 .../templates/vhost/_passenger_base_uris.erb | 0 .../apache/templates/vhost/_php.erb | 0 .../apache/templates/vhost/_php_admin.erb | 0 .../apache/templates/vhost/_proxy.erb | 0 .../apache/templates/vhost/_rack.erb | 0 .../apache/templates/vhost/_redirect.erb | 0 .../apache/templates/vhost/_requestheader.erb | 0 .../apache/templates/vhost/_require.erb | 0 .../apache/templates/vhost/_rewrite.erb | 0 .../apache/templates/vhost/_scriptalias.erb | 0 .../apache/templates/vhost/_security.erb | 0 .../apache/templates/vhost/_serveralias.erb | 0 .../templates/vhost/_serversignature.erb | 0 .../apache/templates/vhost/_setenv.erb | 0 .../apache/templates/vhost/_ssl.erb | 0 .../apache/templates/vhost/_sslproxy.erb | 0 .../apache/templates/vhost/_suexec.erb | 0 .../apache/templates/vhost/_suphp.erb | 0 .../apache/templates/vhost/_wsgi.erb | 0 .../unix/irc/irc2/secgen_metadata.xml | 2 +- .../unix/irc/unrealirc/manifests/install.pp | 5 +- .../unix/irc/unrealirc/secgen_metadata.xml | 4 + .../monitoring_ids/snort/secgen_metadata.xml | 2 +- .../php/docs/Puppet/Parser/Functions.html | 105 - .../unix/web_frameworks/php/docs/_index.html | 369 --- .../web_frameworks/php/docs/css/common.css | 8 - .../web_frameworks/php/docs/css/full_list.css | 58 - .../web_frameworks/php/docs/css/style.css | 492 --- .../web_frameworks/php/docs/file.README.html | 340 -- .../unix/web_frameworks/php/docs/frames.html | 17 - .../unix/web_frameworks/php/docs/index.html | 340 -- .../unix/web_frameworks/php/docs/js/app.js | 248 -- .../web_frameworks/php/docs/js/full_list.js | 216 -- .../unix/web_frameworks/php/docs/js/jquery.js | 4 - .../php/docs/puppet_class_list.html | 209 -- .../php/docs/puppet_classes/php.html | 906 ------ .../php_3A_3Aapache_config.html | 182 -- .../php/docs/puppet_classes/php_3A_3Acli.html | 182 -- .../puppet_classes/php_3A_3Acomposer.html | 302 -- .../php_3A_3Acomposer_3A_3Aauto_update.html | 246 -- .../php/docs/puppet_classes/php_3A_3Adev.html | 216 -- .../puppet_classes/php_3A_3Aembedded.html | 244 -- .../php/docs/puppet_classes/php_3A_3Afpm.html | 482 --- .../php_3A_3Afpm_3A_3Aconfig.html | 596 ---- .../php_3A_3Afpm_3A_3Aservice.html | 245 -- .../docs/puppet_classes/php_3A_3Aglobal.html | 175 -- .../docs/puppet_classes/php_3A_3Aglobals.html | 384 --- .../puppet_classes/php_3A_3Apackages.html | 232 -- .../docs/puppet_classes/php_3A_3Aparams.html | 490 --- .../docs/puppet_classes/php_3A_3Apear.html | 258 -- .../docs/puppet_classes/php_3A_3Aphpunit.html | 248 -- .../php_3A_3Aphpunit_3A_3Aauto_update.html | 189 -- .../docs/puppet_classes/php_3A_3Arepo.html | 169 - .../php_3A_3Arepo_3A_3Adebian.html | 312 -- .../php_3A_3Arepo_3A_3Aredhat.html | 177 -- .../php_3A_3Arepo_3A_3Asuse.html | 175 -- .../php_3A_3Arepo_3A_3Aubuntu.html | 177 -- .../php/docs/puppet_defined_type_list.html | 104 - .../php_3A_3Aapache_vhost.html | 223 -- .../puppet_defined_types/php_3A_3Aconfig.html | 174 -- .../php_3A_3Aconfig_3A_3Asetting.html | 226 -- .../php_3A_3Aextension.html | 460 --- .../php_3A_3Aextension_3A_3Aconfig.html | 418 --- .../php_3A_3Aextension_3A_3Ainstall.html | 356 --- .../php_3A_3Afpm_3A_3Apool.html | 935 ------ .../php/docs/puppet_function_list.html | 71 - .../ensure_prefix.html | 259 -- .../to_hash_settings.html | 224 -- .../php/docs/puppet_provider_list.html | 71 - .../docs/puppet_providers_package/pear.html | 129 - .../docs/puppet_providers_package/pecl.html | 129 - .../php/docs/top-level-namespace.html | 98 - .../unix/web_frameworks/php/manifests/cli.pp | 26 - .../web_frameworks/php/manifests/globals.pp | 126 - .../utilities/unix/web_frameworks/php/php.pp | 1 - .../web_frameworks/php/secgen_metadata.xml | 24 - .../acceptance/nodesets/docker/centos-5.yml | 19 - .../acceptance/nodesets/docker/centos-6.yml | 20 - .../acceptance/nodesets/docker/centos-7.yml | 19 - .../acceptance/nodesets/docker/debian-7.yml | 18 - .../acceptance/nodesets/docker/debian-8.yml | 20 - .../acceptance/nodesets/docker/debian-9.yml | 20 - .../nodesets/docker/ubuntu-12.04.yml | 19 - .../nodesets/docker/ubuntu-14.04.yml | 21 - .../nodesets/docker/ubuntu-16.04.yml | 19 - .../php/spec/acceptance/php_spec.rb | 25 - .../php/spec/classes/php_spec.rb | 125 - .../php/spec/defines/fpm_pool_spec.rb | 37 - .../php/CHANGELOG.md | 86 +- .../{ => php_stretch_compatible}/php/Gemfile | 23 +- .../php/HISTORY.md | 0 .../php/LICENSE.txt | 0 .../php/README.md | 121 +- .../php_stretch_compatible/php/REFERENCE.md | 2771 +++++++++++++++++ .../{ => php_stretch_compatible}/php/Rakefile | 0 .../php_stretch_compatible/php/checksums.json | 93 + .../php/lib/facter/phpversion.rb | 0 .../puppet/parser/functions/ensure_prefix.rb | 0 .../parser/functions/to_hash_settings.rb | 0 .../php/lib/puppet/provider/package/pear.rb | 0 .../php/lib/puppet/provider/package/pecl.rb | 0 .../php/manifests/apache_config.pp | 10 +- .../php/manifests/apache_vhost.pp | 0 .../php/manifests/cli.pp | 45 + .../php/manifests/composer.pp | 16 +- .../php/manifests/composer/auto_update.pp | 5 +- .../php/manifests/config.pp | 0 .../php/manifests/config/setting.pp | 5 +- .../php/manifests/dev.pp | 12 +- .../php/manifests/embedded.pp | 16 +- .../php/manifests/extension.pp | 60 +- .../php/manifests/extension/config.pp | 56 +- .../php/manifests/extension/install.pp | 4 +- .../php/manifests/fpm.pp | 37 +- .../php/manifests/fpm/config.pp | 40 +- .../php/manifests/fpm/pool.pp | 10 +- .../php/manifests/fpm/service.pp | 8 +- .../php/manifests/global.pp | 6 +- .../php/manifests/globals.pp | 160 + .../php/manifests/init.pp | 81 +- .../php/manifests/packages.pp | 14 +- .../php/manifests/params.pp | 50 +- .../php/manifests/pear.pp | 14 +- .../php/manifests/phpunit.pp | 21 +- .../php/manifests/phpunit/auto_update.pp | 6 +- .../php/manifests/repo.pp | 2 +- .../php/manifests/repo/debian.pp | 8 +- .../php/manifests/repo/redhat.pp | 0 .../php/manifests/repo/suse.pp | 0 .../php/manifests/repo/ubuntu.pp | 0 .../php/metadata.json | 20 +- .../php_stretch_compatible/php/php.pp | 3 + .../php/secgen_metadata.xml | 33 + .../acceptance/nodesets/archlinux-2-x64.yml | 0 .../acceptance/nodesets/centos-511-x64.yml | 0 .../spec/acceptance/nodesets/centos-6-x64.yml | 0 .../acceptance/nodesets/centos-66-x64-pe.yml | 0 .../acceptance/nodesets/centos-66-x64.yml | 0 .../spec/acceptance/nodesets/centos-7-x64.yml | 0 .../acceptance/nodesets/centos-72-x64.yml | 0 .../acceptance/nodesets/debian-78-x64.yml | 0 .../acceptance/nodesets/debian-82-x64.yml | 0 .../nodesets/ec2/amazonlinux-2016091.yml | 0 .../nodesets/ec2/image_templates.yaml | 0 .../acceptance/nodesets/ec2/rhel-73-x64.yml | 0 .../nodesets/ec2/sles-12sp2-x64.yml | 0 .../nodesets/ec2/ubuntu-1604-x64.yml | 0 .../nodesets/ec2/windows-2016-base-x64.yml | 0 .../acceptance/nodesets/fedora-24-x64.yml | 0 .../acceptance/nodesets/fedora-25-x64.yml | 0 .../acceptance/nodesets/fedora-26-x64.yml | 0 .../acceptance/nodesets/fedora-27-x64.yml | 0 .../nodesets/ubuntu-server-1204-x64.yml | 0 .../nodesets/ubuntu-server-1404-x64.yml | 0 .../nodesets/ubuntu-server-1604-x64.yml | 0 .../php/spec/acceptance/php56_spec.rb | 47 + .../php/spec/acceptance/php_spec.rb | 96 + .../php/spec/classes/coverage_spec.rb | 0 .../php/spec/classes/php_fpm_config_spec.rb | 1 + .../php/spec/classes/php_fpm_service_spec.rb | 0 .../php/spec/classes/php_fpm_spec.rb | 0 .../php/spec/classes/php_repo_spec.rb | 0 .../php/spec/classes/php_repo_ubuntu_spec.rb | 0 .../php/spec/classes/php_spec.rb | 265 ++ .../php/spec/default_facts.yml | 0 .../php/spec/defines/config_spec.rb | 0 .../php/spec/defines/extension_rhscl_spec.rb | 53 + .../php/spec/defines/extension_spec.rb | 39 +- .../php/spec/defines/fpm_pool_spec.rb | 41 + .../unit/provider/package/pear/list_a | 0 .../package/pear/remote-info_benchmark | 0 .../provider/package/pear/remote-info_zip | 0 .../spec/functions/to_hash_settings_spec.rb | 0 .../php/spec/spec_helper.rb | 4 + .../php/spec/spec_helper_acceptance.rb | 1 + .../spec/unit/provider/package/pear_spec.rb | 0 .../spec/unit/provider/package/pecl_spec.rb | 0 .../php/templates/fpm/php-fpm.conf.erb | 0 .../php/templates/fpm/pool.conf.erb | 0 .../php/types/installoptions.pp | 0 .../php/types/provider.pp | 0 .../php/types/sapi.pp | 0 .../php/manifests/install.pp | 5 + .../php_wheezy_compatible/php/php.pp | 1 + .../php/secgen_metadata.xml | 34 + .../unix/bash/shellshock/manifests/install.pp | 5 +- .../unix/bash/shellshock/secgen_metadata.xml | 4 + .../dc16_amadhj/secgen_metadata.xml | 4 + .../dc16_b3s23/secgen_metadata.xml | 4 + .../dc16_feedme/secgen_metadata.xml | 4 + .../manifests/install.pp | 5 +- .../proftpd_133c_backdoor/secgen_metadata.xml | 5 + .../local/chkrootkit/manifests/install.pp | 5 +- .../unix/local/chkrootkit/secgen_metadata.xml | 4 + .../unix/system/symlinks/manifests/account.pp | 6 +- .../unix/system/symlinks/secgen_metadata.xml | 4 + .../two_shell_calls/secgen_metadata.xml | 4 + .../web_training/dvwa/secgen_metadata.xml | 4 +- .../webapp/gitlist_040/manifests/apache.pp | 7 - .../webapp/gitlist_040/manifests/install.pp | 15 +- .../webapp/gitlist_040/secgen_metadata.xml | 13 +- .../webapp/moinmoin_195/secgen_metadata.xml | 2 +- .../webapp/onlinestore/manifests/apache.pp | 4 - .../webapp/onlinestore/secgen_metadata.xml | 15 +- .../webapp/userspice_43/secgen_metadata.xml | 8 +- .../webapp/wordpress_1x/secgen_metadata.xml | 8 +- .../webapp/wordpress_2x/secgen_metadata.xml | 12 +- .../webapp/wordpress_3x/secgen_metadata.xml | 11 +- .../webapp/wordpress_4x/secgen_metadata.xml | 12 +- scenarios/test_scenario.xml | 41 +- 626 files changed, 8886 insertions(+), 15873 deletions(-) create mode 100644 modules/services/unix/database/mysql_stretch_compatible/mysql/HISTORY.md create mode 100644 modules/services/unix/database/mysql_stretch_compatible/mysql/REFERENCE.md create mode 100644 modules/services/unix/database/mysql_stretch_compatible/mysql/checksums.json create mode 100644 modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/deepmerge.rb create mode 100644 modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/dirname.rb create mode 100644 modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/password.rb create mode 100644 modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/strip_hash.rb create mode 100644 modules/services/unix/database/mysql_stretch_compatible/mysql/readmes/REFERENCE_ja_JP.md create mode 100644 modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_deepmerge_spec.rb create mode 100644 modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_dirname_spec.rb create mode 100644 modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_password_spec.rb create mode 100644 modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_strip_hash_spec.rb rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/CHANGELOG.md (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/CONTRIBUTING.md (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/Gemfile (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/LICENSE (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/MAINTAINERS.md (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/NOTICE (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/README.md (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/Rakefile (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/apache.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/checksums.json (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/examples/apache.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/examples/dev.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/examples/init.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/examples/mod_load_params.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/examples/mods.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/examples/mods_custom.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/examples/php.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/examples/vhost.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/examples/vhost_directories.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/examples/vhost_filter.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/examples/vhost_ip_based.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/examples/vhost_proxypass.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/examples/vhost_ssl.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/examples/vhosts_without_listen.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/files/httpd (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/lib/facter/apache_version.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/lib/puppet/parser/functions/bool2httpd.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/lib/puppet/parser/functions/validate_apache_log_level.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/lib/puppet/provider/a2mod.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/lib/puppet/provider/a2mod/a2mod.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/lib/puppet/provider/a2mod/gentoo.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/lib/puppet/provider/a2mod/modfix.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/lib/puppet/provider/a2mod/redhat.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/lib/puppet/type/a2mod.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/locales/config.yaml (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/locales/puppetlabs-apache.pot (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/balancer.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/balancermember.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/confd/no_accf.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/custom_config.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/default_confd_files.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/default_mods.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/default_mods/load.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/dev.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/fastcgi/server.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/init.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/listen.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/actions.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/alias.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/auth_basic.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/auth_cas.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/auth_kerb.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/auth_mellon.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/authn_core.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/authn_dbd.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/authn_file.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/authnz_ldap.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/authnz_pam.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/authz_default.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/authz_user.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/autoindex.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/cache.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/cgi.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/cgid.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/cluster.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/dav.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/dav_fs.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/dav_svn.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/dbd.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/deflate.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/dev.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/dir.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/disk_cache.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/dumpio.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/env.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/event.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/expires.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/ext_filter.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/fastcgi.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/fcgid.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/filter.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/geoip.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/headers.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/include.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/info.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/intercept_form_submit.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/itk.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/ldap.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/lookup_identity.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/mime.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/mime_magic.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/negotiation.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/nss.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/pagespeed.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/passenger.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/perl.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/peruser.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/php.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/prefork.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/proxy.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/proxy_ajp.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/proxy_balancer.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/proxy_connect.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/proxy_fcgi.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/proxy_html.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/proxy_http.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/proxy_wstunnel.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/python.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/remoteip.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/reqtimeout.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/rewrite.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/rpaf.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/security.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/setenvif.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/shib.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/socache_shmcb.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/speling.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/ssl.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/status.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/suexec.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/suphp.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/userdir.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/version.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/vhost_alias.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/worker.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/wsgi.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mod/xsendfile.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/mpm.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/namevirtualhost.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/package.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/params.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/peruser/multiplexer.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/peruser/processor.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/php.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/proxy.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/python.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/security/rule_link.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/service.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/ssl.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/version.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/vhost.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/vhost/custom.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/manifests/vhosts.pp (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/metadata.json (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/secgen_metadata.xml (97%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/apache_parameters_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/apache_ssl_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/class_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/custom_config_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/default_mods_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/itk_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/mod_dav_svn_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/mod_deflate_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/mod_fcgid_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/mod_mime_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/mod_negotiation_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/mod_pagespeed_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/mod_passenger_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/mod_php_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/mod_proxy_html_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/mod_security_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/mod_suphp_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/nodesets/centos-7-x64.yml (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/nodesets/debian-8-x64.yml (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/nodesets/default.yml (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/nodesets/docker/centos-7.yml (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/nodesets/docker/debian-8.yml (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/nodesets/docker/ubuntu-14.04.yml (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/nodesets/suse.yml (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/prefork_worker_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/service_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/version.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/vhost_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/acceptance/vhosts_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/apache_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/dev_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/alias_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/auth_cas_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/auth_kerb_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/auth_mellon_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/authn_dbd_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/authnz_ldap_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/authnz_pam_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/cluster_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/dav_svn_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/deflate_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/dev_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/dir_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/disk_cache_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/dumpio_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/event_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/expires_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/ext_filter_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/fastcgi_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/fcgid_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/info_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/intercept_form_submit_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/itk_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/ldap_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/lookup_identity.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/mime_magic_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/mime_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/negotiation_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/pagespeed_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/passenger_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/perl_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/peruser_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/php_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/prefork_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/proxy_balancer_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/proxy_connect_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/proxy_html_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/proxy_wstunnel.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/python_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/remoteip_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/reqtimeout_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/rpaf_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/security_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/shib_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/speling_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/ssl_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/status_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/suphp_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/userdir_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/worker_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/mod/wsgi_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/params_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/service_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/classes/vhosts_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/defines/balancer_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/defines/balancermember_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/defines/custom_config_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/defines/fastcgi_server_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/defines/mod_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/defines/modsec_link_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/defines/vhost_custom_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/defines/vhost_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/fixtures/files/negotiation.conf (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/fixtures/files/spec (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/fixtures/site_apache/templates/fake.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/fixtures/templates/negotiation.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/spec_helper.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/spec_helper_acceptance.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/spec_helper_local.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/unit/apache_version_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/unit/provider/a2mod/gentoo_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/confd/no-accf.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/fastcgi/server.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/httpd.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/listen.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/alias.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/auth_cas.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/auth_mellon.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/authn_dbd.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/authnz_ldap.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/autoindex.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/cgid.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/cluster.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/dav_fs.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/deflate.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/dir.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/disk_cache.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/dumpio.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/event.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/expires.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/ext_filter.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/fastcgi.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/fcgid.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/geoip.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/info.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/itk.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/ldap.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/load.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/mime.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/mime_magic.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/mpm_event.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/negotiation.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/nss.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/pagespeed.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/passenger.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/peruser.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/php.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/prefork.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/proxy.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/proxy_balancer.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/proxy_html.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/remoteip.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/reqtimeout.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/rpaf.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/security.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/security_crs.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/setenvif.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/ssl.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/status.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/suphp.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/userdir.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/worker.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/mod/wsgi.conf.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/namevirtualhost.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/ports_header.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_access_log.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_action.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_additional_includes.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_aliases.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_allow_encoded_slashes.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_auth_cas.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_auth_kerb.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_block.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_charsets.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_custom_fragment.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_directories.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_docroot.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_error_document.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_fallbackresource.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_fastcgi.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_file_footer.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_file_header.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_filters.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_header.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_http_protocol_options.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_itk.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_jk_mounts.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_keepalive_options.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_logging.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_passenger.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_passenger_base_uris.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_php.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_php_admin.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_proxy.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_rack.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_redirect.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_requestheader.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_require.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_rewrite.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_scriptalias.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_security.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_serveralias.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_serversignature.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_setenv.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_ssl.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_sslproxy.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_suexec.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_suphp.erb (100%) rename modules/services/unix/http/{apache_kali_compatible => apache_stretch_compatible}/apache/templates/vhost/_wsgi.erb (100%) delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/Puppet/Parser/Functions.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/_index.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/css/common.css delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/css/full_list.css delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/css/style.css delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/file.README.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/frames.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/index.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/js/app.js delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/js/full_list.js delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/js/jquery.js delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_class_list.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aapache_config.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Acli.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Acomposer.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Acomposer_3A_3Aauto_update.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Adev.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aembedded.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Afpm.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Afpm_3A_3Aconfig.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Afpm_3A_3Aservice.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aglobal.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aglobals.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Apackages.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aparams.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Apear.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aphpunit.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aphpunit_3A_3Aauto_update.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Adebian.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Aredhat.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Asuse.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Aubuntu.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_defined_type_list.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aapache_vhost.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aconfig.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aconfig_3A_3Asetting.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aextension.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aextension_3A_3Aconfig.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aextension_3A_3Ainstall.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Afpm_3A_3Apool.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_function_list.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_functions_ruby3x/ensure_prefix.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_functions_ruby3x/to_hash_settings.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_provider_list.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_providers_package/pear.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/puppet_providers_package/pecl.html delete mode 100644 modules/utilities/unix/web_frameworks/php/docs/top-level-namespace.html delete mode 100644 modules/utilities/unix/web_frameworks/php/manifests/cli.pp delete mode 100644 modules/utilities/unix/web_frameworks/php/manifests/globals.pp delete mode 100644 modules/utilities/unix/web_frameworks/php/php.pp delete mode 100644 modules/utilities/unix/web_frameworks/php/secgen_metadata.xml delete mode 100644 modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/centos-5.yml delete mode 100644 modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/centos-6.yml delete mode 100644 modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/centos-7.yml delete mode 100644 modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/debian-7.yml delete mode 100644 modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/debian-8.yml delete mode 100644 modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/debian-9.yml delete mode 100644 modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/ubuntu-12.04.yml delete mode 100644 modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/ubuntu-14.04.yml delete mode 100644 modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/ubuntu-16.04.yml delete mode 100644 modules/utilities/unix/web_frameworks/php/spec/acceptance/php_spec.rb delete mode 100644 modules/utilities/unix/web_frameworks/php/spec/classes/php_spec.rb delete mode 100644 modules/utilities/unix/web_frameworks/php/spec/defines/fpm_pool_spec.rb rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/CHANGELOG.md (71%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/Gemfile (76%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/HISTORY.md (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/LICENSE.txt (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/README.md (76%) create mode 100644 modules/utilities/unix/web_frameworks/php_stretch_compatible/php/REFERENCE.md rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/Rakefile (100%) create mode 100644 modules/utilities/unix/web_frameworks/php_stretch_compatible/php/checksums.json rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/lib/facter/phpversion.rb (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/lib/puppet/parser/functions/ensure_prefix.rb (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/lib/puppet/parser/functions/to_hash_settings.rb (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/lib/puppet/provider/package/pear.rb (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/lib/puppet/provider/package/pecl.rb (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/apache_config.pp (65%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/apache_vhost.pp (100%) create mode 100644 modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/cli.pp rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/composer.pp (72%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/composer/auto_update.pp (92%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/config.pp (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/config/setting.pp (90%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/dev.pp (77%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/embedded.pp (63%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/extension.pp (59%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/extension/config.pp (67%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/extension/install.pp (93%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/fpm.pp (74%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/fpm/config.pp (84%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/fpm/pool.pp (93%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/fpm/service.pp (84%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/global.pp (80%) create mode 100644 modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/globals.pp rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/init.pp (67%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/packages.pp (64%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/params.pp (80%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/pear.pp (84%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/phpunit.pp (57%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/phpunit/auto_update.pp (74%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/repo.pp (94%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/repo/debian.pp (92%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/repo/redhat.pp (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/repo/suse.pp (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/manifests/repo/ubuntu.pp (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/metadata.json (84%) create mode 100644 modules/utilities/unix/web_frameworks/php_stretch_compatible/php/php.pp create mode 100644 modules/utilities/unix/web_frameworks/php_stretch_compatible/php/secgen_metadata.xml rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/archlinux-2-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/centos-511-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/centos-6-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/centos-66-x64-pe.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/centos-66-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/centos-7-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/centos-72-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/debian-78-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/debian-82-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/ec2/image_templates.yaml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/ec2/rhel-73-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/fedora-24-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/fedora-25-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/fedora-26-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/fedora-27-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml (100%) create mode 100644 modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/php56_spec.rb create mode 100644 modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/php_spec.rb rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/classes/coverage_spec.rb (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/classes/php_fpm_config_spec.rb (98%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/classes/php_fpm_service_spec.rb (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/classes/php_fpm_spec.rb (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/classes/php_repo_spec.rb (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/classes/php_repo_ubuntu_spec.rb (100%) create mode 100644 modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/php_spec.rb rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/default_facts.yml (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/defines/config_spec.rb (100%) create mode 100644 modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/defines/extension_rhscl_spec.rb rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/defines/extension_spec.rb (84%) create mode 100644 modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/defines/fpm_pool_spec.rb rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/fixtures/unit/provider/package/pear/list_a (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/fixtures/unit/provider/package/pear/remote-info_benchmark (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/fixtures/unit/provider/package/pear/remote-info_zip (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/functions/to_hash_settings_spec.rb (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/spec_helper.rb (88%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/spec_helper_acceptance.rb (95%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/unit/provider/package/pear_spec.rb (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/spec/unit/provider/package/pecl_spec.rb (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/templates/fpm/php-fpm.conf.erb (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/templates/fpm/pool.conf.erb (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/types/installoptions.pp (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/types/provider.pp (100%) rename modules/utilities/unix/web_frameworks/{ => php_stretch_compatible}/php/types/sapi.pp (100%) create mode 100644 modules/utilities/unix/web_frameworks/php_wheezy_compatible/php/manifests/install.pp create mode 100644 modules/utilities/unix/web_frameworks/php_wheezy_compatible/php/php.pp create mode 100644 modules/utilities/unix/web_frameworks/php_wheezy_compatible/php/secgen_metadata.xml diff --git a/lib/schemas/vulnerability_metadata_schema.xsd b/lib/schemas/vulnerability_metadata_schema.xsd index 5c113fb1f..fc476d44b 100644 --- a/lib/schemas/vulnerability_metadata_schema.xsd +++ b/lib/schemas/vulnerability_metadata_schema.xsd @@ -16,6 +16,7 @@ + diff --git a/lib/templates/Vagrantfile.erb b/lib/templates/Vagrantfile.erb index 6d788a755..a79ac409b 100644 --- a/lib/templates/Vagrantfile.erb +++ b/lib/templates/Vagrantfile.erb @@ -137,7 +137,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| <% end %> <% else -%> <% if (@options.has_key? :ovirtuser) && (@options.has_key? :ovirtpass) %> - <% if @ovirt_template and @ovirt_template.include? 'kali_linux_msf' %> + <% if @ovirt_template and (@ovirt_template.include? 'kali_linux_msf' or @ovirt_template.include? 'debian_server' )%> <%= system.name %>.vm.provision 'shell', inline: "echo \"auto lo\niface lo inet loopback\n\nauto eth0\niface eth0 inet static\n\taddress <%= resolve_network(selected_module)%>\" > /etc/network/interfaces" <%= system.name %>.vm.provision 'shell', inline: "echo '' > /etc/environment" <% elsif @ovirt_template and @ovirt_template.include? 'debian_desktop_kde' %> diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/CHANGELOG.md b/modules/services/unix/database/mysql_stretch_compatible/mysql/CHANGELOG.md index 5e9f85f23..d9ee70215 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/CHANGELOG.md +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/CHANGELOG.md @@ -1,7 +1,65 @@ # 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). +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). + +## [6.2.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/6.2.0) (2018-09-27) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/6.1.0...6.2.0) + +### Added + +- pdksync - \(MODULES-6805\) metadata.json shows support for puppet 6 [\#1127](https://github.com/puppetlabs/puppetlabs-mysql/pull/1127) ([tphoney](https://github.com/tphoney)) + +### Fixed + +- \(maint\) - Change versioning comparison [\#1123](https://github.com/puppetlabs/puppetlabs-mysql/pull/1123) ([eimlav](https://github.com/eimlav)) + +## [6.1.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/6.1.0) (2018-09-13) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/6.0.0...6.1.0) + +### Fixed + +- pdksync - \(MODULES-7705\) - Bumping stdlib dependency from \< 5.0.0 to \< 6.0.0 [\#1114](https://github.com/puppetlabs/puppetlabs-mysql/pull/1114) ([pmcmaw](https://github.com/pmcmaw)) +- \(MODULES-6981\) Do not try to read ~root/.my.cnf when calling "mysqld -V" [\#1063](https://github.com/puppetlabs/puppetlabs-mysql/pull/1063) ([simondeziel](https://github.com/simondeziel)) + +## [6.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/6.0.0) (2018-08-01) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/5.4.0...6.0.0) + +### Changed + +- \[FM-6962\] Removal of unsupported OS from mysql [\#1086](https://github.com/puppetlabs/puppetlabs-mysql/pull/1086) ([david22swan](https://github.com/david22swan)) + +### Added + +- \(FM-5985\) - Addition of support for Ubuntu 18.04 to mysql [\#1104](https://github.com/puppetlabs/puppetlabs-mysql/pull/1104) ([david22swan](https://github.com/david22swan)) +- \(MODULES-7439\) - Implementing beaker-testmode\_switcher [\#1095](https://github.com/puppetlabs/puppetlabs-mysql/pull/1095) ([pmcmaw](https://github.com/pmcmaw)) +- Support for optional\_\_args and prescript to mysqldump backup provider [\#1083](https://github.com/puppetlabs/puppetlabs-mysql/pull/1083) ([eputnam](https://github.com/eputnam)) +- Allow empty user passwords [\#1075](https://github.com/puppetlabs/puppetlabs-mysql/pull/1075) ([disappear89](https://github.com/disappear89)) +- Add user tls\_options and grant options to mysql::db [\#1065](https://github.com/puppetlabs/puppetlabs-mysql/pull/1065) ([edestecd](https://github.com/edestecd)) +- Use puppet4 functions-api [\#1044](https://github.com/puppetlabs/puppetlabs-mysql/pull/1044) ([juliantodt](https://github.com/juliantodt)) +- Replaced 'DROP USER' with 'DROP USER IF EXISTS' [\#942](https://github.com/puppetlabs/puppetlabs-mysql/pull/942) ([libertamohamed](https://github.com/libertamohamed)) + +### Fixed + +- \(MODULES-7353\) Enable service for Debian 9 [\#1094](https://github.com/puppetlabs/puppetlabs-mysql/pull/1094) ([david22swan](https://github.com/david22swan)) +- Update locales test for Debian 9 [\#1091](https://github.com/puppetlabs/puppetlabs-mysql/pull/1091) ([HelenCampbell](https://github.com/HelenCampbell)) +- \[FM-7045\] Fix to allow Debian 9 test's to run clean [\#1088](https://github.com/puppetlabs/puppetlabs-mysql/pull/1088) ([david22swan](https://github.com/david22swan)) +- \(MODULES-7198\) Fix DROP USER IF EXISTS on mariadb [\#1082](https://github.com/puppetlabs/puppetlabs-mysql/pull/1082) ([hunner](https://github.com/hunner)) + +## 5.4.0 + +### Added + +- \(PDOC-210\) Puppet Strings documentation [\#1068](https://github.com/puppetlabs/puppetlabs-mysql/pull/1068) ([hunner](https://github.com/hunner)) +- Compatibility for Alpine linux [\#1049](https://github.com/puppetlabs/puppetlabs-mysql/pull/1049) ([cisco87](https://github.com/cisco87)) + +### Fixed + +- \(MODULES-6627\) Removed unused --host flag from mysqlcaller [\#1064](https://github.com/puppetlabs/puppetlabs-mysql/pull/1064) ([HelenCampbell](https://github.com/HelenCampbell)) +- Fixed archlinux compatibility [\#1057](https://github.com/puppetlabs/puppetlabs-mysql/pull/1057) ([bastelfreak](https://github.com/bastelfreak)) +- Changed input param option in export.json from sql to file [\#1054](https://github.com/puppetlabs/puppetlabs-mysql/pull/1054) ([cgoswami](https://github.com/cgoswami)) ## Supported Release [5.3.0] ### Summary @@ -878,8 +936,12 @@ configuration variables. ## 2011-06-03 - Dan Bode - 0.0.1 * initial commit +[5.4.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.3.0...5.4.0 [5.3.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.2.1...5.3.0 [5.2.1]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.2.0...5.2.1 [5.2.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.1.0...5.2.0 [5.1.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.0.0...5.1.0 [5.0.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/4.0.1...5.0.0 + + +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/Gemfile b/modules/services/unix/database/mysql_stretch_compatible/mysql/Gemfile index 2ededb50a..2707ef7be 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/Gemfile +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/Gemfile @@ -1,25 +1,18 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' def location_for(place_or_version, fake_version = nil) - if place_or_version =~ %r{\A(git[:@][^#]*)#(.*)} - [fake_version, { git: Regexp.last_match(1), branch: Regexp.last_match(2), require: false }].compact - elsif place_or_version =~ %r{\Afile:\/\/(.*)} - ['>= 0', { path: File.expand_path(Regexp.last_match(1)), require: false }] + git_url_regex = %r{\A(?(https?|git)[:@][^#]*)(#(?.*))?} + file_url_regex = %r{\Afile:\/\/(?.*)} + + if place_or_version && (git_url = place_or_version.match(git_url_regex)) + [fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact + elsif place_or_version && (file_url = place_or_version.match(file_url_regex)) + ['>= 0', { path: File.expand_path(file_url[:path]), require: false }] else [place_or_version, { require: false }] end end -def gem_type(place_or_version) - if place_or_version =~ %r{\Agit[:@]} - :git - elsif !place_or_version.nil? && place_or_version.start_with?('file:') - :file - else - :gem - end -end - ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments minor_version = ruby_version_segments[0..1].join('.') @@ -28,95 +21,42 @@ group :development do gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9') + gem "json", '<= 2.0.4', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.4.4') gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby] gem "puppet-module-posix-dev-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-win-dev-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "puppet-blacksmith", '~> 3.4', require: false gem "puppet-lint-i18n", require: false + gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2') 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.13') - gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1') - gem "beaker-pe", require: false - gem "beaker-hostgenerator" - gem "beaker-rspec" + 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-testmode_switcher", require: false end puppet_version = ENV['PUPPET_GEM_VERSION'] -puppet_type = gem_type(puppet_version) facter_version = ENV['FACTER_GEM_VERSION'] hiera_version = ENV['HIERA_GEM_VERSION'] -def puppet_older_than?(version) - puppet_version = ENV['PUPPET_GEM_VERSION'] - !puppet_version.nil? && - Gem::Version.correct?(puppet_version) && - Gem::Requirement.new("< #{version}").satisfied_by?(Gem::Version.new(puppet_version.dup)) -end - gems = {} gems['puppet'] = location_for(puppet_version) # If facter or hiera versions have been specified via the environment -# variables, use those versions. If not, and if the puppet version is < 3.5.0, -# use known good versions of both for puppet < 3.5.0. -if facter_version - gems['facter'] = location_for(facter_version) -elsif puppet_type == :gem && puppet_older_than?('3.5.0') - gems['facter'] = ['>= 1.6.11', '<= 1.7.5', require: false] -end +# variables -if hiera_version - gems['hiera'] = location_for(ENV['HIERA_GEM_VERSION']) -elsif puppet_type == :gem && puppet_older_than?('3.5.0') - gems['hiera'] = ['>= 1.0.0', '<= 1.3.0', require: false] -end +gems['facter'] = location_for(facter_version) if facter_version +gems['hiera'] = location_for(hiera_version) if hiera_version -if Gem.win_platform? && (puppet_type != :gem || puppet_older_than?('3.5.0')) - # For Puppet gems < 3.5.0 (tested as far back as 3.0.0) on Windows - if puppet_type == :gem - gems['ffi'] = ['1.9.0', require: false] - gems['minitar'] = ['0.5.4', require: false] - gems['win32-eventlog'] = ['0.5.3', '<= 0.6.5', require: false] - gems['win32-process'] = ['0.6.5', '<= 0.7.5', require: false] - gems['win32-security'] = ['~> 0.1.2', '<= 0.2.5', require: false] - gems['win32-service'] = ['0.7.2', '<= 0.8.8', require: false] - else - gems['ffi'] = ['~> 1.9.0', require: false] - gems['minitar'] = ['~> 0.5.4', require: false] - gems['win32-eventlog'] = ['~> 0.5', '<= 0.6.5', require: false] - gems['win32-process'] = ['~> 0.6', '<= 0.7.5', require: false] - gems['win32-security'] = ['~> 0.1', '<= 0.2.5', require: false] - gems['win32-service'] = ['~> 0.7', '<= 0.8.8', require: false] - end - - gems['win32-dir'] = ['~> 0.3', '<= 0.4.9', require: false] - - if RUBY_VERSION.start_with?('1.') - gems['win32console'] = ['1.3.2', require: false] - # sys-admin was removed in Puppet 3.7.0 and doesn't compile under Ruby 2.x - gems['sys-admin'] = ['1.5.6', require: false] - end - - # Puppet < 3.7.0 requires these. - # Puppet >= 3.5.0 gem includes these as requirements. - # The following versions are tested to work with 3.0.0 <= puppet < 3.7.0. - gems['win32-api'] = ['1.4.8', require: false] - gems['win32-taskscheduler'] = ['0.2.2', require: false] - gems['windows-api'] = ['0.4.3', require: false] - gems['windows-pr'] = ['1.2.3', require: false] -elsif Gem.win_platform? +if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)} # If we're using a Puppet gem on Windows which handles its own win32-xxx gem # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445). gems['win32-dir'] = ['<= 0.4.9', require: false] gems['win32-eventlog'] = ['<= 0.6.5', require: false] gems['win32-process'] = ['<= 0.7.5', require: false] gems['win32-security'] = ['<= 0.2.5', require: false] - gems['win32-service'] = ['<= 0.8.8', require: false] + gems['win32-service'] = ['0.8.8', require: false] end gems.each do |gem_name, gem_params| diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/HISTORY.md b/modules/services/unix/database/mysql_stretch_compatible/mysql/HISTORY.md new file mode 100644 index 000000000..740a28c85 --- /dev/null +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/HISTORY.md @@ -0,0 +1,894 @@ +## 5.4.0 + +### Added + +- \(PDOC-210\) Puppet Strings documentation [\#1068](https://github.com/puppetlabs/puppetlabs-mysql/pull/1068) ([hunner](https://github.com/hunner)) +- Compatibility for Alpine linux [\#1049](https://github.com/puppetlabs/puppetlabs-mysql/pull/1049) ([cisco87](https://github.com/cisco87)) + +### Fixed + +- \(MODULES-6627\) Removed unused --host flag from mysqlcaller [\#1064](https://github.com/puppetlabs/puppetlabs-mysql/pull/1064) ([HelenCampbell](https://github.com/HelenCampbell)) +- Fixed archlinux compatibility [\#1057](https://github.com/puppetlabs/puppetlabs-mysql/pull/1057) ([bastelfreak](https://github.com/bastelfreak)) +- Changed input param option in export.json from sql to file [\#1054](https://github.com/puppetlabs/puppetlabs-mysql/pull/1054) ([cgoswami](https://github.com/cgoswami)) + +## Supported Release [5.3.0] +### Summary +This release uses the PDK convert functionality which in return makes the module PDK compliant. It also includes a roll up of maintenance changes, a new task and support for `GRANTS FUNCTION`. + +### Added +- Add support for `GRANTS FUNCTION` ([MODULES-2075](https://tickets.puppet.com/browse/MODULES-2075)). +- Add Export database task. +- PDK Convert mysql ([MODULES-6454](https://tickets.puppet.com/browse/MODULES-6454)). + +### Changed +- Allow authentication plugin to be changed. +- Update mysql_user provider. +- Plugins don't exist before 5.5; password field name changed +- Fix helpful rubocops and disable hurtful cops. +- Addressing puppet-lint and rubocop errors +- Remove update bundler and add ignore .DS_Store +- Skip rubocop warning in task. +- Fix a typo in a classname in the changelog. + +## Supported Release [5.2.1] +### Summary +This release fixes CVE-2018-6508 which is a potential arbitrary code execution via tasks. + +### Fixed +- Fix export and mysql tasks for arbitrary remote code + +## Supported Release [5.2.0] + +### Added +- Compatibility for puppet-staging 3.0.0 + +### Fixed +- Centralize all mysql command calls for providers +- Add paths to `mysql_datadir` provider for RedHat Software Collections + +## Supported Release [5.1.0] +### Summary +This release adds Tasks to the Mysql module. + +#### Added +- Adds the execute sql task. + +## Supported Release [5.0.0] +### Summary +This is a major release that adds support for string translation. Currently the only supported language besides +English is Japanese. + +#### Added +- Several gem dependencies required for translation. +- Wrapping of strings that require translation. Strings in ruby code are now wrapped with `_()` and strings in puppet code with `translate()`. +- Debian 9 support + +#### Changed +- The default php_package_name for Debian and Ubuntu to `php-mysql` + +## Supported Release 4.0.1 +### Summary +This is a small bugfix release that makes `mysql_install_db` optional and fixes some regular expression issues. + +#### Bugfixes +- ([MODULES-5528](https://tickets.puppet.com/browse/MODULES-5528)) Fixes the `mysql_install_db` command so that it is optional +- ([MODULES-5602](https://tickets.puppet.com/browse/MODULES-5602)) Removes superfluous backslashes in some regular expressions that were causing instability + +## Supported Release 4.0.0 +### Summary +This release sees the enablement of rubocop, also an update to the lib directory with rubocop fixes and several other changes and fixes. Also a bump to the Puppet version compatibility and several Puppet language updates. + +#### Added +- Updated README.md with example how to install MySQL Community Server 5.6 on Centos 7.3 +- Enabled Rubocop and addition of Rubocop fixes for /lib directory. + +#### Removed +- Dropped legacy tests for db.pp. + +#### Changed +- Replaced validate function calls with datatypes in db.pp. +- Bumped recommended puppet version to between 4.7.0 and 6.0.0. +- Conditionalize name validation in mysql_grant type. ([MODULES-4604](https://tickets.puppet.com/browse/MODULES-4604)) + +#### Fixed +- Removal of invalid parameter provider on Mysql_user[user@localhost] in mysql::db ([MODULES-4115](https://tickets.puppet.com/browse/MODULES-4115)) +- Fixed server_service_name for Debian/stretch. +- Spec fixes for Puppet 5. +- Test update for fix:create procedure, then grant ([MODULES-5390](https://tickets.puppet.com/browse/MODULES-5390)) +- Fixing empty user/password issue for xtrabackup. Now defaults as undef instead of ''. +- Remove unsupported Ubuntu versions ([MODULES-5501](https://tickets.puppet.com/browse/MODULES-5501)) + +## Supported Release 3.11.0 +### Summary +This release includes README and metadata translations to Japanese, as well as some enhancements and bugfixes. + +#### Added +- New flag for successful backups +- Solaris support improvements +- New parameter `optional_args` for extra innobackupex options +- Specify environment variables (e.g. https_proxy) for MySQLTuner download. +- Check to only install bzip2 if `$backupcompress` is `true` +- Debian 9 compatibility +- Japanese README + +#### Fixed +- Syntax errors +- Bug where error logs were being created before the datadir was initialized (MODULES-4743) + +## Supported Release 3.10.0 +### Summary +This release includes new features for setting TLS options on a mysql user, a new parameter to allow specifying tool to import sql files, as well as various bugfixes. + +#### Features +- (MODULES-3879) Adds `import_cat_cmd` parameter to specify the command to read sql files +- Adds support for setting `tls_options` in `mysql_user` + +#### Bugfixes +- (MODULES-3557) Adds Ubuntu 16.04 package names for language bindings +- (MODULES-3907) Adds MySQL/Percona 5.7 initialize on fresh deploy + +## Supported Release 3.9.0 +### Summary +This release adds Percona 5.7 support and compatibility with Ubuntu 16.04, in addition to various bugfixes. + +#### Features +- (MODULES-3441) Adds the `mysqld_version` fact +- (MODULES-3513) Adds a new backup dump parameter `maxallowedpacket` +- Adds new parameter `xtrabackup_package_name` to `mysql::backup::xtrabackup` class +- Adds ability to revoke GRANT privilege + +#### Bugfixes +- Fixes a bug where `mysql_user` fails if facter cannot retrieve fqdn. +- Fix global parameter usage in backup script +- Adds support for `puppet-staging` version `2.0.0` +- (MODULES-3601) Moves binary logging configuration to take place after package install +- (MODULES-3711) Add limit to mysql server ID generated value +- (MODULES-3698) Fixes defaults for SLES12 +- Updates user name length restrictions for MySQL version 5.7.8 and above. +- Fixes a bug where error log is not writable by owner + +## Supported Release 3.8.0 +### Summary +This release adds Percona 5.7 support and compatibility with Ubuntu 16.04, in addition to various bugfixes. + +#### Features +- Adds support for Percona 5.7 +- Adds support for Ubuntu 16.04 (Xenial) + +#### Known Limitations +- The mysqlbackup.sh script will not work on MySQL 5.7.0 and up. + +#### Bugfixes +- Use mysql_install_db only with uniq defaults-extra-file +- Updates mysqlbackup.sh to ensure backup directory exist +- Loosen MariaDB recognition to fix it on Debian 8 +- Allow mysql::backup::mysqldump to access root_group in tests +- Fixed problem with ignoring parameters from global configs +- Fixes ordering issue that initialized mysqld before config is set +- (MODULES-1256) Fix parameters on OpenSUSE 12 +- Fixes install errors on Debian-based OS by configuring the base of includedir +- Configure the configfile location for mariadb +- Default mysqld_type return value should be 'mysql' if another type is not detected +- Make sure that bzip2 is installed before setting up the cron tab job using mysqlbackup.sh +- Fixes path issue on FreeBSD +- Check that /var/lib/mysql actually contains files +- Removes mysql regex when checking type +- (MODULES-2111) Add the system database to user related actions +- Updates default group for logfiles on Debian-based OS to 'adm' +- Fixes an issue with Amazon linux major release 4 installation +- Fixes 'mysql_install_db' script support on Gentoo +- Removes erroneous anchors to mysql::client from mysql::db +- Adds path to be able to find MySQL 5.5 installation on CentOS + +## Supported Release 3.7.0 +### Summary + +A large release with several new features. Also includes a considerable amount of bugfixes, many around compatibility and improvements to current functionality. + +#### Features + +- Now uses mariadb in OpenSuSE >= 13.1. +- Switch to rspec-puppet-facts. +- Additional function to check if table exists before grant. +- Add ability to input password hash directly. +- Now checking major release instead of specific release. +- Debian 8 support. + +#### Bugfixes + +- Minor doc update. +- Fixes improper use of function `warn` in backup manifest of server. +- Fixes to Compatibility with PE 3.3. +- Fixes `when not managing config file` in `mysql_server_spec`. +- Improved user validation and munging. +- Fixes fetching the mysql_user password for MySQL >=5.7.6. +- Fixes unique server_id within my.cnf, the issue were the entire mac address was not being read in to generate the id. +- Corrects the daemon_dev_package_name for mariadb on redhat. +- Fix version compare to properly suppress show_diff for root password. +- Fixes to ensure compatibility with future parser. +- Solaris removed from PE in metadata as its not supported. +- Use MYSQL_PWD to avoid mysqldump warnings. +- Use temp cnf file instead of env variable which creates acceptance test failures. +- No longer hash passwords that are already hashed. +- Fix Gemfile to work with ruby 1.8.7. +- Fixed MySQL 5.7.6++ compatibility. +- Fixing error when disabling service management and the service does not exist. +- Ubuntu vivid should use systemd not upstart. +- Fixed new mysql_datadir provider on CentOS for MySQl 5.7.6 compatibility. +- Ensure if service restart to wait till mysql is up. +- Move all dependencies to not have them in case of service unmanaged. +- Re-Added the ability to set a empty string as option parameter. +- Fixes edge-case with dropping pre-existing users with grants. +- Fix logic for choosing rspec version. +- Refactored main acceptance suite. +- Skip idempotency tests on test cells that do have PUP-5016 unfixed. +- Fix tmpdir to be shared across examples. +- Update to current msync configs [006831f]. +- Fix mysql_grant with MySQL ANSI_QUOTES mode. +- Generate .my.cnf for all sections. + +## Supported Release 3.6.2 +### Summary + +Small release for support of newer PE versions. This increments the version of PE in the metadata.json file. + +## 2015-09-22 - Supported Release 3.6.1 +### Summary +This is a security and bugfix release that fixes incorrect username truncation in the munge for the mysql_user type, incorrect function used in `mysql::server::backup` and fixes compatibility issues with PE 3.3.x. + +#### Bugfixes +- Loosen the regex in mysql_user munging so the username is not unintentionally truncated. +- Use `warning()` not `warn()` +- Metadata had inadvertantly dropped 3.3.x support +- Some 3.3.x compatibility issues in `mysqltuner` were corrected + +## 2015-08-10 - Supported Release 3.6.0 +### Summary +This release adds the ability to use mysql::db and `mysql_*` types against unmanaged or external mysql instances. + +#### Features +- Add ability to use mysql::db WITHOUT mysql::server (ie, externally) +- Add prescript attribute to mysql::server::backup for xtrabackup +- Add postscript ability to xtrabackup provider. + +#### Bugfixes +- Fix default root passwords blocking puppet on mysql 5.8 +- Fix service dependency when package_manage is false +- Fix selinux permissions on my.cnf + +## 2015-07-23 - Supported Release 3.5.0 +### Summary +A small release to add explicit support to newer Puppet versions and accumulated patches. + +#### Features/Improvements +- Start running tests against puppet 4 +- Support longer usernames on newer MariaDB versions +- Add parameters for Solaris 11 and 12 + +#### Bugfixes +- Fix references to the mysql-server package +- mysql_server_id doesn't throw and error on machines without macaddress + +## 2015-05-19 - Supported Release 3.4.0 +### Summary +This release includes the addition of extra facts, OpenBSD compatibility, and a number of other features, improvements and bug fixes. + +#### Features/Improvements +- Added server_id fact which includes mac address for better uniqueness +- Added OpenBSD compatibility, only for 'OpenBSD -current' (due to the recent switch to mariadb) +- Added a $mysql_group parameter, and use that instead of the $root_group parameter to define the group membership of the mysql error log file. +- Updated tests for rspec-puppet 2 and future parser +- Further acceptance testing improvements +- MODULES-1928 - allow log-error to be undef +- Split package installation and database install +- README wording improvements +- Added options for including/excluding triggers and routines +- Made the 'TRIGGER' privilege of mysqldump backups depend on whether or not we are actually backing up triggers +- Cleaned up the privilege assignment in the mysqldump backup script +- Add a fact for capturing the mysql version installed + +#### Bugfixes +- mysql backup: fix regression in mysql_user call +- Set service_ensure to undef, in the case of an unmanaged service +- README Typos fixed +- Bugfix on Xtrabackup crons +- Fixed a permission problem that was preventing triggers from being backed up +- MODULES-1981: Revoke and grant difference of old and new privileges +- Fix an issue were we assume triggers work +- Change default for mysql::server::backup to ignore_triggers = false + +#### Deprecations +mysql::server::old_root_password property + +## 2015-03-03 - Supported Release 3.3.0 +### Summary +This release includes major README updates, the addition of backup providers, and a fix for managing the log-bin directory. + +#### Features +- Add package_manage parameters to `mysql::server` and `mysql::client` (MODULES-1143) +- README improvements +- Add `mysqldump`, `mysqlbackup`, and `xtrabackup` backup providers. + +#### Bugfixes +- log-error overrides were not being properly used (MODULES-1804) +- check for full path for log-bin to stop puppet from managing file '.' + +## 2015-02-09 - Supported Release 3.2.0 +### Summary +This release includes several new features and bugfixes, including support for various plugins, making the output from mysql_password more consistent when input is empty and improved username validation. + +#### Features +- Add type and provider to manage plugins +- Add support for authentication plugins +- Add support for mysql_install_db on freebsd +- Add `create_root_user` and `create_root_my_cnf` parameters to `mysql::server` + +#### Bugfixes +- Remove dependency on stdlib >= 4.1.0 (MODULES-1759) +- Make grant autorequire user +- Remove invalid parameter 'provider' from mysql_user instance (MODULES-1731) +- Return empty string for empty input in mysql_password +- Fix `mysql::account_security` when fqdn==localhost +- Update username validation (MODULES-1520) +- Future parser fix in params.pp +- Fix package name for debian 8 +- Don't start the service until the server package is installed and the config file is in place +- Test fixes +- Lint fixes + +## 2014-12-16 - Supported Release 3.1.0 +### Summary + +This release includes several new features, including SLES12 support, and a number of bug fixes. + +#### Notes + +`mysql::server::mysqltuner` has been refactored to fetch the mysqltuner script from github by default. If you are running on a non-network-connected system, you will need to download that file and have it available to your node at a path specified by the `source` parameter to the `mysqltuner` class. + +#### Features +- Add support for install_options for all package resources (MODULES-1484) +- Add log-bin directory creation +- Allow mysql::db to import multiple files (MODULES-1338) +- SLES12 support +- Improved identifier quoting detections +- Reworked `mysql::server::mysqltuner` so that we are no longer packaging the script as it is licensed under the GPL. + +#### Bugfixes +- Fix regression in username validation +- Proper containment for mysql::client in mysql::db +- Support quoted usernames of length 15 and 16 chars + +## 2014-11-11 - Supported Release 3.0.0 +### Summary + +Added several new features including MariaDB support and future parser + +#### Backwards-incompatible Changes +* Remove the deprecated `database`, `database_user`, and `database_grant` resources. The correct resources to use are `mysql`, `mysql_user`, and `mysql_grant` respectively. + +#### Features +* Add MariaDB Support +* The mysqltuner perl script has been updated to 1.3.0 based on work at http://github.com/major/MySQLTuner-perl +* Add future parse support, fixed issues with undef to empty string +* Pass the backup credentials to 'SHOW DATABASES' +* Ability to specify the Includedir for `mysql::server` +* `mysql::db` now has an import\_timeout feature that defaults to 300 +* The `mysql` class has been removed +* `mysql::server` now takes an `override_options` hash that will affect the installation +* Ability to install both dev and client dev + +#### BugFix +* `mysql::server::backup` now passes `ensure` param to the nested `mysql_grant` +* `mysql::server::service` now properly requires the presence of the `log_error` file +* `mysql::config` now occurs before `mysql::server::install_db` correctly + +## 2014-07-15 - Supported Release 2.3.1 +### Summary + +This release merely updates metadata.json so the module can be uninstalled and +upgraded via the puppet module command. + +## 2014-05-14 - Supported Release 2.3.0 + +This release primarily adds support for RHEL7 and Ubuntu 14.04 but it +also adds a couple of new parameters to allow for further customization, +as well as ensuring backups can backup stored procedures properly. + +#### Features +Added `execpath` to allow a custom executable path for non-standard mysql installations. +Added `dbname` to mysql::db and use ensure_resource to create the resource. +Added support for RHEL7 and Fedora Rawhide. +Added support for Ubuntu 14.04. +Create a warning for if you disable SSL. +Ensure the error logfile is owned by MySQL. +Disable ssl on FreeBSD. +Add PROCESS privilege for backups. + +#### Bugfixes + +#### Known Bugs +* No known bugs + +## 2014-03-04 - Supported Release 2.2.3 +### 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 +* No known bugs + +## 2014-03-04 - Supported Release 2.2.2 +### Summary +This is a supported release. Mostly comprised of enhanced testing, plus a +bugfix for Suse. + +#### Bugfixes +- PHP bindings on Suse +- Test fixes + +#### Known Bugs +* No known bugs + +## 2014-02-19 - Version 2.2.1 + +### Summary + +Minor release that repairs mysql_database{} so that it sees the correct +collation settings (it was only checking the global mysql ones, not the +actual database and constantly setting it over and over since January 22nd). + +Also fixes a bunch of tests on various platforms. + + +## 2014-02-13 - Version 2.2.0 + +### Summary + +#### Features +- Add `backupdirmode`, `backupdirowner`, `backupdirgroup` to + mysql::server::backup to allow customizing the mysqlbackupdir. +- Support multiple options of the same name, allowing you to + do 'replicate-do-db' => ['base1', 'base2', 'base3'] in order to get three + lines of replicate-do-db = base1, replicate-do-db = base2 etc. + +#### Bugfixes +- Fix `restart` so it actually stops mysql restarting if set to false. +- DRY out the defaults_file functionality in the providers. +- mysql_grant fixed to work with root@localhost/@. +- mysql_grant fixed for WITH MAX_QUERIES_PER_HOUR +- mysql_grant fixed so revoking all privileges accounts for GRANT OPTION +- mysql_grant fixed to remove duplicate privileges. +- mysql_grant fixed to handle PROCEDURES when removing privileges. +- mysql_database won't try to create existing databases, breaking replication. +- bind_address renamed bind-address in 'mysqld' options. +- key_buffer renamed to key_buffer_size. +- log_error renamed to log-error. +- pid_file renamed to pid-file. +- Ensure mysql::server::root_password runs before mysql::server::backup +- Fix options_override -> override_options in the README. +- Extensively rewrite the README to be accurate and awesome. +- Move to requiring stdlib 3.2.0, shipped in PE3.0 +- Add many new tests. + + +## 2013-11-13 - Version 2.1.0 + +### Summary + +The most important changes in 2.1.0 are improvements to the my.cnf creation, +as well as providers. Setting options to = true strips them to be just the +key name itself, which is required for some options. + +The provider updates fix a number of bugs, from lowercase privileges to +deprecation warnings. + +Last, the new hiera integration functionality should make it easier to +externalize all your grants, users, and, databases. Another great set of +community submissions helped to make this release. + +#### Features +- Some options can not take a argument. Gets rid of the '= true' when an +option is set to true. +- Easier hiera integration: Add hash parameters to mysql::server to allow +specifying grants, users, and databases. + +#### Bugfixes +- Fix an issue with lowercase privileges in mysql_grant{} causing them to be reapplied needlessly. +- Changed defaults-file to defaults-extra-file in providers. +- Ensure /root/.my.cnf is 0600 and root owned. +- database_user deprecation warning was incorrect. +- Add anchor pattern for client.pp +- Documentation improvements. +- Various test fixes. + + +## 2013-10-21 - Version 2.0.1 + +### Summary + +This is a bugfix release to handle an issue where unsorted mysql_grant{} +privileges could cause Puppet to incorrectly reapply the permissions on +each run. + +#### Bugfixes +- Mysql_grant now sorts privileges in the type and provider for comparison. +- Comment and test tweak for PE3.1. + + +## 2013-10-14 - Version 2.0.0 + +### Summary + +(Previously detailed in the changelog for 2.0.0-rc1) + +This module has been completely refactored and works significantly different. +The changes are broad and touch almost every piece of the module. + +See the README.md for full details of all changes and syntax. +Please remain on 1.0.0 if you don't have time to fully test this in dev. + +* mysql::server, mysql::client, and mysql::bindings are the primary interface +classes. +* mysql::server takes an `override_options` parameter to set my.cnf options, +with the hash format: { 'section' => { 'thing' => 'value' }} +* mysql attempts backwards compatibility by forwarding all parameters to +mysql::server. + + +## 2013-10-09 - Version 2.0.0-rc5 + +### Summary + +Hopefully the final rc! Further fixes to mysql_grant (stripping out the +cleverness so we match a much wider range of input.) + +#### Bugfixes +- Make mysql_grant accept '.*'@'.*' in terms of input for user@host. + + +## 2013-10-09 - Version 2.0.0-rc4 + +### Summary + +Bugfixes to mysql_grant and mysql_user form the bulk of this rc, as well as +ensuring that values in the override_options hash that contain a value of '' +are created as just "key" in the conf rather than "key =" or "key = false". + +#### Bugfixes +- Improve mysql_grant to work with IPv6 addresses (both long and short). +- Ensure @host users work as well as user@host users. +- Updated my.cnf template to support items with no values. + + +## 2013-10-07 - Version 2.0.0-rc3 + +### Summary +Fix mysql::server::monitor's use of mysql_user{}. + +#### Bugfixes +- Fix myql::server::monitor's use of mysql_user{} to grant the proper +permissions. Add specs as well. (Thanks to treydock!) + + +## 2013-10-03 - Version 2.0.0-rc2 + +### Summary +Bugfixes + +#### Bugfixes +- Fix a duplicate parameter in mysql::server + + +## 2013-10-03 - Version 2.0.0-rc1 + +### Summary + +This module has been completely refactored and works significantly different. +The changes are broad and touch almost every piece of the module. + +See the README.md for full details of all changes and syntax. +Please remain on 1.0.0 if you don't have time to fully test this in dev. + +* mysql::server, mysql::client, and mysql::bindings are the primary interface +classes. +* mysql::server takes an `override_options` parameter to set my.cnf options, +with the hash format: { 'section' => { 'thing' => 'value' }} +* mysql attempts backwards compatibility by forwarding all parameters to +mysql::server. + +--- +## 2013-09-23 - Version 1.0.0 + +### Summary + +This release introduces a number of new type/providers, to eventually +replace the database_ ones. The module has been converted to call the +new providers rather than the previous ones as they have a number of +fixes, additional options, and work with puppet resource. + +This 1.0.0 release precedes a large refactoring that will be released +almost immediately after as 2.0.0. + +#### Features +- Added mysql_grant, mysql_database, and mysql_user. +- Add `mysql::bindings` class and refactor all other bindings to be contained underneath mysql::bindings:: namespace. +- Added support to back up specified databases only with 'mysqlbackup' parameter. +- Add option to mysql::backup to set the backup script to perform a mysqldump on each database to its own file + +#### Bugfixes +- Update my.cnf.pass.erb to allow custom socket support +- Add environment variable for .my.cnf in mysql::db. +- Add HOME environment variable for .my.cnf to mysqladmin command when +(re)setting root password + +--- +## 2013-07-15 - Version 0.9.0 +#### Features +- Add `mysql::backup::backuprotate` parameter +- Add `mysql::backup::delete_before_dump` parameter +- Add `max_user_connections` attribute to `database_user` type + +#### Bugfixes +- Add client package dependency for `mysql::db` +- Remove duplicate `expire_logs_days` and `max_binlog_size` settings +- Make root's `.my.cnf` file path dynamic +- Update pidfile path for Suse variants +- Fixes for lint + +## 2013-07-05 - Version 0.8.1 +#### Bugfixes + - Fix a typo in the Fedora 19 support. + +## 2013-07-01 - Version 0.8.0 +#### Features + - mysql::perl class to install perl-DBD-mysql. + - minor improvements to the providers to improve reliability + - Install the MariaDB packages on Fedora 19 instead of MySQL. + - Add new `mysql` class parameters: + - `max_connections`: The maximum number of allowed connections. + - `manage_config_file`: Opt out of puppetized control of my.cnf. + - `ft_min_word_len`: Fine tune the full text search. + - `ft_max_word_len`: Fine tune the full text search. + - Add new `mysql` class performance tuning parameters: + - `key_buffer` + - `thread_stack` + - `thread_cache_size` + - `myisam-recover` + - `query_cache_limit` + - `query_cache_size` + - `max_connections` + - `tmp_table_size` + - `table_open_cache` + - `long_query_time` + - Add new `mysql` class replication parameters: + - `server_id` + - `sql_log_bin` + - `log_bin` + - `max_binlog_size` + - `binlog_do_db` + - `expire_logs_days` + - `log_bin_trust_function_creators` + - `replicate_ignore_table` + - `replicate_wild_do_table` + - `replicate_wild_ignore_table` + - `expire_logs_days` + - `max_binlog_size` + +#### Bugfixes + - No longer restart MySQL when /root/.my.cnf changes. + - Ensure mysql::config runs before any mysql::db defines. + +## 2013-06-26 - Version 0.7.1 +#### Bugfixes +- Single-quote password for special characters +- Update travis testing for puppet 3.2.x and missing Bundler gems + +## 2013-06-25 - Version 0.7.0 +This is a maintenance release for community bugfixes and exposing +configuration variables. + +* Add new `mysql` class parameters: + - `basedir`: The base directory mysql uses + - `bind_address`: The IP mysql binds to + - `client_package_name`: The name of the mysql client package + - `config_file`: The location of the server config file + - `config_template`: The template to use to generate my.cnf + - `datadir`: The directory MySQL's datafiles are stored + - `default_engine`: The default engine to use for tables + - `etc_root_password`: Whether or not to add the mysql root password to + /etc/my.cnf + - `java_package_name`: The name of the java package containing the java + connector + - `log_error`: Where to log errors + - `manage_service`: Boolean dictating if mysql::server should manage the + service + - `max_allowed_packet`: Maximum network packet size mysqld will accept + - `old_root_password`: Previous root user password + - `php_package_name`: The name of the phpmysql package to install + - `pidfile`: The location mysql will expect the pidfile to be + - `port`: The port mysql listens on + - `purge_conf_dir`: Value fed to recurse and purge parameters of the + /etc/mysql/conf.d resource + - `python_package_name`: The name of the python mysql package to install + - `restart`: Whether to restart mysqld + - `root_group`: Use specified group for root-owned files + - `root_password`: The root MySQL password to use + - `ruby_package_name`: The name of the ruby mysql package to install + - `ruby_package_provider`: The installation suite to use when installing the + ruby package + - `server_package_name`: The name of the server package to install + - `service_name`: The name of the service to start + - `service_provider`: The name of the service provider + - `socket`: The location of the MySQL server socket file + - `ssl_ca`: The location of the SSL CA Cert + - `ssl_cert`: The location of the SSL Certificate to use + - `ssl_key`: The SSL key to use + - `ssl`: Whether or not to enable ssl + - `tmpdir`: The directory MySQL's tmpfiles are stored +* Deprecate `mysql::package_name` parameter in favor of +`mysql::client_package_name` +* Fix local variable template deprecation +* Fix dependency ordering in `mysql::db` +* Fix ANSI quoting in queries +* Fix travis support (but still messy) +* Fix typos + +## 2013-01-11 - Version 0.6.1 +* Fix providers when /root/.my.cnf is absent + +## 2013-01-09 - Version 0.6.0 +* Add `mysql::server::config` define for specific config directives +* Add `mysql::php` class for php support +* Add `backupcompress` parameter to `mysql::backup` +* Add `restart` parameter to `mysql::config` +* Add `purge_conf_dir` parameter to `mysql::config` +* Add `manage_service` parameter to `mysql::server` +* Add syslog logging support via the `log_error` parameter +* Add initial SuSE support +* Fix remove non-localhost root user when fqdn != hostname +* Fix dependency in `mysql::server::monitor` +* Fix .my.cnf path for root user and root password +* Fix ipv6 support for users +* Fix / update various spec tests +* Fix typos +* Fix lint warnings + +## 2012-08-23 - Version 0.5.0 +* Add puppetlabs/stdlib as requirement +* Add validation for mysql privs in provider +* Add `pidfile` parameter to mysql::config +* Add `ensure` parameter to mysql::db +* Add Amazon linux support +* Change `bind_address` parameter to be optional in my.cnf template +* Fix quoting root passwords + +## 2012-07-24 - Version 0.4.0 +* Fix various bugs regarding database names +* FreeBSD support +* Allow specifying the storage engine +* Add a backup class +* Add a security class to purge default accounts + +## 2012-05-03 - Version 0.3.0 +* 14218 Query the database for available privileges +* Add mysql::java class for java connector installation +* Use correct error log location on different distros +* Fix set_mysql_rootpw to properly depend on my.cnf + +## 2012-04-11 - Version 0.2.0 + +## 2012-03-19 - William Van Hevelingen +* (#13203) Add ssl support (f7e0ea5) + +## 2012-03-18 - Nan Liu +* Travis ci before script needs success exit code. (0ea463b) + +## 2012-03-18 - Nan Liu +* Fix Puppet 2.6 compilation issues. (9ebbbc4) + +## 2012-03-16 - Nan Liu +* Add travis.ci for testing multiple puppet versions. (33c72ef) + +## 2012-03-15 - William Van Hevelingen +* (#13163) Datadir should be configurable (f353fc6) + +## 2012-03-16 - Nan Liu +* Document create_resources dependency. (558a59c) + +## 2012-03-16 - Nan Liu +* Fix spec test issues related to error message. (eff79b5) + +## 2012-03-16 - Nan Liu +* Fix mysql service on Ubuntu. (72da2c5) + +## 2012-03-16 - Dan Bode +* Add more spec test coverage (55e399d) + +## 2012-03-16 - Nan Liu +* (#11963) Fix spec test due to path changes. (1700349) + +## 2012-03-07 - François Charlier +* Add a test to check path for 'mysqld-restart' (b14c7d1) + +## 2012-03-07 - François Charlier +* Fix path for 'mysqld-restart' (1a9ae6b) + +## 2012-03-15 - Dan Bode +* Add rspec-puppet tests for mysql::config (907331a) + +## 2012-03-15 - Dan Bode +* Moved class dependency between sever and config to server (da62ad6) + +## 2012-03-14 - Dan Bode +* Notify mysql restart from set_mysql_rootpw exec (0832a2c) + +## 2012-03-15 - Nan Liu +* Add documentation related to osfamily fact. (8265d28) + +## 2012-03-14 - Dan Bode +* Mention osfamily value in failure message (e472d3b) + +## 2012-03-14 - Dan Bode +* Fix bug when querying for all database users (015490c) + +## 2012-02-09 - Nan Liu +* Major refactor of mysql module. (b1f90fd) + +## 2012-01-11 - Justin Ellison +* Ruby and Python's MySQL libraries are named differently on different distros. (1e926b4) + +## 2012-01-11 - Justin Ellison +* Per @ghoneycutt, we should fail explicitly and explain why. (09af083) + +## 2012-01-11 - Justin Ellison +* Removing duplicate declaration (7513d03) + +## 2012-01-10 - Justin Ellison +* Use socket value from params class instead of hardcoding. (663e97c) + +## 2012-01-10 - Justin Ellison +* Instead of hardcoding the config file target, pull it from mysql::params (031a47d) + +## 2012-01-10 - Justin Ellison +* Moved $socket to within the case to toggle between distros. Added a $config_file variable to allow per-distro config file destinations. (360eacd) + +## 2012-01-10 - Justin Ellison +* Pretty sure this is a bug, 99% of Linux distros out there won't ever hit the default. (3462e6b) + +## 2012-02-09 - William Van Hevelingen +* Changed the README to use markdown (3b7dfeb) + +## 2012-02-04 - Daniel Black +* (#12412) mysqltuner.pl update (b809e6f) + +## 2011-11-17 - Matthias Pigulla +* (#11363) Add two missing privileges to grant: event_priv, trigger_priv (d15c9d1) + +## 2011-12-20 - Jeff McCune +* (minor) Fixup typos in Modulefile metadata (a0ed6a1) + +## 2011-12-19 - Carl Caum +* Only notify Exec to import sql if sql is given (0783c74) + +## 2011-12-19 - Carl Caum +* (#11508) Only load sql_scripts on DB creation (e3b9fd9) + +## 2011-12-13 - Justin Ellison +* Require not needed due to implicit dependencies (3058feb) + +## 2011-12-13 - Justin Ellison +* Bug #11375: puppetlabs-mysql fails on CentOS/RHEL (a557b8d) + +## 2011-06-03 - Dan Bode - 0.0.1 +* initial commit + +[5.4.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.3.0...5.4.0 +[5.3.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.2.1...5.3.0 +[5.2.1]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.2.0...5.2.1 +[5.2.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.1.0...5.2.0 +[5.1.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.0.0...5.1.0 +[5.0.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/4.0.1...5.0.0 diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/README.md b/modules/services/unix/database/mysql_stretch_compatible/mysql/README.md index b7273d050..8a93f7842 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/README.md +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/README.md @@ -13,7 +13,8 @@ * [Specify passwords](#specify-passwords) * [Install Percona server on CentOS](#install-percona-server-on-centos) * [Install MariaDB on Ubuntu](#install-mariadb-on-ubuntu) -4. [Reference - An under-the-hood peek at what the module is doing and how](#reference) + * [Install Plugins](#install-plugins) +4. [Reference - An under-the-hood peek at what the module is doing and how](REFERENCE.md) 5. [Limitations - OS compatibility, etc.](#limitations) 6. [Development - Guide for contributing to the module](#development) @@ -170,6 +171,8 @@ mysql::db { 'mydb': } ``` +If required, the password can also be an empty string to allow connections without an password. + ### Install Percona server on CentOS This example shows how to do a minimal installation of a Percona server on a @@ -365,7 +368,7 @@ mysql::server::service_name: 'mysqld' # required for puppet module mysql::server::override_options: 'mysqld': 'bind-address': '127.0.0.1' - 'log-error': /var/log/mysqld.log' # required for proper MySQL installation + 'log-error': '/var/log/mysqld.log' # required for proper MySQL installation 'mysqld_safe': 'log-error': '/var/log/mysqld.log' # required for proper MySQL installation @@ -380,929 +383,32 @@ mysql::server::db: ``` +### Install Plugins -## Reference - -### Classes - -#### Public classes - -* [`mysql::server`](#mysqlserver): Installs and configures MySQL. -* [`mysql::server::monitor`](#mysqlservermonitor): Sets up a monitoring user. -* [`mysql::server::mysqltuner`](#mysqlservermysqltuner): Installs MySQL tuner script. -* [`mysql::server::backup`](#mysqlserverbackup): Sets up MySQL backups via cron. -* [`mysql::bindings`](#mysqlbindings): Installs various MySQL language bindings. -* [`mysql::client`](#mysqlclient): Installs MySQL client (for non-servers). - -#### Private classes - -* `mysql::server::install`: Installs packages. -* `mysql::server::installdb`: Implements setup of mysqld data directory (e.g. /var/lib/mysql) -* `mysql::server::config`: Configures MYSQL. -* `mysql::server::service`: Manages service. -* `mysql::server::account_security`: Deletes default MySQL accounts. -* `mysql::server::root_password`: Sets MySQL root password. -* `mysql::server::providers`: Creates users, grants, and databases. -* `mysql::bindings::client_dev`: Installs MySQL client development package. -* `mysql::bindings::daemon_dev`: Installs MySQL daemon development package. -* `mysql::bindings::java`: Installs Java bindings. -* `mysql::bindings::perl`: Installs Perl bindings. -* `mysql::bindings::php`: Installs PHP bindings. -* `mysql::bindings::python`: Installs Python bindings. -* `mysql::bindings::ruby`: Installs Ruby bindings. -* `mysql::client::install`: Installs MySQL client. -* `mysql::backup::mysqldump`: Implements mysqldump backups. -* `mysql::backup::mysqlbackup`: Implements backups with Oracle MySQL Enterprise Backup. -* `mysql::backup::xtrabackup`: Implements backups with XtraBackup from Percona. - -### Parameters - -#### mysql::server - -##### `create_root_user` - -Whether root user should be created. - -Valid values are `true`, `false`. - -Defaults to `true`. - -This is useful for a cluster setup with Galera. The root user has to be created only once. You can set this parameter true on one node and set it to false on the remaining nodes. - -##### `create_root_my_cnf` - -Whether to create `/root/.my.cnf`. - -Valid values are `true`, `false`. - -Defaults to `true`. - -`create_root_my_cnf` allows creation of `/root/.my.cnf` independently of `create_root_user`. You can use this for a cluster setup with Galera where you want `/root/.my.cnf` to exist on all nodes. - -##### `root_password` - -The MySQL root password. Puppet attempts to set the root password and update `/root/.my.cnf` with it. - -This is required if `create_root_user` or `create_root_my_cnf` are true. If `root_password` is 'UNSET', then `create_root_user` and `create_root_my_cnf` are assumed to be false --- that is, the MySQL root user and `/root/.my.cnf` are not created. - -Password changes are supported; however, the old password must be set in `/root/.my.cnf`. Effectively, Puppet uses the old password, configured in `/root/my.cnf`, to set the new password in MySQL, and then updates `/root/.my.cnf` with the new password. - -##### `old_root_password` - -This parameter no longer does anything. It exists only for backwards compatibility. See the `root_password` parameter above for details on changing the root password. - -##### `override_options` - -Specifies override options to pass into MySQL. Structured like a hash in the my.cnf file: +Plugins can be installed by using the `mysql_plugin` defined type. See `examples/mysql_plugin.pp` for futher examples. ```puppet -$override_options = { - 'section' => { - 'item' => 'thing', - } +class { 'mysql::server': + root_password => 'password' } + +mysql_plugin { 'auth_pam': + ensure => present, + soname => 'auth_pam.so', +} + ``` -See [**Customize Server Options**](#customize-server-options) above for usage details. - -##### `config_file` - -The location, as a path, of the MySQL configuration file. - -##### `manage_config_file` - -Whether the MySQL configuration file should be managed. - -Valid values are `true`, `false`. - -Defaults to `true`. - -##### `includedir` - -The location, as a path, of !includedir for custom configuration overrides. - -##### `install_options` - -Passes [install_options](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options) array to managed package resources. You must pass the appropriate options for the specified package manager. - -##### `purge_conf_dir` - -Whether the `includedir` directory should be purged. - -Valid values are `true`, `false`. - -Defaults to `false`. - -##### `restart` - -Whether the service should be restarted when things change. - -Valid values are `true`, `false`. - -Defaults to `false`. - -##### `root_group` - -The name of the group used for root. Can be a group name or a group ID. See more about the [`group` file attribute](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group). - -##### `mysql_group` - -The name of the group of the MySQL daemon user. Can be a group name or a group ID. See more about the [`group` file attribute](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group). - -##### `package_ensure` - -Whether the package exists or should be a specific version. - -Valid values are 'present', 'absent', or 'x.y.z'. - -Defaults to 'present'. - -##### `package_manage` - -Whether to manage the MySQL server package. - -Defaults to `true`. - -##### `package_name` - -The name of the MySQL server package to install. - -##### `remove_default_accounts` - -Specifies whether to automatically include `mysql::server::account_security`. - -Valid values are `true`, `false`. - -Defaults to `false`. - -##### `service_enabled` - -Specifies whether the service should be enabled. - -Valid values are `true`, `false`. - -Defaults to `true`. - -##### `service_manage` - -Specifies whether the service should be managed. - -Valid values are `true`, `false`. - -Defaults to `true`. - -##### `service_name` - -The name of the MySQL server service. - -Defaults are OS dependent, defined in 'params.pp'. - -##### `service_provider` - -The provider to use to manage the service. - -For Ubuntu, defaults to 'upstart'; otherwise, default is undefined. - -##### `users` - -Optional hash of users to create, which are passed to [mysql_user](#mysql_user). - -```puppet -users => { - 'someuser@localhost' => { - ensure => 'present', - max_connections_per_hour => '0', - max_queries_per_hour => '0', - max_updates_per_hour => '0', - max_user_connections => '0', - password_hash => '*F3A2A51A9B0F2BE2468926B4132313728C250DBF', - tls_options => ['NONE'], - }, -} -``` - -##### `grants` - -Optional hash of grants, which are passed to [mysql_grant](#mysql_grant). - -```puppet -grants => { - 'someuser@localhost/somedb.*' => { - ensure => 'present', - options => ['GRANT'], - privileges => ['SELECT', 'INSERT', 'UPDATE', 'DELETE'], - table => 'somedb.*', - user => 'someuser@localhost', - }, -} -``` - -##### `databases` - -Optional hash of databases to create, which are passed to [mysql_database](#mysql_database). - -```puppet -databases => { - 'somedb' => { - ensure => 'present', - charset => 'utf8', - }, -} -``` - -#### mysql::server::backup - -##### `backupuser` - -MySQL user to create for backups. - -##### `backuppassword` - -MySQL user password for backups. - -##### `backupdir` - -Directory in which to store backups. - -##### `backupdirmode` - -Permissions applied to the backup directory. This parameter is passed directly to the `file` resource. - -##### `backupdirowner` - -Owner for the backup directory. This parameter is passed directly to the `file` resource. - -##### `backupdirgroup` - -Group owner for the backup directory. This parameter is passed directly to the `file` resource. - -##### `backupcompress` - -Whether backups should be compressed. - -Valid values are `true`, `false`. - -Defaults to `true`. - -##### `backuprotate` - -How many days to keep backups. - -Valid value is an integer. - -Defaults to 30. - -##### `delete_before_dump` - -Whether to delete old .sql files before backing up. Setting to true deletes old files before backing up, while setting to false deletes them after backup. - -Valid values are `true`, `false`. - -Defaults to `false`. - -##### `backupdatabases` - -Specifies an array of databases to back up. - -##### `file_per_database` - -Whether a separate file be used per database. - -Valid values are `true`, `false`. - -Defaults to `false`. - -##### `include_routines` - -Whether or not to include routines for each database when doing a `file_per_database` backup. - -Defaults to `false`. - -##### `include_triggers` - -Whether or not to include triggers for each database when doing a `file_per_database` backup. - -Defaults to `false`. - -##### `ensure` - -Allows you to remove the backup scripts. - -Valid values are 'present', 'absent'. - -Defaults to 'present'. - -##### `execpath` - -Allows you to set a custom PATH should your MySQL installation be non-standard places. Defaults to `/usr/bin:/usr/sbin:/bin:/sbin`. - -##### `time` - -An array of two elements to set the backup time. Allows ['23', '5'] (i.e., 23:05) or ['3', '45'] (i.e., 03:45) for HH:MM times. - -#### mysql::server::backup - -##### `postscript` - -A script that is executed when the backup is finished. This could be used to sync the backup to a central store. This script can be either a single line that is directly executed or a number of lines supplied as an array. It could also be one or more externally managed (executable) files. - -##### `prescript` - -A script that is executed before the backup begins. - -##### `provider` - -Sets the server backup implementation. Valid values are: - -* `mysqldump`: Implements backups with mysqldump. Backup type: Logical. This is the default value. -* `mysqlbackup`: Implements backups with MySQL Enterprise Backup from Oracle. Backup type: Physical. To use this type of backup, you'll need the `meb` package, which is available in RPM and TAR formats from Oracle. For Ubuntu, you can use [meb-deb](https://github.com/dveeden/meb-deb) to create a package from an official tarball. -* `xtrabackup`: Implements backups with XtraBackup from Percona. Backup type: Physical. - -##### `maxallowedpacket` - -Defines the maximum SQL statement size for the backup dump script. The default value is 1MB, as this is the default MySQL Server value. - -##### `optional_args` - -Specifies an array of optional arguments which should be passed through to the backup tool. (Currently only supported by the xtrabackup provider.) - -#### mysql::server::monitor - -##### `mysql_monitor_username` - -The username to create for MySQL monitoring. - -##### `mysql_monitor_password` - -The password to create for MySQL monitoring. - -##### `mysql_monitor_hostname` - -The hostname from which the monitoring user requests are allowed access. - -#### mysql::server::mysqltuner - -**Note**: If you're using this class on a non-network-connected system, you must download the mysqltuner.pl script and have it hosted somewhere accessible via `http(s)://`, `puppet://`, `ftp://`, or a fully qualified file path. - -##### `ensure` - -Ensures that the resource exists. - -Valid values are 'present', 'absent'. - -Defaults to 'present'. - -##### `version` - -The version to install from the major/MySQLTuner-perl github repository. Must be a valid tag. - -Defaults to 'v1.3.0'. - -##### `environment` - -Environment variables active during download, e.g. to download via proxies: environment => 'https_proxy=http://proxy.example.com:80' - -#### mysql::bindings - -##### `client_dev` - -Specifies whether `::mysql::bindings::client_dev` should be included. - -Valid values are `true`', `false`. - -Defaults to `false`. - -##### `daemon_dev` - -Specifies whether `::mysql::bindings::daemon_dev` should be included. - -Valid values are `true`, `false`. - -Defaults to `false`. - -##### `java_enable` - -Specifies whether `::mysql::bindings::java` should be included. - -Valid values are `true`, `false`. - -Defaults to `false`. - -##### `perl_enable` - -Specifies whether `mysql::bindings::perl` should be included. - -Valid values are `true`, `false`. - -Defaults to `false`. - -##### `php_enable` - -Specifies whether `mysql::bindings::php` should be included. - -Valid values are `true`, `false`. - -Defaults to `false`. - -##### `python_enable` - -Specifies whether `mysql::bindings::python` should be included. - -Valid values are `true`, `false`. - -Defaults to `false`. - -##### `ruby_enable` - -Specifies whether `mysql::bindings::ruby` should be included. - -Valid values are `true`, `false`. - -Defaults to `false`. - -##### `install_options` - -Passes `install_options` array to managed package resources. You must pass the [appropriate options](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options) for the package manager(s). - -##### `client_dev_package_ensure` - -Whether the package should be present, absent, or a specific version. - -Valid values are 'present', 'absent', or 'x.y.z'. - -Only applies if `client_dev => true`. - -##### `client_dev_package_name` - -The name of the client_dev package to install. - -Only applies if `client_dev => true`. - -##### `client_dev_package_provider` - -The provider to use to install the client_dev package. - -Only applies if `client_dev => true`. - -##### `daemon_dev_package_ensure` - -Whether the package should be present, absent, or a specific version. - -Valid values are 'present', 'absent', or 'x.y.z'. - -Only applies if `daemon_dev => true`. - -##### `daemon_dev_package_name` - -The name of the daemon_dev package to install. - -Only applies if `daemon_dev => true`. - -##### `daemon_dev_package_provider` - -The provider to use to install the daemon_dev package. - -Only applies if `daemon_dev => true`. - -##### `java_package_ensure` - -Whether the package should be present, absent, or a specific version. - -Valid values are 'present', 'absent', or 'x.y.z'. - -Only applies if `java_enable => true`. - -##### `java_package_name` - -The name of the Java package to install. - -Only applies if `java_enable => true`. - -##### `java_package_provider` - -The provider to use to install the Java package. - -Only applies if `java_enable => true`. - -##### `perl_package_ensure` - -Whether the package should be present, absent, or a specific version. - -Valid values are 'present', 'absent', or 'x.y.z'. - -Only applies if `perl_enable => true`. - -##### `perl_package_name` - -The name of the Perl package to install. - -Only applies if `perl_enable => true`. - -##### `perl_package_provider` - -The provider to use to install the Perl package. - -Only applies if `perl_enable => true`. - -##### `php_package_ensure` - -Whether the package should be present, absent, or a specific version. - -Valid values are 'present', 'absent', or 'x.y.z'. - -Only applies if `php_enable => true`. - -##### `php_package_name` - -The name of the PHP package to install. - -Only applies if `php_enable => true`. - -##### `python_package_ensure` - -Whether the package should be present, absent, or a specific version. - -Valid values are 'present', 'absent', or 'x.y.z'. - -Only applies if `python_enable => true`. - -##### `python_package_name` - -The name of the Python package to install. - -Only applies if `python_enable => true`. - -##### `python_package_provider` - -The provider to use to install the Python package. - -Only applies if `python_enable => true`. - -##### `ruby_package_ensure` - -Whether the package should be present, absent, or a specific version. - -Valid values are 'present', 'absent', or 'x.y.z'. - -Only applies if `ruby_enable => true`. - -##### `ruby_package_name` - -The name of the Ruby package to install. - -Only applies if `ruby_enable => true`. - -##### `ruby_package_provider` - -What provider should be used to install the package. - -#### mysql::client - -##### `bindings_enable` - -Whether to automatically install all bindings. - -Valid values are `true`, `false`. - -Default to `false`. - -##### `install_options` - -Array of install options for managed package resources. You must pass the appropriate options for the package manager. - -##### `package_ensure` - -Whether the MySQL package should be present, absent, or a specific version. - -Valid values are 'present', 'absent', or 'x.y.z'. - -##### `package_manage` - -Whether to manage the MySQL client package. - -Defaults to `true`. - -##### `package_name` - -The name of the MySQL client package to install. - -### Defines - -#### mysql::db - -```puppet -mysql_database { 'information_schema': - ensure => 'present', - charset => 'utf8', - collate => 'utf8_swedish_ci', -} -mysql_database { 'mysql': - ensure => 'present', - charset => 'latin1', - collate => 'latin1_swedish_ci', -} -``` - -##### `user` - -The user for the database you're creating. - -##### `password` - -The password for $user for the database you're creating. - -##### `dbname` - -The name of the database to create. - -Defaults to "$name". - -##### `charset` - -The character set for the database. - -Defaults to 'utf8'. - -##### `collate` - -The collation for the database. - -Defaults to 'utf8_general_ci'. - -##### `host` - -The host to use as part of user@host for grants. - -Defaults to 'localhost'. - -##### `grant` - -The privileges to be granted for user@host on the database. - -Defaults to 'ALL'. - -##### `sql` - -The path to the sqlfile you want to execute. This can be single file specified as string, or it can be an array of strings. - -Defaults to `undef`. - -##### `enforce_sql` - -Specifies whether executing the sqlfiles should happen on every run. If set to false, sqlfiles only run once. - -Valid values are `true`, `false`. - -Defaults to `false`. - -##### `ensure` - -Specifies whether to create the database. - -Valid values are 'present', 'absent'. - -Defaults to 'present'. - -##### `import_timeout` - -Timeout, in seconds, for loading the sqlfiles. - -Defaults to 300. - -##### `import_cat_cmd` - -Command to read the sqlfile for importing the database. Useful for compressed sqlfiles. For example, you can use 'zcat' for .gz files. - -Defaults to 'cat'. - -### Types - -#### mysql_database - -`mysql_database` creates and manages databases within MySQL. - -##### `ensure` - -Whether the resource is present. - -Valid values are 'present', 'absent'. - -Defaults to 'present'. - -##### `name` - -The name of the MySQL database to manage. - -##### `charset` - -The CHARACTER SET setting for the database. - -Defaults to ':utf8'. - -##### `collate` - -The COLLATE setting for the database. - -Defaults to ':utf8_general_ci'. - -#### mysql_user - -Creates and manages user grants within MySQL. - -```puppet -mysql_user { 'root@127.0.0.1': - ensure => 'present', - max_connections_per_hour => '0', - max_queries_per_hour => '0', - max_updates_per_hour => '0', - max_user_connections => '0', -} -``` - -You can also specify an authentication plugin. - -```puppet -mysql_user{ 'myuser'@'localhost': - ensure => 'present', - plugin => 'unix_socket', -} -``` - -TLS options can be specified for a user. - -```puppet -mysql_user{ 'myuser'@'localhost': - ensure => 'present', - tls_options => ['SSL'], -} -``` - -##### `name` - -The name of the user, as 'username@hostname' or username@hostname. - -##### `password_hash` - -The user's password hash of the user. Use mysql_password() for creating such a hash. - -##### `max_user_connections` - -Maximum concurrent connections for the user. - -Must be an integer value. - -A value of '0' specifies no (or global) limit. - -##### `max_connections_per_hour` - -Maximum connections per hour for the user. - -Must be an integer value. - -A value of '0' specifies no (or global) limit. - -##### `max_queries_per_hour` - -Maximum queries per hour for the user. - -Must be an integer value. - -A value of '0' specifies no (or global) limit. - -##### `max_updates_per_hour` - -Maximum updates per hour for the user. - -Must be an integer value. - -A value of '0' specifies no (or global) limit. - -##### `tls_options` - -SSL-related options for a MySQL account, using one or more tls_option values. 'NONE' specifies that the account has no TLS options enforced, and the available options are 'SSL', 'X509', 'CIPHER *cipher*', 'ISSUER *issuer*', 'SUBJECT *subject*'; as stated in the MySQL documentation. - - -#### mysql_grant - -`mysql_grant` creates grant permissions to access databases within MySQL. To create grant permissions to access databases with MySQL, use it you must create the title of the resource as shown below, following the pattern of `username@hostname/database.table`: - -```puppet -mysql_grant { 'root@localhost/*.*': - ensure => 'present', - options => ['GRANT'], - privileges => ['ALL'], - table => '*.*', - user => 'root@localhost', -} -``` - -It is possible to specify privileges down to the column level: - -```puppet -mysql_grant { 'root@localhost/mysql.user': - ensure => 'present', - privileges => ['SELECT (Host, User)'], - table => 'mysql.user', - user => 'root@localhost', -} -``` - -To revoke GRANT privilege specify ['NONE']. - -##### `ensure` - -Whether the resource is present. - -Valid values are 'present', 'absent'. - -Defaults to 'present'. - -##### `name` - -Name to describe the grant. Must in a 'user/table' format. - -##### `privileges` - -Privileges to grant the user. - -##### `table` - -The table to which privileges are applied. - -##### `user` - -User to whom privileges are granted. - -##### `options` - -MySQL options to grant. Optional. - -#### mysql_plugin - -`mysql_plugin` can be used to load plugins into the MySQL Server. - -```puppet -mysql_plugin { 'auth_socket': - ensure => 'present', - soname => 'auth_socket.so', -} -``` - -##### `ensure` - -Whether the resource is present. - -Valid values are 'present', 'absent'. - -Defaults to 'present'. - -##### `name` - -The name of the MySQL plugin to manage. - -##### `soname` - -The library file name. - -#### `mysql_datadir` - -Initializes the MySQL data directory with version specific code. Pre MySQL 5.7.6 it uses mysql_install_db. After MySQL 5.7.6 it uses mysqld --initialize-insecure. - -Insecure initialization is needed, as mysqld version 5.7 introduced 'secure by default' mode. This means MySQL generates a random password and writes it to STDOUT. This means puppet can never access the database server afterwards, as no credentials are available. - -This type is an internal type and should not be called directly. - -### Facts - -#### `mysql_version` - -Determines the MySQL version by parsing the output from `mysql --version` - -#### `mysql_server_id` - -Generates a unique id, based on the node's MAC address, which can be used as `server_id`. This fact will *always* return `0` on nodes that have only loopback interfaces. Because those nodes aren't connected to the outside world, this shouldn't cause any conflicts. - ### Tasks The MySQL module has an example task that allows a user to execute arbitary SQL against a database. 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. ## Limitations -This module has been tested on: - -* RedHat Enterprise Linux 5, 6, 7 -* Debian 6, 7, 8 -* CentOS 5, 6, 7 -* Ubuntu 10.04, 12.04, 14.04, 16.04 -* Scientific Linux 5, 6 -* SLES 11 - -Testing on other platforms has been minimal and cannot be guaranteed. +For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-tomcat/blob/master/metadata.json) **Note:** The mysqlbackup.sh does not work and is not supported on MySQL 5.7 and greater. -Debian 9 compatibility has not been fully verified. - ## 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. diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/REFERENCE.md b/modules/services/unix/database/mysql_stretch_compatible/mysql/REFERENCE.md new file mode 100644 index 000000000..fe4c2c3ac --- /dev/null +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/REFERENCE.md @@ -0,0 +1,1180 @@ +# Reference + + +## Classes + +### Public Classes + +* [`mysql::bindings`](#mysqlbindings): Parent class for MySQL bindings. +* [`mysql::client`](#mysqlclient): Installs and configures the MySQL client. +* [`mysql::server`](#mysqlserver): Installs and configures the MySQL server. +* [`mysql::server::backup`](#mysqlserverbackup): Create and manage a MySQL backup. +* [`mysql::server::monitor`](#mysqlservermonitor): This is a helper class to add a monitoring user to the database +* [`mysql::server::mysqltuner`](#mysqlservermysqltuner): Manage the MySQLTuner package. + +### Private Classes + +* `mysql::backup::mysqlbackup`: Manage the mysqlbackup client. +* `mysql::backup::mysqldump`: "Provider" for mysqldump +* `mysql::backup::xtrabackup`: "Provider" for Percona XtraBackup +* `mysql::bindings::client_dev`: Private class for installing client development bindings +* `mysql::bindings::daemon_dev`: Private class for installing daemon development bindings +* `mysql::bindings::java`: Private class for installing java language bindings. +* `mysql::bindings::perl`: Private class for installing perl language bindings. +* `mysql::bindings::php`: Private class for installing php language bindings +* `mysql::bindings::python`: Private class for installing python language bindings +* `mysql::bindings::ruby`: Private class for installing ruby language bindings +* `mysql::client::install`: Private class for MySQL client install. +* `mysql::params`: Params class. +* `mysql::server::account_security`: Private class for ensuring localhost accounts do not exist +* `mysql::server::binarylog`: Binary log configuration requires the mysql user to be present. This must be done after package install +* `mysql::server::config`: Private class for MySQL server configuration. +* `mysql::server::install`: Private class for managing MySQL package. +* `mysql::server::installdb`: Builds initial databases on installation. +* `mysql::server::providers`: Convenience class to call each of the three providers with the corresponding hashes provided in mysql::server. +* `mysql::server::root_password`: Private class for managing the root password +* `mysql::server::service`: Private class for managing the MySQL service + +## Defined types + +* [`mysql::db`](#mysqldb): Create and configure a MySQL database. + +## Resource types + +### Public Resource types + +* [`mysql_plugin`](#mysql_plugin): Manage MySQL plugins. + +### Private Resource types + +* `mysql_database`: Manage a MySQL database. +* `mysql_datadir`: Manage MySQL datadirs with mysql_install_db OR mysqld (5.7.6 and above). +* `mysql_grant`: Manage a MySQL user's rights. +* `mysql_user`: Manage a MySQL user. This includes management of users password as well as privileges. + +## Functions + +* [`mysql_deepmerge`](#mysql_deepmerge): Recursively merges two or more hashes together and returns the resulting hash. +* [`mysql_dirname`](#mysql_dirname): Returns the dirname of a path +* [`mysql_password`](#mysql_password): Hash a string as mysql's "PASSWORD()" function would do it +* [`mysql_strip_hash`](#mysql_strip_hash): TEMPORARY FUNCTION: EXPIRES 2014-03-10 When given a hash this function strips out all blank entries. + +## Tasks + +* [`export`](#export): Allows you to backup your database to local file. +* [`sql`](#sql): Allows you to execute arbitary SQL + +## Classes + +### mysql::bindings + +Parent class for MySQL bindings. + +#### Examples + +##### Install Ruby language bindings + +```puppet +class { 'mysql::bindings': + ruby_enable => true, + ruby_package_ensure => 'present', + ruby_package_name => 'ruby-mysql-2.7.1-1mdv2007.0.sparc.rpm', + ruby_package_provider => 'rpm', +} +``` + +#### Parameters + +The following parameters are available in the `mysql::bindings` class. + +##### `install_options` + +Data type: `Any` + +Passes `install_options` array to managed package resources. You must pass the [appropriate options](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options) for the package manager(s). + +Default value: `undef` + +##### `java_enable` + +Data type: `Any` + +Specifies whether `::mysql::bindings::java` should be included. Valid values are `true`, `false`. + +Default value: `false` + +##### `perl_enable` + +Data type: `Any` + +Specifies whether `mysql::bindings::perl` should be included. Valid values are `true`, `false`. + +Default value: `false` + +##### `php_enable` + +Data type: `Any` + +Specifies whether `mysql::bindings::php` should be included. Valid values are `true`, `false`. + +Default value: `false` + +##### `python_enable` + +Data type: `Any` + +Specifies whether `mysql::bindings::python` should be included. Valid values are `true`, `false`. + +Default value: `false` + +##### `ruby_enable` + +Data type: `Any` + +Specifies whether `mysql::bindings::ruby` should be included. Valid values are `true`, `false`. + +Default value: `false` + +##### `client_dev` + +Data type: `Any` + +Specifies whether `::mysql::bindings::client_dev` should be included. Valid values are `true`', `false`. + +Default value: `false` + +##### `daemon_dev` + +Data type: `Any` + +Specifies whether `::mysql::bindings::daemon_dev` should be included. Valid values are `true`, `false`. + +Default value: `false` + +##### `java_package_ensure` + +Data type: `Any` + +Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `java_enable => true`. + +Default value: $mysql::params::java_package_ensure + +##### `java_package_name` + +Data type: `Any` + +The name of the Java package to install. Only applies if `java_enable => true`. + +Default value: $mysql::params::java_package_name + +##### `java_package_provider` + +Data type: `Any` + +The provider to use to install the Java package. Only applies if `java_enable => true`. + +Default value: $mysql::params::java_package_provider + +##### `perl_package_ensure` + +Data type: `Any` + +Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `perl_enable => true`. + +Default value: $mysql::params::perl_package_ensure + +##### `perl_package_name` + +Data type: `Any` + +The name of the Perl package to install. Only applies if `perl_enable => true`. + +Default value: $mysql::params::perl_package_name + +##### `perl_package_provider` + +Data type: `Any` + +The provider to use to install the Perl package. Only applies if `perl_enable => true`. + +Default value: $mysql::params::perl_package_provider + +##### `php_package_ensure` + +Data type: `Any` + +Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `php_enable => true`. + +Default value: $mysql::params::php_package_ensure + +##### `php_package_name` + +Data type: `Any` + +The name of the PHP package to install. Only applies if `php_enable => true`. + +Default value: $mysql::params::php_package_name + +##### `php_package_provider` + +Data type: `Any` + +The provider to use to install the PHP package. Only applies if `php_enable => true`. + +Default value: $mysql::params::php_package_provider + +##### `python_package_ensure` + +Data type: `Any` + +Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `python_enable => true`. + +Default value: $mysql::params::python_package_ensure + +##### `python_package_name` + +Data type: `Any` + +The name of the Python package to install. Only applies if `python_enable => true`. + +Default value: $mysql::params::python_package_name + +##### `python_package_provider` + +Data type: `Any` + +The provider to use to install the Python package. Only applies if `python_enable => true`. + +Default value: $mysql::params::python_package_provider + +##### `ruby_package_ensure` + +Data type: `Any` + +Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `ruby_enable => true`. + +Default value: $mysql::params::ruby_package_ensure + +##### `ruby_package_name` + +Data type: `Any` + +The name of the Ruby package to install. Only applies if `ruby_enable => true`. + +Default value: $mysql::params::ruby_package_name + +##### `ruby_package_provider` + +Data type: `Any` + +What provider should be used to install the package. + +Default value: $mysql::params::ruby_package_provider + +##### `client_dev_package_ensure` + +Data type: `Any` + +Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `client_dev => true`. + +Default value: $mysql::params::client_dev_package_ensure + +##### `client_dev_package_name` + +Data type: `Any` + +The name of the client_dev package to install. Only applies if `client_dev => true`. + +Default value: $mysql::params::client_dev_package_name + +##### `client_dev_package_provider` + +Data type: `Any` + +The provider to use to install the client_dev package. Only applies if `client_dev => true`. + +Default value: $mysql::params::client_dev_package_provider + +##### `daemon_dev_package_ensure` + +Data type: `Any` + +Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `daemon_dev => true`. + +Default value: $mysql::params::daemon_dev_package_ensure + +##### `daemon_dev_package_name` + +Data type: `Any` + +The name of the daemon_dev package to install. Only applies if `daemon_dev => true`. + +Default value: $mysql::params::daemon_dev_package_name + +##### `daemon_dev_package_provider` + +Data type: `Any` + +The provider to use to install the daemon_dev package. Only applies if `daemon_dev => true`. + +Default value: $mysql::params::daemon_dev_package_provider + +### mysql::client + +Installs and configures the MySQL client. + +#### Examples + +##### Install the MySQL client + +```puppet +class {'::mysql::client': + package_name => 'mysql-client', + package_ensure => 'present', + bindings_enable => true, +} +``` + +#### Parameters + +The following parameters are available in the `mysql::client` class. + +##### `bindings_enable` + +Data type: `Any` + +Whether to automatically install all bindings. Valid values are `true`, `false`. Default to `false`. + +Default value: $mysql::params::bindings_enable + +##### `install_options` + +Data type: `Any` + +Array of install options for managed package resources. You must pass the appropriate options for the package manager. + +Default value: `undef` + +##### `package_ensure` + +Data type: `Any` + +Whether the MySQL package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. + +Default value: $mysql::params::client_package_ensure + +##### `package_manage` + +Data type: `Any` + +Whether to manage the MySQL client package. Defaults to `true`. + +Default value: $mysql::params::client_package_manage + +##### `package_name` + +Data type: `Any` + +The name of the MySQL client package to install. + +Default value: $mysql::params::client_package_name + +### mysql::server + +Installs and configures the MySQL server. + +#### Examples + +##### Install MySQL Server + +```puppet +class { '::mysql::server': + package_name => 'mysql-server', + package_ensure => '5.7.1+mysql~trusty', + root_password => 'strongpassword', + remove_default_accounts => true, +} +``` + +#### Parameters + +The following parameters are available in the `mysql::server` class. + +##### `config_file` + +Data type: `Any` + +The location, as a path, of the MySQL configuration file. + +Default value: $mysql::params::config_file + +##### `includedir` + +Data type: `Any` + +The location, as a path, of !includedir for custom configuration overrides. + +Default value: $mysql::params::includedir + +##### `install_options` + +Data type: `Any` + +Passes [install_options](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options) array to managed package resources. You must pass the appropriate options for the specified package manager + +Default value: `undef` + +##### `install_secret_file` + +Data type: `Any` + +Path to secret file containing temporary root password. + +Default value: $mysql::params::install_secret_file + +##### `manage_config_file` + +Data type: `Any` + +Whether the MySQL configuration file should be managed. Valid values are `true`, `false`. Defaults to `true`. + +Default value: $mysql::params::manage_config_file + +##### `override_options` + +Data type: `Any` + +Specifies override options to pass into MySQL. Structured like a hash in the my.cnf file: See above for usage details. + +Default value: {} + +##### `package_ensure` + +Data type: `Any` + +Whether the package exists or should be a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Defaults to 'present'. + +Default value: $mysql::params::server_package_ensure + +##### `package_manage` + +Data type: `Any` + +Whether to manage the MySQL server package. Defaults to `true`. + +Default value: $mysql::params::server_package_manage + +##### `package_name` + +Data type: `Any` + +The name of the MySQL server package to install. + +Default value: $mysql::params::server_package_name + +##### `purge_conf_dir` + +Data type: `Any` + +Whether the `includedir` directory should be purged. Valid values are `true`, `false`. Defaults to `false`. + +Default value: $mysql::params::purge_conf_dir + +##### `remove_default_accounts` + +Data type: `Any` + +Specifies whether to automatically include `mysql::server::account_security`. Valid values are `true`, `false`. Defaults to `false`. + +Default value: `false` + +##### `restart` + +Data type: `Any` + +Whether the service should be restarted when things change. Valid values are `true`, `false`. Defaults to `false`. + +Default value: $mysql::params::restart + +##### `root_group` + +Data type: `Any` + +The name of the group used for root. Can be a group name or a group ID. See more about the [group](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group). + +Default value: $mysql::params::root_group + +##### `mysql_group` + +Data type: `Any` + +The name of the group of the MySQL daemon user. Can be a group name or a group ID. See more about the [group](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group). + +Default value: $mysql::params::mysql_group + +##### `root_password` + +Data type: `Any` + +The MySQL root password. Puppet attempts to set the root password and update `/root/.my.cnf` with it. This is required if `create_root_user` or `create_root_my_cnf` are true. If `root_password` is 'UNSET', then `create_root_user` and `create_root_my_cnf` are assumed to be false --- that is, the MySQL root user and `/root/.my.cnf` are not created. Password changes are supported; however, the old password must be set in `/root/.my.cnf`. Effectively, Puppet uses the old password, configured in `/root/my.cnf`, to set the new password in MySQL, and then updates `/root/.my.cnf` with the new password. + +Default value: $mysql::params::root_password + +##### `service_enabled` + +Data type: `Any` + +Specifies whether the service should be enabled. Valid values are `true`, `false`. Defaults to `true`. + +Default value: $mysql::params::server_service_enabled + +##### `service_manage` + +Data type: `Any` + +Specifies whether the service should be managed. Valid values are `true`, `false`. Defaults to `true`. + +Default value: $mysql::params::server_service_manage + +##### `service_name` + +Data type: `Any` + +The name of the MySQL server service. Defaults are OS dependent, defined in 'params.pp'. + +Default value: $mysql::params::server_service_name + +##### `service_provider` + +Data type: `Any` + +The provider to use to manage the service. For Ubuntu, defaults to 'upstart'; otherwise, default is undefined. + +Default value: $mysql::params::server_service_provider + +##### `create_root_user` + +Data type: `Any` + +Whether root user should be created. Valid values are `true`, `false`. Defaults to `true`. This is useful for a cluster setup with Galera. The root user has to be created only once. You can set this parameter true on one node and set it to false on the remaining nodes. + +Default value: $mysql::params::create_root_user + +##### `create_root_my_cnf` + +Data type: `Any` + +Whether to create `/root/.my.cnf`. Valid values are `true`, `false`. Defaults to `true`. `create_root_my_cnf` allows creation of `/root/.my.cnf` independently of `create_root_user`. You can use this for a cluster setup with Galera where you want `/root/.my.cnf` to exist on all nodes. + +Default value: $mysql::params::create_root_my_cnf + +##### `users` + +Data type: `Any` + +Optional hash of users to create, which are passed to [mysql_user](#mysql_user). + +Default value: {} + +##### `grants` + +Data type: `Any` + +Optional hash of grants, which are passed to [mysql_grant](#mysql_grant). + +Default value: {} + +##### `databases` + +Data type: `Any` + +Optional hash of databases to create, which are passed to [mysql_database](#mysql_database). + +Default value: {} + +##### `enabled` + +Data type: `Any` + +_Deprecated_ + +Default value: `undef` + +##### `manage_service` + +Data type: `Any` + +_Deprecated_ + +Default value: `undef` + +##### `old_root_password` + +Data type: `Any` + +This parameter no longer does anything. It exists only for backwards compatibility. See the `root_password` parameter above for details on changing the root password. + +Default value: `undef` + +### mysql::server::backup + +Create and manage a MySQL backup. + +#### Examples + +##### Create a basic MySQL backup: + +```puppet +class { 'mysql::server': + root_password => 'password' +} +class { 'mysql::server::backup': + backupuser => 'myuser', + backuppassword => 'mypassword', + backupdir => '/tmp/backups', +} +``` + +#### Parameters + +The following parameters are available in the `mysql::server::backup` class. + +##### `backupuser` + +Data type: `Any` + +MySQL user with backup administrator privileges. + +Default value: `undef` + +##### `backuppassword` + +Data type: `Any` + +Password for `backupuser`. + +Default value: `undef` + +##### `backupdir` + +Data type: `Any` + +Directory to store backup. + +Default value: `undef` + +##### `backupdirmode` + +Data type: `Any` + +Permissions applied to the backup directory. This parameter is passed directly to the file resource. + +Default value: '0700' + +##### `backupdirowner` + +Data type: `Any` + +Owner for the backup directory. This parameter is passed directly to the file resource. + +Default value: 'root' + +##### `backupdirgroup` + +Data type: `Any` + +Group owner for the backup directory. This parameter is passed directly to the file resource. + +Default value: 'root' + +##### `backupcompress` + +Data type: `Any` + +Whether or not to compress the backup (when using the mysqldump provider) + +Default value: `true` + +##### `backuprotate` + +Data type: `Any` + +Backup rotation interval in 24 hour periods. + +Default value: 30 + +##### `ignore_events` + +Data type: `Any` + +Ignore the mysql.event table. + +Default value: `true` + +##### `delete_before_dump` + +Data type: `Any` + +Whether to delete old .sql files before backing up. Setting to true deletes old files before backing up, while setting to false deletes them after backup. + +Default value: `false` + +##### `backupdatabases` + +Data type: `Any` + +Databases to backup (if using xtrabackup provider). + +Default value: [] + +##### `file_per_database` + +Data type: `Any` + +Use file per database mode creating one file per database backup. + +Default value: `false` + +##### `include_routines` + +Data type: `Any` + +Dump stored routines (procedures and functions) from dumped databases when doing a `file_per_database` backup. + +Default value: `false` + +##### `include_triggers` + +Data type: `Any` + +Dump triggers for each dumped table when doing a `file_per_database` backup. + +Default value: `false` + +##### `ensure` + +Data type: `Any` + + + +Default value: 'present' + +##### `time` + +Data type: `Any` + +An array of two elements to set the backup time. Allows ['23', '5'] (i.e., 23:05) or ['3', '45'] (i.e., 03:45) for HH:MM times. + +Default value: ['23', '5'] + +##### `prescript` + +Data type: `Any` + +A script that is executed before the backup begins. + +Default value: `false` + +##### `postscript` + +Data type: `Any` + +A script that is executed when the backup is finished. This could be used to sync the backup to a central store. This script can be either a single line that is directly executed or a number of lines supplied as an array. It could also be one or more externally managed (executable) files. + +Default value: `false` + +##### `execpath` + +Data type: `Any` + +Allows you to set a custom PATH should your MySQL installation be non-standard places. Defaults to `/usr/bin:/usr/sbin:/bin:/sbin`. + +Default value: '/usr/bin:/usr/sbin:/bin:/sbin' + +##### `provider` + +Data type: `Any` + +Sets the server backup implementation. Valid values are: + +Default value: 'mysqldump' + +##### `maxallowedpacket` + +Data type: `Any` + +Defines the maximum SQL statement size for the backup dump script. The default value is 1MB, as this is the default MySQL Server value. + +Default value: '1M' + +##### `optional_args` + +Data type: `Any` + +Specifies an array of optional arguments which should be passed through to the backup tool. (Currently only supported by the xtrabackup provider.) + +Default value: [] + +### mysql::server::monitor + +This is a helper class to add a monitoring user to the database + +#### Parameters + +The following parameters are available in the `mysql::server::monitor` class. + +##### `mysql_monitor_username` + +Data type: `Any` + +The username to create for MySQL monitoring. + +Default value: '' + +##### `mysql_monitor_password` + +Data type: `Any` + +The password to create for MySQL monitoring. + +Default value: '' + +##### `mysql_monitor_hostname` + +Data type: `Any` + +The hostname from which the monitoring user requests are allowed access. + +Default value: '' + +### mysql::server::mysqltuner + +Manage the MySQLTuner package. + +#### Parameters + +The following parameters are available in the `mysql::server::mysqltuner` class. + +##### `ensure` + +Data type: `Any` + +Ensures that the resource exists. Valid values are 'present', 'absent'. Defaults to 'present'. + +Default value: 'present' + +##### `version` + +Data type: `Any` + +The version to install from the major/MySQLTuner-perl github repository. Must be a valid tag. Defaults to 'v1.3.0'. + +Default value: 'v1.3.0' + +##### `source` + +Data type: `Any` + +Source path for the mysqltuner package. + +Default value: `undef` + +##### `environment` + +Data type: `Any` + +Environment variables active during download, e.g. to download via proxies: environment => 'https_proxy=http://proxy.example.com:80' + +Default value: `undef` + +## Defined types + +### mysql::db + +Create and configure a MySQL database. + +#### Examples + +##### Create a database + +```puppet +mysql::db { 'mydb': + user => 'myuser', + password => 'mypass', + host => 'localhost', + grant => ['SELECT', 'UPDATE'], +} +``` + +#### Parameters + +The following parameters are available in the `mysql::db` defined type. + +##### `user` + +Data type: `Any` + +The user for the database you're creating. + +##### `password` + +Data type: `Any` + +The password for $user for the database you're creating. + +##### `dbname` + +Data type: `Any` + +The name of the database to create. + +Default value: $name + +##### `charset` + +Data type: `Any` + +The character set for the database. + +Default value: 'utf8' + +##### `collate` + +Data type: `Any` + +The collation for the database. + +Default value: 'utf8_general_ci' + +##### `host` + +Data type: `Any` + +The host to use as part of user@host for grants. + +Default value: 'localhost' + +##### `grant` + +Data type: `Any` + +The privileges to be granted for user@host on the database. + +Default value: 'ALL' + +##### `sql` + +Data type: `Optional[Variant[Array, Hash, String]]` + +The path to the sqlfile you want to execute. This can be single file specified as string, or it can be an array of strings. + +Default value: `undef` + +##### `enforce_sql` + +Data type: `Any` + +Specifies whether executing the sqlfiles should happen on every run. If set to false, sqlfiles only run once. + +Default value: `false` + +##### `ensure` + +Data type: `Enum['absent', 'present']` + +Specifies whether to create the database. Valid values are 'present', 'absent'. Defaults to 'present'. + +Default value: 'present' + +##### `import_timeout` + +Data type: `Any` + +Timeout, in seconds, for loading the sqlfiles. Defaults to 300. + +Default value: 300 + +##### `import_cat_cmd` + +Data type: `Any` + +Command to read the sqlfile for importing the database. Useful for compressed sqlfiles. For example, you can use 'zcat' for .gz files. + +Default value: 'cat' + +## Resource types + +### mysql_plugin + +Manage MySQL plugins. + +#### Examples + +##### + +```puppet +mysql_plugin { 'some_plugin': + soname => 'some_pluginlib.so', +} +``` + +#### Properties + +The following properties are available in the `mysql_plugin` type. + +##### `ensure` + +Valid values: present, absent + +The basic property that the resource should be in. + +Default value: present + +##### `soname` + +Valid values: %r{^\w+\.\w+$} + +The name of the library + +#### Parameters + +The following parameters are available in the `mysql_plugin` type. + +##### `name` + +namevar + +The name of the MySQL plugin to manage. + +## Functions + +### mysql_deepmerge + +Type: Ruby 3.x API + +- When there is a duplicate key that is a hash, they are recursively merged. +- When there is a duplicate key that is not a hash, the key in the rightmost hash will "win." +- When there are conficting uses of dashes and underscores in two keys (which mysql would otherwise equate), + the rightmost style will win. + +#### `mysql_deepmerge()` + +- When there is a duplicate key that is a hash, they are recursively merged. +- When there is a duplicate key that is not a hash, the key in the rightmost hash will "win." +- When there are conficting uses of dashes and underscores in two keys (which mysql would otherwise equate), + the rightmost style will win. + +Returns: `Hash` + +### mysql_dirname + +Type: Ruby 3.x API + +Returns the dirname of a path + +#### `mysql_dirname(String $path)` + +Returns: `String` Directory name of path. + +##### `path` + +Data type: `String` + +Path to find the dirname for. + +### mysql_password + +Type: Ruby 3.x API + +Hash a string as mysql's "PASSWORD()" function would do it + +#### `mysql_password(String $password)` + +Returns: `String` the mysql password hash from the clear text password. + +##### `password` + +Data type: `String` + +Plain text password. + +### mysql_strip_hash + +Type: Ruby 3.x API + +TEMPORARY FUNCTION: EXPIRES 2014-03-10 +When given a hash this function strips out all blank entries. + +#### `mysql_strip_hash()` + +TEMPORARY FUNCTION: EXPIRES 2014-03-10 +When given a hash this function strips out all blank entries. + +Returns: `Any` + +## Tasks + +### export + +Allows you to backup your database to local file. + +**Supports noop?** false + +#### Parameters + +##### `database` + +Data type: `Optional[String[1]]` + +Database to connect to + +##### `user` + +Data type: `Optional[String[1]]` + +The user + +##### `password` + +Data type: `Optional[String[1]]` + +The password + +##### `file` + +Data type: `String[1]` + +Path to file you want backup to + +### sql + +Allows you to execute arbitary SQL + +**Supports noop?** false + +#### Parameters + +##### `database` + +Data type: `Optional[String[1]]` + +Database to connect to + +##### `user` + +Data type: `Optional[String[1]]` + +The user + +##### `password` + +Data type: `Optional[String[1]]` + +The password + +##### `sql` + +Data type: `String[1]` + +The SQL you want to execute + diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/Rakefile b/modules/services/unix/database/mysql_stretch_compatible/mysql/Rakefile index f39d8351c..112dc4212 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/Rakefile +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/Rakefile @@ -1,4 +1,76 @@ require 'puppetlabs_spec_helper/rake_tasks' require 'puppet-syntax/tasks/puppet-syntax' -require 'puppet_blacksmith/rake_tasks' +require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any? +require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any? require 'puppet_pot_generator/rake_tasks' + +def changelog_user + return unless Rake.application.top_level_tasks.include? "changelog" + returnVal = nil || JSON.load(File.read('metadata.json'))['author'] + raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil? + puts "GitHubChangelogGenerator user:#{returnVal}" + returnVal +end + +def changelog_project + return unless Rake.application.top_level_tasks.include? "changelog" + returnVal = nil || JSON.load(File.read('metadata.json'))['name'] + raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil? + puts "GitHubChangelogGenerator project:#{returnVal}" + returnVal +end + +def changelog_future_release + return unless Rake.application.top_level_tasks.include? "changelog" + returnVal = JSON.load(File.read('metadata.json'))['version'] + raise "unable to find the future_release (version) in metadata.json" if returnVal.nil? + puts "GitHubChangelogGenerator future_release:#{returnVal}" + returnVal +end + +PuppetLint.configuration.send('disable_relative') + +if Bundler.rubygems.find_name('github_changelog_generator').any? + GitHubChangelogGenerator::RakeTask.new :changelog do |config| + raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil? + config.user = "#{changelog_user}" + config.project = "#{changelog_project}" + config.future_release = "#{changelog_future_release}" + config.exclude_labels = ['maintenance'] + config.header = "# Change log\n\nAll 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)." + config.add_pr_wo_labels = true + config.issues = false + config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM" + config.configure_sections = { + "Changed" => { + "prefix" => "### Changed", + "labels" => ["backwards-incompatible"], + }, + "Added" => { + "prefix" => "### Added", + "labels" => ["feature", "enhancement"], + }, + "Fixed" => { + "prefix" => "### Fixed", + "labels" => ["bugfix"], + }, + } + end +else + desc 'Generate a Changelog from GitHub' + task :changelog do + raise <= Gem::Version.new('2.2.2')" +EOM + end +end + diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/checksums.json b/modules/services/unix/database/mysql_stretch_compatible/mysql/checksums.json new file mode 100644 index 000000000..e5c01ff43 --- /dev/null +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/checksums.json @@ -0,0 +1,137 @@ +{ + "CHANGELOG.md": "bea624121cef123e00250ec2321228a9", + "CONTRIBUTING.md": "4d17f3c942e7c93d1577cc4438a231e4", + "Gemfile": "9ba204736d497887aa71980fa336319f", + "HISTORY.md": "202fb76908e67e272549113e70da44a9", + "LICENSE": "3b83ef96387f14655fc854ddc3c6bd57", + "MAINTAINERS.md": "d1a8a0cb1736b23f3143b685e0d034b0", + "NOTICE": "61151e454f47a0df587642c792385533", + "README.md": "83c63cf4abd3c2c57586af802aeea73d", + "REFERENCE.md": "728640207cebe9fcc76bfd28c51be978", + "Rakefile": "5a645b196705e2e8d973114d1552e5ef", + "TODO": "88ca4024a37992b46c34cb46e4ac39e6", + "examples/backup.pp": "a61c6f34f153a323209faf25948737f5", + "examples/bindings.pp": "35a8387f5c55fa2e479c513a67918674", + "examples/java.pp": "0ad9de4f9f2c049642bcf08124757085", + "examples/mysql_database.pp": "107ee8793f7b4a12cfca32eddccc6bbd", + "examples/mysql_db.pp": "55d2d603f9fb8ab3c8a781d08119aa69", + "examples/mysql_grant.pp": "cd42336a6c7b2d27f5d5d6d0e310ee1a", + "examples/mysql_plugin.pp": "3be416bd610ccc563517c1378c726463", + "examples/mysql_user.pp": "ec5182bfb57a9e7a8ba44ad8aff82ac9", + "examples/perl.pp": "454f14dc4492fcf04afbe81b2776917e", + "examples/python.pp": "355a7e1ea3978a8fd290b5bc28b63808", + "examples/ruby.pp": "a6ae0381aacc5a8d2c403e606c6df0f0", + "examples/server/account_security.pp": "375442b7886c01b42fbf75a1fcb31822", + "examples/server/config.pp": "659b7c40e9b55634721b3c33a8c6da98", + "examples/server.pp": "72e22552a95b9a5e4a349dbfc13639dc", + "lib/facter/mysql_server_id.rb": "8074e28063136191d064de5bbd23d823", + "lib/facter/mysql_version.rb": "9e8e89de386bbbd74bac1c24c388ed61", + "lib/facter/mysqld_version.rb": "a865c82a1bbe4fc49998d17038eaaa11", + "lib/puppet/functions/mysql/deepmerge.rb": "91fb87c5912f1499aa00caba63142ffb", + "lib/puppet/functions/mysql/dirname.rb": "2edd12fbdaee91cac386125d66f7f159", + "lib/puppet/functions/mysql/password.rb": "fd2cf970768fb515547179481357c503", + "lib/puppet/functions/mysql/strip_hash.rb": "46f744d3d50c331332ef893e5b1dcddf", + "lib/puppet/parser/functions/mysql_deepmerge.rb": "866fa179eec788d60d879674595bea5f", + "lib/puppet/parser/functions/mysql_dirname.rb": "c86c31344b8d5c0c2bc1ce05eedbbfdc", + "lib/puppet/parser/functions/mysql_password.rb": "c4d522919ce8d270a5d3d2ccf060ecd1", + "lib/puppet/parser/functions/mysql_strip_hash.rb": "59f90ce7c6a5f96c3565ba2ef12a6e7e", + "lib/puppet/provider/mysql.rb": "3eb92809e36d1a57357229d461aa6dc9", + "lib/puppet/provider/mysql_database/mysql.rb": "12e6bfef70486ed4d8a4e731bfde89fa", + "lib/puppet/provider/mysql_datadir/mysql.rb": "aa72daf1732dadd9d5caa6c6ff696414", + "lib/puppet/provider/mysql_grant/mysql.rb": "e0a96951629bc906d45c8bc73f0d16d5", + "lib/puppet/provider/mysql_plugin/mysql.rb": "d0043d2fec34ab9d9839ecb2f5e6f494", + "lib/puppet/provider/mysql_user/mysql.rb": "343f3871935e7a36e2c981cdae5d6482", + "lib/puppet/type/mysql_database.rb": "a52d622db5cb4e9978c57d445e7d63f7", + "lib/puppet/type/mysql_datadir.rb": "003e20fbccdfabbf46e62dfbfc41781b", + "lib/puppet/type/mysql_grant.rb": "2d9bdca037cd3db847f840ffc807817f", + "lib/puppet/type/mysql_plugin.rb": "5786a52bf1ca04a9300831add3f4dbad", + "lib/puppet/type/mysql_user.rb": "0886e73a6ecfe8838196fcaf7e1907a4", + "locales/config.yaml": "2fa67bcbae3c1f47b447359558142bb4", + "locales/ja/puppetlabs-mysql.po": "2cf26b43a97d4444f0af6e542b140a84", + "locales/puppetlabs-mysql.pot": "0bc1d574fc470daa825d2052b901f1c2", + "manifests/backup/mysqlbackup.pp": "a3af8ed949cfa26dda63708b8525f7a7", + "manifests/backup/mysqldump.pp": "6e1650e5af995c9aad06d905f9e9884e", + "manifests/backup/xtrabackup.pp": "735376e8698570aa9e2523307739735b", + "manifests/bindings/client_dev.pp": "22caac5dc87099f19e930c045bd3b8ab", + "manifests/bindings/daemon_dev.pp": "835f8b31d04dc4e274554ebc521bfae4", + "manifests/bindings/java.pp": "594bed2948731d4707837f149a6a34dc", + "manifests/bindings/perl.pp": "1db6a303f85d294e60437425d69e6e21", + "manifests/bindings/php.pp": "fd2f05eb16fb26dcb6856368b32e0d8e", + "manifests/bindings/python.pp": "6f21841a99e131cbbed991cd3b224b45", + "manifests/bindings/ruby.pp": "4e15dc048a88fff9d4dda51149444474", + "manifests/bindings.pp": "a082c3fb3bb814a0953ec7beda9f0786", + "manifests/client/install.pp": "26c737ee4b0ce3a4529dbf3368dd56d5", + "manifests/client.pp": "178235b85d2984e7b6245b3419eb9c58", + "manifests/db.pp": "f7d5de529a9d55e432f6d3606cea28f2", + "manifests/params.pp": "bdd97f331dff824bcb71b512bde0ac31", + "manifests/server/account_security.pp": "e8547d61232dab8399fc1c026678f0e8", + "manifests/server/backup.pp": "1781622fb06122bbc119eb6f80b5bbe5", + "manifests/server/binarylog.pp": "5ea5c22eeda8100c49c0de59bf0348bb", + "manifests/server/config.pp": "fd386ce8b1a6015362af0cd745d273a4", + "manifests/server/install.pp": "e00ad8cd4292540d6556c63a82bcf923", + "manifests/server/installdb.pp": "320b2242006cbd4d3f537b07df054f97", + "manifests/server/monitor.pp": "3303efac7f345000b5d49ce8c807a513", + "manifests/server/mysqltuner.pp": "063d000c4b3dedcc3873725f2345ed7c", + "manifests/server/providers.pp": "1ff9ff9f003b061c3a6a184c01ca734e", + "manifests/server/root_password.pp": "ac1250741d8e26bfe5c73a2dc6599fba", + "manifests/server/service.pp": "0e37b66b3d68d734cccf6e18c50238e2", + "manifests/server.pp": "e2aeee196fb5afb00de32270ae979fa2", + "metadata.json": "f8eb72b00d30b0f02968431052f0199e", + "readmes/README_ja_JP.md": "18d5302aa8b6e984b190ac2b3e633999", + "readmes/REFERENCE_ja_JP.md": "8f395be104df61b6f20b96cf861d4307", + "spec/acceptance/locales_spec.rb": "5999c778fcbbe072b5302bd9a1b862a6", + "spec/acceptance/mysql_backup_spec.rb": "1e45476499232adfc732d4d7db084950", + "spec/acceptance/mysql_db_spec.rb": "cc23120fecd30fc1689ebbbd976c03c3", + "spec/acceptance/mysql_helper.rb": "5f9f41b66022b99b4630ba9b581e68cf", + "spec/acceptance/mysql_server_spec.rb": "c72db5ea61b0f3c4c0765d8cb6cf2fbf", + "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/sql_task_spec.rb": "5ccb8605df65ac994b2e3ada87413a65", + "spec/acceptance/types/mysql_database_spec.rb": "18d2d82180d8f26e793d25d2853199b6", + "spec/acceptance/types/mysql_grant_spec.rb": "acaa270a0f778d3bd8e06836141fac6e", + "spec/acceptance/types/mysql_plugin_spec.rb": "3984c7432d3f8b8f7461e21e139776c5", + "spec/acceptance/types/mysql_user_spec.rb": "2973815482b49457ee3c22f18921abd3", + "spec/classes/graceful_failures_spec.rb": "b87bf88de1903d81765ea2823e30b13f", + "spec/classes/mycnf_template_spec.rb": "41a4593b53d5ad9416f96d1c695efa0c", + "spec/classes/mysql_bindings_spec.rb": "cc74d765e235c986be88dc23b68bcc85", + "spec/classes/mysql_client_spec.rb": "8cbbecb97b11841730d1e6e761b55f9e", + "spec/classes/mysql_server_account_security_spec.rb": "fa9089b55ba0839a601e1b487d6f6958", + "spec/classes/mysql_server_backup_spec.rb": "476160ee6579495309ec11c2a081fdd9", + "spec/classes/mysql_server_monitor_spec.rb": "1e028eeb613ab7baa6d8ae2c9cf7366f", + "spec/classes/mysql_server_mysqltuner_spec.rb": "b353330180fedb94dff9a242acf8f729", + "spec/classes/mysql_server_spec.rb": "b39d692016bb1bfb63c61bbc777bfbbb", + "spec/default_facts.yml": "b1ca07fac7dcb249d641d8b63239ef7c", + "spec/defines/mysql_db_spec.rb": "83b27cf8dbfe928db504b37c0fa4d1bc", + "spec/functions/mysql_deepmerge_spec.rb": "fb3afbbe85490122c62c1472a9f98d27", + "spec/functions/mysql_dirname_spec.rb": "2d24e3737d189a4a6bc27e0e979b4ab4", + "spec/functions/mysql_password_spec.rb": "3ef9614805abbb84a90a6abb2a4125e6", + "spec/functions/mysql_strip_hash_spec.rb": "40c9eccc3b09ca20ed7ce35930affe21", + "spec/spec_helper.rb": "d1342428e68cc7b29b19a29688def899", + "spec/spec_helper_acceptance.rb": "ee714af36b07fb0638b57c232ffdc9d2", + "spec/spec_helper_local.rb": "35d201e4b56adf60407d84c2a231b9ff", + "spec/unit/facter/mysql_server_id_spec.rb": "6cd165396028f68de96b8e66f1acadb6", + "spec/unit/facter/mysql_version_spec.rb": "0e555c398b189e20648ae6a037d106f6", + "spec/unit/facter/mysqld_version_spec.rb": "7af40a2b38b996684752b49f2cb64ec6", + "spec/unit/puppet/functions/mysql_deepmerge_spec.rb": "96b153d97d10255a9e3904da0a7bfd48", + "spec/unit/puppet/functions/mysql_password_spec.rb": "82214310a621f86813dee0dfecaf27ca", + "spec/unit/puppet/provider/mysql_database/mysql_spec.rb": "05ab36956e6807e9e7056b61c2de05f1", + "spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb": "033d476b84e766a455b7bfd403a67c2d", + "spec/unit/puppet/provider/mysql_user/mysql_spec.rb": "7a8e569fefae9758ec692c2cec46d881", + "spec/unit/puppet/type/mysql_database_spec.rb": "8e790bec45c59bc48544d7ac446b2f25", + "spec/unit/puppet/type/mysql_grant_spec.rb": "f6aafaffed76df6cad9466defb30e34b", + "spec/unit/puppet/type/mysql_plugin_spec.rb": "c4bfe6319219c10142667af520e09e2b", + "spec/unit/puppet/type/mysql_user_spec.rb": "3e56a74ff308a9744c6a915462093846", + "tasks/export.json": "81c6eee3500d31843221da03e75a9f7b", + "tasks/export.rb": "bed98c19b371cef7f4b1a54d273842de", + "tasks/sql.json": "f57ad96a8079e6729ff7557f9ac6fa62", + "tasks/sql.rb": "b6428a942317640b2b23d2776faac505", + "templates/meb.cnf.erb": "b6422b19ee97b8a2883bfac44fdc0292", + "templates/my.cnf.erb": "535d2ff37fea6b11ad928224965143d3", + "templates/my.cnf.pass.erb": "11f80afb0993a436f074a43f70733999", + "templates/mysqlbackup.sh.erb": "5ef94baab34d6061798b7381de89d1d5", + "templates/xtrabackup.sh.erb": "ebcf249f36fd947e2daf5cff92367a14" +} \ No newline at end of file diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/examples/mysql_plugin.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/examples/mysql_plugin.pp index d80275972..6901d0b01 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/examples/mysql_plugin.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/examples/mysql_plugin.pp @@ -7,7 +7,7 @@ $validate_password_soname = $::osfamily ? { default => 'validate_password.so' } -mysql::plugin { 'validate_password': +mysql_plugin { 'validate_password': ensure => present, soname => $validate_password_soname, } @@ -17,7 +17,7 @@ $auth_socket_soname = $::osfamily ? { default => 'auth_socket.so' } -mysql::plugin { 'auth_socket': +mysql_plugin { 'auth_socket': ensure => present, soname => $auth_socket_soname, } diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/examples/mysql_user.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/examples/mysql_user.pp index c47186866..6c312ce40 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/examples/mysql_user.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/examples/mysql_user.pp @@ -6,18 +6,18 @@ class { 'mysql::server': mysql_user{ 'redmine@localhost': ensure => present, - password_hash => mysql_password('redmine'), + password_hash => mysql::password('redmine'), require => Class['mysql::server'], } mysql_user{ 'dan@localhost': ensure => present, - password_hash => mysql_password('blah') + password_hash => mysql::password('blah') } mysql_user{ 'dan@%': ensure => present, - password_hash => mysql_password('blah'), + password_hash => mysql::password('blah'), } mysql_user{ 'socketplugin@%': @@ -27,6 +27,6 @@ mysql_user{ 'socketplugin@%': mysql_user{ 'socketplugin@%': ensure => present, - password_hash => mysql_password('blah'), + password_hash => mysql::password('blah'), plugin => 'mysql_native_password', } diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/facter/mysqld_version.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/facter/mysqld_version.rb index 61e2acf9a..a97459eff 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/facter/mysqld_version.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/facter/mysqld_version.rb @@ -1,5 +1,5 @@ Facter.add('mysqld_version') do setcode do - Facter::Util::Resolution.exec('mysqld -V 2>/dev/null') + Facter::Util::Resolution.exec('mysqld --no-defaults -V 2>/dev/null') end end diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/deepmerge.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/deepmerge.rb new file mode 100644 index 000000000..3cda71d18 --- /dev/null +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/deepmerge.rb @@ -0,0 +1,66 @@ +# @summary Recursively merges two or more hashes together and returns the resulting hash. +# +# @example +# $hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } } +# $hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } } +# $merged_hash = mysql_deepmerge($hash1, $hash2) +# # The resulting hash is equivalent to: +# # $merged_hash = { 'one' => 1, 'two' => 'dos', 'three' => { 'four' => 4, 'five' => 5 } } +# +# - When there is a duplicate key that is a hash, they are recursively merged. +# - When there is a duplicate key that is not a hash, the key in the rightmost hash will "win." +# - When there are conficting uses of dashes and underscores in two keys (which mysql would otherwise equate), the rightmost style will win. +# +Puppet::Functions.create_function(:'mysql::deepmerge') do + def deepmerge(*args) + if args.length < 2 + raise Puppet::ParseError, _('mysql_deepmerge(): wrong number of arguments (%{args_length}; must be at least 2)') % { args_length: args.length } + end + + result = {} + args.each do |arg| + next if arg.is_a?(String) && arg.empty? # empty string is synonym for puppet's undef + # If the argument was not a hash, skip it. + unless arg.is_a?(Hash) + raise Puppet::ParseError, _('mysql_deepmerge: unexpected argument type %{arg_class}, only expects hash arguments.') % { args_class: args.class } + end + + # We need to make a copy of the hash since it is frozen by puppet + current = deep_copy(arg) + + # Now we have to traverse our hash assigning our non-hash values + # to the matching keys in our result while following our hash values + # and repeating the process. + overlay(result, current) + end + result + end + + def normalized?(hash, key) + return true if hash.key?(key) + return false unless key =~ %r{-|_} + other_key = key.include?('-') ? key.tr('-', '_') : key.tr('_', '-') + return false unless hash.key?(other_key) + hash[key] = hash.delete(other_key) + true + end + + def overlay(hash1, hash2) + hash2.each do |key, value| + if normalized?(hash1, key) && value.is_a?(Hash) && hash1[key].is_a?(Hash) + overlay(hash1[key], value) + else + hash1[key] = value + end + end + end + + def deep_copy(inputhash) + return inputhash unless inputhash.is_a? Hash + hash = {} + inputhash.each do |k, v| + hash.store(k, deep_copy(v)) + end + hash + end +end diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/dirname.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/dirname.rb new file mode 100644 index 000000000..4074a4241 --- /dev/null +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/dirname.rb @@ -0,0 +1,20 @@ +# @summary +# Returns the dirname of a path +# +Puppet::Functions.create_function(:'mysql::dirname') do + # @param path + # Path to find the dirname for. + # + # @return + # Directory name of path. + # + dispatch :dirname do + required_param 'Variant[String, Undef]', :path + return_type 'String' + end + + def dirname(path) + return '' if path.nil? + File.dirname(path) + end +end diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/password.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/password.rb new file mode 100644 index 000000000..24d1cc5b1 --- /dev/null +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/password.rb @@ -0,0 +1,21 @@ +require 'digest/sha1' +# @summary +# Hash a string as mysql's "PASSWORD()" function would do it +# +Puppet::Functions.create_function(:'mysql::password') do + # @param password + # Plain text password. + # + # @return the mysql password hash from the clear text password. + # + dispatch :password do + required_param 'String', :password + return_type 'String' + end + + def password(password) + return '' if password.empty? + return password if password =~ %r{\*[A-F0-9]{40}$} + '*' + Digest::SHA1.hexdigest(Digest::SHA1.digest(password)).upcase + end +end diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/strip_hash.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/strip_hash.rb new file mode 100644 index 000000000..90a74e686 --- /dev/null +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/functions/mysql/strip_hash.rb @@ -0,0 +1,19 @@ +# @summary +# When given a hash this function strips out all blank entries. +# +Puppet::Functions.create_function(:'mysql::strip_hash') do + # @param hash + # Hash to be stripped + # + dispatch :strip_hash do + required_param 'Hash', :hash + return_type 'Hash' + end + + def strip_hash(hash) + # Filter out all the top level blanks. + hash.reject { |_k, v| v == '' }.each do |_k, v| + v.reject! { |_ki, vi| vi == '' } if v.is_a?(Hash) + end + end +end diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb index 97d10229b..766028e89 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb @@ -1,21 +1,20 @@ -# Recursively merges two or more hashes together and returns the resulting hash. module Puppet::Parser::Functions newfunction(:mysql_deepmerge, type: :rvalue, doc: <<-'ENDHEREDOC') do |args| - Recursively merges two or more hashes together and returns the resulting hash. - - For example: + @summary Recursively merges two or more hashes together and returns the resulting hash. + @example $hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } } $hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } } $merged_hash = mysql_deepmerge($hash1, $hash2) # The resulting hash is equivalent to: # $merged_hash = { 'one' => 1, 'two' => 'dos', 'three' => { 'four' => 4, 'five' => 5 } } - When there is a duplicate key that is a hash, they are recursively merged. - When there is a duplicate key that is not a hash, the key in the rightmost hash will "win." - When there are conficting uses of dashes and underscores in two keys (which mysql would otherwise equate), + - When there is a duplicate key that is a hash, they are recursively merged. + - When there is a duplicate key that is not a hash, the key in the rightmost hash will "win." + - When there are conficting uses of dashes and underscores in two keys (which mysql would otherwise equate), the rightmost style will win. + @return [Hash] ENDHEREDOC if args.length < 2 diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/parser/functions/mysql_dirname.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/parser/functions/mysql_dirname.rb index e1a21202d..40a8ad64f 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/parser/functions/mysql_dirname.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/parser/functions/mysql_dirname.rb @@ -1,7 +1,13 @@ -# Returns the dirname of a path. module Puppet::Parser::Functions newfunction(:mysql_dirname, type: :rvalue, doc: <<-EOS - Returns the dirname of a path. + @summary + Returns the dirname of a path + + @param [String] path + Path to find the dirname for. + + @return [String] + Directory name of path. EOS ) do |arguments| diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/parser/functions/mysql_password.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/parser/functions/mysql_password.rb index 4169bf433..53ba580b2 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/parser/functions/mysql_password.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/parser/functions/mysql_password.rb @@ -1,9 +1,12 @@ require 'digest/sha1' -# Returns the mysql password hash from the clear text password. -# Hash a string as mysql's "PASSWORD()" function would do it module Puppet::Parser::Functions newfunction(:mysql_password, type: :rvalue, doc: <<-EOS - Returns the mysql password hash from the clear text password. + @summary + Hash a string as mysql's "PASSWORD()" function would do it + + @param [String] password Plain text password. + + @return [String] the mysql password hash from the clear text password. EOS ) do |args| diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/provider/mysql.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/provider/mysql.rb index 173d3ce9e..a01570849 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/provider/mysql.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/provider/mysql.rb @@ -50,13 +50,21 @@ class Puppet::Provider::Mysql < Puppet::Provider self.class.mysqld_version end + def self.newer_than(forks_versions) + forks_versions.keys.include?(mysqld_type) && Puppet::Util::Package.versioncmp(mysqld_version, forks_versions[mysqld_type]) >= 0 + end + + def newer_than(forks_versions) + self.class.newer_than(forks_versions) + end + def defaults_file self.class.defaults_file end def self.mysql_caller(text_of_sql, type) if type.eql? 'system' - mysql_raw([defaults_file, '--host=', system_database, '-e', text_of_sql].flatten.compact) + mysql_raw([defaults_file, system_database, '-e', text_of_sql].flatten.compact) elsif type.eql? 'regular' mysql_raw([defaults_file, '-NBe', text_of_sql].flatten.compact) else diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/provider/mysql_datadir/mysql.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/provider/mysql_datadir/mysql.rb index ec5f32b32..b733b9379 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/provider/mysql_datadir/mysql.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/provider/mysql_datadir/mysql.rb @@ -52,7 +52,7 @@ Puppet::Type.type(:mysql_datadir).provide(:mysql, parent: Puppet::Provider::Mysq end opts = [defaults_extra_file] - %w[basedir datadir user].each do |opt| + ['basedir', 'datadir', 'user'].each do |opt| val = eval(opt) # rubocop:disable Security/Eval opts << "--#{opt}=#{val}" unless val.nil? end @@ -60,7 +60,7 @@ Puppet::Type.type(:mysql_datadir).provide(:mysql, parent: Puppet::Provider::Mysq if mysqld_version.nil? debug("Installing MySQL data directory with mysql_install_db #{opts.compact.join(' ')}") mysql_install_db(opts.compact) - elsif (mysqld_type == 'mysql' || mysqld_type == 'percona') && Puppet::Util::Package.versioncmp(mysqld_version, '5.7.6') >= 0 + elsif newer_than('mysql' => '5.7.6', 'percona' => '5.7.6') opts << "--log-error=#{log_error}" opts << initialize.to_s debug("Initializing MySQL data directory >= 5.7.6 with mysqld: #{opts.compact.join(' ')}") @@ -80,7 +80,7 @@ Puppet::Type.type(:mysql_datadir).provide(:mysql, parent: Puppet::Provider::Mysq def exists? datadir = @resource[:datadir] - File.directory?("#{datadir}/mysql") && (Dir.entries("#{datadir}/mysql") - %w[. ..]).any? + File.directory?("#{datadir}/mysql") && (Dir.entries("#{datadir}/mysql") - ['.', '..']).any? end ## diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/provider/mysql_user/mysql.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/provider/mysql_user/mysql.rb index d647f6420..bbe7b63a1 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/provider/mysql_user/mysql.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/provider/mysql_user/mysql.rb @@ -14,7 +14,7 @@ Puppet::Type.type(:mysql_user).provide(:mysql, parent: Puppet::Provider::Mysql) ## Default ... # rubocop:disable Metrics/LineLength query = "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, SSL_TYPE, SSL_CIPHER, X509_ISSUER, X509_SUBJECT, PASSWORD /*!50508 , PLUGIN */ FROM mysql.user WHERE CONCAT(user, '@', host) = '#{name}'" - elsif (mysqld_type == 'mysql' || mysqld_type == 'percona') && Puppet::Util::Package.versioncmp(mysqld_version, '5.7.6') >= 0 + elsif newer_than('mysql' => '5.7.6', 'percona' => '5.7.6') query = "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, SSL_TYPE, SSL_CIPHER, X509_ISSUER, X509_SUBJECT, AUTHENTICATION_STRING, PLUGIN FROM mysql.user WHERE CONCAT(user, '@', host) = '#{name}'" else query = "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, SSL_TYPE, SSL_CIPHER, X509_ISSUER, X509_SUBJECT, PASSWORD /*!50508 , PLUGIN */ FROM mysql.user WHERE CONCAT(user, '@', host) = '#{name}'" @@ -83,8 +83,7 @@ Puppet::Type.type(:mysql_user).provide(:mysql, parent: Puppet::Provider::Mysql) @property_hash[:max_updates_per_hour] = max_updates_per_hour merged_tls_options = tls_options.join(' AND ') - if ((mysqld_type == 'mysql' || mysqld_type == 'percona') && Puppet::Util::Package.versioncmp(mysqld_version, '5.7.6') >= 0) || - (mysqld_type == 'mariadb' && Puppet::Util::Package.versioncmp(mysqld_version, '10.2.0') >= 0) + if newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.2.0') self.class.mysql_caller("ALTER USER '#{merged_name}' REQUIRE #{merged_tls_options}", 'system') else self.class.mysql_caller("GRANT USAGE ON *.* TO '#{merged_name}' REQUIRE #{merged_tls_options}", 'system') @@ -96,7 +95,13 @@ Puppet::Type.type(:mysql_user).provide(:mysql, parent: Puppet::Provider::Mysql) def destroy merged_name = @resource[:name].sub('@', "'@'") - self.class.mysql_caller("DROP USER '#{merged_name}'", 'system') + if_exists = if newer_than('mysql' => '5.7', 'percona' => '5.7', 'mariadb' => '10.1.3') + 'IF EXISTS ' + else + '' + end + + self.class.mysql_caller("DROP USER #{if_exists}'#{merged_name}'", 'system') @property_hash.clear exists? ? (return false) : (return true) @@ -120,8 +125,8 @@ Puppet::Type.type(:mysql_user).provide(:mysql, parent: Puppet::Provider::Mysql) if mysqld_version.nil? # default ... if mysqld_version does not work self.class.mysql_caller("SET PASSWORD FOR #{merged_name} = '#{string}'", 'system') - elsif (mysqld_type == 'mysql' || mysqld_type == 'percona') && Puppet::Util::Package.versioncmp(mysqld_version, '5.7.6') >= 0 - raise ArgumentError, _('Only mysql_native_password (*ABCD...XXX) hashes are supported.') unless string =~ %r{^\*} + elsif newer_than('mysql' => '5.7.6', 'percona' => '5.7.6') + raise ArgumentError, _('Only mysql_native_password (*ABCD...XXX) hashes are supported.') unless string =~ %r{^\*|^$} self.class.mysql_caller("ALTER USER #{merged_name} IDENTIFIED WITH mysql_native_password AS '#{string}'", 'system') else self.class.mysql_caller("SET PASSWORD FOR #{merged_name} = '#{string}'", 'system') @@ -161,7 +166,7 @@ Puppet::Type.type(:mysql_user).provide(:mysql, parent: Puppet::Provider::Mysql) def plugin=(string) merged_name = self.class.cmd_user(@resource[:name]) - if (mysqld_type == 'mysql' || mysqld_type == 'percona') && Puppet::Util::Package.versioncmp(mysqld_version, '5.7.6') >= 0 + if newer_than('mysql' => '5.7.6', 'percona' => '5.7.6') sql = "ALTER USER #{merged_name} IDENTIFIED WITH '#{string}'" sql << " AS '#{@resource[:password_hash]}'" if string == 'mysql_native_password' else @@ -178,8 +183,7 @@ Puppet::Type.type(:mysql_user).provide(:mysql, parent: Puppet::Provider::Mysql) def tls_options=(array) merged_name = self.class.cmd_user(@resource[:name]) merged_tls_options = array.join(' AND ') - if ((mysqld_type == 'mysql' || mysqld_type == 'percona') && Puppet::Util::Package.versioncmp(mysqld_version, '5.7.6') >= 0) || - (mysqld_type == 'mariadb' && Puppet::Util::Package.versioncmp(mysqld_version, '10.2.0') >= 0) + if newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.2.0') self.class.mysql_caller("ALTER USER #{merged_name} REQUIRE #{merged_tls_options}", 'system') else self.class.mysql_caller("GRANT USAGE ON *.* TO #{merged_name} REQUIRE #{merged_tls_options}", 'system') diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_database.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_database.rb index f8b940650..817f04257 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_database.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_database.rb @@ -1,5 +1,10 @@ Puppet::Type.newtype(:mysql_database) do - @doc = 'Manage MySQL databases.' + @doc = <<-PUPPET + @summary + Manage a MySQL database. + + @api private + PUPPET ensurable diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_datadir.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_datadir.rb index e49a41195..7945f4e30 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_datadir.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_datadir.rb @@ -1,5 +1,10 @@ Puppet::Type.newtype(:mysql_datadir) do - @doc = 'Manage MySQL datadirs with mysql_install_db OR mysqld (5.7.6 and above).' + @doc = <<-PUPPET + @summary + Manage MySQL datadirs with mysql_install_db OR mysqld (5.7.6 and above). + + @api private + PUPPET ensurable diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_grant.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_grant.rb index c8929d8dc..ea1db177d 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_grant.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_grant.rb @@ -1,6 +1,10 @@ -# This has to be a separate type to enable collecting Puppet::Type.newtype(:mysql_grant) do - @doc = "Manage a MySQL user's rights." + @doc = <<-PUPPET + @summary + Manage a MySQL user's rights. + + @api private + PUPPET ensurable autorequire(:file) { '/root/.my.cnf' } diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_plugin.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_plugin.rb index 029220e18..433146e69 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_plugin.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_plugin.rb @@ -1,5 +1,14 @@ Puppet::Type.newtype(:mysql_plugin) do - @doc = 'Manage MySQL plugins.' + @doc = <<-PUPPET + @summary + Manage MySQL plugins. + + @example + mysql_plugin { 'some_plugin': + soname => 'some_pluginlib.so', + } + + PUPPET ensurable diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_user.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_user.rb index 8a564edd6..10dfae7c0 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_user.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/lib/puppet/type/mysql_user.rb @@ -1,6 +1,11 @@ # This has to be a separate type to enable collecting Puppet::Type.newtype(:mysql_user) do - @doc = 'Manage a MySQL user. This includes management of users password as well as privileges.' + @doc = <<-PUPPET + @summary + Manage a MySQL user. This includes management of users password as well as privileges. + + @api private + PUPPET ensurable diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/backup/mysqlbackup.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/backup/mysqlbackup.pp index 08a5cc1d7..adcb99e2e 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/backup/mysqlbackup.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/backup/mysqlbackup.pp @@ -1,4 +1,8 @@ -# See README.me for usage. +# @summary +# Manage the mysqlbackup client. +# +# @api private +# class mysql::backup::mysqlbackup ( $backupuser = '', $backuppassword = '', @@ -25,7 +29,7 @@ class mysql::backup::mysqlbackup ( mysql_user { "${backupuser}@localhost": ensure => $ensure, - password_hash => mysql_password($backuppassword), + password_hash => mysql::password($backuppassword), require => Class['mysql::server::root_password'], } @@ -88,7 +92,7 @@ class mysql::backup::mysqlbackup ( 'password' => $backuppassword, } } - $options = mysql_deepmerge($default_options, $mysql::server::override_options) + $options = mysql::deepmerge($default_options, $mysql::server::override_options) file { 'mysqlbackup-config-file': path => '/etc/mysql/conf.d/meb.cnf', diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/backup/mysqldump.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/backup/mysqldump.pp index e8988dfc4..7ed2a86a2 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/backup/mysqldump.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/backup/mysqldump.pp @@ -1,4 +1,7 @@ -# See README.me for usage. +# @summary +# "Provider" for mysqldump +# @api private +# class mysql::backup::mysqldump ( $backupuser = '', $backuppassword = '', @@ -30,7 +33,7 @@ class mysql::backup::mysqldump ( mysql_user { "${backupuser}@localhost": ensure => $ensure, - password_hash => mysql_password($backuppassword), + password_hash => mysql::password($backuppassword), require => Class['mysql::server::root_password'], } diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/backup/xtrabackup.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/backup/xtrabackup.pp index e0365588a..fc3e670d7 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/backup/xtrabackup.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/backup/xtrabackup.pp @@ -1,4 +1,7 @@ -# See README.me for usage. +# @summary +# "Provider" for Percona XtraBackup +# @api private +# class mysql::backup::xtrabackup ( $xtrabackup_package_name = $mysql::params::xtrabackup_package_name, $backupuser = undef, @@ -26,14 +29,12 @@ class mysql::backup::xtrabackup ( $additional_cron_args = '' ) inherits mysql::params { - package{ $xtrabackup_package_name: - ensure => $ensure, - } + ensure_packages($xtrabackup_package_name) if $backupuser and $backuppassword { mysql_user { "${backupuser}@localhost": ensure => $ensure, - password_hash => mysql_password($backuppassword), + password_hash => mysql::password($backuppassword), require => Class['mysql::server::root_password'], } diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings.pp index 3fd9c74a3..a6565ce2a 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings.pp @@ -1,4 +1,72 @@ -# See README.md. +# @summary +# Parent class for MySQL bindings. +# +# @example Install Ruby language bindings +# class { 'mysql::bindings': +# ruby_enable => true, +# ruby_package_ensure => 'present', +# ruby_package_name => 'ruby-mysql-2.7.1-1mdv2007.0.sparc.rpm', +# ruby_package_provider => 'rpm', +# } +# @param install_options +# Passes `install_options` array to managed package resources. You must pass the [appropriate options](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options) for the package manager(s). +# @param java_enable +# Specifies whether `::mysql::bindings::java` should be included. Valid values are `true`, `false`. +# @param perl_enable +# Specifies whether `mysql::bindings::perl` should be included. Valid values are `true`, `false`. +# @param php_enable +# Specifies whether `mysql::bindings::php` should be included. Valid values are `true`, `false`. +# @param python_enable +# Specifies whether `mysql::bindings::python` should be included. Valid values are `true`, `false`. +# @param ruby_enable +# Specifies whether `mysql::bindings::ruby` should be included. Valid values are `true`, `false`. +# @param client_dev +# Specifies whether `::mysql::bindings::client_dev` should be included. Valid values are `true`', `false`. +# @param daemon_dev +# Specifies whether `::mysql::bindings::daemon_dev` should be included. Valid values are `true`, `false`. +# @param java_package_ensure +# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `java_enable => true`. +# @param java_package_name +# The name of the Java package to install. Only applies if `java_enable => true`. +# @param java_package_provider +# The provider to use to install the Java package. Only applies if `java_enable => true`. +# @param perl_package_ensure +# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `perl_enable => true`. +# @param perl_package_name +# The name of the Perl package to install. Only applies if `perl_enable => true`. +# @param perl_package_provider +# The provider to use to install the Perl package. Only applies if `perl_enable => true`. +# @param php_package_ensure +# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `php_enable => true`. +# @param php_package_name +# The name of the PHP package to install. Only applies if `php_enable => true`. +# @param php_package_provider +# The provider to use to install the PHP package. Only applies if `php_enable => true`. +# @param python_package_ensure +# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `python_enable => true`. +# @param python_package_name +# The name of the Python package to install. Only applies if `python_enable => true`. +# @param python_package_provider +# The provider to use to install the Python package. Only applies if `python_enable => true`. +# @param ruby_package_ensure +# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `ruby_enable => true`. +# @param ruby_package_name +# The name of the Ruby package to install. Only applies if `ruby_enable => true`. +# @param ruby_package_provider +# What provider should be used to install the package. +# @param client_dev_package_ensure +# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `client_dev => true`. +# @param client_dev_package_name +# The name of the client_dev package to install. Only applies if `client_dev => true`. +# @param client_dev_package_provider +# The provider to use to install the client_dev package. Only applies if `client_dev => true`. +# @param daemon_dev_package_ensure +# Whether the package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Only applies if `daemon_dev => true`. +# @param daemon_dev_package_name +# The name of the daemon_dev package to install. Only applies if `daemon_dev => true`. +# @param daemon_dev_package_provider +# The provider to use to install the daemon_dev package. Only applies if `daemon_dev => true`. +# class mysql::bindings ( $install_options = undef, # Boolean to determine if we should include the classes. diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/client_dev.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/client_dev.pp index dc249e158..9e88946db 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/client_dev.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/client_dev.pp @@ -1,4 +1,8 @@ -# Private class +# @summary +# Private class for installing client development bindings +# +# @api private +# class mysql::bindings::client_dev { if $mysql::bindings::client_dev_package_name { diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/daemon_dev.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/daemon_dev.pp index 44caaafc1..48a936e32 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/daemon_dev.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/daemon_dev.pp @@ -1,4 +1,8 @@ -# Private class +# @summary +# Private class for installing daemon development bindings +# +# @api private +# class mysql::bindings::daemon_dev { if $mysql::bindings::daemon_dev_package_name { diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/java.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/java.pp index db93ac282..23e3aa566 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/java.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/java.pp @@ -1,4 +1,8 @@ -# Private class +# @summary +# Private class for installing java language bindings. +# +# @api private +# class mysql::bindings::java { package { 'mysql-connector-java': diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/perl.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/perl.pp index 99d429c46..9ef13b9bc 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/perl.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/perl.pp @@ -1,4 +1,8 @@ -# Private class +# @summary +# Private class for installing perl language bindings. +# +# @api private +# class mysql::bindings::perl { package{ 'perl_mysql': diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/php.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/php.pp index 9af706962..36c914921 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/php.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/php.pp @@ -1,4 +1,8 @@ -# Private class: See README.md +# @summary +# Private class for installing php language bindings +# +# @api private +# class mysql::bindings::php { package { 'php-mysql': diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/python.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/python.pp index a44c8fa15..1c2494ac5 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/python.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/python.pp @@ -1,4 +1,8 @@ -# Private class +# @summary +# Private class for installing python language bindings +# +# @api private +# class mysql::bindings::python { package { 'python-mysqldb': diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/ruby.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/ruby.pp index d431efedc..1630265fb 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/ruby.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/bindings/ruby.pp @@ -1,4 +1,8 @@ -# Private class +# @summary +# Private class for installing ruby language bindings +# +# @api private +# class mysql::bindings::ruby { package{ 'ruby_mysql': diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/client.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/client.pp index 2af2351d3..58cd04f71 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/client.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/client.pp @@ -1,3 +1,23 @@ +# @summary +# Installs and configures the MySQL client. +# +# @example Install the MySQL client +# class {'::mysql::client': +# package_name => 'mysql-client', +# package_ensure => 'present', +# bindings_enable => true, +# } +# +# @param bindings_enable +# Whether to automatically install all bindings. Valid values are `true`, `false`. Default to `false`. +# @param install_options +# Array of install options for managed package resources. You must pass the appropriate options for the package manager. +# @param package_ensure +# Whether the MySQL package should be present, absent, or a specific version. Valid values are 'present', 'absent', or 'x.y.z'. +# @param package_manage +# Whether to manage the MySQL client package. Defaults to `true`. +# @param package_name +# The name of the MySQL client package to install. # class mysql::client ( $bindings_enable = $mysql::params::bindings_enable, diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/client/install.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/client/install.pp index 26e5ec276..9e5f98e7c 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/client/install.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/client/install.pp @@ -1,4 +1,8 @@ -# See README.md. +# @summary +# Private class for MySQL client install. +# +# @api private +# class mysql::client::install { if $mysql::client::package_manage { diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/db.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/db.pp index 6b6c39b9b..a84c0c84d 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/db.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/db.pp @@ -1,19 +1,60 @@ -# See README.md for details. +# @summary +# Create and configure a MySQL database. +# +# @example Create a database +# mysql::db { 'mydb': +# user => 'myuser', +# password => 'mypass', +# host => 'localhost', +# grant => ['SELECT', 'UPDATE'], +# } +# +# @param user +# The user for the database you're creating. +# @param password +# The password for $user for the database you're creating. +# @param tls_options +# The tls_options for $user for the database you're creating. +# @param dbname +# The name of the database to create. +# @param charset +# The character set for the database. +# @param collate +# The collation for the database. +# @param host +# The host to use as part of user@host for grants. +# @param grant +# The privileges to be granted for user@host on the database. +# @param grant_options +# The grant_options for the grant for user@host on the database. +# @param sql +# The path to the sqlfile you want to execute. This can be single file specified as string, or it can be an array of strings. +# @param enforce_sql +# Specifies whether executing the sqlfiles should happen on every run. If set to false, sqlfiles only run once. +# @param ensure +# Specifies whether to create the database. Valid values are 'present', 'absent'. Defaults to 'present'. +# @param import_timeout +# Timeout, in seconds, for loading the sqlfiles. Defaults to 300. +# @param import_cat_cmd +# Command to read the sqlfile for importing the database. Useful for compressed sqlfiles. For example, you can use 'zcat' for .gz files. +# define mysql::db ( $user, $password, + $tls_options = undef, $dbname = $name, $charset = 'utf8', $collate = 'utf8_general_ci', $host = 'localhost', $grant = 'ALL', + $grant_options = undef, Optional[Variant[Array, Hash, String]] $sql = undef, $enforce_sql = false, Enum['absent', 'present'] $ensure = 'present', $import_timeout = 300, $import_cat_cmd = 'cat', ) { - #input validation + $table = "${dbname}.*" $sql_inputs = join([$sql], ' ') @@ -31,7 +72,8 @@ define mysql::db ( $user_resource = { ensure => $ensure, - password_hash => mysql_password($password), + password_hash => mysql::password($password), + tls_options => $tls_options, } ensure_resource('mysql_user', "${user}@${host}", $user_resource) @@ -41,6 +83,7 @@ define mysql::db ( provider => 'mysql', user => "${user}@${host}", table => $table, + options => $grant_options, require => [ Mysql_database[$dbname], Mysql_user["${user}@${host}"], diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/params.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/params.pp index 9de66a983..e28fa0071 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/params.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/params.pp @@ -1,4 +1,8 @@ -# Private class: See README.md. +# @summary +# Params class. +# +# @api private +# class mysql::params { $manage_config_file = true @@ -221,27 +225,30 @@ class mysql::params { } 'Archlinux': { - $client_package_name = 'mariadb-clients' - $server_package_name = 'mariadb' - $basedir = '/usr' - $config_file = '/etc/mysql/my.cnf' - $datadir = '/var/lib/mysql' - $log_error = '/var/log/mysqld.log' - $pidfile = '/var/run/mysqld/mysqld.pid' - $root_group = 'root' - $mysql_group = 'mysql' - $server_service_name = 'mysqld' - $socket = '/var/lib/mysql/mysql.sock' - $ssl_ca = '/etc/mysql/cacert.pem' - $ssl_cert = '/etc/mysql/server-cert.pem' - $ssl_key = '/etc/mysql/server-key.pem' - $tmpdir = '/tmp' + $daemon_dev_package_name = undef + $client_dev_package_name = undef + $includedir = undef + $client_package_name = 'mariadb-clients' + $server_package_name = 'mariadb' + $basedir = '/usr' + $config_file = '/etc/mysql/my.cnf' + $datadir = '/var/lib/mysql' + $log_error = '/var/log/mysqld.log' + $pidfile = '/var/run/mysqld/mysqld.pid' + $root_group = 'root' + $mysql_group = 'mysql' + $server_service_name = 'mysqld' + $socket = '/var/lib/mysql/mysql.sock' + $ssl_ca = '/etc/mysql/cacert.pem' + $ssl_cert = '/etc/mysql/server-cert.pem' + $ssl_key = '/etc/mysql/server-key.pem' + $tmpdir = '/tmp' # mysql::bindings - $java_package_name = 'mysql-connector-java' - $perl_package_name = 'perl-dbd-mysql' - $php_package_name = undef - $python_package_name = 'mysql-python' - $ruby_package_name = 'mysql-ruby' + $java_package_name = 'mysql-connector-java' + $perl_package_name = 'perl-dbd-mysql' + $php_package_name = undef + $python_package_name = 'mysql-python' + $ruby_package_name = 'mysql-ruby' } 'Gentoo': { diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server.pp index 11e074880..9e2ba9f54 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server.pp @@ -1,4 +1,69 @@ -# Class: mysql::server: See README.md for documentation. +# @summary +# Installs and configures the MySQL server. +# +# @example Install MySQL Server +# class { '::mysql::server': +# package_name => 'mysql-server', +# package_ensure => '5.7.1+mysql~trusty', +# root_password => 'strongpassword', +# remove_default_accounts => true, +# } +# +# @param config_file +# The location, as a path, of the MySQL configuration file. +# @param includedir +# The location, as a path, of !includedir for custom configuration overrides. +# @param install_options +# Passes [install_options](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options) array to managed package resources. You must pass the appropriate options for the specified package manager +# @param install_secret_file +# Path to secret file containing temporary root password. +# @param manage_config_file +# Whether the MySQL configuration file should be managed. Valid values are `true`, `false`. Defaults to `true`. +# @param override_options +# Specifies override options to pass into MySQL. Structured like a hash in the my.cnf file: See above for usage details. +# @param package_ensure +# Whether the package exists or should be a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Defaults to 'present'. +# @param package_manage +# Whether to manage the MySQL server package. Defaults to `true`. +# @param package_name +# The name of the MySQL server package to install. +# @param purge_conf_dir +# Whether the `includedir` directory should be purged. Valid values are `true`, `false`. Defaults to `false`. +# @param remove_default_accounts +# Specifies whether to automatically include `mysql::server::account_security`. Valid values are `true`, `false`. Defaults to `false`. +# @param restart +# Whether the service should be restarted when things change. Valid values are `true`, `false`. Defaults to `false`. +# @param root_group +# The name of the group used for root. Can be a group name or a group ID. See more about the [group](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group). +# @param mysql_group +# The name of the group of the MySQL daemon user. Can be a group name or a group ID. See more about the [group](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group). +# @param root_password +# The MySQL root password. Puppet attempts to set the root password and update `/root/.my.cnf` with it. This is required if `create_root_user` or `create_root_my_cnf` are true. If `root_password` is 'UNSET', then `create_root_user` and `create_root_my_cnf` are assumed to be false --- that is, the MySQL root user and `/root/.my.cnf` are not created. Password changes are supported; however, the old password must be set in `/root/.my.cnf`. Effectively, Puppet uses the old password, configured in `/root/my.cnf`, to set the new password in MySQL, and then updates `/root/.my.cnf` with the new password. +# @param service_enabled +# Specifies whether the service should be enabled. Valid values are `true`, `false`. Defaults to `true`. +# @param service_manage +# Specifies whether the service should be managed. Valid values are `true`, `false`. Defaults to `true`. +# @param service_name +# The name of the MySQL server service. Defaults are OS dependent, defined in 'params.pp'. +# @param service_provider +# The provider to use to manage the service. For Ubuntu, defaults to 'upstart'; otherwise, default is undefined. +# @param create_root_user +# Whether root user should be created. Valid values are `true`, `false`. Defaults to `true`. This is useful for a cluster setup with Galera. The root user has to be created only once. You can set this parameter true on one node and set it to false on the remaining nodes. +# @param create_root_my_cnf +# Whether to create `/root/.my.cnf`. Valid values are `true`, `false`. Defaults to `true`. `create_root_my_cnf` allows creation of `/root/.my.cnf` independently of `create_root_user`. You can use this for a cluster setup with Galera where you want `/root/.my.cnf` to exist on all nodes. +# @param users +# Optional hash of users to create, which are passed to [mysql_user](#mysql_user). +# @param grants +# Optional hash of grants, which are passed to [mysql_grant](#mysql_grant). +# @param databases +# Optional hash of databases to create, which are passed to [mysql_database](#mysql_database). +# @param enabled +# _Deprecated_ +# @param manage_service +# _Deprecated_ +# @param old_root_password +# This parameter no longer does anything. It exists only for backwards compatibility. See the `root_password` parameter above for details on changing the root password. +# class mysql::server ( $config_file = $mysql::params::config_file, $includedir = $mysql::params::includedir, @@ -49,7 +114,7 @@ class mysql::server ( } # Create a merged together set of options. Rightmost hashes win over left. - $options = mysql_deepmerge($mysql::params::default_options, $override_options) + $options = mysql::deepmerge($mysql::params::default_options, $override_options) Class['mysql::server::root_password'] -> Mysql::Db <| |> diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/account_security.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/account_security.pp index 3fcdd614c..c2095d83a 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/account_security.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/account_security.pp @@ -1,4 +1,8 @@ -# See README.md. +# @summary +# Private class for ensuring localhost accounts do not exist +# +# @api private +# class mysql::server::account_security { mysql_user { [ 'root@127.0.0.1', diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/backup.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/backup.pp index 21102d384..25bf0537a 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/backup.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/backup.pp @@ -1,4 +1,60 @@ -# See README.me for usage. +# @summary +# Create and manage a MySQL backup. +# +# @example Create a basic MySQL backup: +# class { 'mysql::server': +# root_password => 'password' +# } +# class { 'mysql::server::backup': +# backupuser => 'myuser', +# backuppassword => 'mypassword', +# backupdir => '/tmp/backups', +# } +# +# @param backupuser +# MySQL user with backup administrator privileges. +# @param backuppassword +# Password for `backupuser`. +# @param backupdir +# Directory to store backup. +# @param backupdirmode +# Permissions applied to the backup directory. This parameter is passed directly to the file resource. +# @param backupdirowner +# Owner for the backup directory. This parameter is passed directly to the file resource. +# @param backupdirgroup +# Group owner for the backup directory. This parameter is passed directly to the file resource. +# @param backupcompress +# Whether or not to compress the backup (when using the mysqldump provider) +# @param backuprotate +# Backup rotation interval in 24 hour periods. +# @param ignore_events +# Ignore the mysql.event table. +# @param delete_before_dump +# Whether to delete old .sql files before backing up. Setting to true deletes old files before backing up, while setting to false deletes them after backup. +# @param backupdatabases +# Databases to backup (if using xtrabackup provider). +# @param file_per_database +# Use file per database mode creating one file per database backup. +# @param include_routines +# Dump stored routines (procedures and functions) from dumped databases when doing a `file_per_database` backup. +# @param include_triggers +# Dump triggers for each dumped table when doing a `file_per_database` backup. +# @param ensure +# @param time +# An array of two elements to set the backup time. Allows ['23', '5'] (i.e., 23:05) or ['3', '45'] (i.e., 03:45) for HH:MM times. +# @param prescript +# A script that is executed before the backup begins. +# @param postscript +# A script that is executed when the backup is finished. This could be used to sync the backup to a central store. This script can be either a single line that is directly executed or a number of lines supplied as an array. It could also be one or more externally managed (executable) files. +# @param execpath +# Allows you to set a custom PATH should your MySQL installation be non-standard places. Defaults to `/usr/bin:/usr/sbin:/bin:/sbin`. +# @param provider +# Sets the server backup implementation. Valid values are: +# @param maxallowedpacket +# Defines the maximum SQL statement size for the backup dump script. The default value is 1MB, as this is the default MySQL Server value. +# @param optional_args +# Specifies an array of optional arguments which should be passed through to the backup tool. (Supported by the xtrabackup and mysqldump providers.) +# class mysql::server::backup ( $backupuser = undef, $backuppassword = undef, diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/binarylog.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/binarylog.pp index 459915d0c..68d5c09e1 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/binarylog.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/binarylog.pp @@ -1,4 +1,8 @@ -# Binary log configuration requires the mysql user to be present. This must be done after package install +# @summary +# Binary log configuration requires the mysql user to be present. This must be done after package install +# +# @api private +# class mysql::server::binarylog { $options = $mysql::server::options @@ -7,7 +11,7 @@ class mysql::server::binarylog { $logbin = pick($options['mysqld']['log-bin'], $options['mysqld']['log_bin'], false) if $logbin { - $logbindir = mysql_dirname($logbin) + $logbindir = mysql::dirname($logbin) #Stop puppet from managing directory if just a filename/prefix is specified if $logbindir != '.' { diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/config.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/config.pp index de97bea5e..6c0b7f017 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/config.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/config.pp @@ -1,4 +1,8 @@ -# See README.me for options. +# @summary +# Private class for MySQL server configuration. +# +# @api private +# class mysql::server::config { $options = $mysql::server::options @@ -20,7 +24,7 @@ class mysql::server::config { # on some systems this is /etc/my.cnf.d, while Debian has /etc/mysql/conf.d and FreeBSD something in /usr/local. For the latter systems, # managing this basedir is also required, to have it available before the package is installed. - $includeparentdir = mysql_dirname($includedir) + $includeparentdir = mysql::dirname($includedir) if $includeparentdir != '/' and $includeparentdir != '/etc' { file { $includeparentdir: ensure => directory, @@ -39,9 +43,9 @@ class mysql::server::config { # on mariadb systems, $includedir is not defined, but /etc/my.cnf.d has # to be managed to place the server.cnf there - $configparentdir = mysql_dirname($mysql::server::config_file) + $configparentdir = mysql::dirname($mysql::server::config_file) if $configparentdir != '/' and $configparentdir != '/etc' and $configparentdir - != $includedir and $configparentdir != mysql_dirname($includedir) { + != $includedir and $configparentdir != mysql::dirname($includedir) { file { $configparentdir: ensure => directory, mode => '0755', diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/install.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/install.pp index 3b9601def..21c762ef7 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/install.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/install.pp @@ -1,3 +1,7 @@ +# @summary +# Private class for managing MySQL package. +# +# @api private # class mysql::server::install { diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/installdb.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/installdb.pp index 7e5423328..ee80b4604 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/installdb.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/installdb.pp @@ -1,3 +1,7 @@ +# @summary +# Builds initial databases on installation. +# +# @api private # class mysql::server::installdb { $options = $mysql::server::options diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/monitor.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/monitor.pp index 6b1860983..0e9d43a62 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/monitor.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/monitor.pp @@ -1,4 +1,13 @@ -#This is a helper class to add a monitoring user to the database +# @summary +# This is a helper class to add a monitoring user to the database +# +# @param mysql_monitor_username +# The username to create for MySQL monitoring. +# @param mysql_monitor_password +# The password to create for MySQL monitoring. +# @param mysql_monitor_hostname +# The hostname from which the monitoring user requests are allowed access. +# class mysql::server::monitor ( $mysql_monitor_username = '', $mysql_monitor_password = '', @@ -9,7 +18,7 @@ class mysql::server::monitor ( mysql_user { "${mysql_monitor_username}@${mysql_monitor_hostname}": ensure => present, - password_hash => mysql_password($mysql_monitor_password), + password_hash => mysql::password($mysql_monitor_password), require => Class['mysql::server::service'], } diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/mysqltuner.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/mysqltuner.pp index ae91e63ac..b337f50ca 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/mysqltuner.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/mysqltuner.pp @@ -1,3 +1,14 @@ +# @summary +# Manage the MySQLTuner package. +# +# @param ensure +# Ensures that the resource exists. Valid values are 'present', 'absent'. Defaults to 'present'. +# @param version +# The version to install from the major/MySQLTuner-perl github repository. Must be a valid tag. Defaults to 'v1.3.0'. +# @param source +# Source path for the mysqltuner package. +# @param environment +# Environment variables active during download, e.g. to download via proxies: environment => 'https_proxy=http://proxy.example.com:80' # class mysql::server::mysqltuner( $ensure = 'present', diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/providers.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/providers.pp index b651172fc..0f1cb8fa9 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/providers.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/providers.pp @@ -1,6 +1,8 @@ -# Convenience class to call each of the three providers with the corresponding -# hashes provided in mysql::server. -# See README.md for details. +# @summary +# Convenience class to call each of the three providers with the corresponding hashes provided in mysql::server. +# +# @api private +# class mysql::server::providers { create_resources('mysql_user', $mysql::server::users) create_resources('mysql_grant', $mysql::server::grants) diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/root_password.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/root_password.pp index 9ebc10398..e32f6f834 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/root_password.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/root_password.pp @@ -1,3 +1,7 @@ +# @summary +# Private class for managing the root password +# +# @api private # class mysql::server::root_password { @@ -22,7 +26,7 @@ class mysql::server::root_password { if $mysql::server::create_root_user == true and $mysql::server::root_password != 'UNSET' { mysql_user { 'root@localhost': ensure => present, - password_hash => mysql_password($mysql::server::root_password), + password_hash => mysql::password($mysql::server::root_password), require => Exec['remove install pass'] } } diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/service.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/service.pp index 3ce81d483..f9bc20c2a 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/service.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/manifests/server/service.pp @@ -1,3 +1,7 @@ +# @summary +# Private class for managing the MySQL service +# +# @api private # class mysql::server::service { $options = $mysql::server::options diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/metadata.json b/modules/services/unix/database/mysql_stretch_compatible/mysql/metadata.json index 6a86aad08..43491b84f 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/metadata.json +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/metadata.json @@ -1,7 +1,7 @@ { "name": "puppetlabs-mysql", - "version": "5.3.0", - "author": "Puppet Labs", + "version": "6.2.0", + "author": "puppetlabs", "summary": "Installs, configures, and manages the MySQL service.", "license": "Apache-2.0", "source": "git://github.com/puppetlabs/puppetlabs-mysql.git", @@ -14,13 +14,14 @@ }, { "name": "puppetlabs/stdlib", - "version_requirement": ">= 3.2.0 < 5.0.0" + "version_requirement": ">= 3.2.0 < 6.0.0" }, { "name": "puppet/staging", "version_requirement": ">= 1.0.1 < 4.0.0" } ], + "data_provider": null, "operatingsystem_support": [ { "operatingsystem": "RedHat", @@ -49,7 +50,6 @@ { "operatingsystem": "Scientific", "operatingsystemrelease": [ - "5", "6", "7" ] @@ -57,14 +57,13 @@ { "operatingsystem": "SLES", "operatingsystemrelease": [ - "11 SP1", + "11", "12" ] }, { "operatingsystem": "Debian", "operatingsystemrelease": [ - "7", "8", "9" ] @@ -73,17 +72,19 @@ "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "14.04", - "16.04" + "16.04", + "18.04" ] } ], "requirements": [ { "name": "puppet", - "version_requirement": ">= 4.7.0 < 6.0.0" + "version_requirement": ">= 4.7.0 < 7.0.0" } ], "description": "MySQL module", - "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git", - "template-ref": "1.3.2-0-g07678c8" + "template-url": "https://github.com/puppetlabs/pdk-templates", + "template-ref": "heads/master-0-g8fc95db", + "pdk-version": "1.7.0" } diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/mysql.pp b/modules/services/unix/database/mysql_stretch_compatible/mysql/mysql.pp index 63dec3a70..1d37e9c51 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/mysql.pp +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/mysql.pp @@ -1 +1,2 @@ -include '::mysql::server' \ No newline at end of file +include '::mysql::server' +include '::mysql::client' \ No newline at end of file diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/readmes/README_ja_JP.md b/modules/services/unix/database/mysql_stretch_compatible/mysql/readmes/README_ja_JP.md index 69f98c3d1..483a4daa9 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/readmes/README_ja_JP.md +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/readmes/README_ja_JP.md @@ -2,22 +2,23 @@ #### 目次 -1. [モジュールについて - モジュールの機能とその有益性](#モジュールについて) -2. [セットアップ - mysql導入の基本](#セットアップ) - * [mysqlの導入](#mysqlの導入) -3. [使用方法 - 設定オプションとその他の機能](#使用方法) - * [サーバオプションのカスタマイズ](#サーバオプションのカスタマイズ) - * [データベースの作成](#データベースの作成) - * [設定のカスタマイズ](#設定のカスタマイズ) - * [既存のサーバに対する操作](#既存のサーバに対する操作) - * [パスワードの指定](#パスワードの指定) - * [CentOSへのPerconaサーバのインストール](#centosへのperconaサーバのインストール) - *[UbuntuへのMariaDBのインストール](#ubuntuへのmariadbのインストール) -4. [参考 - モジュールの機能と動作について](#参考) -5. [制約事項 - OSの互換性など](#制約事項) -6. [開発 - モジュール貢献についてのガイドライン](#開発) +1. [説明 - モジュールの機能とその有益性](#module-description) +2. [セットアップ - mysql導入の基本](#setup) + * [mysqlの導入](#beginning-with-mysql) +3. [使用方法 - 設定オプションと追加機能](#usage) + * [サーバオプションのカスタマイズ](#customize-server-options) + * [データベースを作成します](#create-a-database) + * [設定のカスタマイズ](#customize-configuration) + * [既存のサーバに対する操作](#work-with-an-existing-server) + * [パスワードの指定](#specify-passwords) + * [CentOSへのPerconaサーバのインストール](#install-percona-server-on-centos) + * [UbuntuへのMariaDBのインストール](#install-mariadb-on-ubuntu) + * [プラグインのインストール](#install-plugins) +4. [参考 - モジュールの機能と動作について](REFERENCE.md) +5. [制約 - OS互換性など](#limitations) +6. [開発 - モジュール貢献についてのガイド](#development) -## モジュールについて +## モジュールの概要 mysqlモジュールは、MySQLサービスをインストール、設定、管理します。 @@ -43,7 +44,7 @@ class { '::mysql::server': $override_options用のハッシュ構造体の例については、後述の[**サーバオプションのカスタマイズ**](#サーバオプションのカスタマイズ)を参照してください。 -## 使用方法 +## 使用 サーバに関するすべてのインタラクションは`mysql::server`を使用して行われ、クライアントのインストールには`mysql::client`が、バインディングのインストールには`mysql::bindings`が使用されます。 @@ -90,7 +91,7 @@ replicate-do-db = base2 バージョンに固有なパラメータを実装するには、[mysqld-5.5]のようにバージョンを指定します。こうすると、1つのconfigで複数の異なるバージョンのMySQLに対応できます。 -### データベースの作成 +### データベースを作成します ユーザおよび割り当てられたいくつかの権限を含むデータベースを作成するには、次のようにします。 @@ -170,15 +171,15 @@ mysql::db { 'mydb': } ``` +必要に応じて、パスワードも空文字列とし、パスワードなしで接続を許可することができます。 + ### CentOSへのPerconaサーバのインストール -次の例は、CentOSシステムへのPerconaサーバの最小限のインストール方法を示します。 -この例では、Perconaサーバ、クライアント、バインディング(PerlとPythonのバインディングを含む)がセットアップされます。この方法をカスタマイズして必要に応じバージョンを更新することができます。 +次の例は、CentOSシステムへのPerconaサーバの最小限のインストール方法を示します。この例では、Perconaサーバ、クライアント、バインディング(PerlとPythonのバインディングを含む)がセットアップされます。この方法をカスタマイズして必要に応じバージョンを更新することができます。 この方法は、Puppet 4.4/CentOS 7/Perconaサーバ5.7でテストされています。 -**注意：** yumレポジトリのインストールはこのパッケージには含まれていません。 -この例は、インストールの詳細を示したものに過ぎません。 +注意：** yumレポジトリのインストールはこのパッケージには含まれていません。 ```puppet yumrepo { 'percona': @@ -229,7 +230,7 @@ class { 'mysql::bindings': python_package_name => 'MySQL-python', } -# 依存関係の定義 +# Dependencies definition Yumrepo['percona']-> Class['mysql::server'] @@ -293,8 +294,7 @@ class {'::mysql::server': } } -# 依存関係の管理。レポジトリをインストールする場合は -# この例の前のステップで示されている部分だけを使用してください。 +# 依存関係の管理。レポジトリをインストールする場合はこの例の前のステップで示されている部分だけを使用してください。 Apt::Source['mariadb'] ~> Class['apt::update'] -> Class['::mysql::server'] @@ -314,7 +314,7 @@ class {'::mysql::client': bindings_enable => true, } -# 依存関係の管理。レポジトリをインストールする場合はこの例の前のステップで示されている部分だけを使用してください。 +# Dependency management. Only use that part if you are installing the repository as shown in the Preliminary step of this example. Apt::Source['mariadb'] ~> Class['apt::update'] -> Class['::mysql::client'] @@ -326,7 +326,7 @@ MySQLモジュールおよびHieraを使用して、MySQL Communityサーバー * MySQL Community Server 5.6 * Centos 7.3 -* Hieraを使用したPuppet 3.8.7 +* Hieraを使用したPuppet 3.8.7 * puppetlabs-mysqlモジュールv3.9.0 Puppetで： @@ -357,17 +357,17 @@ yumrepo: gpgkey: 'http://repo.mysql.com/RPM-GPG-KEY-mysql' mysql::client::package_name: "mysql-community-client" # 適切なMySQL導入のために必要 -mysql::server::package_name: "mysql-community-server" #適切なMySQL導入のために必要 -mysql::server::package_ensure: 'installed' #ここではバージョンを指定しないでください。残念ながら、パッケージがインストールされているエラーでyumは失敗しました。 +mysql::server::package_name: "mysql-community-server" # 適切なMySQL導入のために必要 +mysql::server::package_ensure: 'installed' # ここではバージョンを指定しないでください。残念ながら、パッケージがインストールされているエラーでyumは失敗しました。 mysql::server::root_password: "change_me_i_am_insecure" mysql::server::manage_config_file: true mysql::server::service_name: 'mysqld' # Puppetモジュールに必要 mysql::server::override_options: 'mysqld': 'bind-address': '127.0.0.1' - 'log-error': /var/log/mysqld.log' # 適切なMySQL導入のために必要 + 'log-error': '/var/log/mysqld.log' # 適切なMySQL導入のために必要 'mysqld_safe': - 'log-error': '/var/log/mysqld.log' # 適切なMySQL導入のために必要 + 'log-error': '/var/log/mysqld.log' # 適切なMySQL導入のために必要 # データベース+アクセスできるアカウント、暗号化されていないパスワードを作成 mysql::server::db: @@ -380,929 +380,32 @@ mysql::server::db: ``` +### プラグインのインストール -## 参考 - -### クラス - -#### パブリッククラス - -* [`mysql::server`](#mysqlserver)：MySQLをインストールして設定します。 -* [`mysql::server::monitor`](#mysqlservermonitor)：モニタするユーザをセットアップします。 -* [`mysql::server::mysqltuner`](#mysqlservermysqltuner)：MySQL tunerスクリプトをインストールします。 -* [`mysql::server::backup`](#mysqlserverbackup)：cronを使用してMySQLバックアップをセットアップします。 -* [`mysql::bindings`](#mysqlbindings)：さまざまなMySQL言語バインディングをインストールします。 -* [`mysql::client`](#mysqlclient)：MySQLクライアントをインストールします(サーバ以外)。 - -#### プライベートクラス - -* `mysql::server::install`：パッケージをインストールします。 -* `mysql::server::installdb`：mysqldデータディレクトリ(/var/lib/mysqlなど)のセットアップを実行します。 -* `mysql::server::config`：MySQLを設定します。 -* `mysql::server::service`：サービスを管理します。 -* `mysql::server::account_security`：デフォルトのMySQLアカウントを削除します。 -* `mysql::server::root_password`：MySQLのルートパスワードを設定します。 -* `mysql::server::providers`：ユーザ、GRANT権限、データベースを作成します。 -* `mysql::bindings::client_dev`：MySQLクライアント開発パッケージをインストールします。 -* `mysql::bindings::daemon_dev`：MySQLデーモン開発パッケージをインストールします。 -* `mysql::bindings::java`：javaバインディングをインストールします。 -* `mysql::bindings::perl`：Perlバインディングをインストールします。 -* `mysql::bindings::php`：PHPバインディングをインストールします。 -* `mysql::bindings::python`：Pythonバインディングをインストールします。 -* `mysql::bindings::ruby`：Rubyバインディングをインストールします。 -* `mysql::client::install`：MySQLクライアントをインストールします。 -* `mysql::backup::mysqldump`：mysqldumpのバックアップを実行します。 -* `mysql::backup::mysqlbackup`：Oracle MySQL Enterprise Backupを使用してバックアップを実行します。 -* `mysql::backup::xtrabackup`：PerconaのXtraBackupを使用してバックアップを実行します。 - -### パラメータ - -#### mysql::server - -##### `create_root_user` - -ルートユーザを作成するかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`true`。 - -このパラメータは、Galeraでクラスタをセットアップする場合に役立ちます。ルートユーザの作成が必要なのは一度だけです。このパラメータを、1つのノードに対しtrueに設定し、他のすべてのノードに対してfalseに設定できます。 - -##### `create_root_my_cnf` - -`/root/.my.cnf`を作成するかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`true`。 - -`create_root_my_cnf`を使用すると`create_root_user`に左右されずに`/root/.my.cnf`を作成できます。すべてのノードに`/root/.my.cnf`が存在するようにしたい場合に、Galeraでこの機能を使用してクラスタをセットアップできます。 - -##### `root_password` - -MySQLのルートパスワード。Puppetは、このパラメータを使用して、ルートパスワードの設定や`/root/.my.cnf`の更新を試みます。 - -`create_root_user`または`create_root_my_cnf`がtrueの場合にこのパラメータが必要です。`root_password`が'UNSET'の場合は`create_root_user`と`create_root_my_cnf`がfalseになります(MySQLルートユーザと`/root/.my.cnf`が作成されません)。 - -パスワード変更はサポートされますが、`/root/.my.cnf`に旧パスワードが設定されている必要があります。実際には、Puppetは`/root/.my.cnf`に設定されている旧パスワードを使用してMySQLで新しいパスワードを設定してから、`/root/.my.cnf`を新しいパスワードで更新します。 - -##### `old_root_password` - -現在、このパラメータでは何も行わず、下位互換性を確保するためだけに存在します。ルートパスワードの変更についての詳細は、上記の`root_password`パラメータの説明を参照してください。 - -##### `override_options` - -MySQLに渡すオーバーライドオプションを指定します。構造はmy.cnfファイルのハッシュと同様です。 +プラグインはユーザ定義のタイプ`mysql_plugin` を使用してインストールできます。`examples/mysql_plugin.pp`で、具体的な例を参照してください。 ```puppet -$override_options = { - 'section' => { - 'item' => 'thing', - } +class { 'mysql::server': + root_password => 'password' } + +mysql_plugin { 'auth_pam': + ensure => present, + soname => 'auth_pam.so', +} + ``` -使用方法の詳細は、上記の[**サーバオプションのカスタマイズ**](#サーバオプションのカスタマイズ)を参照してください。 - -##### `config_file` - -MySQL設定ファイルの場所を示すパス。 - -##### `manage_config_file` - -MySQL設定ファイルを管理するかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`true`。 - -##### `includedir` - -カスタム設定オーバーライド用の!includedirの場所を示すパス。 - -##### `install_options` - -管理対象のパッケージリソースに[install_options](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options)配列を渡します。指定されているパッケージマネージャに対応する正しいオプションを渡す必要があります。 - -##### `purge_conf_dir` - -`includedir`ディレクトリをパージするかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`false`。 - -##### `restart` - -何らかの変更があった場合にサービスを再起動するかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`false`。 - -##### `root_group` - -ルートに使用するグループの名前。グループ名またはグループIDのいずれかです。詳細については[`group`ファイルの属性](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group)を参照してください。 - -##### `mysql_group` - -MySQLデーモンユーザのグループの名前。グループ名またはグループIDのいずれかです。詳細については[`group`ファイルの属性](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group)を参照してください。 - -##### `package_ensure` - -パッケージが存在するかどうか、またはパッケージが特定のバージョンでなければならないかどうかを指定します。 - -有効な値：'present'、'absent'、または'x.y.z'。 - -デフォルト値：'present'。 - -##### `package_manage` - -MySQLサーバパッケージを管理するかどうかを指定します。 - -デフォルト値：`true`。 - -##### `package_name` - -インストールするMySQLサーバパッケージの名前。 - -##### `remove_default_accounts` - -`mysql::server::account_security`を自動的に含めるかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`false`。 - -##### `service_enabled` - -サービスの有効化を指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`true`。 - -##### `service_manage` - -サービスを管理するかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`true`。 - -##### `service_name` - -MySQLサーバサービスの名前。 - -デフォルト値はOSにより異なり、'params.pp'に定義されています。 - -##### `service_provider` - -サービスの管理に使用するプロバイダ。 - -Ubuntuの場合のデフォルト値は'upstart'、Ubuntu以外の場合のデフォルト値は定義されていません。 - -##### `users` - -作成するユーザのハッシュ(オプション)。[mysql_user](#mysql_user)に渡されます。 - -```puppet -users => { - 'someuser@localhost' => { - ensure => 'present', - max_connections_per_hour => '0', - max_queries_per_hour => '0', - max_updates_per_hour => '0', - max_user_connections => '0', - password_hash => '*F3A2A51A9B0F2BE2468926B4132313728C250DBF', - tls_options => ['NONE'], - }, -} -``` - -##### `grants` - -[mysql_grant](#mysql_grant)に渡されるGRANT権限のハッシュ(オプション)。 - -```puppet -grants => { - 'someuser@localhost/somedb.*' => { - ensure => 'present', - options => ['GRANT'], - privileges => ['SELECT', 'INSERT', 'UPDATE', 'DELETE'], - table => 'somedb.*', - user => 'someuser@localhost', - }, -} -``` - -##### `databases` - -作成されるデータベースのハッシュ(オプション)。[mysql_database](#mysql_database)に渡されます。 - -```puppet -databases => { - 'somedb' => { - ensure => 'present', - charset => 'utf8', - }, -} -``` - -#### mysql::server::backup - -##### `backupuser` - -バックアップ用に作成するMySQLユーザ。 - -##### `backuppassword` - -バックアップ用のMySQLユーザパスワード。 - -##### `backupdir` - -バックアップを保存するディレクトリ。 - -##### `backupdirmode` - -バックアップディレクトリに適用されるパーミッション。このパラメータは`file`リソースに直接渡されます。 - -##### `backupdirowner` - -バックアップディレクトリの所有者。このパラメータは`file`リソースに直接渡されます。 - -##### `backupdirgroup` - -バックアップディレクトリのグループ所有者。このパラメータは`file`リソースに直接渡されます。 - -##### `backupcompress` - -バックアップを圧縮するかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`true`。 - -##### `backuprotate` - -バックアップを保持する日数。 - -有効な値：整数値。 - -デフォルト値：30。 - -##### `delete_before_dump` - -バックアップ前に古い.sqlファイルを削除するかどうかを設定します。trueに設定すると古いファイルがバックアップ前に削除され、falseに設定するとバックアップ後に削除されます。 - -有効な値：`true`、`false`。 - -デフォルト値：`false`。 - -##### `backupdatabases` - -バックアップするデータベースの配列を指定します。 - -##### `file_per_database` - -データベースごとに個別のファイルを使用するかどうかを設定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`false`。 - -##### `include_routines` - -`file_per_database`バックアップを実行する際にデータベースごとにルーチンを含めるかどうかを設定します。 - -デフォルト値：`false`。 - -##### `include_triggers` - -`file_per_database`バックアップを実行する際にデータベースごとにトリガを含めるかどうかを設定します。 - -デフォルト値：`false`。 - -##### `ensure` - -バックアップスクリプトを削除できます。 - -有効な値：'present'、'absent'。 - -デフォルト値：'present'。 - -##### `execpath` - -MySQLを標準的でない場所にインストールする場合にカスタムパスを設定できます。デフォルト値：`/usr/bin:/usr/sbin:/bin:/sbin`。 - -##### `time` - -バックアップ時刻を設定する2つの要素の配列。時刻をHH:MM形式で['23', '5'](23:05)または['3', '45'](03:45)に設定できます。 - -#### mysql::server::backup - -##### `postscript` - -バックアップ終了時に実行されるスクリプト。この機能を使用すると、バックアップを中央ストアに同期させることができます。このスクリプトは、直接実行される1つの行であっても、配列を形成する複数の行であっても構いません。あるいは、外部で管理される1つ以上の(実行可能な)ファイルにすることもできます。 - -##### `prescript` - -バックアップ開始前に実行されるスクリプト。 - -##### `provider` - -サーバのバックアップの実行について設定します。有効な値は以下のとおりです。 - -* `mysqldump`：mysqldumpを使用してバックアップを実行。バックアップのタイプ：Logical(デフォルト値)。 -* `mysqlbackup`：OracleのMySQL Enterprise Backupを使用してバックアップを実行します。バックアップのタイプ：Physical。このタイプのバックアップを使用するにはOracleの`meb`パッケージが必要です。RPM形式のものとTAR形式のものがあります。Ubuntuの場合は、[meb-deb](https://github.com/dveeden/meb-deb)を使用して公式のtarballからパッケージを作成できます。 -* `xtrabackup：PerconaのXtraBackupを使用してバックアップを実行します。バックアップのタイプ：Physical。 - -##### `maxallowedpacket` - -バックアップダンプスクリプト用のSQLステートメントの最大サイズを定義ます。デフォルト値は1MBで、MySQL Serverのデフォルト値と同じです。 - -##### `optional_args` - -バックアップツールに渡すべきオプションの引数の配列を指定します(現在はxtrabackupプロバイダでのみサポート)。 - -#### mysql::server::monitor - -##### `mysql_monitor_username` - -MySQLのモニタ用に作成するユーザ名。 - -##### `mysql_monitor_password` - -MySQLのモニタ用に作成するパスワード。 - -##### `mysql_monitor_hostname` - -モニタするユーザリクエストへのアクセスが許可されたホスト名。 - -#### mysql::server::mysqltuner - -**注意**：ネットワークに接続されていないシステムでこのクラスを使用する場合は、mysqltuner.plスクリプトをダウンロードし、`http(s)://`、`puppet://`、`ftp://`、または完全修飾ファイルパスを使用して、アクセス可能な場所でホストされるようにしておく必要があります。 - -##### `ensure` - -リソースが存在することを確認します。 - -有効な値：'present'、'absent'。 - -デフォルト値：'present'。 - -##### `version` - -major/MySQLTuner-perl githubレポジトリからインストールするバージョン。有効なタグでなければなりません。 - -デフォルト値：'v1.3.0'。 - -##### `environment` - -プロキシを使用したダウンロードなどのダウンロード中に有効な環境変数：environment => 'https_proxy=http://proxy.example.com:80' - -#### mysql::bindings - -##### `client_dev` - -`::mysql::bindings::client_dev`を含めるかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`false`。 - -##### `daemon_dev` - -`::mysql::bindings::daemon_dev`を含めるかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`false`。 - -##### `java_enable` - -`::mysql::bindings::java`を含めるかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`false`。 - -##### `perl_enable` - -`mysql::bindings::perl`を含めるかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`false`。 - -##### `php_enable` - -`mysql::bindings::php`を含めるかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`false`。 - -##### `python_enable` - -`mysql::bindings::python`を含めるかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`false`。 - -##### `ruby_enable` - -`mysql::bindings::ruby`を含めるかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`false`。 - -##### `install_options` - -管理対象のパッケージリソースに`install_options`を渡します。パッケージマネージャに対応する[正しいオプション](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options)を渡す必要があります。 - -##### `client_dev_package_ensure` - -パッケージが、存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。 - -有効な値：'present'、'absent'、または'x.y.z'。 - -適用されるのは`client_dev => true`の場合だけです。 - -##### `client_dev_package_name` - -インストールするclient_devパッケージの名前。 - -適用されるのは`client_dev => true`の場合だけです。 - -##### `client_dev_package_provider` - -client_devパッケージのインストールに使用するプロバイダ。 - -適用されるのは`client_dev => true`の場合だけです。 - -##### `daemon_dev_package_ensure` - -パッケージが、存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。 - -有効な値：'present'、'absent'、または'x.y.z'。 - -適用されるのはdaemon_dev => true`の場合だけです。 - -##### `daemon_dev_package_name` - -インストールするdaemon_devパッケージの名前。 - -適用されるのはdaemon_dev => true`の場合だけです。 - -##### `daemon_dev_package_provider` - -daemon_devパッケージのインストールに使用するプロバイダ。 - -適用されるのはdaemon_dev => true`の場合だけです。 - -##### `java_package_ensure` - -パッケージが、存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。 - -有効な値：'present'、'absent'、または'x.y.z'。 - -適用されるのは`java_enable => true`の場合だけです。 - -##### `java_package_name` - -インストールするJavaパッケージの名前。 - -適用されるのは`java_enable => true`の場合だけです。 - -##### `java_package_provider` - -Javaパッケージのインストールに使用するプロバイダ。 - -適用されるのは`java_enable => true`の場合だけです。 - -##### `perl_package_ensure` - -パッケージが、存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。 - -有効な値：'present'、'absent'、または'x.y.z'。 - -適用されるのは`perl_enable => true`の場合だけです。 - -##### `perl_package_name` - -インストールするPerlパッケージの名前。 - -適用されるのは`perl_enable => true`の場合だけです。 - -##### `perl_package_provider` - -Perlパッケージのインストールに使用するプロバイダ。 - -適用されるのは`perl_enable => true`の場合だけです。 - -##### `php_package_ensure` - -パッケージが、存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。 - -有効な値：'present'、'absent'、または'x.y.z'。 - -適用されるのは`php_enable => true`の場合だけです。 - -##### `php_package_name` - -インストールするPHPパッケージの名前。 - -適用されるのは`php_enable => true`の場合だけです。 - -##### `python_package_ensure` - -パッケージが、存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。 - -有効な値：'present'、'absent'、または'x.y.z'。 - -適用されるのは`python_enable => true`の場合だけです。 - -##### `python_package_name` - -インストールするPythonパッケージの名前。 - -適用されるのは`python_enable => true`の場合だけです。 - -##### `python_package_provider` - -Pythonパッケージのインストールに使用するプロバイダ。 - -適用されるのは`python_enable => true`の場合だけです。 - -##### `ruby_package_ensure` - -パッケージが、存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。 - -有効な値：'present'、'absent'、または'x.y.z'。 - -適用されるのは`ruby_enable => true`の場合だけです。 - -##### `ruby_package_name` - -インストールするRubyパッケージの名前。 - -適用されるのは`ruby_enable => true`の場合だけです。 - -##### `ruby_package_provider` - -Rubyパッケージのインストールに使用するプロバイダ。 - -#### mysql::client - -##### `bindings_enable` - -すべてのバインディングを自動的にインストールするかどうかを指定します。 - -有効な値：`true`、`false`。 - -デフォルト値：`false`。 - -##### `install_options` - -管理対象のパッケージリソースに関するインストールオプションの配列。パッケージマネージャに対応する正しいオプションを渡す必要があります。 - -##### `package_ensure` - -MySQLパッケージが、存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。 - -有効な値：'present'、'absent'、または'x.y.z'。 - -##### `package_manage` - -MySQLクライアントパッケージを管理するかどうかを指定します。 - -デフォルト値：`true`。 - -##### `package_name` - -インストールするMySQLクライアントパッケージの名前。 - -### 定義 - -#### mysql::db - -```puppet -mysql_database { 'information_schema': - ensure => 'present', - charset => 'utf8', - collate => 'utf8_swedish_ci', -} -mysql_database { 'mysql': - ensure => 'present', - charset => 'latin1', - collate => 'latin1_swedish_ci', -} -``` - -##### `user` - -作成するデータベースのユーザ。 - -##### `password` - -作成するデータベースの$userのパスワード。 - -##### `dbname` - -作成するデータベースの名前。 - -デフォルト値："$name"。 - -##### `charset` - -データベースに使用するキャラクタセット。 - -デフォルト値：'utf8'。 - -##### `collate` - -データベースの照合順序。 - -デフォルト値：'utf8_general_ci'。 - -##### `host` - -GRANT権限を付与するuser@hostの一部として使用するホスト。 - -デフォルト値：'localhost'。 - -##### `grant` - -データベースに対してuser@hostに付与される権限。 - -デフォルト値：'ALL'。 - -##### `sql` - -実行するsqlfileへのパス。文字列として指定された1つのファイル、または文字列の配列のいずれかです。 - -デフォルト値：`undef`。 - -##### `enforce_sql` - -sqlfilesを毎回実行するかどうかを指定します。falseに設定した場合はsqlfilesは1回しか実行されません。 - -有効な値：`true`、`false`。 - -デフォルト値：`false`。 - -##### `ensure` - -データベースを作成するかどうかを指定します。 - -有効な値：'present'、'absent'。 - -デフォルト値：'present'。 - -##### `import_timeout` - -sqlfilesをロードするときのタイムアウト(秒)。 - -デフォルト値：300。 - -##### `import_cat_cmd` - -データベースをインポートするためにsqlfileを読み込むコマンド。sqlfilesが圧縮されている場合に役立ちます。たとえば.gzファイルの場合に'zcat'を使用することができます。 - -デフォルト値：'cat'。 - -### タイプ - -#### mysql_database - -`mysql_database`は、MySQLでデータベースを作成し、管理します。 - -##### `ensure` - -リソースの存在を指定します。 - -有効な値：'present'、'absent'。 - -デフォルト値：'present'。 - -##### `name` - -管理するMySQLデータベースの名前。 - -##### `charset` - -データベースに使用するキャラクタセットの設定。 - -デフォルト値：'utf8'。 - -##### `collate` - -データベースに使用する照合順序の設定。 - -デフォルト値：'utf8_general_ci'。 - -#### mysql_user - -MySQLでのユーザのGRANT権限を作成し、管理します。 - -```puppet -mysql_user { 'root@127.0.0.1': - ensure => 'present', - max_connections_per_hour => '0', - max_queries_per_hour => '0', - max_updates_per_hour => '0', - max_user_connections => '0', -} -``` - -認証プラグインを指定することもできます。 - -```puppet -mysql_user{ 'myuser'@'localhost': - ensure => 'present', - plugin => 'unix_socket', -} -``` - -ユーザに対しTLSオプションを指定できます。 - -```puppet -mysql_user{ 'myuser'@'localhost': - ensure => 'present', - tls_options => ['SSL'], -} -``` - -##### `name` - -ユーザ名('username@hostname'またはusername@hostname)。 - -##### `password_hash` - -ユーザのパスワードハッシュ。このようなハッシュを作成するには、mysql_password()を使用してください。 - -##### `max_user_connections` - -同時に接続するユーザ数の最大値。 - -整数値でなければなりません。 - -指定値が'0'の場合は無制限(またはグローバル)になります。 - -##### `max_connections_per_hour` - -ユーザの1時間あたりの接続回数最大値。 - -整数値でなければなりません。 - -指定値が'0'の場合は無制限(またはグローバル)になります。 - -##### `max_queries_per_hour` - -ユーザの1時間あたりのクエリ数最大値。 - -整数値でなければなりません。 - -指定値が'0'の場合は無制限(またはグローバル)になります。 - -##### `max_updates_per_hour` - -ユーザの1時間あたりの更新回数最大値。 - -整数値でなければなりません。 - -指定値が'0'の場合は無制限(またはグローバル)になります。 - -##### `tls_options` - -1つ以上のtls_optionの値を使用するMySQLアカウント用のSSL関連のオプション。'NONE'の場合はアカウントにTLSオプションが指定されません。使用可能なオプションは、MySQLドキュメントに示されているとおり、'SSL'、'X509'、'CIPHER *cipher*'、'ISSUER *issuer*'、'SUBJECT *subject*'です。 - - -#### mysql_grant - -`mysql_grant`は、MySQLでデータベースにアクセスするのに必要なGRANT権限を作成します。MySQLでデータベースにアクセスするためのGRANT権限を作成するには、`username@hostname/database.table`のパターンに続けて次のようにリソースのタイトルを作成する必要があります。 - -```puppet -mysql_grant { 'root@localhost/*.*': - ensure => 'present', - options => ['GRANT'], - privileges => ['ALL'], - table => '*.*', - user => 'root@localhost', -} -``` - -次のように、列レベルまで詳細に権限を指定することができます。 - -```puppet -mysql_grant { 'root@localhost/mysql.user': - ensure => 'present', - privileges => ['SELECT (Host, User)'], - table => 'mysql.user', - user => 'root@localhost', -} -``` - -GRANT権限を取り消す場合は['NONE']を指定します。 - -##### `ensure` - -リソースの存在を指定します。 - -有効な値：'present'、'absent'。 - -デフォルト値：'present'。 - -##### `name` - -GRANT権限を示す名前。'user/table'の形式でなければなりません。 - -##### `privileges` - -ユーザに許可を与える権限。 - -##### `table` - -権限が適用されるテーブル。 - -##### `user` - -権限が付与されるユーザ。 - -##### `options` - -権限を付与するMySQLオプション(オプション)。 - -#### mysql_plugin - -`mysql_plugin`を使用してMySQLサーバにプラグインをロードできます。 - -```puppet -mysql_plugin { 'auth_socket': - ensure => 'present', - soname => 'auth_socket.so', -} -``` - -##### `ensure` - -リソースの存在を指定します。 - -有効な値：'present'、'absent'。 - -デフォルト値：'present'。 - -##### `name` - -管理するMySQLプラグインの名前。 - -##### `soname` - -ライブラリファイルの名前。 - -#### `mysql_datadir` - -バージョンに固有なコードでMySQLデータディレクトリを初期化します。MySQL 5.7.6より前のバージョンではmysql_install_dbを、後のバージョンではmysqld --initialize-insecureを使用します。 - -安全でない初期化が必要なのは、mysqldバージョン5.7で'secure by default'モードが導入されているからです。これは、MySQLがランダムなパスワードを作成してSTDOUTに書き込むことを意味します。したがって、使用可能な認証情報がないためPuppetが後でデータベースサーバにアクセスすることはできません。 - -このタイプは内部タイプであるため、直接呼び出すことはできません。 - -### ファクト - -#### `mysql_version` - -`mysql --version`からの出力を解析してMySQLのバージョンを判断します。 - -#### `mysql_server_id` - -ノードのMACアドレスに基づいて、`server_id`として使用可能な一意なIDを作成します。ループバックインターフェイスしかないノードでは、このファクトは*常に*`0`を返します。これらのノードは外部に接続されていないため、これが衝突の原因になる可能性はありません。 - ### タスク MySQLモジュールにはサンプルタスクがあり、ユーザはデータベースに対して任意のSQLを実行できます。[Puppet Enterpriseマニュアル](https://puppet.com/docs/pe/2017.3/orchestrator/running_tasks.html)または[Boltマニュアル](https://puppet.com/docs/bolt/latest/bolt.html)で、タスクを実行する方法に関する情報を参照してください。 -## 制約事項 +## 制約 -このモジュールは以下のプラットフォームでテストされています。 - -* RedHat Enterprise Linux 5、6、7 -* Debian 6、7、8 -* CentOS 5、 6、7 -* Ubuntu 10.04、12.04、14.04、16.04 -* Scientific Linux 5、6 -* SLES 11 - -他のプラットフォームでは最小限のテストしか行っていないため、保証はできません。 +サポートされているオペレーティングシステムの一覧については、[metadata.json](https://github.com/puppetlabs/puppetlabs-tomcat/blob/master/metadata.json)を参照してください。 **注意：** mysqlbackup.shは、MySQL 5.7以降では動作せず、サポートされていません。 -Debian 9の互換性は完全には検証されていません。 - ## 開発 Puppet Forge上のPuppetモジュールはオープンプロジェクトであり、その価値を維持するにはコミュニティからの貢献が欠かせません。Puppetが提供する膨大な数のプラットフォームや、無数のハードウェア、ソフトウェア、デプロイ設定に弊社がアクセスすることは不可能です。 @@ -1326,4 +429,4 @@ Puppet Forge上のPuppetモジュールはオープンプロジェクトであ * Chris Weyl * Daniël van Eeden * Jan-Otto Kröpke -* Timothy Sven Nelson \ No newline at end of file +* Timothy Sven Nelson diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/readmes/REFERENCE_ja_JP.md b/modules/services/unix/database/mysql_stretch_compatible/mysql/readmes/REFERENCE_ja_JP.md new file mode 100644 index 000000000..ce5091ae9 --- /dev/null +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/readmes/REFERENCE_ja_JP.md @@ -0,0 +1,1180 @@ +# リファレンス + + +## クラス + +### パブリッククラス + +* [`mysql::bindings`](#mysqlbindings): MySQLバインディングの親クラス。 +* [`mysql::client`](#mysqlclient): MySQLクライアントをインストールして設定します。 +* [`mysql::server`](#mysqlserver): MySQLサーバをインストールして設定します。 +* [`mysql::server::backup`](#mysqlserverbackup): MySQLバックアップを作成して管理します。 +* [`mysql::server::monitor`](#mysqlservermonitor): モニタするユーザをデータベースに追加するヘルパクラスです。 +* [`mysql::server::mysqltuner`](#mysqlservermysqltuner): MySQLTunerパッケージを管理します。 + +### プライベートクラス + +* `mysql::backup::mysqlbackup`: mysqlbackupクライアントを管理します。 +* `mysql::backup::mysqldump`: mysqldumpの"プロバイダ" +* `mysql::backup::xtrabackup`: Percona XtraBackupの"プロバイダ" +* `mysql::bindings::client_dev`: クライアント開発バインディングのインストールに使用するプライベートクラス +* `mysql::bindings::daemon_dev`: デーモン開発バインディングのインストールに使用するプライベートクラス +* `mysql::bindings::java`: java言語バインディングのインストールに使用するプライベートクラス。 +* `mysql::bindings::perl`: perl言語バインディングのインストールに使用するプライベートクラス。 +* `mysql::bindings::php`: php言語バインディングのインストールに使用するプライベートクラス +* `mysql::bindings::python`: python言語バインディングのインストールに使用するプライベートクラス +* `mysql::bindings::ruby`: ruby言語バインディングのインストールに使用するプライベートクラス +* `mysql::client::install`: MySQLクライアントのインストールに使用するプライベートクラス。 +* `mysql::params`: Paramsクラス。 +* `mysql::server::account_security`: localhostアカウントが存在しないことを確認するためのプライベートクラス +* `mysql::server::binarylog`: バイナリログの設定では、mysqlユーザが必要です。パッケージのインストール後に行ってください +* `mysql::server::config`: MySQLサーバの設定に使用するプライベートクラス。 +* `mysql::server::install`: MySQLパッケージの管理に使用するプライベートクラス。 +* `mysql::server::installdb`: インストール時に初期データベースを構築します。 +* `mysql::server::providers`: mysel::serverで指定された、対応するハッシュを使って3つのプロバイダを呼び出すためのコンビニエンスクラス。 +* `mysql::server::root_password`: ルートパスワードの管理に使用するプライベートクラス +* `mysql::server::service`: MySQLサービスの管理に使用するプライベートクラス + +## 定義された型 + +* [`mysql::db`](#mysqldb): MySQLデータベースを作成して設定します。 + +## リソース型 + +### パブリックリソース型 + +* [`mysql_plugin`](#mysql_plugin): MySQLプラグインを管理します。 + +### プライベートリソース型 + +* `mysql_database`: MySQLデータベースを管理します。 +* `mysql_datadir`: mysql_install_dbまたはmysqld (5.7.6以上)を使用してMySQL datadirsを管理します。 +* `mysql_grant`: MySQLのユーザ権限を管理します。 +* `mysql_user`: MySQLユーザを管理します。これには、ユーザパスワードおよび権限の管理が含まれます。 + +## 関数 + +* [`mysql_deepmerge`](#mysql_deepmerge): 2つ以上のハッシュタグを再帰的に統合し、その結果得られたハッシュを返します。 +* [`mysql_dirname`](#mysql_dirname): パスのdirnameを返します +* [`mysql_password`](#mysql_password): mysqlの"PASSWORD()"関数のように、文字列にハッシュをかけます +* [`mysql_strip_hash`](#mysql_strip_hash): TEMPORARY FUNCTION: EXPIRES 2014-03-10 ハッシュが指定されると、この関数はすべての空白エントリを取り除きます。 + +## タスク + +* [`export`](#export): ローカルファイルにデータベースのバックアップを作成できます。 +* [`sql`](#sql): 任意のSQLを実行できます + +## クラス + +### mysql::bindings + +MySQLバインディングの親クラス。 + +#### 例 + +##### Ruby言語バインディングをインストールします + +```puppet +class { 'mysql::bindings': + ruby_enable => true, + ruby_package_ensure => 'present', + ruby_package_name => 'ruby-mysql-2.7.1-1mdv2007.0.sparc.rpm', + ruby_package_provider => 'rpm', +} +``` + +#### パラメータ + +`mysql::bindings`クラスでは、以下のパラメータを使用できます。 + +##### `install_options` + +データ型: `Any` + +管理対象のパッケージリソースに`install_options`を渡します。パッケージマネージャに対応する[正しいオプション](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options)を渡す必要があります。 + +デフォルト値: `undef` + +##### `java_enable` + +データ型: `Any` + +`::mysql::bindings::java`を含めるかどうかを指定します。有効な値: `true`、`false`。 + +デフォルト値: `false` + +##### `perl_enable` + +データ型: `Any` + +`mysql::bindings::perl`を含めるかどうかを指定します。有効な値: `true`、false`。 + +デフォルト値: `false` + +##### `php_enable` + +データ型: `Any` + +`mysql::bindings::php`を含めるかどうかを指定します。有効な値: `true`、`false`。 + +デフォルト値: `false` + +##### `python_enable` + +データ型: `Any` + +`mysql::bindings::python`を含めるかどうかを指定します。有効な値: `true`、`false`。 + +デフォルト値: `false` + +##### `ruby_enable` + +データ型: `Any` + +`mysql::bindings::ruby`を含めるかどうかを指定します。有効な値: `true`、`false`。 + +デフォルト値: `false` + +##### `client_dev` + +データ型: `Any` + +`::mysql::bindings::client_dev`を含めるかどうかを指定します。有効な値: `true`、`false`。 + +デフォルト値: `false` + +##### `daemon_dev` + +データ型: `Any` + +`::mysql::bindings::daemon_dev`を含めるかどうかを指定します。有効な値: `true`、`false`。 + +デフォルト値: `false` + +##### `java_package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。適用されるのは`java_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::java_package_ensure + +##### `java_package_name` + +データ型: `Any` + +インストールするJavaパッケージの名前。適用されるのは`java_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::java_package_name + +##### `java_package_provider` + +データ型: `Any` + +Javaパッケージのインストールに使用するプロバイダ。適用されるのは`java_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::java_package_provider + +##### `perl_package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。適用されるのは`perl_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::perl_package_ensure + +##### `perl_package_name` + +データ型: `Any` + +インストールするPerlパッケージの名前。適用されるのは`perl_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::perl_package_name + +##### `perl_package_provider` + +データ型: `Any` + +Perlパッケージのインストールに使用するプロバイダ。適用されるのは`perl_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::perl_package_provider + +##### `php_package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。適用されるのは`php_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::php_package_ensure + +##### `php_package_name` + +データ型: `Any` + +インストールするPHPパッケージの名前。適用されるのは`php_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::php_package_name + +##### `php_package_provider` + +データ型: `Any` + +PHPパッケージのインストールに使用するプロバイダ。適用されるのは`php_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::php_package_provider + +##### `python_package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。適用されるのは`python_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::python_package_ensure + +##### `python_package_name` + +データ型: `Any` + +インストールするPythonパッケージの名前。適用されるのは`python_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::python_package_name + +##### `python_package_provider` + +データ型: `Any` + +Pythonパッケージのインストールに使用するプロバイダ。適用されるのは`python_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::python_package_provider + +##### `ruby_package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。適用されるのは`ruby_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::ruby_package_ensure + +##### `ruby_package_name` + +データ型: `Any` + +インストールするRubyパッケージの名前。適用されるのは`ruby_enable => true`の場合だけです。 + +デフォルト値: $mysql::params::ruby_package_name + +##### `ruby_package_provider` + +データ型: `Any` + +Rubyパッケージのインストールに使用するプロバイダ。 + +デフォルト値: $mysql::params::ruby_package_provider + +##### `client_dev_package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。適用されるのは`client_dev => true`の場合だけです。 + +デフォルト値: $mysql::params::client_dev_package_ensure + +##### `client_dev_package_name` + +データ型: `Any` + +インストールするclient_devパッケージの名前。適用されるのは`client_dev => true`の場合だけです。 + +デフォルト値: $mysql::params::client_dev_package_name + +##### `client_dev_package_provider` + +データ型: `Any` + +client_devパッケージのインストールに使用するプロバイダ。適用されるのは`client_dev => true`の場合だけです。 + +デフォルト値: $mysql::params::client_dev_package_provider + +##### `daemon_dev_package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。適用されるのは`daemon_dev => true`の場合だけです。 + +デフォルト値: $mysql::params::daemon_dev_package_ensure + +##### `daemon_dev_package_name` + +データ型: `Any` + +インストールするdaemon_devパッケージの名前。適用されるのは`daemon_dev => true`の場合だけです。 + +デフォルト値: $mysql::params::daemon_dev_package_name + +##### `daemon_dev_package_provider` + +データ型: `Any` + +daemon_devパッケージのインストールに使用するプロバイダ。適用されるのは`daemon_dev => true`の場合だけです。 + +デフォルト値: $mysql::params::daemon_dev_package_provider + +### mysql::client + +MySQLクライアントをインストールして設定します。 + +#### 例 + +##### MySQLクライアントをインストールします + +```puppet +class {'::mysql::client': + package_name => 'mysql-client', + package_ensure => 'present', + bindings_enable => true, +} +``` + +#### パラメータ + +`mysql::client`クラスでは、以下のパラメータを使用できます。 + +##### `bindings_enable` + +データ型: `Any` + +すべてのバインディングを自動的にインストールするかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `false`。 + +デフォルト値: $mysql::params::bindings_enable + +##### `install_options` + +データ型: `Any` + +管理対象のパッケージリソースに関するインストールオプションの配列。パッケージマネージャに対応する正しいオプションを渡す必要があります。 + +デフォルト値: `undef` + +##### `package_ensure` + +データ型: `Any` + +MySQLパッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。 + +デフォルト値: $mysql::params::client_package_ensure + +##### `package_manage` + +データ型: `Any` + +MySQLクライアントパッケージを管理するかどうかを指定します。デフォルト値: `true`。 + +デフォルト値: $mysql::params::client_package_manage + +##### `package_name` + +データ型: `Any` + +インストールするMySQLクライアントパッケージの名前。 + +デフォルト値: $mysql::params::client_package_name + +### mysql::server + +MySQLサーバーをインストールして設定します。 + +#### 例 + +##### MySQLサーバをインストールします + +```puppet +class { '::mysql::server': + package_name => 'mysql-server', + package_ensure => '5.7.1+mysql~trusty', + root_password => 'strongpassword', + remove_default_accounts => true, +} +``` + +#### パラメータ + +`mysql::server`クラスでは、以下のパラメータを使用できます。 + +##### `config_file` + +データ型: `Any` + +MySQL設定ファイルの場所を示すパス。 + +デフォルト値: $mysql::params::config_file + +##### `includedir` + +データ型: `Any` + +カスタム設定オーバーライド用の!includedirの場所を示すパス。 + +デフォルト値: $mysql::params::includedir + +##### `install_options` + +データ型: `Any` + +管理対象のパッケージリソースに[install_options](https://docs.puppetlabs.com/references/latest/type.html#package-attribute-install_options)配列を渡します。指定されているパッケージマネージャに対応する正しいオプションを渡す必要があります。 + +デフォルト値: `undef` + +##### `install_secret_file` + +データ型: `Any` + +一時的なルートパスワードを含むシークレットファイルへのパス。 + +デフォルト値: $mysql::params::install_secret_file + +##### `manage_config_file` + +データ型: `Any` + +MySQLの設定ファイルを管理するかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `true`。 + +デフォルト値: $mysql::params::manage_config_file + +##### `override_options` + +データ型: `Any` + +MySQLに渡すオーバーライドオプションを指定します。構造はmy.cnfファイルのハッシュと同様です。詳しい使用方法については、上記を参照してください。 + +デフォルト値: {} + +##### `package_ensure` + +データ型: `Any` + +パッケージが存在するかしないか、または特定のバージョンでなければならないかどうかを指定します。有効な値: 'present'、'absent'、'x.y.z'。デフォルト値: 'present'。 + +デフォルト値: $mysql::params::server_package_ensure + +##### `package_manage` + +データ型: `Any` + +MySQLサーバパッケージを管理するかどうかを指定します。デフォルト値: `true`。 + +デフォルト値: $mysql::params::server_package_manage + +##### `package_name` + +データ型: `Any` + +インストールするMySQLサーバパッケージの名前。 + +デフォルト値: $mysql::params::server_package_name + +##### `purge_conf_dir` + +データ型: `Any` + +`includedir`ディレクトリをパージするかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `false`。 + +デフォルト値: $mysql::params::purge_conf_dir + +##### `remove_default_accounts` + +データ型: `Any` + +`mysql::server::account_security`を自動的に含めるかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `false`。 + +デフォルト値: `false` + +##### `restart` + +データ型: `Any` + +何らかの変化があった場合にサービスを再起動するかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `false`。 + +デフォルト値: $mysql::params::restart + +##### `root_group` + +データ型: `Any` + +ルートに使用するグループの名前。グループ名またはグループIDのいずれかです。詳細については[group](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group)を参照してください。 + +デフォルト値: $mysql::params::root_group + +##### `mysql_group` + +データ型: `Any` + +MySQLデーモンユーザのグループの名前、グループ名またはグループIDのいずれかです。詳細については[group](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group)を参照してください。 + +デフォルト値: $mysql::params::mysql_group + +##### `root_password` + +データ型: `Any` + +MySQLのルートパスワード。Puppetは、このパラメータを使用して、ルートパスワードの設定や`/root/.my.cnf`の更新を試みます。`create_root_user`または`create_root_my_cnf`がtrueの場合にこのパラメータが必要です。`root_password`が'UNSET'の場合は`create_root_user`と`create_root_my_cnf`はfalseになります(MySQLルートユーザと`/root/.my.cnf`は作成されません)。パスワード変更はサポートされますが、`/root/.my.cnf`に旧パスワードが設定されている必要があります。実際には、Puppetは`/root/my.cnf`に設定されている旧パスワードを使用してMySQLで新しいパスワードを設定してから、`/root/.my.cnf`を新しいパスワードで更新します。 + +デフォルト値: $mysql::params::root_password + +##### `service_enabled` + +データ型: `Any` + +サービスを有効化するかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `true`。 + +デフォルト値: $mysql::params::server_service_enabled + +##### `service_manage` + +データ型: `Any` + +サービスを管理するかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `true`。 + +デフォルト値: $mysql::params::server_service_manage + +##### `service_name` + +データ型: `Any` + +MySQLサーバサービスの名前。デフォルト値はOSにより異なり、'params.pp'に定義されています。 + +デフォルト値: $mysql::params::server_service_name + +##### `service_provider` + +データ型: `Any` + +サービスの管理に使用するプロバイダ。Ubuntuの場合のデフォルト値は'upstart'、Ubuntu以外の場合のデフォルト値は定義されていません。 + +デフォルト値: $mysql::params::server_service_provider + +##### `create_root_user` + +データ型: `Any` + +ルートユーザを作成するかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `true`。このパラメータは、Galeraでクラスタをセットアップする場合に役立ちます。ルートユーザの作成が必要なのは一度だけです。このパラメータを、1つのノードに対しtrueに設定し、他のすべてのノードに対してfalseに設定できます。 + +デフォルト値: $mysql::params::create_root_user + +##### `create_root_my_cnf` + +データ型: `Any` + +`/root/.my.cnf`を作成するかどうかを指定します。有効な値: `true`、`false`。デフォルト値: `true`。`create_root_my_cnf`を使用すると`create_root_user`に左右されずに`/root/.my.cnf`を作成できます。すべてのノードに`/root/.my.cnf`が存在するようにした場合に、Galeraでこの機能を使用してクラスタをセットアップできます。 + +デフォルト値: $mysql::params::create_root_my_cnf + +##### `users` + +データ型: `Any` + +作成するユーザのハッシュ(オプション)。[mysql_user](#mysql_user)に渡されます。 + +デフォルト値: {} + +##### `grants` + +データ型: `Any` + +[mysql_grant](#mysql_grant)に渡されるGRANT権限のハッシュ(オプション)。 + +デフォルト値: {} + +##### `databases` + +データ型: `Any` + +作成されるデータベースのハッシュ(オプション)。[mysql_database](#mysql_database)に渡されます。 + +デフォルト値: {} + +##### `enabled` + +データ型: `Any` + +_Deprecated_ + +デフォルト値: `undef` + +##### `manage_service` + +データ型: `Any` + +_Deprecated_ + +デフォルト値: `undef` + +##### `old_root_password` + +データ型: `Any` + +現在、このパラメータでは何も行わず、下位互換性を確保するためだけに存在します。ルートパスワードの変更についての詳細は、上記の`root_password`パラメータの説明を参照してください。 + +デフォルト値: `undef` + +### mysql::server::backup + +MySQLバックアップを作成し、管理します。 + +#### 例 + +##### 基本的なMySQLバックアップを作成します: + +```puppet +class { 'mysql::server': + root_password => 'password' +} +class { 'mysql::server::backup': + backupuser => 'myuser', + backuppassword => 'mypassword', + backupdir => '/tmp/backups', +} +``` + +#### パラメータ + +`mysql::server::backup`クラスでは、以下のパラメータを使用できます。 + +##### `backupuser` + +データ型: `Any` + +バックアップ管理者権限を持つMySQLユーザ。 + +デフォルト値: `undef` + +##### `backuppassword` + +データ型: `Any` + +`backupuser`のパスワード。 + +デフォルト値: `undef` + +##### `backupdir` + +データ型: `Any` + +バックアップを保存するディレクトリ。 + +デフォルト値: `undef` + +##### `backupdirmode` + +データ型: `Any` + +バックアップディレクトリに適用されるパーミッション。このパラメータはfileリソースに直接渡されます。 + +デフォルト値: '0700' + +##### `backupdirowner` + +データ型: `Any` + +バックアップディレクトリの所有者。このパラメータはfileリソースに直接渡されます。 + +デフォルト値: 'root' + +##### `backupdirgroup` + +データ型: `Any` + +バックアップディレクトリのグループ所有者。このパラメータはfileリソースに直接渡されます。 + +デフォルト値: 'root' + +##### `backupcompress` + +データ型: `Any` + +バックアップを圧縮するかどうかを指定します(mysqldumpプロバイダを使用する場合)。 + +デフォルト値: `true` + +##### `backuprotate` + +データ型: `Any` + +バックアップの回転間隔(24時間形式)。 + +デフォルト値: 30 + +##### `ignore_events` + +データ型: `Any` + +mysql.eventテーブルを無視します。 + +デフォルト値: `true` + +##### `delete_before_dump` + +データ型: `Any` + +バックアップ前に古い.sqlファイルを削除するかどうかを設定します。trueに設定すると古いファイルがバックアップ前に削除され、falseに設定するとバックアップ後に削除されます。 + +デフォルト値: `false` + +##### `backupdatabases` + +データ型: `Any` + +バックアップするデータベース(xtrabackupプロバイダを使用する場合)。 + +デフォルト値: [] + +##### `file_per_database` + +データ型: `Any` + +データベースバックアップごとにファイルを1つ作成する、file per databaseモードを使用します。 + +デフォルト値: `false` + +##### `include_routines` + +データ型: `Any` + +`file_per_database`バックアップを実行する際に、ダンプされたデータベースから保存済みのルーチン(プロシージャと関数)をダンプします。 + +デフォルト値: `false` + +##### `include_triggers` + +データ型: `Any` + +`file_per_database`バックアップを実行する際に、ダンプされた各テーブルのトリガをダンプします。 + +デフォルト値: `false` + +##### `ensure` + +データ型: `Any` + + + +デフォルト値: 'present' + +##### `time` + +データ型: `Any` + +バックアップ時刻を設定する2つの要素の配列。時刻をHH:MM形式で['23', '5'](23:05)または['3', '45'](03:45)に設定できます。 + +デフォルト値: ['23', '5'] + +##### `prescript` + +データ型: `Any` + +バックアップ開始前に実行されるスクリプト。 + +デフォルト値: `false` + +##### `postscript` + +データ型: `Any` + +バックアップ終了時に実行されるスクリプト。この機能を使用すると、バックアップを中央ストアに同期させることができます。このスクリプトは、直接実行される1つの行であっても、配列を形成する複数の行であっても構いません。あるいは、外部で管理される1つ以上の(実行可能な)ファイルにすることもできます。 + +デフォルト値: `false` + +##### `execpath` + +データ型: `Any` + +MySQLを標準的でない場所にインストールする場合にカスタムパスを設定できます。デフォルト値：`/usr/bin:/usr/sbin:/bin:/sbin`。 + +デフォルト値: '/usr/bin:/usr/sbin:/bin:/sbin' + +##### `provider` + +データ型: `Any` + +サーバのバックアップの実行について設定します。有効な値は以下のとおりです。 + +デフォルト値: 'mysqldump' + +##### `maxallowedpacket` + +データ型: `Any` + +バックアップダンプスクリプト用のSQLステートメントの最大サイズを定義ます。デフォルト値は1MBで、MySQL Serverのデフォルト値と同じです。 + +デフォルト値: '1M' + +##### `optional_args` + +データ型: `Any` + +バックアップツールに渡すべきオプションの引数の配列を指定します(現在はxtrabackupプロバイダでのみサポート)。 + +デフォルト値: [] + +### mysql::server::monitor + +モニタするユーザをデータベースに追加するヘルパクラスです + +#### パラメータ + +`mysql::server::monitor`クラスでは、以下のパラメータを使用できます。 + +##### `mysql_monitor_username` + +データ型: `Any` + +MySQLのモニタ用に作成するユーザ名。 + +デフォルト値: '' + +##### `mysql_monitor_password` + +データ型: `Any` + +MySQLのモニタ用に作成するパスワード。 + +デフォルト値: '' + +##### `mysql_monitor_hostname` + +データ型: `Any` + +モニタするユーザリクエストへのアクセスが許可されたホスト名。 + +デフォルト値: '' + +### mysql::server::mysqltuner + +MySQLTunerパッケージを管理します。 + +#### パラメータ + +`mysql::server::mysqltuner`クラスでは、以下のパラメータを使用できます。 + +##### `ensure` + +データ型: `Any` + +リソースが存在することを確認します。有効な値: 'present'、'absent'。デフォルト値: 'present'。 + +デフォルト値: 'present' + +##### `version` + +データ型: `Any` + +major/MySQLTuner-perl githubリポジトリからインストールするバージョン。有効なタグでなければなりません。デフォルト値: 'v1.3.0'。 + +デフォルト値: 'v1.3.0' + +##### `source` + +データ型: `Any` + +mysqltunerパッケージのソースパス。 + +デフォルト値: `undef` + +##### `environment` + +データ型: `Any` + +プロキシを使用したダウンロードなどのダウンロード中に有効な環境変数: environment => 'https_proxy=http://proxy.example.com:80' + +デフォルト値: `undef` + +## 定義された型 + +### mysql::db + +MySQLデータベースを作成し、設定します。 + +#### 例 + +##### データベースを作成します + +```puppet +mysql::db { 'mydb': + user => 'myuser', + password => 'mypass', + host => 'localhost', + grant => ['SELECT', 'UPDATE'], +} +``` + +#### パラメータ + +`mysql::db`ユーザ定義タイプでは、以下のパラメータを使用できます。 + +##### `user` + +データ型: `Any` + +作成するデータベースのユーザ。 + +##### `password` + +データ型: `Any` + +作成するデータベースの$userのパスワード。 + +##### `dbname` + +データ型: `Any` + +作成するデータベースの名前。 + +デフォルト値: $name + +##### `charset` + +データ型: `Any` + +データベースに使用するキャラクタセット。 + +デフォルト値: 'utf8' + +##### `collate` + +データ型: `Any` + +データベースの照合順序。 + +デフォルト値: 'utf8_general_ci' + +##### `host` + +データ型: `Any` + +GRANT権限を付与するuser@hostの一部として使用するホスト。 + +デフォルト値: 'localhost' + +##### `grant` + +データ型: `Any` + +データベースに対してuser@hostに付与される権限。 + +デフォルト値: 'ALL' + +##### `sql` + +データタイプ: `Optional[Variant[Array, Hash, String]]` + +実行するsqlfileへのパス。文字列として指定された1つのファイル、または文字列の配列のいずれかです。 + +デフォルト値: `undef` + +##### `enforce_sql` + +データ型: `Any` + +sqlfilesを毎回実行するかどうかを指定します。falseに設定した場合はsqlfilesは1回しか実行されません。 + +デフォルト値: `false` + +##### `ensure` + +データタイプ: `Enum['absent', 'present']` + +データベースを作成するかどうかを指定します。有効な値: 'present'、'absent'。デフォルト値: 'present'。 + +デフォルト値: 'present' + +##### `import_timeout` + +データ型: `Any` + +sqlfilesをロードするときのタイムアウト(秒)。デフォルト値: 300。 + +デフォルト値: 300 + +##### `import_cat_cmd` + +データ型: `Any` + +データベースをインポートするためにsqlfileを読み込むコマンド。sqlfilesが圧縮されている場合に役立ちます。例えば.gzファイルの場合に'zcat'を使用することができます。 + +デフォルト値: 'cat' + +## リソース型 + +### mysql_plugin + +MySQLプラグインを管理します。 + +#### 例 + +##### + +```puppet +mysql_plugin { 'some_plugin': + soname => 'some_pluginlib.so', +} +``` + +#### プロパティ + +`mysql_plugin`タイプでは、以下のプロパティを使用できます。 + +##### `ensure` + +デフォルト値: present、absent + +リソースの基本的なプロパティ。 + +デフォルト値: present + +##### `soname` + +有効な値: %r{^\w+\.\w+$} + +ライブラリの名前 + +#### パラメータ + +`mysql_plugin`タイプでは、以下のパラメータを使用できます。 + +##### `name` + +namevar + +管理するMySQLプラグインの名前。 + +## 関数 + +### mysql_deepmerge + +タイプ: Ruby 3.x API + +- ハッシュである重複キーが存在する場合は、再帰的に統合されます。 +- ハッシュではない重複キーが存在する場合は、最右のハッシュのキーが上位になります。 +- 2つのキーの間でダッシュとアンダースコアの使用に競合がある場合(競合がない場合は、mysqlはこれらを同一のものとして扱います)、 + 最右のスタイルが上位になります。 + +#### `mysql_deepmerge()` + +- ハッシュである重複キーが存在する場合は、再帰的に統合されます。 +- ハッシュではない重複キーが存在する場合は、最右のハッシュのキーが上位になります。 +- 2つのキーの間でダッシュとアンダースコアの使用に競合がある場合(競合がない場合は、mysqlはこれらを同一のものとして扱います)、 + 最右のスタイルが上位になります。 + +結果: `Hash` + +### mysql_dirname + +タイプ: Ruby 3.x API + +パスのdirnameを返します + +#### `mysql_dirname(String $path)` + +結果: `String` パスのディレクトリ名。 + +##### `path` + +データタイプ: `String` + +dirnameを検索するパス。 + +### mysql_password + +タイプ: Ruby 3.x API + +mysqlの"PASSWORD()"関数のように、文字列にハッシュをかけます + +#### `mysql_password(String $password)` + +結果: `String` 平文のパスワードから返されたmysqlパスワードハッシュ。 + +##### `password` + +データタイプ: `String` + +平文のパスワード。 + +### mysql_strip_hash + +タイプ: Ruby 3.x API + +TEMPORARY FUNCTION: EXPIRES 2014-03-10 +ハッシュが指定されると、この関数はすべての空白エントリを取り除きます。 + +#### `mysql_strip_hash()` + +TEMPORARY FUNCTION: EXPIRES 2014-03-10 +ハッシュが指定されると、この関数はすべての空白エントリを取り除きます。 + +結果: `Any` + +## タスク + +### export + +ローカルファイルにデータベースのバックアップを作成できます。 + +**Supports noop?** false + +#### パラメータ + +##### `database` + +データタイプ: `Optional[String[1]]` + +接続先のデータベース + +##### `user` + +データタイプ: `Optional[String[1]]` + +ユーザ + +##### `password` + +データタイプ: `Optional[String[1]]` + +パスワード + +##### `file` + +データタイプ: `String[1]` + +バックアップ先のファイルのパス + +### sql + +任意のSQLを実行できます + +**Supports noop?** false + +#### パラメータ + +##### `database` + +データタイプ: `Optional[String[1]]` + +接続先のデータベース + +##### `user` + +データタイプ: `Optional[String[1]]` + +ユーザ + +##### `password` + +データタイプ: `Optional[String[1]]` + +パスワード + +##### `sql` + +データタイプ: `String[1]` + +実行するSQL + diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/locales_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/locales_spec.rb index e3cef352a..23bbcbcc6 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/locales_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/locales_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper_acceptance' require 'beaker/i18n_helper' -describe 'mysql localization', if: (fact('osfamily') == 'Debian' || fact('osfamily') == 'RedHat') && puppet_version =~ %r{(^4\.10\.[56789]|5\.\d\.\d)} do +describe 'mysql localization', if: (fact('osfamily') == 'Debian' || fact('osfamily') == 'RedHat') && (Gem::Version.new(puppet_version) >= Gem::Version.new('4.10.5')) do before :all do hosts.each do |host| on(host, "sed -i \"96i FastGettext.locale='ja'\" /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet.rb") @@ -10,6 +10,14 @@ describe 'mysql localization', if: (fact('osfamily') == 'Debian' || fact('osfami end context 'when triggering puppet simple string error' do + # 'service_enabled' being set to false can cause random failures in Debian 9 + let(:os_variant) do + if fact('operatingsystem') =~ %r{Debian} && fact('operatingsystemrelease') =~ %r{^9\.} + 'true' + else + 'false' + end + end let(:pp) do <<-MANIFEST class { 'mysql::server': @@ -24,13 +32,13 @@ describe 'mysql localization', if: (fact('osfamily') == 'Debian' || fact('osfami root_group => 'root', root_password => 'test', old_root_password => 'kittensnmittens', - service_enabled => 'false' + service_enabled => '#{os_variant}', } MANIFEST end it 'displays Japanese error' do - apply_manifest(pp, catch_error: true) do |r| + execute_manifest(pp, catch_error: true) do |r| expect(r.stderr).to match(%r{`old_root_password`属性は廃止予定であり、今後のリリースで廃止されます。}i) end end @@ -53,7 +61,7 @@ describe 'mysql localization', if: (fact('osfamily') == 'Debian' || fact('osfami end it 'displays Japanese failure' do - apply_manifest(pp, catch_failures: true) do |r| + execute_manifest(pp, catch_failures: true) do |r| expect(r.stderr).to match(%r{'prescript'オプションは、現在、mysqldumpバックアッププロバイダ向けには実装されていません。}i) end end @@ -63,7 +71,7 @@ describe 'mysql localization', if: (fact('osfamily') == 'Debian' || fact('osfami let(:pp) do <<-MANIFEST mysql::db { 'mydb': - user => 'thisisalongusernametestfortodayandtomorrowandthenextday', + user => 'thisisalongusernametestfortodayandtomorrowandthenextdayandthedayafteeeeeeerrrrrrrrrrrrrrr', password => 'mypass', host => 'localhost', grant => ['SELECT', 'UPDATE'], @@ -72,7 +80,7 @@ describe 'mysql localization', if: (fact('osfamily') == 'Debian' || fact('osfami end it 'displays Japanese failure' do - apply_manifest(pp, expect_failures: true) do |r| + execute_manifest(pp, expect_failures: true) do |r| expect(r.stderr).to match(%r{MySQLユーザ名は最大\d{2}文字に制限されています。}i) end end @@ -88,7 +96,7 @@ describe 'mysql localization', if: (fact('osfamily') == 'Debian' || fact('osfami end it 'displays Japanese error' do - apply_manifest(pp, expect_failures: true) do |r| + execute_manifest(pp, expect_failures: true) do |r| expect(r.stderr).to match(%r{無効なデータベースのユーザ"name@localhost}i) end end diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/mysql_backup_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/mysql_backup_spec.rb index b0fecb0ca..18e1ade87 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/mysql_backup_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/mysql_backup_spec.rb @@ -29,8 +29,8 @@ describe 'mysql::server::backup class' do } MANIFEST it 'when configuring mysql backups' do - apply_manifest(pp, catch_failures: true) - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end end @@ -104,8 +104,8 @@ describe 'mysql::server::backup class' do } MANIFEST it 'when configuring mysql backups' do - apply_manifest(pp, catch_failures: true) - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end end @@ -124,7 +124,7 @@ describe 'mysql::server::backup class' do it 'creates one file per database' do unless version_is_greater_than('5.7.0') - %w[backup1 backup2].each do |database| + ['backup1', 'backup2'].each do |database| shell("ls -l /tmp/backups/mysql_backup_#{database}_*-*.sql.bz2 | wc -l") do |r| expect(r.stdout).to match(%r{1}) expect(r.exit_code).to be_zero @@ -142,7 +142,7 @@ describe 'mysql::server::backup class' do it 'has one file per database per run' do unless version_is_greater_than('5.7.0') - %w[backup1 backup2].each do |database| + ['backup1', 'backup2'].each do |database| shell("ls -l /tmp/backups/mysql_backup_#{database}_*-*.sql.bz2 | wc -l") do |r| expect(r.stdout).to match(%r{2}) expect(r.exit_code).to be_zero @@ -187,7 +187,7 @@ describe 'mysql::server::backup class' do } MANIFEST it 'when configuring mysql backups with triggers and routines' do - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end it 'runs mysqlbackup.sh with no errors' do diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/mysql_helper.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/mysql_helper.rb index e041d20bc..6da16ca5b 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/mysql_helper.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/mysql_helper.rb @@ -1,5 +1,5 @@ def pre_run - apply_manifest("class { 'mysql::server': root_password => 'password' }", catch_failures: true) + execute_manifest("class { 'mysql::server': root_password => 'password' }", catch_failures: true) @mysql_version = (on default, 'mysql --version').output.chomp.match(%r{\d+\.\d+\.\d+})[0] end diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/mysql_server_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/mysql_server_spec.rb index 3b9b8204c..6d4fdde24 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/mysql_server_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/mysql_server_spec.rb @@ -1,7 +1,6 @@ require 'spec_helper_acceptance' describe 'mysql class' do - # rubocop:disable RSpec/InstanceVariable describe 'advanced config' do let(:pp) do <<-MANIFEST @@ -51,10 +50,18 @@ describe 'mysql class' do before(:all) do @tmpdir = default.tmpdir('mysql') end + # 'manage_config_file'/'service_enabled' being set to false can cause random failures in Debian 9 + let(:os_variant) do + if fact('operatingsystem') =~ %r{Debian} && fact('operatingsystemrelease') =~ %r{^9\.} + 'true' + else + 'false' + end + end let(:pp) do <<-MANIFEST class { 'mysql::server': - manage_config_file => 'false', + manage_config_file => '#{os_variant}', override_options => { 'mysqld' => { 'key_buffer_size' => '32M' }}, package_ensure => 'present', purge_conf_dir => 'false', @@ -62,7 +69,7 @@ describe 'mysql class' do restart => 'false', root_group => 'root', root_password => 'test', - service_enabled => 'false', + service_enabled => '#{os_variant}', service_manage => 'false', users => {}, grants => {}, @@ -73,7 +80,6 @@ describe 'mysql class' do it_behaves_like 'a idempotent resource' end - # rubocop:enable RSpec/InstanceVariable describe 'syslog configuration' do let(:pp) do @@ -92,7 +98,7 @@ describe 'mysql class' do let(:pp) { "class { 'mysql::server': root_password => '#{password}' }" } it 'does not display the password' do - result = apply_manifest(pp, catch_failures: true) + result = execute_manifest(pp, catch_failures: true) # this does not actually prove anything, as show_diff in the puppet config defaults to false. expect(result.stdout).not_to match %r{#{password}} end diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/sql_task_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/sql_task_spec.rb index 1ebed9c9e..781b2e478 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/sql_task_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/sql_task_spec.rb @@ -12,7 +12,7 @@ describe 'mysql tasks', if: puppet_version =~ %r{(5\.\d\.\d)} && fact('operating MANIFEST it 'sets up a mysql instance' do - apply_manifest_on(hosts, pp, catch_failures: true) + execute_manifest_on(hosts, pp, catch_failures: true) end it 'execute arbitary sql' do diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_database_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_database_spec.rb index fc207a6b5..1faad0995 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_database_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_database_spec.rb @@ -6,7 +6,7 @@ describe 'mysql_database' do class { 'mysql::server': } MANIFEST it 'works with no errors' do - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end end @@ -17,7 +17,7 @@ describe 'mysql_database' do } MANIFEST it 'works without errors' do - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end it 'finds the database #stdout' do @@ -44,8 +44,8 @@ describe 'mysql_database' do } MANIFEST it 'creates two db of different types idempotently' do - apply_manifest(pp, catch_failures: true) - apply_manifest(pp, catch_changes: true) + execute_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_changes: true) end it 'finds latin1 db #stdout' do diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_grant_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_grant_spec.rb index 981dd85a2..983757b18 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_grant_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_grant_spec.rb @@ -10,7 +10,7 @@ describe 'mysql_grant' do } MANIFEST - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end describe 'missing privileges for user' do @@ -26,7 +26,7 @@ describe 'mysql_grant' do } MANIFEST it 'fails' do - expect(apply_manifest(pp, expect_failures: true).stderr).to match(%r{`privileges` `parameter` is required}) + expect(execute_manifest(pp, expect_failures: true).stderr).to match(%r{`privileges` `parameter` is required}) end it 'does not find the user' do @@ -47,7 +47,7 @@ describe 'mysql_grant' do } MANIFEST it 'fails' do - apply_manifest(pp, expect_failures: true) + execute_manifest(pp, expect_failures: true) end it 'does not find the user' do @@ -69,7 +69,7 @@ describe 'mysql_grant' do } MANIFEST it 'works without errors' do - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end it 'finds the user #stdout' do @@ -98,7 +98,7 @@ describe 'mysql_grant' do } MANIFEST it 'works without errors' do - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end it 'finds the user #stdout' do @@ -128,7 +128,7 @@ describe 'mysql_grant' do } MANIFEST it 'works without errors' do - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end it 'finds the user #stdout' do @@ -157,7 +157,7 @@ describe 'mysql_grant' do } MANIFEST it 'fails' do - expect(apply_manifest(pp, expect_failures: true).stderr).to match(%r{`table` `parameter` is required.}) + expect(execute_manifest(pp, expect_failures: true).stderr).to match(%r{`table` `parameter` is required.}) end end @@ -176,7 +176,7 @@ describe 'mysql_grant' do } MANIFEST it 'onlies try to apply ALL' do - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end it 'finds the user #stdout' do @@ -246,7 +246,7 @@ describe 'mysql_grant' do } MANIFEST it 'applies' do - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end it 'finds short hostname #stdout' do @@ -383,8 +383,8 @@ describe 'mysql_grant' do } MANIFEST it 'setup mysql::server' do - apply_manifest(pp, catch_failures: true) - apply_manifest(pp, catch_changes: true) + execute_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_changes: true) end end @@ -401,7 +401,7 @@ describe 'mysql_grant' do } MANIFEST it 'create ALL privs' do - apply_manifest(pp_one, catch_failures: true) + execute_manifest(pp_one, catch_failures: true) end pp_two = <<-MANIFEST @@ -416,7 +416,7 @@ describe 'mysql_grant' do } MANIFEST it 'create lowercase all privs' do - expect(apply_manifest(pp_two, catch_failures: true).exit_code).to eq(0) + expect(execute_manifest(pp_two, catch_failures: true).exit_code).to eq(0) end end @@ -439,7 +439,7 @@ describe 'mysql_grant' do } MANIFEST it 'works without errors' do - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end it 'finds the user #stdout' do @@ -475,7 +475,7 @@ describe 'mysql_grant' do } EOS - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end # rubocop:enable RSpec/ExampleLength it 'finds the user' do @@ -504,7 +504,7 @@ describe 'mysql_grant' do } MANIFEST it 'works without errors when version greater than 5.5.0' do - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end it 'finds the user #stdout' do @@ -533,7 +533,7 @@ describe 'mysql_grant' do } MANIFEST it 'works without errors' do - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end it 'finds the user #stdout' do @@ -562,7 +562,7 @@ describe 'mysql_grant' do } MANIFEST it 'fails' do - expect(apply_manifest(pp, expect_failures: true).stderr).to match(%r{`privileges` `parameter`: PROXY can only be specified by itself}) + expect(execute_manifest(pp, expect_failures: true).stderr).to match(%r{`privileges` `parameter`: PROXY can only be specified by itself}) end it 'does not find the user' do @@ -584,7 +584,7 @@ describe 'mysql_grant' do } MANIFEST it 'fails' do - expect(apply_manifest(pp, expect_failures: true).stderr).to match(%r{PROXY user not supported on mysql versions < 5\.5\.0}i) + expect(execute_manifest(pp, expect_failures: true).stderr).to match(%r{PROXY user not supported on mysql versions < 5\.5\.0}i) end it 'does not find the user' do @@ -606,7 +606,7 @@ describe 'mysql_grant' do } MANIFEST it 'fails' do - expect(apply_manifest(pp, expect_failures: true).stderr).to match(%r{`table` `property` for PROXY should be specified as proxy_user@proxy_host.}) + expect(execute_manifest(pp, expect_failures: true).stderr).to match(%r{`table` `property` for PROXY should be specified as proxy_user@proxy_host.}) end it 'does not find the user' do @@ -625,7 +625,7 @@ describe 'mysql_grant' do } MANIFEST it 'setup mysql::server' do - apply_manifest(pp_one, catch_failures: true) + execute_manifest(pp_one, catch_failures: true) end pp_two = <<-MANIFEST @@ -651,7 +651,7 @@ describe 'mysql_grant' do } MANIFEST it 'applies' do - apply_manifest(pp_two, catch_failures: true) + execute_manifest(pp_two, catch_failures: true) end it 'fails with fqdn' do @@ -687,7 +687,7 @@ describe 'mysql_grant' do it 'fails to execute while applying' do mysql_cmd = shell('which mysql').stdout.chomp shell("mv #{mysql_cmd} #{mysql_cmd}.bak") - expect(apply_manifest(pp_three, expect_failures: true).stderr).to match(%r{Could not find a suitable provider for mysql_grant}) + expect(execute_manifest(pp_three, expect_failures: true).stderr).to match(%r{Could not find a suitable provider for mysql_grant}) shell("mv #{mysql_cmd}.bak #{mysql_cmd}") end @@ -697,7 +697,7 @@ describe 'mysql_grant' do } MANIFEST it 'reset mysql::server config' do - apply_manifest(pp_four, catch_failures: true) + execute_manifest(pp_four, catch_failures: true) end end @@ -707,7 +707,7 @@ describe 'mysql_grant' do class { 'mysql::server': override_options => { 'root_password' => 'password' } } MANIFEST it 'setup mysql server' do - apply_manifest(pp_one, catch_failures: true) + execute_manifest(pp_one, catch_failures: true) end pp_two = <<-MANIFEST @@ -722,7 +722,7 @@ describe 'mysql_grant' do } MANIFEST it 'creates grant on missing table will fail' do - expect(apply_manifest(pp_two, expect_failures: true).stderr).to match(%r{Table 'grant_spec_db\.grant_spec_table' doesn't exist}) + expect(execute_manifest(pp_two, expect_failures: true).stderr).to match(%r{Table 'grant_spec_db\.grant_spec_table' doesn't exist}) end pp_three = <<-MANIFEST @@ -738,7 +738,7 @@ describe 'mysql_grant' do } MANIFEST it 'creates table' do - apply_manifest(pp_three, catch_failures: true) + execute_manifest(pp_three, catch_failures: true) end it 'has the table' do diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_plugin_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_plugin_spec.rb index 463523a8e..327e02299 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_plugin_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_plugin_spec.rb @@ -15,19 +15,8 @@ if fact('osfamily') =~ %r{RedHat} plugin_lib = 'auth_pam.so' end elsif fact('osfamily') =~ %r{Debian} - if fact('operatingsystem') =~ %r{Debian} - if fact('operatingsystemrelease') =~ %r{^6\.} - # Only available plugin is innodb which is already loaded and not unload- or reload-able - plugin = nil - elsif fact('operatingsystemrelease') =~ %r{^7\.} - plugin = 'example' - plugin_lib = 'ha_example.so' - end - elsif fact('operatingsystem') =~ %r{Ubuntu} - if fact('operatingsystemrelease') =~ %r{^10\.04} - # Only available plugin is innodb which is already loaded and not unload- or reload-able - plugin = nil - elsif fact('operatingsystemrelease') =~ %r{^16\.04} + if fact('operatingsystem') =~ %r{Ubuntu} + if fact('operatingsystemrelease') =~ %r{^16\.04|^18\.04} # On Xenial running 5.7.12, the example plugin does not appear to be available. plugin = 'validate_password' plugin_lib = 'validate_password.so' @@ -48,7 +37,7 @@ describe 'mysql_plugin' do class { 'mysql::server': } MANIFEST - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end end @@ -60,7 +49,7 @@ describe 'mysql_plugin' do } MANIFEST it 'works without errors' do - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end it 'finds the plugin #stdout' do diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_user_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_user_spec.rb index 507fcf881..58c33772e 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_user_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/acceptance/types/mysql_user_spec.rb @@ -7,7 +7,7 @@ describe 'mysql_user' do class { 'mysql::server': } MANIFEST it 'works with no errors' do - apply_manifest(pp_one, catch_failures: true) + execute_manifest(pp_one, catch_failures: true) end end @@ -19,7 +19,7 @@ describe 'mysql_user' do } MANIFEST it 'works without errors' do - apply_manifest(pp_two, catch_failures: true) + execute_manifest(pp_two, catch_failures: true) end it 'finds the user #stdout' do @@ -54,7 +54,7 @@ describe 'mysql_user' do } EOS - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end it 'has the correct plugin' do @@ -88,7 +88,7 @@ describe 'mysql_user' do } MANIFEST it 'works without errors' do - apply_manifest(pp_three, catch_failures: true) + execute_manifest(pp_three, catch_failures: true) end it 'finds the user #stdout' do @@ -112,7 +112,7 @@ describe 'mysql_user' do } MANIFEST it 'works without errors' do - apply_manifest(pp_four, catch_failures: true) + execute_manifest(pp_four, catch_failures: true) end it 'finds the user #stdout' do @@ -150,7 +150,7 @@ describe 'mysql_user' do } MANIFEST it 'works without errors' do - apply_manifest(pp_five, catch_failures: true) + execute_manifest(pp_five, catch_failures: true) end it 'finds the user #stdout' do @@ -185,7 +185,7 @@ describe 'mysql_user' do } MANIFEST it 'works without errors' do - apply_manifest(pp_six, catch_failures: true) + execute_manifest(pp_six, catch_failures: true) end it 'finds the user #stdout' do diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mycnf_template_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mycnf_template_spec.rb index 63ec2e32d..ddc8c7827 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mycnf_template_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mycnf_template_spec.rb @@ -17,7 +17,7 @@ describe 'mysql::server' do end describe 'array entry' do - let(:params) { { override_options: { 'mysqld' => { 'replicate-do-db' => %w[base1 base2] } } } } + let(:params) { { override_options: { 'mysqld' => { 'replicate-do-db' => ['base1', 'base2'] } } } } it do is_expected.to contain_file('mysql-config-file').with_content( diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_bindings_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_bindings_spec.rb index dba8672b1..1c2283bfa 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_bindings_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_bindings_spec.rb @@ -2,6 +2,7 @@ require 'spec_helper' describe 'mysql::bindings' do on_supported_os.each do |os, facts| + next if facts[:osfamily] == 'Archlinux' context "on #{os}" do let(:facts) do facts.merge(root_home: '/root') diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_client_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_client_spec.rb index 6c651dcae..83eec9d72 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_client_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_client_spec.rb @@ -2,6 +2,7 @@ require 'spec_helper' describe 'mysql::client' do on_supported_os.each do |os, facts| + next if facts[:osfamily] == 'Archlinux' context "on #{os}" do let(:facts) do facts.merge(root_home: '/root') diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_server_monitor_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_server_monitor_spec.rb index 3a64ac3c8..1a79ad789 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_server_monitor_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_server_monitor_spec.rb @@ -27,7 +27,7 @@ describe 'mysql::server::monitor' do it { is_expected.to contain_mysql_grant('monitoruser@monitorhost/*.*').with( ensure: 'present', user: 'monitoruser@monitorhost', - table: '*.*', privileges: %w[PROCESS SUPER], + table: '*.*', privileges: ['PROCESS', 'SUPER'], require: 'Mysql_user[monitoruser@monitorhost]' ) } diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_server_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_server_spec.rb index 07d4917a0..209f40f4f 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_server_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/classes/mysql_server_spec.rb @@ -205,7 +205,7 @@ describe 'mysql::server' do 'foo@localhost/somedb.*' => { 'user' => 'foo@localhost', 'table' => 'somedb.*', - 'privileges' => %w[SELECT UPDATE], + 'privileges' => ['SELECT', 'UPDATE'], 'options' => ['GRANT'], }, 'foo2@localhost/*.*' => { @@ -219,7 +219,7 @@ describe 'mysql::server' do it { is_expected.to contain_mysql_grant('foo@localhost/somedb.*').with( user: 'foo@localhost', table: 'somedb.*', - privileges: %w[SELECT UPDATE], options: ['GRANT'] + privileges: ['SELECT', 'UPDATE'], options: ['GRANT'] ) } it { diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/default_facts.yml b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/default_facts.yml index 3248be5aa..e10d991db 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/default_facts.yml +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/default_facts.yml @@ -2,7 +2,7 @@ # # Facts specified here will override the values provided by rspec-puppet-facts. --- -concat_basedir: "/tmp" +concat_basedir: "" ipaddress: "172.16.254.254" is_pe: false macaddress: "AA:AA:AA:AA:AA:AA" diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/defines/mysql_db_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/defines/mysql_db_spec.rb index ab2550867..4b9ce7cdd 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/defines/mysql_db_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/defines/mysql_db_spec.rb @@ -47,7 +47,7 @@ describe 'mysql::db', type: :define do end it 'imports sql scripts when more than one is specified' do - params['sql'] = %w[test_sql test_2_sql] + params['sql'] = ['test_sql', 'test_2_sql'] is_expected.to contain_exec('test_db-import').with_command('cat test_sql test_2_sql | mysql test_db') end @@ -70,6 +70,16 @@ describe 'mysql::db', type: :define do params['dbname'] = 'real_db' is_expected.to contain_mysql_database('real_db') end + + it 'uses tls_options for user when set' do + params['tls_options'] = ['SSL'] + is_expected.to contain_mysql_user('testuser@localhost').with_tls_options(['SSL']) + end + + it 'uses grant_options for grant when set' do + params['grant_options'] = ['GRANT'] + is_expected.to contain_mysql_grant('testuser@localhost/test_db.*').with_options(['GRANT']) + end end end end diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_deepmerge_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_deepmerge_spec.rb new file mode 100644 index 000000000..e5e9a66ef --- /dev/null +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_deepmerge_spec.rb @@ -0,0 +1,94 @@ +#! /usr/bin/env ruby -S rspec # rubocop:disable Lint/ScriptPermission + +require 'spec_helper' + +describe 'mysql::deepmerge' do + it 'exists' do + is_expected.not_to eq(nil) + end + + it 'throws error with no arguments' do + is_expected.to run.with_params.and_raise_error(Puppet::ParseError) + end + + it 'throws error with only one argument' do + is_expected.to run.with_params('one' => 1).and_raise_error(Puppet::ParseError) + end + + it 'accepts empty strings as puppet undef' do + is_expected.to run.with_params({}, '') + end + + # rubocop:disable RSpec/NamedSubject + index_values = ['one', 'two', 'three'] + expected_values_one = ['1', '2', '2'] + it 'is able to mysql_deepmerge two hashes' do + new_hash = subject.execute({ 'one' => '1', 'two' => '1' }, 'two' => '2', 'three' => '2') + index_values.each_with_index do |index, expected| + expect(new_hash[index]).to eq(expected_values_one[expected]) + end + end + + it 'mysql_deepmerges multiple hashes' do + hash = subject.execute({ 'one' => 1 }, { 'one' => '2' }, 'one' => '3') + expect(hash['one']).to eq('3') + end + + it 'accepts empty hashes' do + is_expected.to run.with_params({}, {}, {}).and_return({}) + end + + expected_values_two = [1, 2, 'four' => 4] + it 'mysql_deepmerges subhashes' do + hash = subject.execute({ 'one' => 1 }, 'two' => 2, 'three' => { 'four' => 4 }) + index_values.each_with_index do |index, expected| + expect(hash[index]).to eq(expected_values_two[expected]) + end + end + + it 'appends to subhashes' do + hash = subject.execute({ 'one' => { 'two' => 2 } }, 'one' => { 'three' => 3 }) + expect(hash['one']).to eq('two' => 2, 'three' => 3) + end + + expected_values_three = [1, 'dos', { 'four' => 4, 'five' => 5 }] + it 'appends to subhashes 2' do + hash = subject.execute({ 'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }, 'two' => 'dos', 'three' => { 'five' => 5 }) + index_values.each_with_index do |index, expected| + expect(hash[index]).to eq(expected_values_three[expected]) + end + end + + index_values_two = ['key1', 'key2'] + expected_values_four = [{ 'a' => 1, 'b' => 99 }, 'c' => 3] + it 'appends to subhashes 3' do + hash = subject.execute({ 'key1' => { 'a' => 1, 'b' => 2 }, 'key2' => { 'c' => 3 } }, 'key1' => { 'b' => 99 }) + index_values_two.each_with_index do |index, expected| + expect(hash[index]).to eq(expected_values_four[expected]) + end + end + + it 'equates keys mod dash and underscore #value' do + hash = subject.execute({ 'a-b-c' => 1 }, 'a_b_c' => 10) + expect(hash['a_b_c']).to eq(10) + end + it 'equates keys mod dash and underscore #not' do + hash = subject.execute({ 'a-b-c' => 1 }, 'a_b_c' => 10) + expect(hash).not_to have_key('a-b-c') + end + + index_values_three = ['a_b_c', 'b-c-d'] + expected_values_five = [10, { 'e-f-g' => 3, 'c_d_e' => 12 }] + index_values_error = ['a-b-c', 'b_c_d'] + index_values_three.each_with_index do |index, expected| + it 'keeps style of the last when keys are equal mod dash and underscore #value' do + hash = subject.execute({ 'a-b-c' => 1, 'b_c_d' => { 'c-d-e' => 2, 'e-f-g' => 3 } }, 'a_b_c' => 10, 'b-c-d' => { 'c_d_e' => 12 }) + expect(hash[index]).to eq(expected_values_five[expected]) + end + it 'keeps style of the last when keys are equal mod dash and underscore #not' do + hash = subject.execute({ 'a-b-c' => 1, 'b_c_d' => { 'c-d-e' => 2, 'e-f-g' => 3 } }, 'a_b_c' => 10, 'b-c-d' => { 'c_d_e' => 12 }) + expect(hash).not_to have_key(index_values_error[expected]) + end + end + # rubocop:enable RSpec/NamedSubject +end diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_dirname_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_dirname_spec.rb new file mode 100644 index 000000000..3e407ec0c --- /dev/null +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_dirname_spec.rb @@ -0,0 +1,19 @@ +require 'spec_helper' + +describe 'mysql::dirname' do + it 'exists' do + is_expected.not_to eq(nil) + end + + it 'raises a ArgumentError if there is less than 1 arguments' do + is_expected.to run.with_params.and_raise_error(ArgumentError) + end + + it 'raises a ArgumentError if there is more than 1 arguments' do + is_expected.to run.with_params('foo', 'bar').and_raise_error(ArgumentError) + end + + it 'returns path of file' do + is_expected.to run.with_params('spec/functions/mysql_dirname_spec.rb').and_return('spec/functions') + end +end diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_password_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_password_spec.rb new file mode 100644 index 000000000..8ca4fb859 --- /dev/null +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_password_spec.rb @@ -0,0 +1,27 @@ +require 'spec_helper' + +describe 'mysql::password' do + it 'exists' do + is_expected.not_to eq(nil) + end + + it 'raises a ArgumentError if there is less than 1 arguments' do + is_expected.to run.with_params.and_raise_error(ArgumentError) + end + + it 'raises a ArgumentError if there is more than 1 arguments' do + is_expected.to run.with_params('foo', 'bar').and_raise_error(ArgumentError) + end + + it 'converts password into a hash' do + is_expected.to run.with_params('password').and_return('*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19') + end + + it 'converts an empty password into a empty string' do + is_expected.to run.with_params('').and_return('') + end + + it 'does not convert a password that is already a hash' do + is_expected.to run.with_params('*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19').and_return('*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19') + end +end diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_strip_hash_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_strip_hash_spec.rb new file mode 100644 index 000000000..be6704653 --- /dev/null +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/functions/mysql_strip_hash_spec.rb @@ -0,0 +1,27 @@ +require 'spec_helper' + +describe 'mysql::strip_hash' do + it 'exists' do + is_expected.not_to eq(nil) + end + + it 'raises a ArgumentError if there is less than 1 arguments' do + is_expected.to run.with_params.and_raise_error(ArgumentError) + end + + it 'raises a ArgumentError if there is more than 1 arguments' do + is_expected.to run.with_params({ 'foo' => 1 }, 'bar' => 2).and_raise_error(ArgumentError) + end + + it 'raises a ArgumentError if argument is not a hash' do + is_expected.to run.with_params('foo').and_raise_error(ArgumentError) + end + + it 'passes a hash without blanks through' do + is_expected.to run.with_params('one' => 1, 'two' => 2, 'three' => 3).and_return('one' => 1, 'two' => 2, 'three' => 3) + end + + it 'removes blank hash elements' do + is_expected.to run.with_params('one' => 1, 'two' => '', 'three' => nil, 'four' => 4).and_return('one' => 1, 'three' => nil, 'four' => 4) + end +end diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/spec_helper.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/spec_helper.rb index c20a31773..84de0e8d6 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/spec_helper.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/spec_helper.rb @@ -1,5 +1,12 @@ require 'puppetlabs_spec_helper/module_spec_helper' require 'rspec-puppet-facts' + +begin + require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb')) +rescue LoadError => loaderror + warn "Could not require spec_helper_local: #{loaderror.message}" +end + include RspecPuppetFacts default_facts = { @@ -20,5 +27,19 @@ end RSpec.configure do |c| c.default_facts = default_facts + c.before :each do + # set to strictest setting for testing + # by default Puppet runs at warning level + Puppet.settings[:strict] = :warning + end end + +def ensure_module_defined(module_name) + module_name.split('::').reduce(Object) do |last_module, next_module| + last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module) + last_module.const_get(next_module) + end +end + +# 'spec_overrides' from sync.yml will appear below this line require 'spec_helper_local' diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/spec_helper_acceptance.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/spec_helper_acceptance.rb index be0f74b48..d1fb56c7b 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/spec_helper_acceptance.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/spec_helper_acceptance.rb @@ -1,11 +1,16 @@ +require 'beaker-pe' +require 'beaker-puppet' require 'puppet' require 'beaker-rspec' require 'beaker/puppet_install_helper' require 'beaker/module_install_helper' require 'beaker/i18n_helper' -require 'beaker/task_helper' +require 'beaker-task_helper' +require 'beaker/testmode_switcher' +require 'beaker/testmode_switcher/dsl' run_puppet_install_helper +configure_type_defaults_on(hosts) install_ca_certs unless pe_install? install_bolt_on(hosts) unless pe_install? install_module_on(hosts) @@ -23,10 +28,12 @@ RSpec.configure do |c| # Configure all nodes in nodeset c.before :suite do - run_puppet_access_login(user: 'admin') if pe_install? && puppet_version =~ %r{(5\.\d\.\d)} + run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0')) hosts.each do |host| # This will be removed, this is temporary to test localisation. - if (fact('osfamily') == 'Debian' || fact('osfamily') == 'RedHat') && (puppet_version >= '4.10.5' && puppet_version < '5.2.0') + if (fact('osfamily') == 'Debian' || fact('osfamily') == 'RedHat') && + (Gem::Version.new(puppet_version) >= Gem::Version.new('4.10.5') && + Gem::Version.new(puppet_version) < Gem::Version.new('5.2.0')) on(host, 'mkdir /opt/puppetlabs/puppet/share/locale/ja') on(host, 'touch /opt/puppetlabs/puppet/share/locale/ja/puppet.po') end @@ -48,10 +55,10 @@ end shared_examples 'a idempotent resource' do it 'applies with no errors' do - apply_manifest(pp, catch_failures: true) + execute_manifest(pp, catch_failures: true) end it 'applies a second time without changes', :skip_pup_5016 do - apply_manifest(pp, catch_changes: true) + execute_manifest(pp, catch_changes: true) end end diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/facter/mysqld_version_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/facter/mysqld_version_spec.rb index e2c01ea13..e30159e54 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/facter/mysqld_version_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/facter/mysqld_version_spec.rb @@ -8,7 +8,7 @@ describe Facter::Util::Fact.to_s do describe 'mysqld_version' do context 'with value' do before :each do - Facter::Util::Resolution.stubs(:exec).with('mysqld -V 2>/dev/null').returns('mysqld Ver 5.5.49-37.9 for Linux on x86_64 (Percona Server (GPL), Release 37.9, Revision efa0073)') + Facter::Util::Resolution.stubs(:exec).with('mysqld --no-defaults -V 2>/dev/null').returns('mysqld Ver 5.5.49-37.9 for Linux on x86_64 (Percona Server (GPL), Release 37.9, Revision efa0073)') end it { expect(Facter.fact(:mysqld_version).value).to eq('mysqld Ver 5.5.49-37.9 for Linux on x86_64 (Percona Server (GPL), Release 37.9, Revision efa0073)') diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb index c2ad8895d..0d86b9628 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb @@ -28,8 +28,8 @@ describe Puppet::Parser::Functions.function(:mysql_deepmerge) do expect { scope.function_mysql_deepmerge([{}, '']) }.not_to raise_error end - index_values = %w[one two three] - expected_values_one = %w[1 2 2] + index_values = ['one', 'two', 'three'] + expected_values_one = ['1', '2', '2'] it 'is able to mysql_deepmerge two hashes' do new_hash = scope.function_mysql_deepmerge([{ 'one' => '1', 'two' => '1' }, { 'two' => '2', 'three' => '2' }]) index_values.each_with_index do |index, expected| @@ -67,7 +67,7 @@ describe Puppet::Parser::Functions.function(:mysql_deepmerge) do end end - index_values_two = %w[key1 key2] + index_values_two = ['key1', 'key2'] expected_values_four = [{ 'a' => 1, 'b' => 99 }, 'c' => 3] it 'appends to subhashes 3' do hash = scope.function_mysql_deepmerge([{ 'key1' => { 'a' => 1, 'b' => 2 }, 'key2' => { 'c' => 3 } }, { 'key1' => { 'b' => 99 } }]) diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/functions/mysql_password_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/functions/mysql_password_spec.rb index b1794f8b1..85c4d44a2 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/functions/mysql_password_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/functions/mysql_password_spec.rb @@ -16,11 +16,11 @@ describe 'the mysql_password function' do end it 'raises a ParseError if there is more than 1 arguments' do - expect { scope.function_mysql_password(%w[foo bar]) }.to(raise_error(Puppet::ParseError)) + expect { scope.function_mysql_password(['foo', 'bar']) }.to(raise_error(Puppet::ParseError)) end it 'converts password into a hash' do - result = scope.function_mysql_password(%w[password]) + result = scope.function_mysql_password(['password']) expect(result).to(eq('*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19')) end diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb index ffa624444..4e29f33af 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe Puppet::Type.type(:mysql_database).provider(:mysql) do let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' } - let(:parsed_databases) { %w[information_schema mydb mysql performance_schema test] } + let(:parsed_databases) { ['information_schema', 'mydb', 'mysql', 'performance_schema', 'test'] } let(:provider) { resource.provider } let(:instance) { provider.class.instances.first } let(:resource) do @@ -13,7 +13,6 @@ describe Puppet::Type.type(:mysql_database).provider(:mysql) do ) end let(:raw_databases) do - # rubocop:disable Layout/IndentHeredoc <<-SQL_OUTPUT information_schema mydb diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb index 84d7b63b3..a6049cbf7 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb @@ -52,7 +52,6 @@ describe Puppet::Type.type(:mysql_user).provider(:mysql) do let(:newhash) { '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5' } let(:raw_users) do - # rubocop:disable Layout/IndentHeredoc <<-SQL_OUTPUT root@127.0.0.1 root@::1 @@ -65,7 +64,7 @@ usvn_user@localhost # rubocop:enable Layout/IndentHeredoc end - let(:parsed_users) { %w[root@127.0.0.1 root@::1 @localhost debian-sys-maint@localhost root@localhost usvn_user@localhost @vagrant-ubuntu-raring-64] } + let(:parsed_users) { ['root@127.0.0.1', 'root@::1', '@localhost', 'debian-sys-maint@localhost', 'root@localhost', 'usvn_user@localhost', '@vagrant-ubuntu-raring-64'] } let(:provider) { resource.provider } let(:instance) { provider.class.instances.first } let(:resource) do @@ -183,6 +182,12 @@ usvn_user@localhost provider.expects(:exists?).returns(false) expect(provider.destroy).to be_truthy end + it 'removes a user using IF EXISTS' do + provider.class.instance_variable_set(:@mysqld_version_string, '5.7.1') + + provider.class.expects(:mysql_caller).with("DROP USER IF EXISTS 'joe'@'localhost'", 'system') + expect(provider.destroy).to be_truthy + end end describe 'exists?' do @@ -362,9 +367,7 @@ usvn_user@localhost end end - %w[max_user_connections max_connections_per_hour max_queries_per_hour - max_updates_per_hour].each do |property| - + ['max_user_connections', 'max_connections_per_hour', 'max_queries_per_hour', 'max_updates_per_hour'].each do |property| describe property do it "returns #{property}" do expect(instance.send(property.to_s.to_sym)).to eq('10') diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/type/mysql_grant_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/type/mysql_grant_spec.rb index 793f1a029..acf47a2dd 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/type/mysql_grant_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/type/mysql_grant_spec.rb @@ -86,9 +86,9 @@ describe Puppet::Type.type(:mysql_grant) do it 'to upcase and ordered' do user = Puppet::Type.type(:mysql_grant).new( name: 'foo@localhost/*.*', table: ['*.*'], user: 'foo@localhost', - privileges: %w[select Insert] + privileges: ['select', 'Insert'] ) - expect(user[:privileges]).to eq(%w[INSERT SELECT]) + expect(user[:privileges]).to eq(['INSERT', 'SELECT']) end it 'ordered including column privileges' do diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/type/mysql_user_spec.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/type/mysql_user_spec.rb index 0c900b0c7..c491d8cf9 100644 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/type/mysql_user_spec.rb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/spec/unit/puppet/type/mysql_user_spec.rb @@ -43,6 +43,11 @@ describe Puppet::Type.type(:mysql_user) do user[:password_hash] = 'foo' expect(user[:password_hash]).to eq('foo') end + + it 'accepts an empty password' do + user[:password_hash] = '' + expect(user[:password_hash]).to eq('') + end end context 'using foo@LocalHost' do diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/templates/mysqlbackup.sh.erb b/modules/services/unix/database/mysql_stretch_compatible/mysql/templates/mysqlbackup.sh.erb index 9a9df12d1..0e2adafc7 100755 --- a/modules/services/unix/database/mysql_stretch_compatible/mysql/templates/mysqlbackup.sh.erb +++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/templates/mysqlbackup.sh.erb @@ -28,6 +28,11 @@ echo "[client]\npassword=$PASS\nuser=$USER\nmax_allowed_packet=$MAX_ALLOWED_PACK echo -e "[client]\npassword=$PASS\nuser=$USER\nmax_allowed_packet=$MAX_ALLOWED_PACKET" > $TMPFILE <%- end -%> +<% if @prescript -%> +<%- [@prescript].flatten.compact.each do |script|%> +<%= script %> +<%- end -%> +<% end -%> # Ensure backup directory exist. mkdir -p $DIR @@ -54,6 +59,12 @@ ADDITIONAL_OPTIONS="$ADDITIONAL_OPTIONS --skip-routines" <% end -%> <% end -%> +<%- if @optional_args and @optional_args.is_a?(Array) -%> +<%- @optional_args.each do |arg| -%> +ADDITIONAL_OPTIONS="$ADDITIONAL_OPTIONS <%= arg %>" +<%- end -%> +<%- end -%> + ##### STOP CONFIG #################################################### PATH=<%= @execpath %> diff --git a/modules/services/unix/http/apache_kali_compatible/apache/CHANGELOG.md b/modules/services/unix/http/apache_stretch_compatible/apache/CHANGELOG.md similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/CHANGELOG.md rename to modules/services/unix/http/apache_stretch_compatible/apache/CHANGELOG.md diff --git a/modules/services/unix/http/apache_kali_compatible/apache/CONTRIBUTING.md b/modules/services/unix/http/apache_stretch_compatible/apache/CONTRIBUTING.md similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/CONTRIBUTING.md rename to modules/services/unix/http/apache_stretch_compatible/apache/CONTRIBUTING.md diff --git a/modules/services/unix/http/apache_kali_compatible/apache/Gemfile b/modules/services/unix/http/apache_stretch_compatible/apache/Gemfile similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/Gemfile rename to modules/services/unix/http/apache_stretch_compatible/apache/Gemfile diff --git a/modules/services/unix/http/apache_kali_compatible/apache/LICENSE b/modules/services/unix/http/apache_stretch_compatible/apache/LICENSE similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/LICENSE rename to modules/services/unix/http/apache_stretch_compatible/apache/LICENSE diff --git a/modules/services/unix/http/apache_kali_compatible/apache/MAINTAINERS.md b/modules/services/unix/http/apache_stretch_compatible/apache/MAINTAINERS.md similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/MAINTAINERS.md rename to modules/services/unix/http/apache_stretch_compatible/apache/MAINTAINERS.md diff --git a/modules/services/unix/http/apache_kali_compatible/apache/NOTICE b/modules/services/unix/http/apache_stretch_compatible/apache/NOTICE similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/NOTICE rename to modules/services/unix/http/apache_stretch_compatible/apache/NOTICE diff --git a/modules/services/unix/http/apache_kali_compatible/apache/README.md b/modules/services/unix/http/apache_stretch_compatible/apache/README.md similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/README.md rename to modules/services/unix/http/apache_stretch_compatible/apache/README.md diff --git a/modules/services/unix/http/apache_kali_compatible/apache/Rakefile b/modules/services/unix/http/apache_stretch_compatible/apache/Rakefile similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/Rakefile rename to modules/services/unix/http/apache_stretch_compatible/apache/Rakefile diff --git a/modules/services/unix/http/apache_kali_compatible/apache/apache.pp b/modules/services/unix/http/apache_stretch_compatible/apache/apache.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/apache.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/apache.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/checksums.json b/modules/services/unix/http/apache_stretch_compatible/apache/checksums.json similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/checksums.json rename to modules/services/unix/http/apache_stretch_compatible/apache/checksums.json diff --git a/modules/services/unix/http/apache_kali_compatible/apache/examples/apache.pp b/modules/services/unix/http/apache_stretch_compatible/apache/examples/apache.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/examples/apache.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/examples/apache.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/examples/dev.pp b/modules/services/unix/http/apache_stretch_compatible/apache/examples/dev.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/examples/dev.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/examples/dev.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/examples/init.pp b/modules/services/unix/http/apache_stretch_compatible/apache/examples/init.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/examples/init.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/examples/init.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/examples/mod_load_params.pp b/modules/services/unix/http/apache_stretch_compatible/apache/examples/mod_load_params.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/examples/mod_load_params.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/examples/mod_load_params.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/examples/mods.pp b/modules/services/unix/http/apache_stretch_compatible/apache/examples/mods.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/examples/mods.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/examples/mods.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/examples/mods_custom.pp b/modules/services/unix/http/apache_stretch_compatible/apache/examples/mods_custom.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/examples/mods_custom.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/examples/mods_custom.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/examples/php.pp b/modules/services/unix/http/apache_stretch_compatible/apache/examples/php.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/examples/php.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/examples/php.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/examples/vhost.pp b/modules/services/unix/http/apache_stretch_compatible/apache/examples/vhost.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/examples/vhost.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/examples/vhost.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_directories.pp b/modules/services/unix/http/apache_stretch_compatible/apache/examples/vhost_directories.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_directories.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/examples/vhost_directories.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_filter.pp b/modules/services/unix/http/apache_stretch_compatible/apache/examples/vhost_filter.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_filter.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/examples/vhost_filter.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_ip_based.pp b/modules/services/unix/http/apache_stretch_compatible/apache/examples/vhost_ip_based.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_ip_based.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/examples/vhost_ip_based.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_proxypass.pp b/modules/services/unix/http/apache_stretch_compatible/apache/examples/vhost_proxypass.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_proxypass.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/examples/vhost_proxypass.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_ssl.pp b/modules/services/unix/http/apache_stretch_compatible/apache/examples/vhost_ssl.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_ssl.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/examples/vhost_ssl.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/examples/vhosts_without_listen.pp b/modules/services/unix/http/apache_stretch_compatible/apache/examples/vhosts_without_listen.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/examples/vhosts_without_listen.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/examples/vhosts_without_listen.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/files/httpd b/modules/services/unix/http/apache_stretch_compatible/apache/files/httpd similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/files/httpd rename to modules/services/unix/http/apache_stretch_compatible/apache/files/httpd diff --git a/modules/services/unix/http/apache_kali_compatible/apache/lib/facter/apache_version.rb b/modules/services/unix/http/apache_stretch_compatible/apache/lib/facter/apache_version.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/lib/facter/apache_version.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/lib/facter/apache_version.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/parser/functions/bool2httpd.rb b/modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/parser/functions/bool2httpd.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/parser/functions/bool2httpd.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/parser/functions/bool2httpd.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/parser/functions/validate_apache_log_level.rb b/modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/parser/functions/validate_apache_log_level.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/parser/functions/validate_apache_log_level.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/parser/functions/validate_apache_log_level.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod.rb b/modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/provider/a2mod.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/provider/a2mod.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/a2mod.rb b/modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/provider/a2mod/a2mod.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/a2mod.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/provider/a2mod/a2mod.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/gentoo.rb b/modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/provider/a2mod/gentoo.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/gentoo.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/provider/a2mod/gentoo.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/modfix.rb b/modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/provider/a2mod/modfix.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/modfix.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/provider/a2mod/modfix.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/redhat.rb b/modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/provider/a2mod/redhat.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/redhat.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/provider/a2mod/redhat.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/type/a2mod.rb b/modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/type/a2mod.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/type/a2mod.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/lib/puppet/type/a2mod.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/locales/config.yaml b/modules/services/unix/http/apache_stretch_compatible/apache/locales/config.yaml similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/locales/config.yaml rename to modules/services/unix/http/apache_stretch_compatible/apache/locales/config.yaml diff --git a/modules/services/unix/http/apache_kali_compatible/apache/locales/puppetlabs-apache.pot b/modules/services/unix/http/apache_stretch_compatible/apache/locales/puppetlabs-apache.pot similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/locales/puppetlabs-apache.pot rename to modules/services/unix/http/apache_stretch_compatible/apache/locales/puppetlabs-apache.pot diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/balancer.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/balancer.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/balancer.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/balancer.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/balancermember.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/balancermember.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/balancermember.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/balancermember.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/confd/no_accf.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/confd/no_accf.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/confd/no_accf.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/confd/no_accf.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/custom_config.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/custom_config.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/custom_config.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/custom_config.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/default_confd_files.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/default_confd_files.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/default_confd_files.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/default_confd_files.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/default_mods.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/default_mods.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/default_mods.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/default_mods.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/default_mods/load.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/default_mods/load.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/default_mods/load.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/default_mods/load.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/dev.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/dev.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/dev.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/dev.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/fastcgi/server.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/fastcgi/server.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/fastcgi/server.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/fastcgi/server.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/init.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/init.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/init.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/init.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/listen.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/listen.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/listen.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/listen.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/actions.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/actions.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/actions.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/actions.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/alias.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/alias.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/alias.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/alias.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_basic.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/auth_basic.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_basic.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/auth_basic.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_cas.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/auth_cas.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_cas.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/auth_cas.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_kerb.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/auth_kerb.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_kerb.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/auth_kerb.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_mellon.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/auth_mellon.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_mellon.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/auth_mellon.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authn_core.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/authn_core.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authn_core.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/authn_core.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authn_dbd.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/authn_dbd.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authn_dbd.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/authn_dbd.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authn_file.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/authn_file.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authn_file.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/authn_file.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authnz_ldap.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/authnz_ldap.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authnz_ldap.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/authnz_ldap.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authnz_pam.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/authnz_pam.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authnz_pam.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/authnz_pam.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authz_default.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/authz_default.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authz_default.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/authz_default.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authz_user.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/authz_user.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authz_user.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/authz_user.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/autoindex.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/autoindex.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/autoindex.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/autoindex.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cache.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/cache.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cache.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/cache.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cgi.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/cgi.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cgi.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/cgi.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cgid.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/cgid.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cgid.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/cgid.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cluster.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/cluster.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cluster.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/cluster.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dav.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/dav.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dav.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/dav.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dav_fs.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/dav_fs.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dav_fs.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/dav_fs.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dav_svn.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/dav_svn.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dav_svn.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/dav_svn.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dbd.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/dbd.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dbd.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/dbd.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/deflate.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/deflate.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/deflate.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/deflate.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dev.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/dev.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dev.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/dev.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dir.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/dir.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dir.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/dir.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/disk_cache.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/disk_cache.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/disk_cache.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/disk_cache.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dumpio.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/dumpio.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dumpio.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/dumpio.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/env.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/env.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/env.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/env.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/event.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/event.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/event.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/event.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/expires.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/expires.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/expires.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/expires.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/ext_filter.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/ext_filter.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/ext_filter.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/ext_filter.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/fastcgi.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/fastcgi.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/fastcgi.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/fastcgi.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/fcgid.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/fcgid.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/fcgid.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/fcgid.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/filter.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/filter.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/filter.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/filter.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/geoip.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/geoip.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/geoip.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/geoip.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/headers.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/headers.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/headers.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/headers.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/include.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/include.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/include.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/include.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/info.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/info.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/info.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/info.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/intercept_form_submit.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/intercept_form_submit.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/intercept_form_submit.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/intercept_form_submit.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/itk.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/itk.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/itk.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/itk.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/ldap.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/ldap.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/ldap.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/ldap.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/lookup_identity.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/lookup_identity.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/lookup_identity.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/lookup_identity.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/mime.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/mime.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/mime.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/mime.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/mime_magic.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/mime_magic.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/mime_magic.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/mime_magic.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/negotiation.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/negotiation.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/negotiation.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/negotiation.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/nss.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/nss.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/nss.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/nss.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/pagespeed.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/pagespeed.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/pagespeed.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/pagespeed.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/passenger.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/passenger.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/passenger.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/passenger.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/perl.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/perl.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/perl.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/perl.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/peruser.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/peruser.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/peruser.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/peruser.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/php.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/php.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/php.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/php.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/prefork.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/prefork.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/prefork.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/prefork.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_ajp.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy_ajp.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_ajp.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy_ajp.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_balancer.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy_balancer.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_balancer.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy_balancer.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_connect.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy_connect.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_connect.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy_connect.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_fcgi.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy_fcgi.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_fcgi.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy_fcgi.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_html.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy_html.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_html.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy_html.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_http.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy_http.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_http.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy_http.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_wstunnel.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy_wstunnel.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_wstunnel.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/proxy_wstunnel.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/python.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/python.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/python.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/python.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/remoteip.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/remoteip.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/remoteip.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/remoteip.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/reqtimeout.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/reqtimeout.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/reqtimeout.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/reqtimeout.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/rewrite.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/rewrite.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/rewrite.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/rewrite.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/rpaf.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/rpaf.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/rpaf.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/rpaf.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/security.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/security.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/security.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/security.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/setenvif.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/setenvif.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/setenvif.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/setenvif.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/shib.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/shib.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/shib.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/shib.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/socache_shmcb.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/socache_shmcb.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/socache_shmcb.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/socache_shmcb.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/speling.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/speling.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/speling.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/speling.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/ssl.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/ssl.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/ssl.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/ssl.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/status.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/status.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/status.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/status.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/suexec.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/suexec.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/suexec.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/suexec.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/suphp.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/suphp.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/suphp.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/suphp.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/userdir.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/userdir.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/userdir.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/userdir.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/version.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/version.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/version.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/version.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/vhost_alias.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/vhost_alias.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/vhost_alias.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/vhost_alias.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/worker.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/worker.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/worker.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/worker.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/wsgi.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/wsgi.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/wsgi.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/wsgi.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/xsendfile.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/xsendfile.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/xsendfile.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mod/xsendfile.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/mpm.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/mpm.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/mpm.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/mpm.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/namevirtualhost.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/namevirtualhost.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/namevirtualhost.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/namevirtualhost.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/package.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/package.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/package.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/package.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/params.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/params.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/params.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/params.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/peruser/multiplexer.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/peruser/multiplexer.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/peruser/multiplexer.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/peruser/multiplexer.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/peruser/processor.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/peruser/processor.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/peruser/processor.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/peruser/processor.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/php.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/php.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/php.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/php.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/proxy.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/proxy.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/proxy.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/proxy.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/python.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/python.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/python.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/python.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/security/rule_link.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/security/rule_link.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/security/rule_link.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/security/rule_link.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/service.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/service.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/service.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/service.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/ssl.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/ssl.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/ssl.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/ssl.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/version.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/version.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/version.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/version.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/vhost.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/vhost.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/vhost.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/vhost.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/vhost/custom.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/vhost/custom.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/vhost/custom.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/vhost/custom.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/manifests/vhosts.pp b/modules/services/unix/http/apache_stretch_compatible/apache/manifests/vhosts.pp similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/manifests/vhosts.pp rename to modules/services/unix/http/apache_stretch_compatible/apache/manifests/vhosts.pp diff --git a/modules/services/unix/http/apache_kali_compatible/apache/metadata.json b/modules/services/unix/http/apache_stretch_compatible/apache/metadata.json similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/metadata.json rename to modules/services/unix/http/apache_stretch_compatible/apache/metadata.json diff --git a/modules/services/unix/http/apache_kali_compatible/apache/secgen_metadata.xml b/modules/services/unix/http/apache_stretch_compatible/apache/secgen_metadata.xml similarity index 97% rename from modules/services/unix/http/apache_kali_compatible/apache/secgen_metadata.xml rename to modules/services/unix/http/apache_stretch_compatible/apache/secgen_metadata.xml index 8be250aed..29eb0e398 100644 --- a/modules/services/unix/http/apache_kali_compatible/apache/secgen_metadata.xml +++ b/modules/services/unix/http/apache_stretch_compatible/apache/secgen_metadata.xml @@ -24,7 +24,7 @@ apache - Wheezy + .*Wheezy.* update diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/apache_parameters_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/apache_parameters_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/apache_parameters_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/apache_parameters_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/apache_ssl_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/apache_ssl_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/apache_ssl_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/apache_ssl_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/class_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/class_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/class_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/class_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/custom_config_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/custom_config_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/custom_config_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/custom_config_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/default_mods_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/default_mods_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/default_mods_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/default_mods_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/itk_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/itk_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/itk_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/itk_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_dav_svn_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_dav_svn_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_dav_svn_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_dav_svn_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_deflate_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_deflate_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_deflate_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_deflate_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_fcgid_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_fcgid_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_fcgid_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_fcgid_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_mime_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_mime_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_mime_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_mime_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_negotiation_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_negotiation_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_negotiation_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_negotiation_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_pagespeed_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_pagespeed_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_pagespeed_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_pagespeed_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_passenger_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_passenger_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_passenger_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_passenger_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_php_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_php_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_php_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_php_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_proxy_html_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_proxy_html_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_proxy_html_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_proxy_html_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_security_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_security_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_security_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_security_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_suphp_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_suphp_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_suphp_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/mod_suphp_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/centos-7-x64.yml b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/nodesets/centos-7-x64.yml similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/centos-7-x64.yml rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/nodesets/centos-7-x64.yml diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/debian-8-x64.yml b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/nodesets/debian-8-x64.yml similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/debian-8-x64.yml rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/nodesets/debian-8-x64.yml diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/default.yml b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/nodesets/default.yml similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/default.yml rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/nodesets/default.yml diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/docker/centos-7.yml b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/nodesets/docker/centos-7.yml similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/docker/centos-7.yml rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/nodesets/docker/centos-7.yml diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/docker/debian-8.yml b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/nodesets/docker/debian-8.yml similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/docker/debian-8.yml rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/nodesets/docker/debian-8.yml diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/nodesets/docker/ubuntu-14.04.yml similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/docker/ubuntu-14.04.yml rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/nodesets/docker/ubuntu-14.04.yml diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/suse.yml b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/nodesets/suse.yml similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/suse.yml rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/nodesets/suse.yml diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/prefork_worker_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/prefork_worker_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/prefork_worker_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/prefork_worker_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/service_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/service_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/service_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/service_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/version.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/version.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/version.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/version.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/vhost_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/vhost_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/vhost_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/vhost_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/vhosts_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/vhosts_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/vhosts_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/acceptance/vhosts_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/apache_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/apache_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/apache_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/apache_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/dev_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/dev_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/dev_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/dev_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/alias_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/alias_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/alias_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/alias_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/auth_cas_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/auth_cas_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/auth_cas_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/auth_cas_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/auth_kerb_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/auth_kerb_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/auth_kerb_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/auth_kerb_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/auth_mellon_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/auth_mellon_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/auth_mellon_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/auth_mellon_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/authn_dbd_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/authn_dbd_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/authn_dbd_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/authn_dbd_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/authnz_ldap_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/authnz_ldap_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/authnz_ldap_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/authnz_ldap_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/authnz_pam_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/authnz_pam_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/authnz_pam_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/authnz_pam_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/cluster_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/cluster_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/cluster_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/cluster_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dav_svn_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/dav_svn_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dav_svn_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/dav_svn_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/deflate_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/deflate_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/deflate_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/deflate_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dev_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/dev_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dev_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/dev_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dir_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/dir_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dir_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/dir_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/disk_cache_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/disk_cache_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/disk_cache_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/disk_cache_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dumpio_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/dumpio_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dumpio_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/dumpio_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/event_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/event_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/event_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/event_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/expires_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/expires_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/expires_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/expires_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/ext_filter_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/ext_filter_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/ext_filter_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/ext_filter_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/fastcgi_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/fastcgi_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/fastcgi_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/fastcgi_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/fcgid_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/fcgid_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/fcgid_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/fcgid_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/info_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/info_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/info_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/info_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/intercept_form_submit_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/intercept_form_submit_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/intercept_form_submit_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/intercept_form_submit_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/itk_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/itk_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/itk_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/itk_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/ldap_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/ldap_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/ldap_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/ldap_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/lookup_identity.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/lookup_identity.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/lookup_identity.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/lookup_identity.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/mime_magic_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/mime_magic_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/mime_magic_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/mime_magic_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/mime_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/mime_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/mime_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/mime_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/negotiation_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/negotiation_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/negotiation_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/negotiation_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/pagespeed_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/pagespeed_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/pagespeed_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/pagespeed_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/passenger_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/passenger_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/passenger_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/passenger_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/perl_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/perl_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/perl_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/perl_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/peruser_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/peruser_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/peruser_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/peruser_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/php_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/php_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/php_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/php_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/prefork_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/prefork_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/prefork_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/prefork_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_balancer_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/proxy_balancer_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_balancer_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/proxy_balancer_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_connect_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/proxy_connect_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_connect_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/proxy_connect_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_html_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/proxy_html_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_html_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/proxy_html_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_wstunnel.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/proxy_wstunnel.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_wstunnel.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/proxy_wstunnel.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/python_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/python_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/python_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/python_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/remoteip_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/remoteip_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/remoteip_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/remoteip_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/reqtimeout_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/reqtimeout_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/reqtimeout_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/reqtimeout_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/rpaf_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/rpaf_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/rpaf_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/rpaf_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/security_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/security_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/security_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/security_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/shib_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/shib_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/shib_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/shib_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/speling_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/speling_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/speling_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/speling_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/ssl_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/ssl_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/ssl_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/ssl_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/status_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/status_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/status_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/status_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/suphp_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/suphp_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/suphp_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/suphp_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/userdir_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/userdir_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/userdir_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/userdir_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/worker_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/worker_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/worker_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/worker_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/wsgi_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/wsgi_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/wsgi_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/mod/wsgi_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/params_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/params_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/params_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/params_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/service_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/service_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/service_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/service_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/vhosts_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/vhosts_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/classes/vhosts_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/classes/vhosts_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/balancer_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/balancer_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/defines/balancer_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/balancer_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/balancermember_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/balancermember_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/defines/balancermember_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/balancermember_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/custom_config_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/custom_config_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/defines/custom_config_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/custom_config_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/fastcgi_server_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/fastcgi_server_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/defines/fastcgi_server_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/fastcgi_server_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/mod_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/mod_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/defines/mod_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/mod_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/modsec_link_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/modsec_link_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/defines/modsec_link_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/modsec_link_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/vhost_custom_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/vhost_custom_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/defines/vhost_custom_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/vhost_custom_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/vhost_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/vhost_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/defines/vhost_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/defines/vhost_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/files/negotiation.conf b/modules/services/unix/http/apache_stretch_compatible/apache/spec/fixtures/files/negotiation.conf similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/files/negotiation.conf rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/fixtures/files/negotiation.conf diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/files/spec b/modules/services/unix/http/apache_stretch_compatible/apache/spec/fixtures/files/spec similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/files/spec rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/fixtures/files/spec diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/site_apache/templates/fake.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/fixtures/site_apache/templates/fake.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/site_apache/templates/fake.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/fixtures/site_apache/templates/fake.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/templates/negotiation.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/fixtures/templates/negotiation.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/templates/negotiation.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/fixtures/templates/negotiation.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/spec_helper.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/spec_helper.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/spec_helper.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/spec_helper.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/spec_helper_acceptance.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/spec_helper_acceptance.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/spec_helper_acceptance.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/spec_helper_acceptance.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/spec_helper_local.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/spec_helper_local.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/spec_helper_local.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/spec_helper_local.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/unit/apache_version_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/unit/apache_version_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/unit/apache_version_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/unit/apache_version_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/unit/provider/a2mod/gentoo_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/unit/provider/a2mod/gentoo_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/unit/provider/a2mod/gentoo_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/unit/provider/a2mod/gentoo_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb b/modules/services/unix/http/apache_stretch_compatible/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb rename to modules/services/unix/http/apache_stretch_compatible/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/confd/no-accf.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/confd/no-accf.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/confd/no-accf.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/confd/no-accf.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/fastcgi/server.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/fastcgi/server.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/fastcgi/server.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/fastcgi/server.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/httpd.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/httpd.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/httpd.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/httpd.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/listen.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/listen.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/listen.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/listen.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/alias.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/alias.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/alias.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/alias.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/auth_cas.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/auth_cas.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/auth_cas.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/auth_cas.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/auth_mellon.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/auth_mellon.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/auth_mellon.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/auth_mellon.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/authn_dbd.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/authn_dbd.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/authn_dbd.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/authn_dbd.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/authnz_ldap.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/authnz_ldap.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/authnz_ldap.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/authnz_ldap.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/autoindex.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/autoindex.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/autoindex.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/autoindex.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/cgid.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/cgid.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/cgid.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/cgid.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/cluster.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/cluster.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/cluster.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/cluster.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/dav_fs.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/dav_fs.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/dav_fs.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/dav_fs.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/deflate.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/deflate.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/deflate.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/deflate.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/dir.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/dir.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/dir.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/dir.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/disk_cache.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/disk_cache.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/disk_cache.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/disk_cache.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/dumpio.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/dumpio.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/dumpio.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/dumpio.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/event.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/event.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/event.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/event.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/expires.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/expires.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/expires.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/expires.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/ext_filter.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/ext_filter.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/ext_filter.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/ext_filter.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/fastcgi.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/fastcgi.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/fastcgi.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/fastcgi.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/fcgid.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/fcgid.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/fcgid.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/fcgid.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/geoip.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/geoip.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/geoip.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/geoip.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/info.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/info.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/info.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/info.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/itk.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/itk.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/itk.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/itk.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/ldap.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/ldap.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/ldap.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/ldap.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/load.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/load.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/load.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/load.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/mime.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/mime.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/mime.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/mime.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/mime_magic.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/mime_magic.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/mime_magic.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/mime_magic.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/mpm_event.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/mpm_event.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/mpm_event.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/mpm_event.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/negotiation.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/negotiation.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/negotiation.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/negotiation.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/nss.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/nss.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/nss.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/nss.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/pagespeed.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/pagespeed.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/pagespeed.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/pagespeed.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/passenger.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/passenger.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/passenger.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/passenger.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/peruser.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/peruser.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/peruser.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/peruser.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/php.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/php.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/php.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/php.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/prefork.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/prefork.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/prefork.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/prefork.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/proxy.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/proxy.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/proxy.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/proxy.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/proxy_balancer.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/proxy_balancer.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/proxy_balancer.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/proxy_balancer.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/proxy_html.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/proxy_html.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/proxy_html.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/proxy_html.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/remoteip.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/remoteip.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/remoteip.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/remoteip.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/reqtimeout.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/reqtimeout.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/reqtimeout.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/reqtimeout.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/rpaf.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/rpaf.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/rpaf.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/rpaf.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/security.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/security.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/security.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/security.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/security_crs.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/security_crs.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/security_crs.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/security_crs.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/setenvif.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/setenvif.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/setenvif.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/setenvif.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/ssl.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/ssl.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/ssl.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/ssl.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/status.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/status.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/status.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/status.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/suphp.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/suphp.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/suphp.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/suphp.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/userdir.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/userdir.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/userdir.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/userdir.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/worker.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/worker.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/worker.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/worker.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/wsgi.conf.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/wsgi.conf.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/mod/wsgi.conf.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/mod/wsgi.conf.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/namevirtualhost.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/namevirtualhost.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/namevirtualhost.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/namevirtualhost.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/ports_header.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/ports_header.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/ports_header.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/ports_header.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_access_log.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_access_log.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_access_log.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_access_log.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_action.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_action.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_action.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_action.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_additional_includes.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_additional_includes.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_additional_includes.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_additional_includes.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_aliases.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_aliases.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_aliases.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_aliases.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_allow_encoded_slashes.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_allow_encoded_slashes.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_allow_encoded_slashes.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_allow_encoded_slashes.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_auth_cas.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_auth_cas.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_auth_cas.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_auth_cas.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_auth_kerb.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_auth_kerb.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_auth_kerb.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_auth_kerb.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_block.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_block.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_block.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_block.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_charsets.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_charsets.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_charsets.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_charsets.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_custom_fragment.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_custom_fragment.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_custom_fragment.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_custom_fragment.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_directories.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_directories.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_directories.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_directories.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_docroot.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_docroot.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_docroot.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_docroot.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_error_document.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_error_document.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_error_document.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_error_document.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_fallbackresource.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_fallbackresource.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_fallbackresource.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_fallbackresource.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_fastcgi.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_fastcgi.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_fastcgi.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_fastcgi.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_file_footer.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_file_footer.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_file_footer.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_file_footer.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_file_header.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_file_header.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_file_header.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_file_header.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_filters.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_filters.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_filters.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_filters.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_header.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_header.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_header.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_header.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_http_protocol_options.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_http_protocol_options.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_http_protocol_options.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_http_protocol_options.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_itk.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_itk.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_itk.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_itk.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_jk_mounts.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_jk_mounts.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_jk_mounts.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_jk_mounts.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_keepalive_options.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_keepalive_options.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_keepalive_options.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_keepalive_options.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_logging.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_logging.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_logging.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_logging.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_passenger.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_passenger.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_passenger.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_passenger.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_passenger_base_uris.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_passenger_base_uris.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_passenger_base_uris.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_passenger_base_uris.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_php.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_php.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_php.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_php.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_php_admin.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_php_admin.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_php_admin.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_php_admin.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_proxy.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_proxy.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_proxy.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_proxy.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_rack.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_rack.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_rack.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_rack.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_redirect.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_redirect.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_redirect.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_redirect.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_requestheader.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_requestheader.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_requestheader.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_requestheader.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_require.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_require.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_require.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_require.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_rewrite.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_rewrite.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_rewrite.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_rewrite.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_scriptalias.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_scriptalias.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_scriptalias.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_scriptalias.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_security.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_security.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_security.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_security.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_serveralias.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_serveralias.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_serveralias.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_serveralias.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_serversignature.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_serversignature.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_serversignature.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_serversignature.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_setenv.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_setenv.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_setenv.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_setenv.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_ssl.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_ssl.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_ssl.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_ssl.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_sslproxy.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_sslproxy.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_sslproxy.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_sslproxy.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_suexec.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_suexec.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_suexec.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_suexec.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_suphp.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_suphp.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_suphp.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_suphp.erb diff --git a/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_wsgi.erb b/modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_wsgi.erb similarity index 100% rename from modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_wsgi.erb rename to modules/services/unix/http/apache_stretch_compatible/apache/templates/vhost/_wsgi.erb diff --git a/modules/services/unix/irc/irc2/secgen_metadata.xml b/modules/services/unix/irc/irc2/secgen_metadata.xml index 8b6a17f8e..a1900e1e6 100644 --- a/modules/services/unix/irc/irc2/secgen_metadata.xml +++ b/modules/services/unix/irc/irc2/secgen_metadata.xml @@ -20,7 +20,7 @@ ircd - Stretch + .*Stretch.* update diff --git a/modules/services/unix/irc/unrealirc/manifests/install.pp b/modules/services/unix/irc/unrealirc/manifests/install.pp index 02d297c3f..b52fe7047 100644 --- a/modules/services/unix/irc/unrealirc/manifests/install.pp +++ b/modules/services/unix/irc/unrealirc/manifests/install.pp @@ -42,9 +42,8 @@ class unrealirc::install { require => Exec['extract-unrealirc'], } - package { ['build-essential', 'gcc-multilib']: - ensure => installed, - } + ensure_packages('build-essential') + ensure_packages('gcc-multilib') # Configure and make unrealircd, with or without ssl enabled if $unrealirc::use_ssl { diff --git a/modules/services/unix/irc/unrealirc/secgen_metadata.xml b/modules/services/unix/irc/unrealirc/secgen_metadata.xml index 2837d950e..77bf56ce5 100644 --- a/modules/services/unix/irc/unrealirc/secgen_metadata.xml +++ b/modules/services/unix/irc/unrealirc/secgen_metadata.xml @@ -32,4 +32,8 @@ Kali.* + + update + + \ No newline at end of file diff --git a/modules/utilities/unix/monitoring_ids/snort/secgen_metadata.xml b/modules/utilities/unix/monitoring_ids/snort/secgen_metadata.xml index 56adfba1c..71f149cb9 100644 --- a/modules/utilities/unix/monitoring_ids/snort/secgen_metadata.xml +++ b/modules/utilities/unix/monitoring_ids/snort/secgen_metadata.xml @@ -13,7 +13,7 @@ - Stretch + .*Stretch.* diff --git a/modules/utilities/unix/web_frameworks/php/docs/Puppet/Parser/Functions.html b/modules/utilities/unix/web_frameworks/php/docs/Puppet/Parser/Functions.html deleted file mode 100644 index 54615e004..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/Puppet/Parser/Functions.html +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - Module: Puppet::Parser::Functions - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
- -
-
- -
- - -

Module: Puppet::Parser::Functions - - - -

-
- - - - - - - - - - - -
-
Defined in:
-
lib/puppet/parser/functions/to_hash_settings.rb,
- lib/puppet/parser/functions/ensure_prefix.rb -
-
- -
- - - - - - - - - - -
- - - -
- - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/_index.html b/modules/utilities/unix/web_frameworks/php/docs/_index.html deleted file mode 100644 index 0da78276c..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/_index.html +++ /dev/null @@ -1,369 +0,0 @@ - - - - - - - Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
- -
-
- -
- - -

Documentation by YARD 0.9.9

-
-

Alphabetic Index

- -

Puppet Class Listing A-Z

- - - - - - -
- - - - -
- - -

Defined Type Listing A-Z

- - - - - - -
- - - - -
- - - -

Puppet Provider Listing A-Z

- - - - - - -
- - -
    -
  • P
    • -
      - -
    • - pear - - (Resource type: package) - -
      • - -
    • - pecl - - (Resource type: package) - -
      • - -
    -
- -
- - -

Puppet Function Listing A-Z

- - - - - - -
- - - - - - - -
- - -

File Listing

- - -
- -

Ruby Namespace Listing A-Z

- - - - - - -
- - -
    -
  • F
    • -
      - -
    • - Functions - - (Puppet::Parser) - -
      • - -
    -
- -
- - -
- -
- - - -
- - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/css/common.css b/modules/utilities/unix/web_frameworks/php/docs/css/common.css deleted file mode 100644 index d28b0936e..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/css/common.css +++ /dev/null @@ -1,8 +0,0 @@ -/* Ensure the search bar doesn't overlap with links */ -.fixed_header { - padding-bottom: 25px; -} - -#full_list { - padding-top: 15px; -} diff --git a/modules/utilities/unix/web_frameworks/php/docs/css/full_list.css b/modules/utilities/unix/web_frameworks/php/docs/css/full_list.css deleted file mode 100644 index fa3598242..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/css/full_list.css +++ /dev/null @@ -1,58 +0,0 @@ -body { - margin: 0; - font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif; - font-size: 13px; - height: 101%; - overflow-x: hidden; - background: #fafafa; -} - -h1 { padding: 12px 10px; padding-bottom: 0; margin: 0; font-size: 1.4em; } -.clear { clear: both; } -.fixed_header { position: fixed; background: #fff; width: 100%; padding-bottom: 10px; margin-top: 0; top: 0; z-index: 9999; height: 70px; } -#search { position: absolute; right: 5px; top: 9px; padding-left: 24px; } -#content.insearch #search, #content.insearch #noresults { background: url(data:image/gif;base64,R0lGODlhEAAQAPYAAP///wAAAPr6+pKSkoiIiO7u7sjIyNjY2J6engAAAI6OjsbGxjIyMlJSUuzs7KamppSUlPLy8oKCghwcHLKysqSkpJqamvT09Pj4+KioqM7OzkRERAwMDGBgYN7e3ujo6Ly8vCoqKjY2NkZGRtTU1MTExDw8PE5OTj4+PkhISNDQ0MrKylpaWrS0tOrq6nBwcKysrLi4uLq6ul5eXlxcXGJiYoaGhuDg4H5+fvz8/KKiohgYGCwsLFZWVgQEBFBQUMzMzDg4OFhYWBoaGvDw8NbW1pycnOLi4ubm5kBAQKqqqiQkJCAgIK6urnJyckpKSjQ0NGpqatLS0sDAwCYmJnx8fEJCQlRUVAoKCggICLCwsOTk5ExMTPb29ra2tmZmZmhoaNzc3KCgoBISEiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCAAAACwAAAAAEAAQAAAHaIAAgoMgIiYlg4kACxIaACEJCSiKggYMCRselwkpghGJBJEcFgsjJyoAGBmfggcNEx0flBiKDhQFlIoCCA+5lAORFb4AJIihCRbDxQAFChAXw9HSqb60iREZ1omqrIPdJCTe0SWI09GBACH5BAkIAAAALAAAAAAQABAAAAdrgACCgwc0NTeDiYozCQkvOTo9GTmDKy8aFy+NOBA7CTswgywJDTIuEjYFIY0JNYMtKTEFiRU8Pjwygy4ws4owPyCKwsMAJSTEgiQlgsbIAMrO0dKDGMTViREZ14kYGRGK38nHguHEJcvTyIEAIfkECQgAAAAsAAAAABAAEAAAB2iAAIKDAggPg4iJAAMJCRUAJRIqiRGCBI0WQEEJJkWDERkYAAUKEBc4Po1GiKKJHkJDNEeKig4URLS0ICImJZAkuQAhjSi/wQyNKcGDCyMnk8u5rYrTgqDVghgZlYjcACTA1sslvtHRgQAh+QQJCAAAACwAAAAAEAAQAAAHZ4AAgoOEhYaCJSWHgxGDJCQARAtOUoQRGRiFD0kJUYWZhUhKT1OLhR8wBaaFBzQ1NwAlkIszCQkvsbOHL7Y4q4IuEjaqq0ZQD5+GEEsJTDCMmIUhtgk1lo6QFUwJVDKLiYJNUd6/hoEAIfkECQgAAAAsAAAAABAAEAAAB2iAAIKDhIWGgiUlh4MRgyQkjIURGRiGGBmNhJWHm4uen4ICCA+IkIsDCQkVACWmhwSpFqAABQoQF6ALTkWFnYMrVlhWvIKTlSAiJiVVPqlGhJkhqShHV1lCW4cMqSkAR1ofiwsjJyqGgQAh+QQJCAAAACwAAAAAEAAQAAAHZ4AAgoOEhYaCJSWHgxGDJCSMhREZGIYYGY2ElYebi56fhyWQniSKAKKfpaCLFlAPhl0gXYNGEwkhGYREUywag1wJwSkHNDU3D0kJYIMZQwk8MjPBLx9eXwuETVEyAC/BOKsuEjYFhoEAIfkECQgAAAAsAAAAABAAEAAAB2eAAIKDhIWGgiUlh4MRgyQkjIURGRiGGBmNhJWHm4ueICImip6CIQkJKJ4kigynKaqKCyMnKqSEK05StgAGQRxPYZaENqccFgIID4KXmQBhXFkzDgOnFYLNgltaSAAEpxa7BQoQF4aBACH5BAkIAAAALAAAAAAQABAAAAdogACCg4SFggJiPUqCJSWGgkZjCUwZACQkgxGEXAmdT4UYGZqCGWQ+IjKGGIUwPzGPhAc0NTewhDOdL7Ykji+dOLuOLhI2BbaFETICx4MlQitdqoUsCQ2vhKGjglNfU0SWmILaj43M5oEAOwAAAAAAAAAAAA==) no-repeat center left; } -#full_list { padding: 0; list-style: none; margin-left: 0; margin-top: 80px; font-size: 1.1em; } -#full_list ul { padding: 0; } -#full_list li { padding: 0; margin: 0; list-style: none; } -#full_list li .item { padding: 5px 5px 5px 12px; } -#noresults { padding: 7px 12px; background: #fff; } -#content.insearch #noresults { margin-left: 7px; } -li.collapsed ul { display: none; } -li a.toggle { cursor: default; position: relative; left: -5px; top: 4px; text-indent: -999px; width: 10px; height: 9px; margin-left: -10px; display: block; float: left; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAYAAABb0P4QAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAK8AAACvABQqw0mAAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTM5jWRgMAAAAVdEVYdENyZWF0aW9uIFRpbWUAMy8xNC8wOeNZPpQAAAE2SURBVDiNrZTBccIwEEXfelIAHUA6CZ24BGaWO+FuzZAK4k6gg5QAdGAq+Bxs2Yqx7BzyL7Llp/VfzZeQhCTc/ezuGzKKnKSzpCxXJM8fwNXda3df5RZETlIt6YUzSQDs93sl8w3wBZxCCE10GM1OcWbWjB2mWgEH4Mfdyxm3PSepBHibgQE2wLe7r4HjEidpnXMYdQPKEMJcsZ4zs2POYQOcaPfwMVOo58zsAdMt18BuoVDPxUJRacELbXv3hUIX2vYmOUvi8C8ydz/ThjXrqKqqLbDIAdsCKBd+Wo7GWa7o9qzOQHVVVXeAbs+yHHCH4aTsaCOQqunmUy1yBUAXkdMIfMlgF5EXLo2OpV/c/Up7jG4hhHcYLgWzAZXUc2b2ixsfvc/RmNNfOXD3Q/oeL9axJE1yT9IOoUu6MGUkAAAAAElFTkSuQmCC) no-repeat bottom left; } -li.collapsed a.toggle { opacity: 0.5; cursor: default; background-position: top left; } -li { color: #888; cursor: pointer; } -li.deprecated { text-decoration: line-through; font-style: italic; } -li.odd { background: #f0f0f0; } -li.even { background: #fafafa; } -.item:hover { background: #ddd; } -li small:before { content: "("; } -li small:after { content: ")"; } -li small.search_info { display: none; } -a, a:visited { text-decoration: none; color: #05a; } -li.clicked > .item { background: #05a; color: #ccc; } -li.clicked > .item a, li.clicked > .item a:visited { color: #eee; } -li.clicked > .item a.toggle { opacity: 0.5; background-position: bottom right; } -li.collapsed.clicked a.toggle { background-position: top right; } -#search input { border: 1px solid #bbb; border-radius: 3px; } -#full_list_nav { margin-left: 10px; font-size: 0.9em; display: block; color: #aaa; } -#full_list_nav a, #nav a:visited { color: #358; } -#full_list_nav a:hover { background: transparent; color: #5af; } -#full_list_nav span:after { content: ' | '; } -#full_list_nav span:last-child:after { content: ''; } - -#content h1 { margin-top: 0; } -li { white-space: nowrap; cursor: normal; } -li small { display: block; font-size: 0.8em; } -li small:before { content: ""; } -li small:after { content: ""; } -li small.search_info { display: none; } -#search { width: 170px; position: static; margin: 3px; margin-left: 10px; font-size: 0.9em; color: #888; padding-left: 0; padding-right: 24px; } -#content.insearch #search { background-position: center right; } -#search input { width: 110px; } - -#full_list.insearch ul { display: block; } -#full_list.insearch .item { display: none; } -#full_list.insearch .found { display: block; padding-left: 11px !important; } -#full_list.insearch li a.toggle { display: none; } -#full_list.insearch li small.search_info { display: block; } diff --git a/modules/utilities/unix/web_frameworks/php/docs/css/style.css b/modules/utilities/unix/web_frameworks/php/docs/css/style.css deleted file mode 100644 index f682a6919..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/css/style.css +++ /dev/null @@ -1,492 +0,0 @@ -html { - width: 100%; - height: 100%; -} -body { - font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif; - font-size: 13px; - width: 100%; - margin: 0; - padding: 0; - display: flex; - display: -webkit-flex; - display: -ms-flexbox; -} - -#nav { - position: relative; - width: 100%; - height: 100%; - border: 0; - border-right: 1px dotted #eee; - overflow: auto; -} -.nav_wrap { - margin: 0; - padding: 0; - width: 20%; - height: 100%; - position: relative; - display: flex; - display: -webkit-flex; - display: -ms-flexbox; - flex-shrink: 0; - -webkit-flex-shrink: 0; - -ms-flex: 1 0; -} -#resizer { - position: absolute; - right: -5px; - top: 0; - width: 10px; - height: 100%; - cursor: col-resize; - z-index: 9999; -} -#main { - flex: 5 1; - -webkit-flex: 5 1; - -ms-flex: 5 1; - outline: none; - position: relative; - background: #fff; - padding: 1.2em; - padding-top: 0.2em; -} - -@media (max-width: 920px) { - .nav_wrap { width: 100%; top: 0; right: 0; overflow: visible; position: absolute; } - #resizer { display: none; } - #nav { - z-index: 9999; - background: #fff; - display: none; - position: absolute; - top: 40px; - right: 12px; - width: 500px; - max-width: 80%; - height: 80%; - overflow-y: scroll; - border: 1px solid #999; - border-collapse: collapse; - box-shadow: -7px 5px 25px #aaa; - border-radius: 2px; - } -} - -@media (min-width: 920px) { - body { height: 100%; overflow: hidden; } - #main { height: 100%; overflow: auto; } - #search { display: none; } -} - -#main img { max-width: 100%; } -h1 { font-size: 25px; margin: 1em 0 0.5em; padding-top: 4px; border-top: 1px dotted #d5d5d5; } -h1.noborder { border-top: 0px; margin-top: 0; padding-top: 4px; } -h1.title { margin-bottom: 10px; } -h1.alphaindex { margin-top: 0; font-size: 22px; } -h2 { - padding: 0; - padding-bottom: 3px; - border-bottom: 1px #aaa solid; - font-size: 1.4em; - margin: 1.8em 0 0.5em; - position: relative; -} -h2 small { font-weight: normal; font-size: 0.7em; display: inline; position: absolute; right: 0; } -h2 small a { - display: block; - height: 20px; - border: 1px solid #aaa; - border-bottom: 0; - border-top-left-radius: 5px; - background: #f8f8f8; - position: relative; - padding: 2px 7px; -} -.clear { clear: both; } -.inline { display: inline; } -.inline p:first-child { display: inline; } -.docstring, .tags, #filecontents { font-size: 15px; line-height: 1.5145em; } -.docstring p > code, .docstring p > tt, .tags p > code, .tags p > tt { - color: #c7254e; background: #f9f2f4; padding: 2px 4px; font-size: 1em; - border-radius: 4px; -} -.docstring h1, .docstring h2, .docstring h3, .docstring h4 { padding: 0; border: 0; border-bottom: 1px dotted #bbb; } -.docstring h1 { font-size: 1.2em; } -.docstring h2 { font-size: 1.1em; } -.docstring h3, .docstring h4 { font-size: 1em; border-bottom: 0; padding-top: 10px; } -.summary_desc .object_link a, .docstring .object_link a { - font-family: monospace; font-size: 1.05em; - color: #05a; background: #EDF4FA; padding: 2px 4px; font-size: 1em; - border-radius: 4px; -} -.rdoc-term { padding-right: 25px; font-weight: bold; } -.rdoc-list p { margin: 0; padding: 0; margin-bottom: 4px; } -.summary_desc pre.code .object_link a, .docstring pre.code .object_link a { - padding: 0px; background: inherit; color: inherit; border-radius: inherit; -} - -/* style for */ -#filecontents table, .docstring table { border-collapse: collapse; } -#filecontents table th, #filecontents table td, -.docstring table th, .docstring table td { border: 1px solid #ccc; padding: 8px; padding-right: 17px; } -#filecontents table tr:nth-child(odd), -.docstring table tr:nth-child(odd) { background: #eee; } -#filecontents table tr:nth-child(even), -.docstring table tr:nth-child(even) { background: #fff; } -#filecontents table th, .docstring table th { background: #fff; } - -/* style for
    */ -#filecontents li > p, .docstring li > p { margin: 0px; } -#filecontents ul, .docstring ul { padding-left: 20px; } -/* style for
    */ -#filecontents dl, .docstring dl { border: 1px solid #ccc; } -#filecontents dt, .docstring dt { background: #ddd; font-weight: bold; padding: 3px 5px; } -#filecontents dd, .docstring dd { padding: 5px 0px; margin-left: 18px; } -#filecontents dd > p, .docstring dd > p { margin: 0px; } - -.note { - color: #222; - margin: 20px 0; - padding: 10px; - border: 1px solid #eee; - border-radius: 3px; - display: block; -} -.docstring .note { - border-left-color: #ccc; - border-left-width: 5px; -} -.note.todo { background: #ffffc5; border-color: #ececaa; } -.note.returns_void { background: #efefef; } -.note.deprecated { background: #ffe5e5; border-color: #e9dada; } -.note.title.deprecated { background: #ffe5e5; border-color: #e9dada; } -.note.private { background: #ffffc5; border-color: #ececaa; } -.note.title { padding: 3px 6px; font-size: 0.9em; font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif; display: inline; } -.summary_signature + .note.title { margin-left: 7px; } -h1 .note.title { font-size: 0.5em; font-weight: normal; padding: 3px 5px; position: relative; top: -3px; text-transform: capitalize; } -.note.title { background: #efefef; } -.note.title.constructor { color: #fff; background: #6a98d6; border-color: #6689d6; } -.note.title.writeonly { color: #fff; background: #45a638; border-color: #2da31d; } -.note.title.readonly { color: #fff; background: #6a98d6; border-color: #6689d6; } -.note.title.private { background: #d5d5d5; border-color: #c5c5c5; } -.note.title.not_defined_here { background: transparent; border: none; font-style: italic; } -.discussion .note { margin-top: 6px; } -.discussion .note:first-child { margin-top: 0; } - -h3.inherited { - font-style: italic; - font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif; - font-weight: normal; - padding: 0; - margin: 0; - margin-top: 12px; - margin-bottom: 3px; - font-size: 13px; -} -p.inherited { - padding: 0; - margin: 0; - margin-left: 25px; -} - -.box_info dl { - margin: 0; - border: 0; - width: 100%; - font-size: 1em; - display: flex; - display: -webkit-flex; - display: -ms-flexbox; -} -.box_info dl dt { - flex-shrink: 0; - -webkit-flex-shrink: 1; - -ms-flex-shrink: 1; - width: 100px; - text-align: right; - font-weight: bold; - border: 1px solid #aaa; - border-width: 1px 0px 0px 1px; - padding: 6px 0; - padding-right: 10px; -} -.box_info dl dd { - flex-grow: 1; - -webkit-flex-grow: 1; - -ms-flex: 1; - max-width: 420px; - padding: 6px 0; - padding-right: 20px; - border: 1px solid #aaa; - border-width: 1px 1px 0 0; - overflow: hidden; - position: relative; -} -.box_info dl:last-child > * { - border-bottom: 1px solid #aaa; -} -.box_info dl:nth-child(odd) > * { background: #eee; } -.box_info dl:nth-child(even) > * { background: #fff; } -.box_info dl > * { margin: 0; } - -ul.toplevel { list-style: none; padding-left: 0; font-size: 1.1em; } -.index_inline_list { padding-left: 0; font-size: 1.1em; } - -.index_inline_list li { - list-style: none; - display: inline-block; - padding: 0 12px; - line-height: 30px; - margin-bottom: 5px; -} - -dl.constants { margin-left: 10px; } -dl.constants dt { font-weight: bold; font-size: 1.1em; margin-bottom: 5px; } -dl.constants dd { width: 75%; white-space: pre; font-family: monospace; margin-bottom: 18px; } -dl.constants .docstring .note:first-child { margin-top: 5px; } - -.summary_desc { - margin-left: 32px; - display: block; - font-family: sans-serif; - font-size: 1.1em; - margin-top: 8px; - line-height: 1.5145em; - margin-bottom: 0.8em; -} -.summary_desc tt { font-size: 0.9em; } -dl.constants .note { padding: 2px 6px; padding-right: 12px; margin-top: 6px; } -dl.constants .docstring { margin-left: 32px; font-size: 0.9em; font-weight: normal; } -dl.constants .tags { padding-left: 32px; font-size: 0.9em; line-height: 0.8em; } -dl.constants .discussion *:first-child { margin-top: 0; } -dl.constants .discussion *:last-child { margin-bottom: 0; } - -.method_details { border-top: 1px dotted #ccc; margin-top: 25px; padding-top: 0; } -.method_details.first { border: 0; margin-top: 5px; } -.method_details.first h3.signature { margin-top: 1em; } -p.signature, h3.signature { - font-size: 1.1em; font-weight: normal; font-family: Monaco, Consolas, Courier, monospace; - padding: 6px 10px; margin-top: 1em; - background: #E8F4FF; border: 1px solid #d8d8e5; border-radius: 5px; -} -p.signature tt, -h3.signature tt { font-family: Monaco, Consolas, Courier, monospace; } -p.signature .overload, -h3.signature .overload { display: block; } -p.signature .extras, -h3.signature .extras { font-weight: normal; font-family: sans-serif; color: #444; font-size: 1em; } -p.signature .not_defined_here, -h3.signature .not_defined_here, -p.signature .aliases, -h3.signature .aliases { display: block; font-weight: normal; font-size: 0.9em; font-family: sans-serif; margin-top: 0px; color: #555; } -p.signature .aliases .names, -h3.signature .aliases .names { font-family: Monaco, Consolas, Courier, monospace; font-weight: bold; color: #000; font-size: 1.2em; } - -.tags .tag_title { font-size: 1.05em; margin-bottom: 0; font-weight: bold; } -.tags .tag_title tt { color: initial; padding: initial; background: initial; } -.tags ul { margin-top: 5px; padding-left: 30px; list-style: square; } -.tags ul li { margin-bottom: 3px; } -.tags ul .name { font-family: monospace; font-weight: bold; } -.tags ul .note { padding: 3px 6px; } -.tags { margin-bottom: 12px; } - -.tags .examples .tag_title { margin-bottom: 10px; font-weight: bold; } -.tags .examples .inline p { padding: 0; margin: 0; font-weight: bold; font-size: 1em; } -.tags .examples .inline p:before { content: "▸"; font-size: 1em; margin-right: 5px; } - -.tags .overload .overload_item { list-style: none; margin-bottom: 25px; } -.tags .overload .overload_item .signature { - padding: 2px 8px; - background: #F1F8FF; border: 1px solid #d8d8e5; border-radius: 3px; -} -.tags .overload .signature { margin-left: -15px; font-family: monospace; display: block; font-size: 1.1em; } -.tags .overload .docstring { margin-top: 15px; } - -.defines { display: none; } - -#method_missing_details .notice.this { position: relative; top: -8px; color: #888; padding: 0; margin: 0; } - -.showSource { font-size: 0.9em; } -.showSource a, .showSource a:visited { text-decoration: none; color: #666; } - -#content a, #content a:visited { text-decoration: none; color: #05a; } -#content a:hover { background: #ffffa5; } - -ul.summary { - list-style: none; - font-family: monospace; - font-size: 1em; - line-height: 1.5em; - padding-left: 0px; -} -ul.summary a, ul.summary a:visited { - text-decoration: none; font-size: 1.1em; -} -ul.summary li { margin-bottom: 5px; } -.summary .summary_signature { - padding: 4px 8px; - background: #f8f8f8; - border: 1px solid #f0f0f0; - border-radius: 5px; -} -.summary_signature:hover { background: #CFEBFF; border-color: #A4CCDA; cursor: pointer; } -ul.summary.compact li { display: inline-block; margin: 0px 5px 0px 0px; line-height: 2.6em;} -ul.summary.compact .summary_signature { padding: 5px 7px; padding-right: 4px; } -#content .summary_signature:hover a, -#content .summary_signature:hover a:visited { - background: transparent; - color: #049; -} - -p.inherited a { font-family: monospace; font-size: 0.9em; } -p.inherited { word-spacing: 5px; font-size: 1.2em; } - -p.children { font-size: 1.2em; } -p.children a { font-size: 0.9em; } -p.children strong { font-size: 0.8em; } -p.children strong.modules { padding-left: 5px; } - -ul.fullTree { display: none; padding-left: 0; list-style: none; margin-left: 0; margin-bottom: 10px; } -ul.fullTree ul { margin-left: 0; padding-left: 0; list-style: none; } -ul.fullTree li { text-align: center; padding-top: 18px; padding-bottom: 12px; background: url(data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAAHtJREFUeNqMzrEJAkEURdGzuhgZbSoYWcAWoBVsB4JgZAGmphsZCZYzTQgWNCYrDN9RvMmHx+X916SUBFbo8CzD1idXrLErw1mQttgXtyrOcQ/Ny5p4Qh+2XqLYYazsPWNTiuMkRxa4vcV+evuNAUOLIx5+c2hyzv7hNQC67Q+/HHmlEwAAAABJRU5ErkJggg==) no-repeat top center; } -ul.fullTree li:first-child { padding-top: 0; background: transparent; } -ul.fullTree li:last-child { padding-bottom: 0; } -.showAll ul.fullTree { display: block; } -.showAll .inheritName { display: none; } - -#search { position: absolute; right: 12px; top: 0px; z-index: 9000; } -#search a { - display: block; float: left; - padding: 4px 8px; text-decoration: none; color: #05a; fill: #05a; - border: 1px solid #d8d8e5; - border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; - background: #F1F8FF; - box-shadow: -1px 1px 3px #ddd; -} -#search a:hover { background: #f5faff; color: #06b; fill: #06b; } -#search a.active { - background: #568; padding-bottom: 20px; color: #fff; fill: #fff; - border: 1px solid #457; - border-top-left-radius: 5px; border-top-right-radius: 5px; -} -#search a.inactive { color: #999; fill: #999; } -.inheritanceTree, .toggleDefines { - float: right; - border-left: 1px solid #aaa; - position: absolute; top: 0; right: 0; - height: 100%; - background: #f6f6f6; - padding: 5px; - min-width: 55px; - text-align: center; -} - -#menu { font-size: 1.3em; color: #bbb; } -#menu .title, #menu a { font-size: 0.7em; } -#menu .title a { font-size: 1em; } -#menu .title { color: #555; } -#menu a, #menu a:visited { color: #333; text-decoration: none; border-bottom: 1px dotted #bbd; } -#menu a:hover { color: #05a; } - -#footer { margin-top: 15px; border-top: 1px solid #ccc; text-align: center; padding: 7px 0; color: #999; } -#footer a, #footer a:visited { color: #444; text-decoration: none; border-bottom: 1px dotted #bbd; } -#footer a:hover { color: #05a; } - -#listing ul.alpha { font-size: 1.1em; } -#listing ul.alpha { margin: 0; padding: 0; padding-bottom: 10px; list-style: none; } -#listing ul.alpha li.letter { font-size: 1.4em; padding-bottom: 10px; } -#listing ul.alpha ul { margin: 0; padding-left: 15px; } -#listing ul small { color: #666; font-size: 0.7em; } - -li.r1 { background: #f0f0f0; } -li.r2 { background: #fafafa; } - -#content ul.summary li.deprecated .summary_signature a, -#content ul.summary li.deprecated .summary_signature a:visited { text-decoration: line-through; font-style: italic; } - -#toc { - position: relative; - float: right; - overflow-x: auto; - right: -3px; - margin-left: 20px; - margin-bottom: 20px; - padding: 20px; padding-right: 30px; - max-width: 300px; - z-index: 5000; - background: #fefefe; - border: 1px solid #ddd; - box-shadow: -2px 2px 6px #bbb; -} -#toc .title { margin: 0; } -#toc ol { padding-left: 1.8em; } -#toc li { font-size: 1.1em; line-height: 1.7em; } -#toc > ol > li { font-size: 1.1em; font-weight: bold; } -#toc ol > ol { font-size: 0.9em; } -#toc ol ol > ol { padding-left: 2.3em; } -#toc ol + li { margin-top: 0.3em; } -#toc.hidden { padding: 10px; background: #fefefe; box-shadow: none; } -#toc.hidden:hover { background: #fafafa; } -#filecontents h1 + #toc.nofloat { margin-top: 0; } -@media (max-width: 560px) { - #toc { - margin-left: 0; - margin-top: 16px; - float: none; - max-width: none; - } -} - -/* syntax highlighting */ -.source_code { display: none; padding: 3px 8px; border-left: 8px solid #ddd; margin-top: 5px; } -#filecontents pre.code, .docstring pre.code, .source_code pre { font-family: monospace; } -#filecontents pre.code, .docstring pre.code { display: block; } -.source_code .lines { padding-right: 12px; color: #555; text-align: right; } -#filecontents pre.code, .docstring pre.code, -.tags pre.example { - padding: 9px 14px; - margin-top: 4px; - border: 1px solid #e1e1e8; - background: #f7f7f9; - border-radius: 4px; - font-size: 1em; - overflow-x: auto; - line-height: 1.2em; -} -pre.code { color: #000; tab-size: 2; } -pre.code .info.file { color: #555; } -pre.code .val { color: #036A07; } -pre.code .tstring_content, -pre.code .heredoc_beg, pre.code .heredoc_end, -pre.code .qwords_beg, pre.code .qwords_end, pre.code .qwords_sep, -pre.code .words_beg, pre.code .words_end, pre.code .words_sep, -pre.code .qsymbols_beg, pre.code .qsymbols_end, pre.code .qsymbols_sep, -pre.code .symbols_beg, pre.code .symbols_end, pre.code .symbols_sep, -pre.code .tstring, pre.code .dstring { color: #036A07; } -pre.code .fid, pre.code .rubyid_new, pre.code .rubyid_to_s, -pre.code .rubyid_to_sym, pre.code .rubyid_to_f, -pre.code .dot + pre.code .id, -pre.code .rubyid_to_i pre.code .rubyid_each { color: #0085FF; } -pre.code .comment { color: #0066FF; } -pre.code .const, pre.code .constant { color: #585CF6; } -pre.code .label, -pre.code .symbol { color: #C5060B; } -pre.code .kw, -pre.code .rubyid_require, -pre.code .rubyid_extend, -pre.code .rubyid_include { color: #0000FF; } -pre.code .ivar { color: #318495; } -pre.code .gvar, -pre.code .rubyid_backref, -pre.code .rubyid_nth_ref { color: #6D79DE; } -pre.code .regexp, .dregexp { color: #036A07; } -pre.code a { border-bottom: 1px dotted #bbf; } - -/* Color fix for links */ -#content .summary_desc pre.code .id > .object_link a, /* identifier */ -#content .docstring pre.code .id > .object_link a { color: #0085FF; } -#content .summary_desc pre.code .const > .object_link a, /* constant */ -#content .docstring pre.code .const > .object_link a { color: #585CF6; } diff --git a/modules/utilities/unix/web_frameworks/php/docs/file.README.html b/modules/utilities/unix/web_frameworks/php/docs/file.README.html deleted file mode 100644 index e48e7ffca..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/file.README.html +++ /dev/null @@ -1,340 +0,0 @@ - - - - - - - File: README - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Forge -Build Status

    - -

    Current Status

    - -

    As the original creators of puppet-php are no longer maintaining the module, it has been handed over into the care of Vox Pupuli. -Please be sure to update all your links to the new location.

    - -

    voxpupuli/php Puppet Module

    - -

    voxpupuli/php is a Puppet module for managing PHP with a strong focus -on php-fpm. The module aims to use sane defaults for the supported -architectures. We strive to support all recent versions of Debian, -Ubuntu, RedHat/CentOS, openSUSE/SLES and FreeBSD. Managing Apache -with mod_php is not supported.

    - -

    This originally was a fork of jippi/puppet-php -(nodes-php on Puppet Forge) but has since been rewritten in large parts.

    - -

    Usage

    - -

    Quickest way to get started is simply include'ing the php class.

    - -
    include '::php'
-
    - -

    Or, you can override defaults and specify additional custom -configurations by declaring class { '::php': } with parameters:

    - -
    class { '::php':
-  ensure       => latest,
-  manage_repos => true,
-  fpm          => true,
-  dev          => true,
-  composer     => true,
-  pear         => true,
-  phpunit      => false,
-}
-
    - -

    Optionally the PHP version or configuration root directory can be changed also:

    - -
    class { '::php::globals':
-  php_version => '7.0',
-  config_root => '/etc/php/7.0',
-}->
-class { '::php':
-  manage_repos => true
-}
-
    - -

    There are more configuration options available. Please refer to the -auto-generated documentation at http://php.puppet.mayflower.de/.

    - -

    Defining php.ini settings

    - -

    PHP configuration parameters in php.ini files can be defined as parameter -settings on the main php class, or php::fpm / php::cli classes, -or php::extension resources for each component independently.

    - -

    These settings are written into their respective php.ini file. Global -settings in php::settings are merged with the settings of all components. -Please note that settings of extensions are always independent.

    - -

    In the following example the PHP options and timezone will be set in -all PHP configurations, i.e. the PHP cli application and all php-fpm pools.

    - -
      class { '::php':
-    settings   => {
-      'PHP/max_execution_time'  => '90',
-      'PHP/max_input_time'      => '300',
-      'PHP/memory_limit'        => '64M',
-      'PHP/post_max_size'       => '32M',
-      'PHP/upload_max_filesize' => '32M',
-      'Date/date.timezone'      => 'Europe/Berlin',
-    },
-  }
-
    - -

    Installing extensions

    - -

    PHP configuration parameters in php.ini files can be defined -as parameter extensions on the main php class. They are -activated for all activated SAPIs.

    - -
      class { '::php':
-    extensions => {
-      bcmath    => { },
-      imagick   => {
-        provider => pecl,
-      },
-      xmlrpc    => { },
-      memcached => {
-        provider        => 'pecl',
-        header_packages => [ 'libmemcached-devel', ],
-      },
-      apc       => {
-        provider => 'pecl',
-        settings => {
-          'apc/stat'       => '1',
-          'apc/stat_ctime' => '1',
-        },
-        sapi     => 'fpm',
-      },
-    },
-  }
-
    - -

    See the documentation -of the php::extension resource for all available parameters and default -values.

    - -

    Defining php-fpm pools

    - -

    If different php-fpm pools are required, you can use php::fpm::pool -defined resource type. A single pool called www will be configured -by default. Specify additional pools like so:

    - -
      php::fpm::pool { 'www2':
-    listen => '127.0.1.1:9000',
-  }
-
    - -

    For an overview of all possible parameters for php::fpm::pool resources -please see its documention.

    - -

    Overriding php-fpm user

    - -

    By default, php-fpm is set up to run as Apache. If you need to customize that user, you can do that like so:

    - -
      class { '::php':
-    fpm_user  => 'nginx',
-    fpm_group => 'nginx',
-  }
-
    - -

    Alternative examples using Hiera

    - -

    Alternative to the Puppet DSL code examples above, you may optionally define your PHP configuration using Hiera.

    - -

    Below are all the examples you see above, but defined in YAML format for use with Hiera.

    - -
    ---
-php::ensure: latest
-php::manage_repos: true
-php::fpm: true
-php::fpm_user: 'nginx'
-php::fpm_group: 'nginx'
-php::dev: true
-php::composer: true
-php::pear: true
-php::phpunit: false
-php::settings:
-  'PHP/max_execution_time': '90'
-  'PHP/max_input_time': '300'
-  'PHP/memory_limit': '64M'
-  'PHP/post_max_size': '32M'
-  'PHP/upload_max_filesize': '32M'
-  'Date/date.timezone': 'Europe/Berlin'
-php::extensions:
-  bcmath: {}
-  xmlrpc: {}
-  imagick:
-    provider: pecl
-  memcached:
-    provider: pecl
-    header_packages:
-      - libmemcached-dev
-  apc:
-    provider: pecl
-    settings:
-      'apc/stat': 1
-      'apc/stat_ctime': 1
-    sapi: 'fpm'
-php::fpm::pools:
-  www2:
-    listen: '127.0.1.1:9000'
-
    - -

    Notes

    - -

    Debian squeeze & Ubuntu precise come with PHP 5.3

    - -

    On Debian-based systems, we use php5enmod to enable extension-specific -configuration. This script is only present in php5 packages beginning with -version 5.4. Furthermore, PHP 5.3 is not supported by upstream anymore.

    - -

    We strongly suggest you use a recent PHP version, even if you're using an -older though still supported distribution release. Our default is to have -php::manage_repos enabled to add apt sources for -Dotdeb on Debian and -ppa:ondrej/php5 on -Ubuntu with packages for the current stable PHP version closely tracking -upstream.

    - -

    Ubuntu systems and Ondřej's PPA

    - -

    The older Ubuntu PPAs run by Ondřej have been deprecated (ondrej/php5, ondrej/php5.6) -in favor of a new PPA: ondrej/php which contains all 3 versions of PHP: 5.5, 5.6, and 7.0 -Here's an example in hiera of getting PHP 5.6 installed with php-fpm, pear/pecl, and composer:

    - -
    php::globals::php_version: '5.6'
-php::fpm: true
-php::dev: true
-php::composer: true
-php::pear: true
-php::phpunit: false
-
    - -

    If you do not specify a php version, in Ubuntu the default will be 7.0 if you are -running Xenial (16.04), otherwise PHP 5.6 will be installed (for other versions)

    - -

    Apache support

    - -

    Apache with mod_php is not supported by this module. Please use -puppetlabs/apache instead.

    - -

    We prefer using php-fpm. You can find an example Apache vhost in -manifests/apache_vhost.pp that shows you how to use mod_proxy_fcgi to -connect to php-fpm.

    - -

    Facts

    - -

    We deliver a phpversion fact with this module. This is explicitly NOT intended -to be used within your puppet manifests as it will only work on your second puppet -run. Its intention is to make querying PHP versions per server easy via PuppetDB or Foreman.

    - -

    FreeBSD support

    - -

    On FreeBSD systems we purge the system-wide extensions.ini in favour of -per-module configuration files.

    - -

    Please also note that support for Composer and PHPUnit on FreeBSD is untested -and thus likely incomplete.

    - -

    Running the test suite

    - -

    To run the tests install the ruby dependencies with bundler and execute -rake:

    - -
    bundle install --path vendor/bundle
-bundle exec rake
-
    - -

    Bugs & New Features

    - -

    If you happen to stumble upon a bug, please feel free to create a pull request -with a fix (optionally with a test), and a description of the bug and how it -was resolved.

    - -

    Or if you're not into coding, simply create an issue adding steps to let us -reproduce the bug and we will happily fix it.

    - -

    If you have a good idea for a feature or how to improve this module in general, -please create an issue to discuss it. We are very open to feedback. Pull -requests are always welcome.

    - -

    We hate orphaned and unmaintained Puppet modules as much as you do and -therefore promise that we will continue to maintain this module and keep -response times to issues short. If we happen to lose interest, we will write -a big fat warning into this README to let you know.

    - -

    License

    - -

    The project is released under the permissive MIT license.

    - -

    The source can be found at -github.com/voxpupuli/puppet-php.

    - -

    This Puppet module was originally maintained by some fellow puppeteers at -Mayflower GmbH and is now maintained by -Vox Pupuli.

    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/frames.html b/modules/utilities/unix/web_frameworks/php/docs/frames.html deleted file mode 100644 index 0cb137144..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/frames.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Documentation by YARD 0.9.9 - - - - diff --git a/modules/utilities/unix/web_frameworks/php/docs/index.html b/modules/utilities/unix/web_frameworks/php/docs/index.html deleted file mode 100644 index 3b1e69a77..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/index.html +++ /dev/null @@ -1,340 +0,0 @@ - - - - - - - File: README - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Forge -Build Status

    - -

    Current Status

    - -

    As the original creators of puppet-php are no longer maintaining the module, it has been handed over into the care of Vox Pupuli. -Please be sure to update all your links to the new location.

    - -

    voxpupuli/php Puppet Module

    - -

    voxpupuli/php is a Puppet module for managing PHP with a strong focus -on php-fpm. The module aims to use sane defaults for the supported -architectures. We strive to support all recent versions of Debian, -Ubuntu, RedHat/CentOS, openSUSE/SLES and FreeBSD. Managing Apache -with mod_php is not supported.

    - -

    This originally was a fork of jippi/puppet-php -(nodes-php on Puppet Forge) but has since been rewritten in large parts.

    - -

    Usage

    - -

    Quickest way to get started is simply include'ing the php class.

    - -
    include '::php'
-
    - -

    Or, you can override defaults and specify additional custom -configurations by declaring class { '::php': } with parameters:

    - -
    class { '::php':
-  ensure       => latest,
-  manage_repos => true,
-  fpm          => true,
-  dev          => true,
-  composer     => true,
-  pear         => true,
-  phpunit      => false,
-}
-
    - -

    Optionally the PHP version or configuration root directory can be changed also:

    - -
    class { '::php::globals':
-  php_version => '7.0',
-  config_root => '/etc/php/7.0',
-}->
-class { '::php':
-  manage_repos => true
-}
-
    - -

    There are more configuration options available. Please refer to the -auto-generated documentation at http://php.puppet.mayflower.de/.

    - -

    Defining php.ini settings

    - -

    PHP configuration parameters in php.ini files can be defined as parameter -settings on the main php class, or php::fpm / php::cli classes, -or php::extension resources for each component independently.

    - -

    These settings are written into their respective php.ini file. Global -settings in php::settings are merged with the settings of all components. -Please note that settings of extensions are always independent.

    - -

    In the following example the PHP options and timezone will be set in -all PHP configurations, i.e. the PHP cli application and all php-fpm pools.

    - -
      class { '::php':
-    settings   => {
-      'PHP/max_execution_time'  => '90',
-      'PHP/max_input_time'      => '300',
-      'PHP/memory_limit'        => '64M',
-      'PHP/post_max_size'       => '32M',
-      'PHP/upload_max_filesize' => '32M',
-      'Date/date.timezone'      => 'Europe/Berlin',
-    },
-  }
-
    - -

    Installing extensions

    - -

    PHP configuration parameters in php.ini files can be defined -as parameter extensions on the main php class. They are -activated for all activated SAPIs.

    - -
      class { '::php':
-    extensions => {
-      bcmath    => { },
-      imagick   => {
-        provider => pecl,
-      },
-      xmlrpc    => { },
-      memcached => {
-        provider        => 'pecl',
-        header_packages => [ 'libmemcached-devel', ],
-      },
-      apc       => {
-        provider => 'pecl',
-        settings => {
-          'apc/stat'       => '1',
-          'apc/stat_ctime' => '1',
-        },
-        sapi     => 'fpm',
-      },
-    },
-  }
-
    - -

    See the documentation -of the php::extension resource for all available parameters and default -values.

    - -

    Defining php-fpm pools

    - -

    If different php-fpm pools are required, you can use php::fpm::pool -defined resource type. A single pool called www will be configured -by default. Specify additional pools like so:

    - -
      php::fpm::pool { 'www2':
-    listen => '127.0.1.1:9000',
-  }
-
    - -

    For an overview of all possible parameters for php::fpm::pool resources -please see its documention.

    - -

    Overriding php-fpm user

    - -

    By default, php-fpm is set up to run as Apache. If you need to customize that user, you can do that like so:

    - -
      class { '::php':
-    fpm_user  => 'nginx',
-    fpm_group => 'nginx',
-  }
-
    - -

    Alternative examples using Hiera

    - -

    Alternative to the Puppet DSL code examples above, you may optionally define your PHP configuration using Hiera.

    - -

    Below are all the examples you see above, but defined in YAML format for use with Hiera.

    - -
    ---
-php::ensure: latest
-php::manage_repos: true
-php::fpm: true
-php::fpm_user: 'nginx'
-php::fpm_group: 'nginx'
-php::dev: true
-php::composer: true
-php::pear: true
-php::phpunit: false
-php::settings:
-  'PHP/max_execution_time': '90'
-  'PHP/max_input_time': '300'
-  'PHP/memory_limit': '64M'
-  'PHP/post_max_size': '32M'
-  'PHP/upload_max_filesize': '32M'
-  'Date/date.timezone': 'Europe/Berlin'
-php::extensions:
-  bcmath: {}
-  xmlrpc: {}
-  imagick:
-    provider: pecl
-  memcached:
-    provider: pecl
-    header_packages:
-      - libmemcached-dev
-  apc:
-    provider: pecl
-    settings:
-      'apc/stat': 1
-      'apc/stat_ctime': 1
-    sapi: 'fpm'
-php::fpm::pools:
-  www2:
-    listen: '127.0.1.1:9000'
-
    - -

    Notes

    - -

    Debian squeeze & Ubuntu precise come with PHP 5.3

    - -

    On Debian-based systems, we use php5enmod to enable extension-specific -configuration. This script is only present in php5 packages beginning with -version 5.4. Furthermore, PHP 5.3 is not supported by upstream anymore.

    - -

    We strongly suggest you use a recent PHP version, even if you're using an -older though still supported distribution release. Our default is to have -php::manage_repos enabled to add apt sources for -Dotdeb on Debian and -ppa:ondrej/php5 on -Ubuntu with packages for the current stable PHP version closely tracking -upstream.

    - -

    Ubuntu systems and Ondřej's PPA

    - -

    The older Ubuntu PPAs run by Ondřej have been deprecated (ondrej/php5, ondrej/php5.6) -in favor of a new PPA: ondrej/php which contains all 3 versions of PHP: 5.5, 5.6, and 7.0 -Here's an example in hiera of getting PHP 5.6 installed with php-fpm, pear/pecl, and composer:

    - -
    php::globals::php_version: '5.6'
-php::fpm: true
-php::dev: true
-php::composer: true
-php::pear: true
-php::phpunit: false
-
    - -

    If you do not specify a php version, in Ubuntu the default will be 7.0 if you are -running Xenial (16.04), otherwise PHP 5.6 will be installed (for other versions)

    - -

    Apache support

    - -

    Apache with mod_php is not supported by this module. Please use -puppetlabs/apache instead.

    - -

    We prefer using php-fpm. You can find an example Apache vhost in -manifests/apache_vhost.pp that shows you how to use mod_proxy_fcgi to -connect to php-fpm.

    - -

    Facts

    - -

    We deliver a phpversion fact with this module. This is explicitly NOT intended -to be used within your puppet manifests as it will only work on your second puppet -run. Its intention is to make querying PHP versions per server easy via PuppetDB or Foreman.

    - -

    FreeBSD support

    - -

    On FreeBSD systems we purge the system-wide extensions.ini in favour of -per-module configuration files.

    - -

    Please also note that support for Composer and PHPUnit on FreeBSD is untested -and thus likely incomplete.

    - -

    Running the test suite

    - -

    To run the tests install the ruby dependencies with bundler and execute -rake:

    - -
    bundle install --path vendor/bundle
-bundle exec rake
-
    - -

    Bugs & New Features

    - -

    If you happen to stumble upon a bug, please feel free to create a pull request -with a fix (optionally with a test), and a description of the bug and how it -was resolved.

    - -

    Or if you're not into coding, simply create an issue adding steps to let us -reproduce the bug and we will happily fix it.

    - -

    If you have a good idea for a feature or how to improve this module in general, -please create an issue to discuss it. We are very open to feedback. Pull -requests are always welcome.

    - -

    We hate orphaned and unmaintained Puppet modules as much as you do and -therefore promise that we will continue to maintain this module and keep -response times to issues short. If we happen to lose interest, we will write -a big fat warning into this README to let you know.

    - -

    License

    - -

    The project is released under the permissive MIT license.

    - -

    The source can be found at -github.com/voxpupuli/puppet-php.

    - -

    This Puppet module was originally maintained by some fellow puppeteers at -Mayflower GmbH and is now maintained by -Vox Pupuli.

    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/js/app.js b/modules/utilities/unix/web_frameworks/php/docs/js/app.js deleted file mode 100644 index b9f21202a..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/js/app.js +++ /dev/null @@ -1,248 +0,0 @@ -(function() { - -var localStorage = {}, sessionStorage = {}; -try { localStorage = window.localStorage; } catch (e) { } -try { sessionStorage = window.sessionStorage; } catch (e) { } - -function createSourceLinks() { - $('.method_details_list .source_code'). - before("[View source]"); - $('.toggleSource').toggle(function() { - $(this).parent().nextAll('.source_code').slideDown(100); - $(this).text("Hide source"); - }, - function() { - $(this).parent().nextAll('.source_code').slideUp(100); - $(this).text("View source"); - }); -} - -function createDefineLinks() { - var tHeight = 0; - $('.defines').after(" more..."); - $('.toggleDefines').toggle(function() { - tHeight = $(this).parent().prev().height(); - $(this).prev().css('display', 'inline'); - $(this).parent().prev().height($(this).parent().height()); - $(this).text("(less)"); - }, - function() { - $(this).prev().hide(); - $(this).parent().prev().height(tHeight); - $(this).text("more..."); - }); -} - -function createFullTreeLinks() { - var tHeight = 0; - $('.inheritanceTree').toggle(function() { - tHeight = $(this).parent().prev().height(); - $(this).parent().toggleClass('showAll'); - $(this).text("(hide)"); - $(this).parent().prev().height($(this).parent().height()); - }, - function() { - $(this).parent().toggleClass('showAll'); - $(this).parent().prev().height(tHeight); - $(this).text("show all"); - }); -} - -function searchFrameButtons() { - $('.full_list_link').click(function() { - toggleSearchFrame(this, $(this).attr('href')); - return false; - }); - window.addEventListener('message', function(e) { - if (e.data === 'navEscape') { - $('#nav').slideUp(100); - $('#search a').removeClass('active inactive'); - $(window).focus(); - } - }); - - $(window).resize(function() { - if ($('#search:visible').length === 0) { - $('#nav').removeAttr('style'); - $('#search a').removeClass('active inactive'); - $(window).focus(); - } - }); -} - -function toggleSearchFrame(id, link) { - var frame = $('#nav'); - $('#search a').removeClass('active').addClass('inactive'); - if (frame.attr('src') === link && frame.css('display') !== "none") { - frame.slideUp(100); - $('#search a').removeClass('active inactive'); - } - else { - $(id).addClass('active').removeClass('inactive'); - if (frame.attr('src') !== link) frame.attr('src', link); - frame.slideDown(100); - } -} - -function linkSummaries() { - $('.summary_signature').click(function() { - document.location = $(this).find('a').attr('href'); - }); -} - -function summaryToggle() { - $('.summary_toggle').click(function(e) { - e.preventDefault(); - localStorage.summaryCollapsed = $(this).text(); - $('.summary_toggle').each(function() { - $(this).text($(this).text() == "collapse" ? "expand" : "collapse"); - var next = $(this).parent().parent().nextAll('ul.summary').first(); - if (next.hasClass('compact')) { - next.toggle(); - next.nextAll('ul.summary').first().toggle(); - } - else if (next.hasClass('summary')) { - var list = $('
      '); - list.html(next.html()); - list.find('.summary_desc, .note').remove(); - list.find('a').each(function() { - $(this).html($(this).find('strong').html()); - $(this).parent().html($(this)[0].outerHTML); - }); - next.before(list); - next.toggle(); - } - }); - return false; - }); - if (localStorage.summaryCollapsed == "collapse") { - $('.summary_toggle').first().click(); - } else { localStorage.summaryCollapsed = "expand"; } -} - -function generateTOC() { - if ($('#filecontents').length === 0) return; - var _toc = $('
        '); - var show = false; - var toc = _toc; - var counter = 0; - var tags = ['h2', 'h3', 'h4', 'h5', 'h6']; - var i; - if ($('#filecontents h1').length > 1) tags.unshift('h1'); - for (i = 0; i < tags.length; i++) { tags[i] = '#filecontents ' + tags[i]; } - var lastTag = parseInt(tags[0][1], 10); - $(tags.join(', ')).each(function() { - if ($(this).parents('.method_details .docstring').length != 0) return; - if (this.id == "filecontents") return; - show = true; - var thisTag = parseInt(this.tagName[1], 10); - if (this.id.length === 0) { - var proposedId = $(this).attr('toc-id'); - if (typeof(proposedId) != "undefined") this.id = proposedId; - else { - var proposedId = $(this).text().replace(/[^a-z0-9-]/ig, '_'); - if ($('#' + proposedId).length > 0) { proposedId += counter; counter++; } - this.id = proposedId; - } - } - if (thisTag > lastTag) { - for (i = 0; i < thisTag - lastTag; i++) { - var tmp = $('
          '); toc.append(tmp); toc = tmp; - } - } - if (thisTag < lastTag) { - for (i = 0; i < lastTag - thisTag; i++) toc = toc.parent(); - } - var title = $(this).attr('toc-title'); - if (typeof(title) == "undefined") title = $(this).text(); - toc.append('
        1. ' + title + '
          2. '); - lastTag = thisTag; - }); - if (!show) return; - html = ''; - $('#content').prepend(html); - $('#toc').append(_toc); - $('#toc .hide_toc').toggle(function() { - $('#toc .top').slideUp('fast'); - $('#toc').toggleClass('hidden'); - $('#toc .title small').toggle(); - }, function() { - $('#toc .top').slideDown('fast'); - $('#toc').toggleClass('hidden'); - $('#toc .title small').toggle(); - }); -} - -function navResizeFn(e) { - if (e.which !== 1) { - navResizeFnStop(); - return; - } - - sessionStorage.navWidth = e.pageX.toString(); - $('.nav_wrap').css('width', e.pageX); - $('.nav_wrap').css('-ms-flex', 'inherit'); -} - -function navResizeFnStop() { - $(window).unbind('mousemove', navResizeFn); - window.removeEventListener('message', navMessageFn, false); -} - -function navMessageFn(e) { - if (e.data.action === 'mousemove') navResizeFn(e.data.event); - if (e.data.action === 'mouseup') navResizeFnStop(); -} - -function navResizer() { - $('#resizer').mousedown(function(e) { - e.preventDefault(); - $(window).mousemove(navResizeFn); - window.addEventListener('message', navMessageFn, false); - }); - $(window).mouseup(navResizeFnStop); - - if (sessionStorage.navWidth) { - navResizeFn({which: 1, pageX: parseInt(sessionStorage.navWidth, 10)}); - } -} - -function navExpander() { - var done = false, timer = setTimeout(postMessage, 500); - function postMessage() { - if (done) return; - clearTimeout(timer); - var opts = { action: 'expand', path: pathId }; - document.getElementById('nav').contentWindow.postMessage(opts, '*'); - done = true; - } - - window.addEventListener('message', function(event) { - if (event.data === 'navReady') postMessage(); - return false; - }, false); -} - -function mainFocus() { - var hash = window.location.hash; - if (hash !== '' && $(hash)[0]) { - $(hash)[0].scrollIntoView(); - } - - setTimeout(function() { $('#main').focus(); }, 10); -} - -$(document).ready(function() { - navResizer(); - navExpander(); - createSourceLinks(); - createDefineLinks(); - createFullTreeLinks(); - searchFrameButtons(); - linkSummaries(); - summaryToggle(); - generateTOC(); - mainFocus(); -}); - -})(); diff --git a/modules/utilities/unix/web_frameworks/php/docs/js/full_list.js b/modules/utilities/unix/web_frameworks/php/docs/js/full_list.js deleted file mode 100644 index 59069c5e2..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/js/full_list.js +++ /dev/null @@ -1,216 +0,0 @@ -(function() { - -var $clicked = $(null); -var searchTimeout = null; -var searchCache = []; -var caseSensitiveMatch = false; -var ignoreKeyCodeMin = 8; -var ignoreKeyCodeMax = 46; -var commandKey = 91; - -RegExp.escape = function(text) { - return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"); -} - -function escapeShortcut() { - $(document).keydown(function(evt) { - if (evt.which == 27) { - window.parent.postMessage('navEscape', '*'); - } - }); -} - -function navResizer() { - $(window).mousemove(function(e) { - window.parent.postMessage({ - action: 'mousemove', event: {pageX: e.pageX, which: e.which} - }, '*'); - }).mouseup(function(e) { - window.parent.postMessage({action: 'mouseup'}, '*'); - }); - window.parent.postMessage("navReady", "*"); -} - -function clearSearchTimeout() { - clearTimeout(searchTimeout); - searchTimeout = null; -} - -function enableLinks() { - // load the target page in the parent window - $('#full_list li').on('click', function(evt) { - $('#full_list li').removeClass('clicked'); - $clicked = $(this); - $clicked.addClass('clicked'); - evt.stopPropagation(); - - if (evt.target.tagName === 'A') return true; - - var elem = $clicked.find('> .item .object_link a')[0]; - var e = evt.originalEvent; - var newEvent = new MouseEvent(evt.originalEvent.type); - newEvent.initMouseEvent(e.type, e.canBubble, e.cancelable, e.view, e.detail, e.screenX, e.screenY, e.clientX, e.clientY, e.ctrlKey, e.altKey, e.shiftKey, e.metaKey, e.button, e.relatedTarget); - elem.dispatchEvent(newEvent); - evt.preventDefault(); - return false; - }); -} - -function enableToggles() { - // show/hide nested classes on toggle click - $('#full_list a.toggle').on('click', function(evt) { - evt.stopPropagation(); - evt.preventDefault(); - $(this).parent().parent().toggleClass('collapsed'); - highlight(); - }); -} - -function populateSearchCache() { - $('#full_list li .item').each(function() { - var $node = $(this); - var $link = $node.find('.object_link a'); - if ($link.length > 0) { - searchCache.push({ - node: $node, - link: $link, - name: $link.text(), - fullName: $link.attr('title').split(' ')[0] - }); - } - }); -} - -function enableSearch() { - $('#search input').keyup(function(event) { - if (ignoredKeyPress(event)) return; - if (this.value === "") { - clearSearch(); - } else { - performSearch(this.value); - } - }); - - $('#full_list').after(""); -} - -function ignoredKeyPress(event) { - if ( - (event.keyCode > ignoreKeyCodeMin && event.keyCode < ignoreKeyCodeMax) || - (event.keyCode == commandKey) - ) { - return true; - } else { - return false; - } -} - -function clearSearch() { - clearSearchTimeout(); - $('#full_list .found').removeClass('found').each(function() { - var $link = $(this).find('.object_link a'); - $link.text($link.text()); - }); - $('#full_list, #content').removeClass('insearch'); - $clicked.parents().removeClass('collapsed'); - highlight(); -} - -function performSearch(searchString) { - clearSearchTimeout(); - $('#full_list, #content').addClass('insearch'); - $('#noresults').text('').hide(); - partialSearch(searchString, 0); -} - -function partialSearch(searchString, offset) { - var lastRowClass = ''; - var i = null; - for (i = offset; i < Math.min(offset + 50, searchCache.length); i++) { - var item = searchCache[i]; - var searchName = (searchString.indexOf('::') != -1 ? item.fullName : item.name); - var matchString = buildMatchString(searchString); - var matchRegexp = new RegExp(matchString, caseSensitiveMatch ? "" : "i"); - if (searchName.match(matchRegexp) == null) { - item.node.removeClass('found'); - item.link.text(item.link.text()); - } - else { - item.node.addClass('found'); - item.node.removeClass(lastRowClass).addClass(lastRowClass == 'r1' ? 'r2' : 'r1'); - lastRowClass = item.node.hasClass('r1') ? 'r1' : 'r2'; - item.link.html(item.name.replace(matchRegexp, "$&")); - } - } - if(i == searchCache.length) { - searchDone(); - } else { - searchTimeout = setTimeout(function() { - partialSearch(searchString, i); - }, 0); - } -} - -function searchDone() { - searchTimeout = null; - highlight(); - if ($('#full_list li:visible').size() === 0) { - $('#noresults').text('No results were found.').hide().fadeIn(); - } else { - $('#noresults').text('').hide(); - } - $('#content').removeClass('insearch'); -} - -function buildMatchString(searchString, event) { - caseSensitiveMatch = searchString.match(/[A-Z]/) != null; - var regexSearchString = RegExp.escape(searchString); - if (caseSensitiveMatch) { - regexSearchString += "|" + - $.map(searchString.split(''), function(e) { return RegExp.escape(e); }). - join('.+?'); - } - return regexSearchString; -} - -function highlight() { - $('#full_list li:visible').each(function(n) { - $(this).removeClass('even odd').addClass(n % 2 == 0 ? 'odd' : 'even'); - }); -} - -/** - * Expands the tree to the target element and its immediate - * children. - */ -function expandTo(path) { - var $target = $(document.getElementById('object_' + path)); - $target.addClass('clicked'); - $target.removeClass('collapsed'); - $target.parentsUntil('#full_list', 'li').removeClass('collapsed'); - if($target[0]) { - window.scrollTo(window.scrollX, $target.offset().top - 250); - highlight(); - } -} - -function windowEvents(event) { - var msg = event.data; - if (msg.action === "expand") { - expandTo(msg.path); - } - return false; -} - -window.addEventListener("message", windowEvents, false); - -$(document).ready(function() { - escapeShortcut(); - navResizer(); - enableLinks(); - enableToggles(); - populateSearchCache(); - enableSearch(); -}); - -})(); diff --git a/modules/utilities/unix/web_frameworks/php/docs/js/jquery.js b/modules/utilities/unix/web_frameworks/php/docs/js/jquery.js deleted file mode 100644 index 198b3ff07..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/js/jquery.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v1.7.1 jquery.com | jquery.org/license */ -(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"":"")+""),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;g=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
    a",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="
    "+""+"
    ",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="
    t
    ",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="
    ",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; -f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&i.push({elem:this,matches:d.slice(e)});for(j=0;j0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

    ";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
    ";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"
    ","
    "],thead:[1,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],col:[2,"","
    "],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
    ","
    "]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() -{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
    ").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_class_list.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_class_list.html deleted file mode 100644 index 7b465fabb..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_class_list.html +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - - - - - - - - - - - - - Puppet Class List - - - -
    -
    -

    Puppet Class List

    - - - -
    - - -
    - - diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php.html deleted file mode 100644 index 89fe3ec2d..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php.html +++ /dev/null @@ -1,906 +0,0 @@ - - - - - - - Puppet Class: php - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php

    -
    - -
    -
    Inherits:
    -
    ::php::params
    -
    - - -
    -
    Defined in:
    -
    - manifests/init.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Base class with global configuration parameters that pulls in all -enabled components.

    - -

    === Parameters

    - -

    [ensure] - Specify which version of PHP packages to install, defaults to 'present'. - Please note that 'absent' to remove packages is not supported!

    - -

    [manage_repos] - Include repository (dotdeb, ppa, etc.) to install recent PHP from

    - -

    [fpm] - Install and configure php-fpm

    - -

    [fpm_service_enable] - Enable/disable FPM service

    - -

    [fpm_service_ensure] - Ensure FPM service is either 'running' or 'stopped'

    - -

    [fpm_service_name] - This is the name of the php-fpm service. It defaults to reasonable OS - defaults but can be different in case of using php7.0/other OS/custom fpm service

    - -

    [fpm_service_provider] - This is the name of the service provider, in case there is a non - OS default service provider used to start FPM. - Defaults to 'undef', pick system defaults.

    - -

    [fpm_pools] - Hash of php::fpm::pool resources that will be created. Defaults - to a single php::fpm::pool named www with default parameters.

    - -

    [fpm_global_pool_settings] - Hash of defaults params php::fpm::pool resources that will be created. - Defaults to empty hash.

    - -

    [fpm_inifile] - Path to php.ini for fpm

    - -

    [fpm_package] - Name of fpm package to install

    - -

    [fpm_user] - The user that php-fpm should run as

    - -

    [fpm_group] - The group that php-fpm should run as

    - -

    [dev] - Install php header files, needed to install pecl modules

    - -

    [composer] - Install and auto-update composer

    - -

    [pear] - Install PEAR

    - -

    [phpunit] - Install phpunit

    - -

    [apache_config] - Manage apache's mod_php configuration

    - -

    [proxy_type] - proxy server type (none|http|https|ftp)

    - -

    [proxy_server] - specify a proxy server, with port number if needed. ie: https://example.com:8080.

    - -

    [extensions] - Install PHP extensions, this is overwritten by hiera hash php::extensions

    - -

    [package_prefix] - This is the prefix for constructing names of php packages. This defaults - to a sensible default depending on your operating system, like 'php-' or - 'php5-'.

    - -

    [config_root_ini] - This is the path to the config .ini files of the extensions. This defaults - to a sensible default depending on your operating system, like - '/etc/php5/mods-available' or '/etc/php5/conf.d'.

    - -

    [config_root_inifile] - The path to the global php.ini file. This defaults to a sensible default - depending on your operating system.

    - -

    [ext_tool_enable] - Absolute path to php tool for enabling extensions in debian/ubuntu systems. - This defaults to '/usr/sbin/php5enmod'.

    - -

    [ext_tool_query] - Absolute path to php tool for querying information about extensions in - debian/ubuntu systems. This defaults to '/usr/sbin/php5query'.

    - -

    [ext_tool_enabled] - Enable or disable the use of php tools on debian based systems - debian/ubuntu systems. This defaults to 'true'.

    - -

    [log_owner] - The php-fpm log owner

    - -

    [log_group] - The group owning php-fpm logs

    - -

    [embedded] - Enable embedded SAPI

    - -

    [pear_ensure] - The package ensure of PHP pear to install and run pear auto_discover

    - -

    [settings]

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - ensure - - - (String) - - - (defaults to: $::php::params::ensure) - - -
      • - -
    • - - manage_repos - - - (Boolean) - - - (defaults to: $::php::params::manage_repos) - - -
      • - -
    • - - fpm - - - (Boolean) - - - (defaults to: true) - - -
      • - -
    • - - fpm_service_enable - - - (Any) - - - (defaults to: $::php::params::fpm_service_enable) - - -
      • - -
    • - - fpm_service_ensure - - - (Any) - - - (defaults to: $::php::params::fpm_service_ensure) - - -
      • - -
    • - - fpm_service_name - - - (Any) - - - (defaults to: $::php::params::fpm_service_name) - - -
      • - -
    • - - fpm_service_provider - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - fpm_pools - - - (Hash) - - - (defaults to: { 'www' => {} }) - - -
      • - -
    • - - fpm_global_pool_settings - - - (Hash) - - - (defaults to: {}) - - -
      • - -
    • - - fpm_inifile - - - (Any) - - - (defaults to: $::php::params::fpm_inifile) - - -
      • - -
    • - - fpm_package - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - fpm_user - - - (Any) - - - (defaults to: $::php::params::fpm_user) - - -
      • - -
    • - - fpm_group - - - (Any) - - - (defaults to: $::php::params::fpm_group) - - -
      • - -
    • - - embedded - - - (Boolean) - - - (defaults to: false) - - -
      • - -
    • - - dev - - - (Boolean) - - - (defaults to: true) - - -
      • - -
    • - - composer - - - (Boolean) - - - (defaults to: true) - - -
      • - -
    • - - pear - - - (Boolean) - - - (defaults to: true) - - -
      • - -
    • - - pear_ensure - - - (String) - - - (defaults to: $::php::params::pear_ensure) - - -
      • - -
    • - - phpunit - - - (Boolean) - - - (defaults to: false) - - -
      • - -
    • - - apache_config - - - (Boolean) - - - (defaults to: false) - - -
      • - -
    • - - proxy_type - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - proxy_server - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - extensions - - - (Hash) - - - (defaults to: {}) - - -
      • - -
    • - - settings - - - (Hash) - - - (defaults to: {}) - - -
      • - -
    • - - package_prefix - - - (Any) - - - (defaults to: $::php::params::package_prefix) - - -
      • - -
    • - - config_root_ini - - - (Stdlib::Absolutepath) - - - (defaults to: $::php::params::config_root_ini) - - -
      • - -
    • - - config_root_inifile - - - (Stdlib::Absolutepath) - - - (defaults to: $::php::params::config_root_inifile) - - -
      • - -
    • - - ext_tool_enable - - - (Optional[Stdlib::Absolutepath]) - - - (defaults to: $::php::params::ext_tool_enable) - - -
      • - -
    • - - ext_tool_query - - - (Optional[Stdlib::Absolutepath]) - - - (defaults to: $::php::params::ext_tool_query) - - -
      • - -
    • - - ext_tool_enabled - - - (Boolean) - - - (defaults to: $::php::params::ext_tool_enabled) - - -
      • - -
    • - - log_owner - - - (String) - - - (defaults to: $::php::params::fpm_user) - - -
      • - -
    • - - log_group - - - (String) - - - (defaults to: $::php::params::fpm_group) - - -
      • - -
    - - -
    -
    - - - - -
    - 
    -
-
-115
-116
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163
-164
-165
-166
-167
-168
-169
-170
-171
-172
-173
-174
-175
-176
-177
-178
-179
-180
-181
-182
-183
-184
-185
-186
-187
-188
-189
-190
-191
-192
-193
-194
-195
-196
-197
-198
-199
-200
-201
-202
-203
-204
-205
-206
-207
-208
-209
-210
-211
-212
-213
-214
-215
-216
-217
-218
-219
-220
-221
-222
-223
-224
-225
-226
-227
-228
-229
-230
-231
-232
-233
-234
-235
-236
-237
-238
-239
-240
-241
-242
-243
-244
-245
    -     		- 
    # File 'manifests/init.pp', line 115
-
-class php (
-  String $ensure                                  = $::php::params::ensure,
-  Boolean $manage_repos                           = $::php::params::manage_repos,
-  Boolean $fpm                                    = true,
-  $fpm_service_enable                             = $::php::params::fpm_service_enable,
-  $fpm_service_ensure                             = $::php::params::fpm_service_ensure,
-  $fpm_service_name                               = $::php::params::fpm_service_name,
-  $fpm_service_provider                           = undef,
-  Hash $fpm_pools                                 = { 'www' => {} },
-  Hash $fpm_global_pool_settings                  = {},
-  $fpm_inifile                                    = $::php::params::fpm_inifile,
-  $fpm_package                                    = undef,
-  $fpm_user                                       = $::php::params::fpm_user,
-  $fpm_group                                      = $::php::params::fpm_group,
-  Boolean $embedded                               = false,
-  Boolean $dev                                    = true,
-  Boolean $composer                               = true,
-  Boolean $pear                                   = true,
-  String $pear_ensure                             = $::php::params::pear_ensure,
-  Boolean $phpunit                                = false,
-  Boolean $apache_config                          = false,
-  $proxy_type                                     = undef,
-  $proxy_server                                   = undef,
-  Hash $extensions                                = {},
-  Hash $settings                                  = {},
-  $package_prefix                                 = $::php::params::package_prefix,
-  Stdlib::Absolutepath $config_root_ini           = $::php::params::config_root_ini,
-  Stdlib::Absolutepath $config_root_inifile       = $::php::params::config_root_inifile,
-  Optional[Stdlib::Absolutepath] $ext_tool_enable = $::php::params::ext_tool_enable,
-  Optional[Stdlib::Absolutepath] $ext_tool_query  = $::php::params::ext_tool_query,
-  Boolean $ext_tool_enabled                       = $::php::params::ext_tool_enabled,
-  String $log_owner                               = $::php::params::fpm_user,
-  String $log_group                               = $::php::params::fpm_group,
-) inherits ::php::params {
-
-  $real_fpm_package = pick($fpm_package, "${package_prefix}${::php::params::fpm_package_suffix}")
-
-  # Deep merge global php settings
-  $real_settings = deep_merge($settings, hiera_hash('php::settings', {}))
-
-  # Deep merge global php extensions
-  $real_extensions = deep_merge($extensions, hiera_hash('php::extensions', {}))
-
-  # Deep merge fpm_pools
-  $real_fpm_pools = deep_merge($fpm_pools, hiera_hash('php::fpm_pools', {}))
-
-  # Deep merge fpm_global_pool_settings
-  $real_fpm_global_pool_settings = deep_merge($fpm_global_pool_settings, hiera_hash('php::fpm_global_pool_settings', {}))
-
-  if $manage_repos {
-    class { '::php::repo': }
-    -> Anchor['php::begin']
-  }
-
-  anchor { 'php::begin': }
-    -> class { '::php::packages': }
-    -> class { '::php::cli':
-      settings => $real_settings,
-    }
-  -> anchor { 'php::end': }
-
-  # Configure global PHP settings in php.ini
-  if $facts['os']['family'] != 'Debian' {
-    Class['php::packages']
-    -> class {'::php::global':
-      settings => $real_settings,
-    }
-    -> Anchor['php::end']
-  }
-
-  if $fpm { contain '::php::fpm' }
-  if $embedded {
-    if $facts['os']['family'] == 'RedHat' and $fpm {
-      # Both fpm and embeded SAPIs are using same php.ini
-      fail('Enabling both cli and embedded sapis is not currently supported')
-    }
-
-    Anchor['php::begin']
-      -> class { '::php::embedded':
-        settings => $real_settings,
-      }
-    -> Anchor['php::end']
-  }
-  if $dev {
-    Anchor['php::begin']
-      -> class { '::php::dev': }
-    -> Anchor['php::end']
-  }
-  if $composer {
-    Anchor['php::begin']
-      -> class { '::php::composer':
-        proxy_type   => $proxy_type,
-        proxy_server => $proxy_server,
-      }
-    -> Anchor['php::end']
-  }
-  if $pear {
-    Anchor['php::begin']
-      -> class { '::php::pear':
-        ensure => $pear_ensure,
-      }
-    -> Anchor['php::end']
-  }
-  if $phpunit {
-    Anchor['php::begin']
-      -> class { '::php::phpunit': }
-    -> Anchor['php::end']
-  }
-  if $apache_config {
-    Anchor['php::begin']
-      -> class { '::php::apache_config':
-        settings => $real_settings,
-      }
-    -> Anchor['php::end']
-  }
-
-  create_resources('::php::extension', $real_extensions, {
-    require => Class['::php::cli'],
-    before  => Anchor['php::end']
-  })
-
-  # On FreeBSD purge the system-wide extensions.ini. It is going
-  # to be replaced with per-module configuration files.
-  if $::osfamily == 'FreeBSD' {
-    # Purge the system-wide extensions.ini
-    file { '/usr/local/etc/php/extensions.ini':
-      ensure  => absent,
-      require => Class['::php::packages'],
-    }
-  }
-}
    -
    - - - - - - - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aapache_config.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aapache_config.html deleted file mode 100644 index a26cdb1d1..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aapache_config.html +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - Puppet Class: php::apache_config - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::apache_config

    -
    - -
    -
    Inherits:
    -
    ::php::params
    -
    - - -
    -
    Defined in:
    -
    - manifests/apache_config.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Install and configure php apache settings

    - -

    === Parameters

    - -

    [inifile] - The path to the ini php-apache ini file

    - -

    [settings] - Hash with nested hash of key => value to set in inifile

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - inifile - - - (Stdlib::Absolutepath) - - - (defaults to: $::php::params::apache_inifile) - - -
      • - -
    • - - settings - - - (Hash) - - - (defaults to: {}) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
    -     		- 
    # File 'manifests/apache_config.pp', line 11
-
-class php::apache_config(
-  Stdlib::Absolutepath $inifile = $::php::params::apache_inifile,
-  Hash $settings                = {}
-) inherits ::php::params {
-
-  if $caller_module_name != $module_name {
-    warning('php::apache_config is private')
-  }
-
-  $real_settings = deep_merge($settings, hiera_hash('php::apache::settings', {}))
-
-  ::php::config { 'apache':
-    file   => $inifile,
-    config => $real_settings,
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Acli.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Acli.html deleted file mode 100644 index e58cc63cf..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Acli.html +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - Puppet Class: php::cli - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::cli

    -
    - -
    -
    Inherits:
    -
    ::php::params
    -
    - - -
    -
    Defined in:
    -
    - manifests/cli.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Install and configure php CLI

    - -

    === Parameters

    - -

    [inifile] - The path to the ini php5-cli ini file

    - -

    [settings] - Hash with nested hash of key => value to set in inifile

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - inifile - - - (Stdlib::Absolutepath) - - - (defaults to: $::php::params::cli_inifile) - - -
      • - -
    • - - settings - - - (Hash) - - - (defaults to: {}) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
    -     		- 
    # File 'manifests/cli.pp', line 11
-
-class php::cli(
-  Stdlib::Absolutepath $inifile = $::php::params::cli_inifile,
-  Hash $settings                = {}
-) inherits ::php::params {
-
-  if $caller_module_name != $module_name {
-    warning('php::cli is private')
-  }
-
-  $real_settings = deep_merge($settings, hiera_hash('php::cli::settings', {}))
-
-  ::php::config { 'cli':
-    file   => $inifile,
-    config => $real_settings,
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Acomposer.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Acomposer.html deleted file mode 100644 index 7dd52e23c..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Acomposer.html +++ /dev/null @@ -1,302 +0,0 @@ - - - - - - - Puppet Class: php::composer - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::composer

    -
    - -
    -
    Inherits:
    -
    ::php::params
    -
    - - -
    -
    Defined in:
    -
    - manifests/composer.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Install composer package manager

    - -

    === Parameters

    - -

    [source] - Holds URL to the Composer source file

    - -

    [path] - Holds path to the Composer executable

    - -

    [proxy_type] - proxy server type (none|http|https|ftp)

    - -

    [proxy_server] - specify a proxy server, with port number if needed. ie: https://example.com:8080.

    - -

    [auto_update] - Defines if composer should be auto updated

    - -

    [max_age] - Defines the time in days after which an auto-update gets executed

    - -

    [root_group] - UNIX group of the root user

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - source - - - (String) - - - (defaults to: $::php::params::composer_source) - - -
      • - -
    • - - path - - - (Stdlib::Absolutepath) - - - (defaults to: $::php::params::composer_path) - - -
      • - -
    • - - proxy_type - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - proxy_server - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - auto_update - - - (Boolean) - - - (defaults to: true) - - -
      • - -
    • - - max_age - - - (Integer) - - - (defaults to: $::php::params::composer_max_age) - - -
      • - -
    • - - root_group - - - (Variant[Integer, String]) - - - (defaults to: $::php::params::root_group) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
    -     		- 
    # File 'manifests/composer.pp', line 26
-
-class php::composer (
-  String $source                       = $::php::params::composer_source,
-  Stdlib::Absolutepath $path           = $::php::params::composer_path,
-  $proxy_type                          = undef,
-  $proxy_server                        = undef,
-  Boolean $auto_update                 = true,
-  Integer $max_age                     = $::php::params::composer_max_age,
-  Variant[Integer, String] $root_group = $::php::params::root_group,
-) inherits ::php::params {
-
-  if $caller_module_name != $module_name {
-    warning('php::composer is private')
-  }
-
-  archive { 'download composer':
-    path         => $path,
-    source       => $source,
-    proxy_type   => $proxy_type,
-    proxy_server => $proxy_server,
-  }
-  -> file { $path:
-    mode  => '0555',
-    owner => root,
-    group => $root_group,
-  }
-
-  if $auto_update {
-    class { '::php::composer::auto_update':
-      max_age      => $max_age,
-      source       => $source,
-      path         => $path,
-      proxy_type   => $proxy_type,
-      proxy_server => $proxy_server,
-    }
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Acomposer_3A_3Aauto_update.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Acomposer_3A_3Aauto_update.html deleted file mode 100644 index 16c208584..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Acomposer_3A_3Aauto_update.html +++ /dev/null @@ -1,246 +0,0 @@ - - - - - - - Puppet Class: php::composer::auto_update - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::composer::auto_update

    -
    - - -
    -
    Defined in:
    -
    - manifests/composer/auto_update.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Install composer package manager

    - -

    === Parameters

    - -

    [max_age] - Defines number of days after which Composer should be updated

    - -

    [source] - Holds URL to the Composer source file

    - -

    [path] - Holds path to the Composer executable

    - -

    [proxy_type] - proxy server type (none|http|https|ftp)

    - -

    [proxy_server] - specify a proxy server, with port number if needed. ie: https://example.com:8080.

    - -

    === Examples

    - -

    include php::composer::auto_update - class { "php::composer::auto_update": - "max_age" => 90 - }

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - max_age - - - (Any) - - - -
      • - -
    • - - source - - - (Any) - - - -
      • - -
    • - - path - - - (Any) - - - -
      • - -
    • - - proxy_type - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - proxy_server - - - (Any) - - - (defaults to: undef) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
    -     		- 
    # File 'manifests/composer/auto_update.pp', line 28
-
-class php::composer::auto_update (
-  $max_age,
-  $source,
-  $path,
-  $proxy_type   = undef,
-  $proxy_server = undef,
-) {
-
-  if $caller_module_name != $module_name {
-    warning('php::composer::auto_update is private')
-  }
-
-  if $proxy_type and $proxy_server {
-    $env = [ 'HOME=/root', "${proxy_type}_proxy=${proxy_server}" ]
-  } else {
-    $env = [ 'HOME=/root' ]
-  }
-
-  exec { 'update composer':
-    command     => "${path} --no-interaction --quiet self-update",
-    environment => $env,
-    onlyif      => "test `find '${path}' -mtime +${max_age}`",
-    path        => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/', '/usr/local/bin', '/usr/local/sbin' ],
-    require     => [File[$path], Class['::php::cli']],
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Adev.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Adev.html deleted file mode 100644 index 6e6ddcf8a..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Adev.html +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - Puppet Class: php::dev - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::dev

    -
    - -
    -
    Inherits:
    -
    ::php::params
    -
    - - -
    -
    Defined in:
    -
    - manifests/dev.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Install the development package with headers for PHP

    - -

    === Parameters

    - -

    [ensure] - The PHP ensure of PHP dev to install

    - -

    [package] - The package name for the PHP development files

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - ensure - - - (String) - - - (defaults to: $::php::ensure) - - -
      • - -
    • - - package - - - (String) - - - (defaults to: "${::php::package_prefix}${::php::params::dev_package_suffix}") - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
    -     		- 
    # File 'manifests/dev.pp', line 11
-
-class php::dev(
-  String $ensure  = $::php::ensure,
-  String $package = "${::php::package_prefix}${::php::params::dev_package_suffix}",
-) inherits ::php::params {
-
-  if $caller_module_name != $module_name {
-    warning('php::dev is private')
-  }
-
-  # On FreeBSD there is no 'devel' package.
-  $real_package = $facts['os']['family'] ? {
-    'FreeBSD' => [],
-    default   => $package,
-  }
-
-  # Default PHP come with xml module and no seperate package for it
-  if $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '16.04') >= 0  {
-    ensure_packages(["${php::package_prefix}xml"], {
-      ensure  => present,
-      require => Class['::apt::update'],
-    })
-
-    package { $real_package:
-      ensure  => $ensure,
-      require => Class['::php::packages'],
-    }
-  } else {
-    package { $real_package:
-      ensure  => $ensure,
-      require => Class['::php::packages'],
-    }
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aembedded.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aembedded.html deleted file mode 100644 index 050916d14..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aembedded.html +++ /dev/null @@ -1,244 +0,0 @@ - - - - - - - Puppet Class: php::embedded - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::embedded

    -
    - -
    -
    Inherits:
    -
    ::php::params
    -
    - - -
    -
    Defined in:
    -
    - manifests/embedded.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Install and configure php embedded SAPI

    - -

    === Parameters

    - -

    [inifile] - The path to the ini php5-embeded ini file

    - -

    [settings] - Hash with nested hash of key => value to set in inifile

    - -

    [package] - Specify which package to install

    - -

    [ensure] - Specify which version of the package to install

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - ensure - - - (String) - - - (defaults to: $::php::ensure) - - -
      • - -
    • - - package - - - (String) - - - (defaults to: "${::php::package_prefix}${::php::params::embedded_package_suffix}") - - -
      • - -
    • - - inifile - - - (Stdlib::Absolutepath) - - - (defaults to: $::php::params::embedded_inifile) - - -
      • - -
    • - - settings - - - (Hash) - - - (defaults to: {}) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
    -     		- 
    # File 'manifests/embedded.pp', line 17
-
-class php::embedded(
-  String $ensure                = $::php::ensure,
-  String $package               = "${::php::package_prefix}${::php::params::embedded_package_suffix}",
-  Stdlib::Absolutepath $inifile = $::php::params::embedded_inifile,
-  Hash $settings                = {},
-) inherits ::php::params {
-
-  if $caller_module_name != $module_name {
-    warning('php::embedded is private')
-  }
-
-  $real_settings = deep_merge(
-    $settings,
-    hiera_hash('php::embedded::settings', {})
-  )
-
-  $real_package = $facts['os']['family'] ? {
-    'Debian' => "lib${package}",
-    default   => $package,
-  }
-
-  package { $real_package:
-    ensure  => $ensure,
-    require => Class['::php::packages'],
-  }
-  -> ::php::config { 'embedded':
-    file   => $inifile,
-    config => $real_settings,
-  }
-
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Afpm.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Afpm.html deleted file mode 100644 index 0652b66fe..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Afpm.html +++ /dev/null @@ -1,482 +0,0 @@ - - - - - - - Puppet Class: php::fpm - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::fpm

    -
    - - -
    -
    Defined in:
    -
    - manifests/fpm.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Install and configure mod_php for fpm

    - -

    === Parameters

    - -

    [user] - The user that php-fpm should run as

    - -

    [group] - The group that php-fpm should run as

    - -

    [service_enable] - Enable/disable FPM service

    - -

    [service_ensure] - Ensure FPM service is either 'running' or 'stopped'

    - -

    [service_name] - This is the name of the php-fpm service. It defaults to reasonable OS - defaults but can be different in case of using php7.0/other OS/custom fpm service

    - -

    [service_provider] - This is the name of the service provider, in case there is a non - OS default service provider used to start FPM. - Defaults to 'undef', pick system defaults.

    - -

    [pools] - Hash of php::fpm::pool resources that will be created. Defaults - to a single php::fpm::pool named www with default parameters.

    - -

    [log_owner] - The php-fpm log owner

    - -

    [log_group] - The group owning php-fpm logs

    - -

    [package] - Specify which package to install

    - -

    [ensure] - Specify which version of the package to install

    - -

    [inifile] - Path to php.ini for fpm

    - -

    [settings] - fpm settings hash

    - -

    [global_pool_settings] - Hash of defaults params php::fpm::pool resources that will be created. - Defaults is empty hash.

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - ensure - - - (String) - - - (defaults to: $::php::ensure) - - -
      • - -
    • - - user - - - (Any) - - - (defaults to: $::php::fpm_user) - - -
      • - -
    • - - group - - - (Any) - - - (defaults to: $::php::fpm_group) - - -
      • - -
    • - - service_ensure - - - (Any) - - - (defaults to: $::php::fpm_service_ensure) - - -
      • - -
    • - - service_enable - - - (Any) - - - (defaults to: $::php::fpm_service_enable) - - -
      • - -
    • - - service_name - - - (Any) - - - (defaults to: $::php::fpm_service_name) - - -
      • - -
    • - - service_provider - - - (Any) - - - (defaults to: $::php::fpm_service_provider) - - -
      • - -
    • - - package - - - (String) - - - (defaults to: $::php::real_fpm_package) - - -
      • - -
    • - - inifile - - - (Stdlib::Absolutepath) - - - (defaults to: $::php::fpm_inifile) - - -
      • - -
    • - - settings - - - (Hash) - - - (defaults to: $::php::real_settings) - - -
      • - -
    • - - global_pool_settings - - - (Any) - - - (defaults to: $::php::real_fpm_global_pool_settings) - - -
      • - -
    • - - pools - - - (Hash) - - - (defaults to: $::php::real_fpm_pools) - - -
      • - -
    • - - log_owner - - - (Any) - - - (defaults to: $::php::log_owner) - - -
      • - -
    • - - log_group - - - (Any) - - - (defaults to: $::php::log_group) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
    -     		- 
    # File 'manifests/fpm.pp', line 52
-
-class php::fpm (
-  String $ensure                = $::php::ensure,
-  $user                         = $::php::fpm_user,
-  $group                        = $::php::fpm_group,
-  $service_ensure               = $::php::fpm_service_ensure,
-  $service_enable               = $::php::fpm_service_enable,
-  $service_name                 = $::php::fpm_service_name,
-  $service_provider             = $::php::fpm_service_provider,
-  String $package               = $::php::real_fpm_package,
-  Stdlib::Absolutepath $inifile = $::php::fpm_inifile,
-  Hash $settings                = $::php::real_settings,
-  $global_pool_settings         = $::php::real_fpm_global_pool_settings,
-  Hash $pools                   = $::php::real_fpm_pools,
-  $log_owner                    = $::php::log_owner,
-  $log_group                    = $::php::log_group,
-) {
-
-  if ! defined(Class['php']) {
-    warning('php::fpm is private')
-  }
-
-  $real_settings = deep_merge($settings, hiera_hash('php::fpm::settings', {}))
-
-  # On FreeBSD fpm is not a separate package, but included in the 'php' package.
-  # Implies that the option SET+=FPM was set when building the port.
-  $real_package = $facts['os']['family'] ? {
-    'FreeBSD' => [],
-    default   => $package,
-  }
-
-  package { $real_package:
-    ensure  => $ensure,
-    require => Class['::php::packages'],
-  }
-
-  class { '::php::fpm::config':
-    user      => $user,
-    group     => $group,
-    inifile   => $inifile,
-    settings  => $real_settings,
-    log_owner => $log_owner,
-    log_group => $log_group,
-    require   => Package[$real_package],
-  }
-  contain '::php::fpm::config'
-  contain '::php::fpm::service'
-
-  Class['php::fpm::config'] ~> Class['php::fpm::service']
-
-  $real_global_pool_settings = hiera_hash('php::fpm::global_pool_settings', $global_pool_settings)
-  $real_pools = hiera_hash('php::fpm::pools', $pools)
-  create_resources(::php::fpm::pool, $real_pools, $real_global_pool_settings)
-
-  # Create an override to use a reload signal as trusty and utopic's
-  # upstart version supports this
-  if ($facts['os']['name'] == 'Ubuntu'
-      and versioncmp($facts['os']['release']['full'], '14') >= 0
-      and versioncmp($facts['os']['release']['full'], '16') < 0) {
-    if ($service_enable) {
-      $fpm_override = 'reload signal USR2'
-    }
-    else {
-      $fpm_override = "reload signal USR2\nmanual"
-    }
-    file { "/etc/init/${::php::fpm::service::service_name}.override":
-      content => $fpm_override,
-      before  => Package[$real_package],
-    }
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Afpm_3A_3Aconfig.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Afpm_3A_3Aconfig.html deleted file mode 100644 index 8dbc64390..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Afpm_3A_3Aconfig.html +++ /dev/null @@ -1,596 +0,0 @@ - - - - - - - Puppet Class: php::fpm::config - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::fpm::config

    -
    - -
    -
    Inherits:
    -
    ::php::params
    -
    - - -
    -
    Defined in:
    -
    - manifests/fpm/config.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Configure php-fpm service

    - -

    === Parameters

    - -

    [config_file] - The path to the fpm config file

    - -

    [user] - The user that runs php-fpm

    - -

    [group] - The group that runs php-fpm

    - -

    [inifile] - The path to ini file

    - -

    [settings] - Nested hash of key => value to apply to php.ini

    - -

    [pool_base_dir] - The folder that contains the php-fpm pool configs

    - -

    [pool_purge] - Whether to purge pool config files not created - by this module

    - -

    [error_log] - Path to error log file. If it's set to "syslog", log is - sent to syslogd instead of being written in a local file.

    - -

    [log_level] - The php-fpm log level

    - -

    [emergency_restart_threshold] - The php-fpm emergency_restart_threshold

    - -

    [emergency_restart_interval] - The php-fpm emergency_restart_interval

    - -

    [process_control_timeout] - The php-fpm process_control_timeout

    - -

    [process_max] - The maximum number of processes FPM will fork.

    - -

    [rlimit_files] - Set open file descriptor rlimit for the master process.

    - -

    [systemd_interval] - The interval between health report notification to systemd

    - -

    [log_owner] - The php-fpm log owner

    - -

    [log_group] - The group owning php-fpm logs

    - -

    [log_dir_mode] - The octal mode of the directory

    - -

    [syslog_facility] - Used to specify what type of program is logging the message

    - -

    [syslog_ident] - Prepended to every message

    - -

    [root_group] - UNIX group of the root user

    - -

    [pid_file] - Path to fpm pid file

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - config_file - - - (Any) - - - (defaults to: $::php::params::fpm_config_file) - - -
      • - -
    • - - user - - - (String) - - - (defaults to: $::php::params::fpm_user) - - -
      • - -
    • - - group - - - (String) - - - (defaults to: $::php::params::fpm_group) - - -
      • - -
    • - - inifile - - - (String) - - - (defaults to: $::php::params::fpm_inifile) - - -
      • - -
    • - - pid_file - - - (Any) - - - (defaults to: $::php::params::fpm_pid_file) - - -
      • - -
    • - - settings - - - (Hash) - - - (defaults to: {}) - - -
      • - -
    • - - pool_base_dir - - - (Stdlib::Absolutepath) - - - (defaults to: $::php::params::fpm_pool_dir) - - -
      • - -
    • - - pool_purge - - - (Any) - - - (defaults to: false) - - -
      • - -
    • - - error_log - - - (String) - - - (defaults to: $::php::params::fpm_error_log) - - -
      • - -
    • - - log_level - - - (String) - - - (defaults to: 'notice') - - -
      • - -
    • - - emergency_restart_threshold - - - (Integer) - - - (defaults to: 0) - - -
      • - -
    • - - emergency_restart_interval - - - (Variant[Integer, Pattern[/^\d+[smhd]?$/]]) - - - (defaults to: 0) - - -
      • - -
    • - - process_control_timeout - - - (Variant[Integer, Pattern[/^\d+[smhd]?$/]]) - - - (defaults to: 0) - - -
      • - -
    • - - process_max - - - (Integer) - - - (defaults to: 0) - - -
      • - -
    • - - rlimit_files - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - systemd_interval - - - (Optional[Variant[Integer,Pattern[/^\d+[smhd]?$/]]]) - - - (defaults to: undef) - - -
      • - -
    • - - log_owner - - - (String) - - - (defaults to: $::php::params::fpm_user) - - -
      • - -
    • - - log_group - - - (String) - - - (defaults to: $::php::params::fpm_group) - - -
      • - -
    • - - log_dir_mode - - - (Pattern[/^\d+$/]) - - - (defaults to: '0770') - - -
      • - -
    • - - root_group - - - (Any) - - - (defaults to: $::php::params::root_group) - - -
      • - -
    • - - syslog_facility - - - (String) - - - (defaults to: 'daemon') - - -
      • - -
    • - - syslog_ident - - - (String) - - - (defaults to: 'php-fpm') - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
    -     		- 
    # File 'manifests/fpm/config.pp', line 73
-
-class php::fpm::config(
-  $config_file                                                          = $::php::params::fpm_config_file,
-  String $user                                                          = $::php::params::fpm_user,
-  String $group                                                         = $::php::params::fpm_group,
-  String $inifile                                                       = $::php::params::fpm_inifile,
-  $pid_file                                                             = $::php::params::fpm_pid_file,
-  Hash $settings                                                        = {},
-  Stdlib::Absolutepath $pool_base_dir                                   = $::php::params::fpm_pool_dir,
-  $pool_purge                                                           = false,
-  String $error_log                                                     = $::php::params::fpm_error_log,
-  String $log_level                                                     = 'notice',
-  Integer $emergency_restart_threshold                                  = 0,
-  Variant[Integer, Pattern[/^\d+[smhd]?$/]] $emergency_restart_interval = 0,
-  Variant[Integer, Pattern[/^\d+[smhd]?$/]] $process_control_timeout    = 0,
-  Integer $process_max                                                  = 0,
-  $rlimit_files                                                         = undef,
-  Optional[Variant[Integer,Pattern[/^\d+[smhd]?$/]]] $systemd_interval  = undef,
-  String $log_owner                                                     = $::php::params::fpm_user,
-  String $log_group                                                     = $::php::params::fpm_group,
-  Pattern[/^\d+$/] $log_dir_mode                                        = '0770',
-  $root_group                                                           = $::php::params::root_group,
-  String $syslog_facility                                               = 'daemon',
-  String $syslog_ident                                                  = 'php-fpm',
-) inherits ::php::params {
-
-  if $caller_module_name != $module_name {
-    warning('php::fpm::config is private')
-  }
-
-  # Hack-ish to default to user for group too
-  $log_group_final = $log_group ? {
-    undef   => $log_owner,
-    default => $log_group,
-  }
-
-  file { $config_file:
-    ensure  => file,
-    content => template('php/fpm/php-fpm.conf.erb'),
-    owner   => root,
-    group   => $root_group,
-    mode    => '0644',
-  }
-
-  file { $pool_base_dir:
-    ensure => directory,
-    owner  => root,
-    group  => $root_group,
-    mode   => '0755',
-  }
-
-  if $pool_purge {
-    File[$pool_base_dir] {
-      purge   => true,
-      recurse => true,
-    }
-  }
-
-  ::php::config { 'fpm':
-    file   => $inifile,
-    config => $settings,
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Afpm_3A_3Aservice.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Afpm_3A_3Aservice.html deleted file mode 100644 index 8bd9175f2..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Afpm_3A_3Aservice.html +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - - Puppet Class: php::fpm::service - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::fpm::service

    -
    - - -
    -
    Defined in:
    -
    - manifests/fpm/service.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Manage fpm service

    - -

    === Parameters

    - -

    [service_name] - name of the php-fpm service

    - -

    [ensure] - 'ensure' value for the service

    - -

    [enable] - Defines if the service is enabled

    - -

    [provider] - Defines if the service provider to use

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - service_name - - - (Any) - - - (defaults to: $::php::fpm::service_name) - - -
      • - -
    • - - ensure - - - (Any) - - - (defaults to: $::php::fpm::service_ensure) - - -
      • - -
    • - - enable - - - (Any) - - - (defaults to: $::php::fpm::service_enable) - - -
      • - -
    • - - provider - - - (Any) - - - (defaults to: $::php::fpm::service_provider) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
    -     		- 
    # File 'manifests/fpm/service.pp', line 17
-
-class php::fpm::service(
-  $service_name = $::php::fpm::service_name,
-  $ensure       = $::php::fpm::service_ensure,
-  $enable       = $::php::fpm::service_enable,
-  $provider     = $::php::fpm::service_provider,
-) {
-
-  if ! defined(Class['php::fpm']) {
-    warning('php::fpm::service is private')
-  }
-
-  $reload = "service ${service_name} reload"
-
-  if ($facts['os']['name'] == 'Ubuntu'
-      and versioncmp($facts['os']['release']['full'], '12') >= 0
-      and versioncmp($facts['os']['release']['full'], '14') < 0) {
-    # Precise upstart doesn't support reload signals, so use
-    # regular service restart instead
-    $restart = undef
-  } else {
-    $restart = $reload
-  }
-
-  service { $service_name:
-    ensure     => $ensure,
-    enable     => $enable,
-    provider   => $provider,
-    hasrestart => true,
-    restart    => $restart,
-    hasstatus  => true,
-  }
-
-  ::Php::Extension <| |> ~> Service[$service_name]
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aglobal.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aglobal.html deleted file mode 100644 index cf160e7a8..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aglobal.html +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - Puppet Class: php::global - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::global

    -
    - -
    -
    Inherits:
    -
    ::php
    -
    - - -
    -
    Defined in:
    -
    - manifests/global.pp -
    -
    -
    - -

    Overview

    -
    -
    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - inifile - - - (Stdlib::Absolutepath) - - - (defaults to: $::php::config_root_inifile) - - -
      • - -
    • - - settings - - - (Hash) - - - (defaults to: {}) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
    -     		- 
    # File 'manifests/global.pp', line 14
-
-class php::global(
-  Stdlib::Absolutepath $inifile = $::php::config_root_inifile,
-  Hash $settings                = {}
-) inherits ::php {
-
-  if $caller_module_name != $module_name {
-    warning('php::global is private')
-  }
-
-  # No deep merging required since the settings we have are the global settings.
-  $real_settings = $settings
-
-  ::php::config { 'global':
-    file   => $inifile,
-    config => $real_settings,
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aglobals.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aglobals.html deleted file mode 100644 index 445b935ea..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aglobals.html +++ /dev/null @@ -1,384 +0,0 @@ - - - - - - - Puppet Class: php::globals - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::globals

    -
    - - -
    -
    Inherited by:
    -
    - - php::params
    - -
    -
    - -
    -
    Defined in:
    -
    - manifests/globals.pp -
    -
    -
    - -

    Overview

    -
    -
    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - php_version - - - (Optional[Pattern[/^[57].[0-9]/]]) - - - (defaults to: undef) - - -
      • - -
    • - - config_root - - - (Optional[Stdlib::Absolutepath]) - - - (defaults to: undef) - - -
      • - -
    • - - fpm_pid_file - - - (Optional[Stdlib::Absolutepath]) - - - (defaults to: undef) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
    -     		- 
    # File 'manifests/globals.pp', line 14
-
-class php::globals (
-  Optional[Pattern[/^[57].[0-9]/]] $php_version = undef,
-  Optional[Stdlib::Absolutepath] $config_root   = undef,
-  Optional[Stdlib::Absolutepath] $fpm_pid_file  = undef,
-) {
-
-  $default_php_version = $facts['os']['family'] ? {
-    'Debian' => $facts['os']['name'] ? {
-      'Ubuntu' => $facts['os']['release']['full'] ? {
-        /^(1[67].04)$/ => '7.0',
-        default => '5.x',
-      },
-      default => '5.x',
-    },
-    default => '5.x',
-  }
-
-  $globals_php_version = pick($php_version, $default_php_version)
-
-  case $facts['os']['family'] {
-    'Debian': {
-      if $facts['os']['name'] == 'Ubuntu' {
-        case $globals_php_version {
-          /^5\.4/: {
-            $default_config_root  = '/etc/php5'
-            $default_fpm_pid_file = "/var/run/php/php${globals_php_version}-fpm.pid"
-            $fpm_error_log        = '/var/log/php5-fpm.log'
-            $fpm_service_name     = 'php5-fpm'
-            $ext_tool_enable      = '/usr/sbin/php5enmod'
-            $ext_tool_query       = '/usr/sbin/php5query'
-            $package_prefix       = 'php5-'
-          }
-          /^[57].[0-9]/: {
-            $default_config_root  = "/etc/php/${globals_php_version}"
-            $default_fpm_pid_file = "/var/run/php/php${globals_php_version}-fpm.pid"
-            $fpm_error_log        = "/var/log/php${globals_php_version}-fpm.log"
-            $fpm_service_name     = "php${globals_php_version}-fpm"
-            $ext_tool_enable      = "/usr/sbin/phpenmod -v ${globals_php_version}"
-            $ext_tool_query       = "/usr/sbin/phpquery -v ${globals_php_version}"
-            $package_prefix       = "php${globals_php_version}-"
-          }
-          default: {
-            # Default php installation from Ubuntu official repository use the following paths until 16.04
-            # For PPA please use the $php_version to override it.
-            $default_config_root  = '/etc/php5'
-            $default_fpm_pid_file = '/var/run/php5-fpm.pid'
-            $fpm_error_log        = '/var/log/php5-fpm.log'
-            $fpm_service_name     = 'php5-fpm'
-            $ext_tool_enable      = '/usr/sbin/php5enmod'
-            $ext_tool_query       = '/usr/sbin/php5query'
-            $package_prefix       = 'php5-'
-          }
-        }
-      } else {
-        case $globals_php_version {
-          /^7/: {
-            $default_config_root  = "/etc/php/${globals_php_version}"
-            $default_fpm_pid_file = "/var/run/php/php${globals_php_version}-fpm.pid"
-            $fpm_error_log        = "/var/log/php${globals_php_version}-fpm.log"
-            $fpm_service_name     = "php${globals_php_version}-fpm"
-            $ext_tool_enable      = "/usr/sbin/phpenmod -v ${globals_php_version}"
-            $ext_tool_query       = "/usr/sbin/phpquery -v ${globals_php_version}"
-            $package_prefix       = "php${globals_php_version}-"
-          }
-          default: {
-            $default_config_root  = '/etc/php5'
-            $default_fpm_pid_file = '/var/run/php5-fpm.pid'
-            $fpm_error_log        = '/var/log/php5-fpm.log'
-            $fpm_service_name     = 'php5-fpm'
-            $ext_tool_enable      = '/usr/sbin/php5enmod'
-            $ext_tool_query       = '/usr/sbin/php5query'
-            $package_prefix       = 'php5-'
-          }
-        }
-      }
-    }
-    'Suse': {
-      case $globals_php_version {
-        /^7/: {
-          $default_config_root  = '/etc/php7'
-          $package_prefix       = 'php7-'
-          $default_fpm_pid_file = '/var/run/php7-fpm.pid'
-          $fpm_error_log        = '/var/log/php7-fpm.log'
-        }
-        default: {
-          $default_config_root  = '/etc/php5'
-          $package_prefix       = 'php5-'
-          $default_fpm_pid_file = '/var/run/php5-fpm.pid'
-          $fpm_error_log        = '/var/log/php5-fpm.log'
-        }
-      }
-    }
-    'RedHat': {
-      $default_config_root  = '/etc/php.d'
-      $default_fpm_pid_file = '/var/run/php-fpm/php-fpm.pid'
-    }
-    'FreeBSD': {
-      $default_config_root  = '/usr/local/etc'
-      $default_fpm_pid_file = '/var/run/php-fpm.pid'
-    }
-    'Archlinux': {
-      $default_config_root  =  '/etc/php'
-      $default_fpm_pid_file = '/run/php-fpm/php-fpm.pid'
-    }
-    default: {
-      fail("Unsupported osfamily: ${facts['os']['family']}")
-    }
-  }
-
-  $globals_config_root = pick($config_root, $default_config_root)
-
-  $globals_fpm_pid_file = pick($fpm_pid_file, $default_fpm_pid_file)
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Apackages.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Apackages.html deleted file mode 100644 index 47cf51e08..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Apackages.html +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - Puppet Class: php::packages - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::packages

    -
    - -
    -
    Inherits:
    -
    ::php::params
    -
    - - -
    -
    Defined in:
    -
    - manifests/packages.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Install common PHP packages

    - -

    === Parameters

    - -

    [ensure] - Specify which version of PHP packages to install

    - -

    [names] - List of the names of the package to install

    - -

    [names_to_prefix] - List of packages names that should be prefixed with the common - package prefix $php::package_prefix

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - ensure - - - (String) - - - (defaults to: $::php::ensure) - - -
      • - -
    • - - manage_repos - - - (Boolean) - - - (defaults to: $::php::manage_repos) - - -
      • - -
    • - - names_to_prefix - - - (Array) - - - (defaults to: prefix($::php::params::common_package_suffixes, $::php::package_prefix)) - - -
      • - -
    • - - names - - - (Array) - - - (defaults to: $::php::params::common_package_names) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
    -     		- 
    # File 'manifests/packages.pp', line 15
-
-class php::packages (
-  String $ensure         = $::php::ensure,
-  Boolean $manage_repos  = $::php::manage_repos,
-  Array $names_to_prefix = prefix($::php::params::common_package_suffixes, $::php::package_prefix),
-  Array $names           = $::php::params::common_package_names,
-) inherits ::php::params {
-
-  if $caller_module_name != $module_name {
-    warning('php::packages is private')
-  }
-
-  $real_names = union($names, $names_to_prefix)
-  if $facts['os']['family'] == 'debian' {
-    if $manage_repos {
-      include ::apt
-      Class['::apt::update'] -> Package[$real_names]
-    }
-    package { $real_names:
-      ensure => $ensure,
-    }
-  } else {
-    package { $real_names:
-      ensure => $ensure,
-    }
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aparams.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aparams.html deleted file mode 100644 index 5092403db..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aparams.html +++ /dev/null @@ -1,490 +0,0 @@ - - - - - - - Puppet Class: php::params - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::params

    -
    - -
    -
    Inherits:
    -
    php::globals
    -
    - - -
    -
    Defined in:
    -
    - manifests/params.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    PHP params class

    - -
    -
    -
    - - -
    - - - - - -
    - 
    -
-
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163
-164
-165
-166
-167
-168
-169
-170
-171
-172
-173
-174
-175
-176
-177
-178
-179
-180
-181
-182
-183
-184
-185
-186
-187
-188
-189
-190
-191
    -     		- 
    # File 'manifests/params.pp', line 3
-
-class php::params inherits php::globals {
-
-  $ensure              = 'present'
-  $fpm_service_enable  = true
-  $fpm_service_ensure  = 'running'
-  $composer_source     = 'https://getcomposer.org/composer.phar'
-  $composer_path       = '/usr/local/bin/composer'
-  $composer_max_age    = 30
-  $pear_ensure         = 'present'
-  $pear_package_suffix = 'pear'
-  $phpunit_source      = 'https://phar.phpunit.de/phpunit.phar'
-  $phpunit_path        = '/usr/local/bin/phpunit'
-  $phpunit_max_age     = 30
-
-  case $facts['os']['family'] {
-    'Debian': {
-      $config_root             = $php::globals::globals_config_root
-      $config_root_ini         = "${config_root}/mods-available"
-      $config_root_inifile     = "${config_root}/php.ini"
-      $common_package_names    = []
-      $common_package_suffixes = ['cli', 'common']
-      $cli_inifile             = "${config_root}/cli/php.ini"
-      $dev_package_suffix      = 'dev'
-      $fpm_pid_file            = $php::globals::globals_fpm_pid_file
-      $fpm_config_file         = "${config_root}/fpm/php-fpm.conf"
-      $fpm_error_log           = $php::globals::fpm_error_log
-      $fpm_inifile             = "${config_root}/fpm/php.ini"
-      $fpm_package_suffix      = 'fpm'
-      $fpm_pool_dir            = "${config_root}/fpm/pool.d"
-      $fpm_service_name        = $php::globals::fpm_service_name
-      $fpm_user                = 'www-data'
-      $fpm_group               = 'www-data'
-      $apache_inifile          = "${config_root}/apache2/php.ini"
-      $embedded_package_suffix = 'embed'
-      $embedded_inifile        = "${config_root}/embed/php.ini"
-      $package_prefix          = $php::globals::package_prefix
-      $compiler_packages       = 'build-essential'
-      $root_group              = 'root'
-      $ext_tool_enable         = $php::globals::ext_tool_enable
-      $ext_tool_query          = $php::globals::ext_tool_query
-      $ext_tool_enabled        = true
-
-      case $facts['os']['name'] {
-        'Debian': {
-          $manage_repos = (versioncmp($facts['os']['release']['major'], '8') < 0)
-        }
-
-        'Ubuntu': {
-          $manage_repos = false
-        }
-
-        default: {
-          $manage_repos = false
-        }
-      }
-    }
-
-    'Suse': {
-      if ($php::globals::php_version != undef) {
-        $php_version_major = regsubst($php::globals::php_version, '^(\d+)\.(\d+)$','\1')
-      } else {
-        $php_version_major = 5
-      }
-
-      $config_root             = $php::globals::globals_config_root
-      $config_root_ini         = "${config_root}/conf.d"
-      $config_root_inifile     = "${config_root}/php.ini"
-      $common_package_names    = ["php${php_version_major}"]
-      $common_package_suffixes = []
-      $cli_inifile             = "${config_root}/cli/php.ini"
-      $dev_package_suffix      = 'devel'
-      $fpm_pid_file            = $php::globals::globals_fpm_pid_file
-      $fpm_config_file         = "${config_root}/fpm/php-fpm.conf"
-      $fpm_error_log           = $php::globals::fpm_error_log
-      $fpm_inifile             = "${config_root}/fpm/php.ini"
-      $fpm_package_suffix      = 'fpm'
-      $fpm_pool_dir            = "${config_root}/fpm/pool.d"
-      $fpm_service_name        = 'php-fpm'
-      $fpm_user                = 'wwwrun'
-      $fpm_group               = 'www'
-      $embedded_package_suffix = 'embed'
-      $embedded_inifile        = "${config_root}/embed/php.ini"
-      $package_prefix          = $php::globals::package_prefix
-      $manage_repos            = true
-      $root_group              = 'root'
-      $ext_tool_enable         = undef
-      $ext_tool_query          = undef
-      $ext_tool_enabled        = false
-      case $facts['os']['name'] {
-        'SLES': {
-          $compiler_packages = []
-        }
-        'OpenSuSE': {
-          $compiler_packages = 'devel_basis'
-        }
-        default: {
-          fail("Unsupported operating system ${facts['os']['name']}")
-        }
-      }
-    }
-    'RedHat': {
-      $config_root_ini         = '/etc/php.d'
-      $config_root_inifile     = '/etc/php.ini'
-      $common_package_names    = []
-      $common_package_suffixes = ['cli', 'common']
-      $cli_inifile             = '/etc/php-cli.ini'
-      $dev_package_suffix      = 'devel'
-      $fpm_pid_file            = $php::globals::globals_fpm_pid_file
-      $fpm_config_file         = '/etc/php-fpm.conf'
-      $fpm_error_log           = '/var/log/php-fpm/error.log'
-      $fpm_inifile             = '/etc/php-fpm.ini'
-      $fpm_package_suffix      = 'fpm'
-      $fpm_pool_dir            = '/etc/php-fpm.d'
-      $fpm_service_name        = 'php-fpm'
-      $fpm_user                = 'apache'
-      $fpm_group               = 'apache'
-      $apache_inifile          = '/etc/php.ini'
-      $embedded_package_suffix = 'embedded'
-      $embedded_inifile        = '/etc/php.ini'
-      $package_prefix          = 'php-'
-      $compiler_packages       = ['gcc', 'gcc-c++', 'make']
-      $manage_repos            = false
-      $root_group              = 'root'
-      $ext_tool_enable         = undef
-      $ext_tool_query          = undef
-      $ext_tool_enabled        = false
-    }
-    'FreeBSD': {
-      $config_root             = $php::globals::globals_config_root
-      $config_root_ini         = "${config_root}/php"
-      $config_root_inifile     = "${config_root}/php.ini"
-      # No common packages, because the required PHP base package will be
-      # pulled in as a dependency. This preserves the ability to choose
-      # any available PHP version by setting the 'package_prefix' parameter.
-      $common_package_names    = []
-      $common_package_suffixes = ['extensions']
-      $cli_inifile             = "${config_root}/php-cli.ini"
-      $dev_package_suffix      = undef
-      $fpm_pid_file            = $php::globals::globals_fpm_pid_file
-      $fpm_config_file         = "${config_root}/php-fpm.conf"
-      $fpm_error_log           = '/var/log/php-fpm.log'
-      $fpm_inifile             = "${config_root}/php-fpm.ini"
-      $fpm_package_suffix      = undef
-      $fpm_pool_dir            = "${config_root}/php-fpm.d"
-      $fpm_service_name        = 'php-fpm'
-      $fpm_user                = 'www'
-      $fpm_group               = 'www'
-      $embedded_package_suffix = 'embed'
-      $embedded_inifile        = "${config_root}/php-embed.ini"
-      $package_prefix          = 'php56-'
-      $compiler_packages       = ['gcc']
-      $manage_repos            = false
-      $root_group              = 'wheel'
-      $ext_tool_enable         = undef
-      $ext_tool_query          = undef
-      $ext_tool_enabled        = false
-    }
-    'Archlinux': {
-      $config_root_ini         = '/etc/php/conf.d'
-      $config_root_inifile     = '/etc/php/php.ini'
-      $common_package_names    = []
-      $common_package_suffixes = ['cli', 'common']
-      $cli_inifile             = '/etc/php/php.ini'
-      $dev_package_suffix      = undef
-      $fpm_pid_file            = '/run/php-fpm/php-fpm.pid'
-      $fpm_config_file         = '/etc/php/php-fpm.conf'
-      $fpm_error_log           = '/var/log/php-fpm/error.log'
-      $fpm_inifile             = '/etc/php/php.ini'
-      $fpm_package_suffix      = 'fpm'
-      $fpm_pool_dir            = '/etc/php/php-fpm.d'
-      $fpm_service_name        = 'php-fpm'
-      $fpm_user                = 'root'
-      $fpm_group               = 'root'
-      $apache_inifile          = '/etc/php/php.ini'
-      $embedded_package_suffix = 'embedded'
-      $embedded_inifile        = '/etc/php/php.ini'
-      $package_prefix          = 'php-'
-      $compiler_packages       = ['gcc', 'make']
-      $manage_repos            = false
-      $root_group              = 'root'
-      $ext_tool_enable         = undef
-      $ext_tool_query          = undef
-      $ext_tool_enabled        = false
-    }
-    default: {
-      fail("Unsupported osfamily: ${facts['os']['family']}")
-    }
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Apear.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Apear.html deleted file mode 100644 index 29b72d5c7..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Apear.html +++ /dev/null @@ -1,258 +0,0 @@ - - - - - - - Puppet Class: php::pear - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::pear

    -
    - -
    -
    Inherits:
    -
    ::php::params
    -
    - - -
    -
    Defined in:
    -
    - manifests/pear.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Install PEAR package manager

    - -

    === Parameters

    - -

    [ensure] - The package ensure of PHP pear to install and run pear auto_discover

    - -

    [package] - The package name for PHP pear

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - ensure - - - (String) - - - (defaults to: $::php::pear_ensure) - - -
      • - -
    • - - package - - - (Optional[String]) - - - (defaults to: undef) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
    -     		- 
    # File 'manifests/pear.pp', line 11
-
-class php::pear (
-  String $ensure            = $::php::pear_ensure,
-  Optional[String] $package = undef,
-) inherits ::php::params {
-
-  if $caller_module_name != $module_name {
-    warning('php::pear is private')
-  }
-
-  # Defaults for the pear package name
-  if $package {
-    $package_name = $package
-  } else {
-    case $facts['os']['family'] {
-      'Debian': {
-        # Debian is a litte stupid: The pear package is called 'php-pear'
-        # even though others are called 'php5-fpm' or 'php5-dev'
-        $package_name = "php-${::php::params::pear_package_suffix}"
-      }
-      'Amazon': {
-        # On Amazon Linux the package name is also just 'php-pear'.
-        # This would normally not be problematic but if you specify a
-        # package_prefix other than 'php' then it will fail.
-        $package_name = "php-${::php::params::pear_package_suffix}"
-      }
-      'FreeBSD': {
-        # On FreeBSD the package name is just 'pear'.
-        $package_name = $::php::params::pear_package_suffix
-      }
-      default: {
-        # This is the default for all other architectures
-        $package_name = "${::php::package_prefix}${::php::params::pear_package_suffix}"
-      }
-    }
-  }
-
-  # Default PHP come with xml module and no seperate package for it
-  if $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '16.04') >= 0 {
-    ensure_packages(["${php::package_prefix}xml"], {
-      ensure  => present,
-      require => Class['::apt::update'],
-    })
-
-    package { $package_name:
-      ensure  => $ensure,
-      require => [Class['::apt::update'],Class['::php::cli'],Package["${php::package_prefix}xml"]],
-    }
-  } else {
-    package { $package_name:
-      ensure  => $ensure,
-      require => Class['::php::cli'],
-    }
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aphpunit.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aphpunit.html deleted file mode 100644 index 582bc4160..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aphpunit.html +++ /dev/null @@ -1,248 +0,0 @@ - - - - - - - Puppet Class: php::phpunit - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::phpunit

    -
    - -
    -
    Inherits:
    -
    ::php::params
    -
    - - -
    -
    Defined in:
    -
    - manifests/phpunit.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Install phpunit, PHP testing framework

    - -

    === Parameters

    - -

    [source] - Holds URL to the phpunit source file

    - -

    [path] - Holds path to the phpunit executable

    - -

    [auto_update] - Defines if phpunit should be auto updated

    - -

    [max_age] - Defines the time in days after which an auto-update gets executed

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - source - - - (String) - - - (defaults to: $::php::params::phpunit_source) - - -
      • - -
    • - - path - - - (Stdlib::Absolutepath) - - - (defaults to: $::php::params::phpunit_path) - - -
      • - -
    • - - auto_update - - - (Boolean) - - - (defaults to: true) - - -
      • - -
    • - - max_age - - - (Integer) - - - (defaults to: $::php::params::phpunit_max_age) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
    -     		- 
    # File 'manifests/phpunit.pp', line 17
-
-class php::phpunit (
-  String $source             = $::php::params::phpunit_source,
-  Stdlib::Absolutepath $path = $::php::params::phpunit_path,
-  Boolean $auto_update       = true,
-  Integer $max_age           = $::php::params::phpunit_max_age,
-) inherits ::php::params {
-
-  if $caller_module_name != $module_name {
-    warning('php::phpunit is private')
-  }
-
-  ensure_packages(['wget'])
-
-  exec { 'download phpunit':
-    command => "wget ${source} -O ${path}",
-    creates => $path,
-    path    => ['/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/'],
-    require => [Class['::php::cli'],Package['wget']],
-  }
-  -> file { $path:
-    mode  => '0555',
-    owner => root,
-    group => root,
-  }
-
-  if $auto_update {
-    class { '::php::phpunit::auto_update':
-      max_age => $max_age,
-      source  => $source,
-      path    => $path,
-    }
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aphpunit_3A_3Aauto_update.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aphpunit_3A_3Aauto_update.html deleted file mode 100644 index 8f18a3044..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Aphpunit_3A_3Aauto_update.html +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - Puppet Class: php::phpunit::auto_update - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::phpunit::auto_update

    -
    - - -
    -
    Defined in:
    -
    - manifests/phpunit/auto_update.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Install phpunit package manager

    - -

    === Parameters

    - -

    [max_age] - Defines number of days after which phpunit should be updated

    - -

    [source] - Holds URL to the phpunit source file

    - -

    [path] - Holds path to the phpunit executable

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - max_age - - - (Any) - - - -
      • - -
    • - - source - - - (Any) - - - -
      • - -
    • - - path - - - (Any) - - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
    -     		- 
    # File 'manifests/phpunit/auto_update.pp', line 14
-
-class php::phpunit::auto_update (
-  $max_age,
-  $source,
-  $path,
-) {
-
-  if $caller_module_name != $module_name {
-    warning('php::phpunit::auto_update is private')
-  }
-
-  exec { 'update phpunit':
-    command => "wget ${source} -O ${path}",
-    onlyif  => "test `find '${path}' -mtime +${max_age}`",
-    path    => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ],
-    require => File[$path],
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo.html deleted file mode 100644 index 21009ea7a..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo.html +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - Puppet Class: php::repo - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::repo

    -
    - - -
    -
    Defined in:
    -
    - manifests/repo.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Configure package repository

    - -
    -
    -
    - - -
    - - - - - -
    - 
    -
-
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
    -     		- 
    # File 'manifests/repo.pp', line 3
-
-class php::repo {
-
-  $msg_no_repo = "No repo available for ${facts['os']['family']}/${facts['os']['name']}"
-
-  case $facts['os']['family'] {
-    'Debian': {
-      # no contain here because apt does that already
-      case $facts['os']['name'] {
-        'Debian': {
-          include ::php::repo::debian
-        }
-        'Ubuntu': {
-          include ::php::repo::ubuntu
-        }
-        default: {
-          fail($msg_no_repo)
-        }
-      }
-    }
-    'FreeBSD': {}
-    'Suse': {
-      contain ::php::repo::suse
-    }
-    'RedHat': {
-      contain '::php::repo::redhat'
-    }
-    default: {
-      fail($msg_no_repo)
-    }
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Adebian.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Adebian.html deleted file mode 100644 index d58c119f9..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Adebian.html +++ /dev/null @@ -1,312 +0,0 @@ - - - - - - - Puppet Class: php::repo::debian - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::repo::debian

    -
    - - -
    -
    Defined in:
    -
    - manifests/repo/debian.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Configure debian apt repo

    - -

    === Parameters

    - -

    [location] - Location of the apt repository

    - -

    [release] - Release of the apt repository

    - -

    [repos] - Apt repository names

    - -

    [include_src] - Add source source repository

    - -

    [key] - Public key in apt::key format

    - -

    [dotdeb] - Enable special dotdeb handling

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - location - - - (Any) - - - (defaults to: 'http://packages.dotdeb.org') - - -
      • - -
    • - - release - - - (Any) - - - (defaults to: 'wheezy-php56') - - -
      • - -
    • - - repos - - - (Any) - - - (defaults to: 'all') - - -
      • - -
    • - - include_src - - - (Any) - - - (defaults to: false) - - -
      • - -
    • - - key - - - (Any) - - - (defaults to: { - 'id' => '6572BBEF1B5FF28B28B706837E3F070089DF5277', - 'source' => 'http://www.dotdeb.org/dotdeb.gpg', - }) - - -
      • - -
    • - - dotdeb - - - (Any) - - - (defaults to: true) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
    -     		- 
    # File 'manifests/repo/debian.pp', line 23
-
-class php::repo::debian(
-  $location     = 'http://packages.dotdeb.org',
-  $release      = 'wheezy-php56',
-  $repos        = 'all',
-  $include_src  = false,
-  $key          = {
-    'id'     => '6572BBEF1B5FF28B28B706837E3F070089DF5277',
-    'source' => 'http://www.dotdeb.org/dotdeb.gpg',
-  },
-  $dotdeb       = true,
-) {
-
-  if $caller_module_name != $module_name {
-    warning('php::repo::debian is private')
-  }
-
-  include '::apt'
-
-  create_resources(::apt::key, { 'php::repo::debian' => {
-    id     => $key['id'],
-    source => $key['source'],
-  }})
-
-  ::apt::source { "source_php_${release}":
-    location => $location,
-    release  => $release,
-    repos    => $repos,
-    include  => {
-      'src' => $include_src,
-      'deb' => true,
-    },
-    require  => Apt::Key['php::repo::debian'],
-  }
-
-  if ($dotdeb) {
-    # both repositories are required to work correctly
-    # See: http://www.dotdeb.org/instructions/
-    if $release == 'wheezy-php56' {
-      ::apt::source { 'dotdeb-wheezy':
-        location => $location,
-        release  => 'wheezy',
-        repos    => $repos,
-        include  => {
-          'src' => $include_src,
-          'deb' => true,
-        },
-      }
-    }
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Aredhat.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Aredhat.html deleted file mode 100644 index 05734b324..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Aredhat.html +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - Puppet Class: php::repo::redhat - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::repo::redhat

    -
    - - -
    -
    Defined in:
    -
    - manifests/repo/redhat.pp -
    -
    -
    - -

    Overview

    -
    -
    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - yum_repo - - - (Any) - - - (defaults to: 'remi_php56') - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
    -     		- 
    # File 'manifests/repo/redhat.pp', line 9
-
-class php::repo::redhat (
-  $yum_repo = 'remi_php56',
-) {
-
-  $releasever = $facts['os']['name'] ? {
-    /(?i:Amazon)/ => '6',
-    default       => '$releasever',  # Yum var
-  }
-
-  yumrepo { 'remi':
-    descr      => 'Remi\'s RPM repository for Enterprise Linux $releasever - $basearch',
-    mirrorlist => "https://rpms.remirepo.net/enterprise/${releasever}/remi/mirror",
-    enabled    => 1,
-    gpgcheck   => 1,
-    gpgkey     => 'https://rpms.remirepo.net/RPM-GPG-KEY-remi',
-    priority   => 1,
-  }
-
-  yumrepo { 'remi-php56':
-    descr      => 'Remi\'s PHP 5.6 RPM repository for Enterprise Linux $releasever - $basearch',
-    mirrorlist => "https://rpms.remirepo.net/enterprise/${releasever}/php56/mirror",
-    enabled    => 1,
-    gpgcheck   => 1,
-    gpgkey     => 'https://rpms.remirepo.net/RPM-GPG-KEY-remi',
-    priority   => 1,
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Asuse.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Asuse.html deleted file mode 100644 index 43e07075a..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Asuse.html +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - Puppet Class: php::repo::suse - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::repo::suse

    -
    - - -
    -
    Defined in:
    -
    - manifests/repo/suse.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Configure suse repo

    - -

    === Parameters

    - -

    [reponame] - Name of the Zypper repository

    - -

    [baseurl] - Base URL of the Zypper repository

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - reponame - - - (Any) - - - (defaults to: 'mayflower-php56') - - -
      • - -
    • - - baseurl - - - (Any) - - - (defaults to: 'http://download.opensuse.org/repositories/home:/mayflower:/php5.6_based/SLE_11_SP3/') - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
    -     		- 
    # File 'manifests/repo/suse.pp', line 11
-
-class php::repo::suse (
-  $reponame = 'mayflower-php56',
-  $baseurl  = 'http://download.opensuse.org/repositories/home:/mayflower:/php5.6_based/SLE_11_SP3/',
-) {
-  zypprepo { $reponame:
-    baseurl     => $baseurl,
-    enabled     => 1,
-    autorefresh => 1,
-  }
-  ~> exec { 'zypprepo-accept-key':
-    command     => 'zypper --gpg-auto-import-keys update -y',
-    path        => '/usr/bin:/bin',
-    refreshonly => true,
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Aubuntu.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Aubuntu.html deleted file mode 100644 index f41785aca..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_classes/php_3A_3Arepo_3A_3Aubuntu.html +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - Puppet Class: php::repo::ubuntu - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Class: php::repo::ubuntu

    -
    - - -
    -
    Defined in:
    -
    - manifests/repo/ubuntu.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Configure ubuntu ppa

    - -

    === Parameters

    - -

    [version] - PHP version to manage (e.g. 5.6)

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - version - - - (Any) - - - (defaults to: undef) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
    -     		- 
    # File 'manifests/repo/ubuntu.pp', line 8
-
-class php::repo::ubuntu (
-  $version   = undef,
-) {
-  include '::apt'
-
-  if($version == undef) {
-    $version_real = '5.6'
-  } else {
-    $version_real = $version
-  }
-
-  if ($version_real == '5.5') {
-    fail('PHP 5.5 is no longer available for download')
-  }
-  assert_type(Pattern[/^\d\.\d/], $version_real)
-
-  $version_repo = $version_real ? {
-    '5.4' => 'ondrej/php5-oldstable',
-    '5.6' => 'ondrej/php',
-    '7.0' => 'ondrej/php'
-  }
-
-  ::apt::ppa { "ppa:${version_repo}": }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_type_list.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_type_list.html deleted file mode 100644 index 344a86a7b..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_type_list.html +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - Defined Type List - - - -
    -
    -

    Defined Type List

    - - - -
    - - -
    - - diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aapache_vhost.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aapache_vhost.html deleted file mode 100644 index 03dea06f8..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aapache_vhost.html +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - Defined Type: php::apache_vhost - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Defined Type: php::apache_vhost

    -
    -
    -
    Defined in:
    -
    - manifests/apache_vhost.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Configures an apache vhost for php

    - -

    === Parameters

    - -

    [vhost] - The vhost address

    - -

    [docroot] - The vhost docroot

    - -

    [port] - The vhost port

    - -

    [default_vhost] - defines if vhost is the default vhost

    - -

    [fastcgi_socket] - address of the fastcgi socket

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - vhost - - - (Any) - - - (defaults to: 'example.com') - - -
      • - -
    • - - docroot - - - (Any) - - - (defaults to: '/var/www') - - -
      • - -
    • - - port - - - (Any) - - - (defaults to: 80) - - -
      • - -
    • - - default_vhost - - - (Any) - - - (defaults to: true) - - -
      • - -
    • - - fastcgi_socket - - - (Any) - - - (defaults to: 'fcgi://127.0.0.1:9000/$1') - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
    -     		- 
    # File 'manifests/apache_vhost.pp', line 20
-
-define php::apache_vhost(
-  $vhost          = 'example.com',
-  $docroot        = '/var/www',
-  $port           = 80,
-  $default_vhost  = true,
-  $fastcgi_socket = 'fcgi://127.0.0.1:9000/$1'
-) {
-
-  ::apache::vhost { $vhost:
-    docroot         => $docroot,
-    default_vhost   => $default_vhost,
-    port            => $port,
-    override        => 'all',
-    custom_fragment => "ProxyPassMatch ^/(.*\\.php(/.*)?)$ ${fastcgi_socket}",
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aconfig.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aconfig.html deleted file mode 100644 index 4dcdc194e..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aconfig.html +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - Defined Type: php::config - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Defined Type: php::config

    -
    -
    -
    Defined in:
    -
    - manifests/config.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Configure php.ini settings for a PHP SAPI

    - -

    === Parameters

    - -

    [file] - The path to ini file

    - -

    [config] - Nested hash of key => value to apply to php.ini

    - -

    === Examples

    - -

    php::config { '$unique-name': - file => '$full_path_to_ini_file' - config => { - => 'Europe/Berlin' - } - }

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - file - - - (Stdlib::Absolutepath) - - - -
      • - -
    • - - config - - - (Hash) - - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
    -     		- 
    # File 'manifests/config.pp', line 20
-
-define php::config(
-  Stdlib::Absolutepath $file,
-  Hash $config
-) {
-
-  if $caller_module_name != $module_name {
-    warning('php::config is private')
-  }
-
-  create_resources(::php::config::setting, to_hash_settings($config, $file), {
-    file => $file
-  })
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aconfig_3A_3Asetting.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aconfig_3A_3Asetting.html deleted file mode 100644 index c7b487bd0..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aconfig_3A_3Asetting.html +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - Defined Type: php::config::setting - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Defined Type: php::config::setting

    -
    -
    -
    Defined in:
    -
    - manifests/config/setting.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Configure php.ini settings

    - -

    === Parameters

    - -

    [key] - The key of the value, like ini_setting

    - -

    [file] - The path to ini file

    - -

    [value] - The value to set

    - -

    === Examples

    - -

    php::config::setting { 'Date/date.timezone': - file => '$full_path_to_ini_file' - value => 'Europe/Berlin' - }

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - key - - - (Any) - - - -
      • - -
    • - - value - - - (Any) - - - -
      • - -
    • - - file - - - (Stdlib::Absolutepath) - - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
    -     		- 
    # File 'manifests/config/setting.pp', line 21
-
-define php::config::setting(
-  $key,
-  $value,
-  Stdlib::Absolutepath $file,
-) {
-
-  if $caller_module_name != $module_name {
-    warning('php::config::setting is private')
-  }
-
-  $split_name = split($key, '/')
-  if count($split_name) == 1 {
-    $section = '' # lint:ignore:empty_string_assignment
-    $setting = $split_name[0]
-  } else {
-    $section = $split_name[0]
-    $setting = $split_name[1]
-  }
-
-  if $value == undef {
-    $ensure = 'absent'
-  } else {
-    $ensure = 'present'
-  }
-
-  ini_setting { $name:
-    ensure  => $ensure,
-    value   => $value,
-    path    => $file,
-    section => $section,
-    setting => $setting,
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aextension.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aextension.html deleted file mode 100644 index 163e06749..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aextension.html +++ /dev/null @@ -1,460 +0,0 @@ - - - - - - - Defined Type: php::extension - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Defined Type: php::extension

    -
    -
    -
    Defined in:
    -
    - manifests/extension.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Install a PHP extension package

    - -

    === Parameters

    - -

    [ensure] - The ensure of the package to install - Could be "latest", "installed" or a pinned version

    - -

    [package_prefix] - Prefix to prepend to the package name for the package provider

    - -

    [provider] - The provider used to install the package - Could be "pecl", "apt", "dpkg" or any other OS package provider - If set to "none", no package will be installed

    - -

    [source] - The source to install the extension from. Possible values - depend on the provider used

    - -

    [so_name] - The DSO name of the package (e.g. opcache for zendopcache)

    - -

    [ini_prefix] - An optional filename prefix for the settings file of the extension

    - -

    [php_api_version] - This parameter is used to build the full path to the extension - directory for zend_extension in PHP < 5.5 (e.g. 20100525)

    - -

    [header_packages] - System packages dependencies to install for extensions (e.g. for - memcached libmemcached-dev on Debian)

    - -

    [compiler_packages] - System packages dependencies to install for compiling extensions - (e.g. build-essential on Debian)

    - -

    [zend] - Boolean parameter, whether to load extension as zend_extension. - Defaults to false.

    - -

    [settings] - Nested hash of global config parameters for php.ini

    - -

    [settings_prefix] - Boolean/String parameter, whether to prefix all setting keys with - the extension name or specified name. Defaults to false.

    - -

    [sapi] - String parameter, whether to specify ALL sapi or a specific sapi. - Defaults to ALL.

    - -

    [responsefile] - File containing answers for interactive extension setup. Supported - providers: pear, pecl.

    - -

    [install_options] - Array of String or Hash options to pass to the provider.

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - ensure - - - (String) - - - (defaults to: 'installed') - - -
      • - -
    • - - provider - - - (Optional[Php::Provider]) - - - (defaults to: undef) - - -
      • - -
    • - - source - - - (Optional[String]) - - - (defaults to: undef) - - -
      • - -
    • - - so_name - - - (Optional[String]) - - - (defaults to: downcase($name)) - - -
      • - -
    • - - ini_prefix - - - (Optional[String]) - - - (defaults to: undef) - - -
      • - -
    • - - php_api_version - - - (Optional[String]) - - - (defaults to: undef) - - -
      • - -
    • - - package_prefix - - - (String) - - - (defaults to: $::php::package_prefix) - - -
      • - -
    • - - zend - - - (Boolean) - - - (defaults to: false) - - -
      • - -
    • - - settings - - - (Hash) - - - (defaults to: {}) - - -
      • - -
    • - - sapi - - - (Php::Sapi) - - - (defaults to: 'ALL') - - -
      • - -
    • - - settings_prefix - - - (Variant[Boolean, String]) - - - (defaults to: false) - - -
      • - -
    • - - responsefile - - - (Optional[Stdlib::AbsolutePath]) - - - (defaults to: undef) - - -
      • - -
    • - - header_packages - - - (Variant[String, Array[String]]) - - - (defaults to: []) - - -
      • - -
    • - - compiler_packages - - - (Variant[String, Array[String]]) - - - (defaults to: $::php::params::compiler_packages) - - -
      • - -
    • - - install_options - - - (Php::InstallOptions) - - - (defaults to: undef) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
    -     		- 
    # File 'manifests/extension.pp', line 61
-
-define php::extension (
-  String           $ensure                          = 'installed',
-  Optional[Php::Provider] $provider                 = undef,
-  Optional[String] $source                          = undef,
-  Optional[String] $so_name                         = downcase($name),
-  Optional[String] $ini_prefix                      = undef,
-  Optional[String] $php_api_version                 = undef,
-  String           $package_prefix                  = $::php::package_prefix,
-  Boolean          $zend                            = false,
-  Hash             $settings                        = {},
-  Php::Sapi        $sapi                            = 'ALL',
-  Variant[Boolean, String]       $settings_prefix   = false,
-  Optional[Stdlib::AbsolutePath] $responsefile      = undef,
-  Variant[String, Array[String]] $header_packages   = [],
-  Variant[String, Array[String]] $compiler_packages = $::php::params::compiler_packages,
-  Php::InstallOptions $install_options              = undef,
-) {
-
-  if ! defined(Class['php']) {
-    warning('php::extension is private')
-  }
-
-  php::extension::install { $title:
-    ensure            => $ensure,
-    provider          => $provider,
-    source            => $source,
-    responsefile      => $responsefile,
-    package_prefix    => $package_prefix,
-    header_packages   => $header_packages,
-    compiler_packages => $compiler_packages,
-    install_options   => $install_options,
-  }
-
-  # PEAR packages don't require any further configuration, they just need to "be there".
-  if $provider != 'pear' {
-    php::extension::config { $title:
-      ensure          => $ensure,
-      provider        => $provider,
-      so_name         => $so_name,
-      ini_prefix      => $ini_prefix,
-      php_api_version => $php_api_version,
-      zend            => $zend,
-      settings        => $settings,
-      settings_prefix => $settings_prefix,
-      sapi            => $sapi,
-      subscribe       => Php::Extension::Install[$title],
-    }
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aextension_3A_3Aconfig.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aextension_3A_3Aconfig.html deleted file mode 100644 index 8b595692a..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aextension_3A_3Aconfig.html +++ /dev/null @@ -1,418 +0,0 @@ - - - - - - - Defined Type: php::extension::config - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Defined Type: php::extension::config

    -
    -
    -
    Defined in:
    -
    - manifests/extension/config.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Configure a PHP extension package

    - -

    === Parameters

    - -

    [ensure] - The ensure of the package to install - Could be "latest", "installed" or a pinned version

    - -

    [provider] - The provider used to install the package - Could be "pecl", "apt", "dpkg" or any other OS package provider - If set to "none", no package will be installed

    - -

    [so_name] - The DSO name of the package (e.g. opcache for zendopcache)

    - -

    [ini_prefix] - An optional filename prefix for the settings file of the extension

    - -

    [php_api_version] - This parameter is used to build the full path to the extension - directory for zend_extension in PHP < 5.5 (e.g. 20100525)

    - -

    [header_packages] - System packages dependencies to install for extensions (e.g. for - memcached libmemcached-dev on Debian)

    - -

    [compiler_packages] - System packages dependencies to install for compiling extensions - (e.g. build-essential on Debian)

    - -

    [zend] - Boolean parameter, whether to load extension as zend_extension. - Defaults to false.

    - -

    [settings] - Nested hash of global config parameters for php.ini

    - -

    [settings_prefix] - Boolean/String parameter, whether to prefix all setting keys with - the extension name or specified name. Defaults to false.

    - -

    [sapi] - String parameter, whether to specify ALL sapi or a specific sapi. - Defaults to ALL.

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - ensure - - - (String) - - - (defaults to: 'installed') - - -
      • - -
    • - - provider - - - (Optional[Php::Provider]) - - - (defaults to: undef) - - -
      • - -
    • - - so_name - - - (Optional[String]) - - - (defaults to: downcase($name)) - - -
      • - -
    • - - ini_prefix - - - (Optional[String]) - - - (defaults to: undef) - - -
      • - -
    • - - php_api_version - - - (Optional[String]) - - - (defaults to: undef) - - -
      • - -
    • - - zend - - - (Boolean) - - - (defaults to: false) - - -
      • - -
    • - - settings - - - (Hash) - - - (defaults to: {}) - - -
      • - -
    • - - settings_prefix - - - (Variant[Boolean, String]) - - - (defaults to: false) - - -
      • - -
    • - - sapi - - - (Php::Sapi) - - - (defaults to: 'ALL') - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
    -     		- 
    # File 'manifests/extension/config.pp', line 47
-
-define php::extension::config (
-  String                   $ensure          = 'installed',
-  Optional[Php::Provider]  $provider        = undef,
-  Optional[String]         $so_name         = downcase($name),
-  Optional[String]         $ini_prefix      = undef,
-  Optional[String]         $php_api_version = undef,
-  Boolean                  $zend            = false,
-  Hash                     $settings        = {},
-  Variant[Boolean, String] $settings_prefix = false,
-  Php::Sapi                $sapi            = 'ALL',
-) {
-
-  if ! defined(Class['php']) {
-    warning('php::extension::config is private')
-  }
-
-  if $zend == true {
-    $extension_key = 'zend_extension'
-    $module_path = $php_api_version? {
-      undef   => undef,
-      default => "/usr/lib/php5/${php_api_version}/",
-    }
-  } else {
-    $extension_key = 'extension'
-    $module_path = undef
-  }
-
-  $ini_name = downcase($so_name)
-
-  # Ensure "<extension>." prefix is present in setting keys if requested
-  $full_settings = $settings_prefix? {
-    true   => ensure_prefix($settings, "${so_name}."),
-    false  => $settings,
-    String => ensure_prefix($settings, "${settings_prefix}."),
-  }
-
-  if $provider != 'pear' {
-    $final_settings = deep_merge(
-      {"${extension_key}" => "${module_path}${so_name}.so"},
-      $full_settings
-    )
-  } else {
-    $final_settings = $full_settings
-  }
-
-  $config_root_ini = pick_default($::php::config_root_ini, $::php::params::config_root_ini)
-  ::php::config { $title:
-    file   => "${config_root_ini}/${ini_prefix}${ini_name}.ini",
-    config => $final_settings,
-  }
-
-  # Ubuntu/Debian systems use the mods-available folder. We need to enable
-  # settings files ourselves with php5enmod command.
-  $ext_tool_enable   = pick_default($::php::ext_tool_enable, $::php::params::ext_tool_enable)
-  $ext_tool_query    = pick_default($::php::ext_tool_query, $::php::params::ext_tool_query)
-  $ext_tool_enabled  = pick_default($::php::ext_tool_enabled, $::php::params::ext_tool_enabled)
-
-  if $facts['os']['family'] == 'Debian' and $ext_tool_enabled {
-    $cmd = "${ext_tool_enable} -s ${sapi} ${so_name}"
-
-    $_sapi = $sapi? {
-      'ALL' => 'cli',
-      default => $sapi,
-    }
-    exec { $cmd:
-      onlyif  => "${ext_tool_query} -s ${_sapi} -m ${so_name} | /bin/grep 'No module matches ${so_name}'",
-      require => ::Php::Config[$title],
-    }
-
-    if $::php::fpm {
-      Package[$::php::fpm::package] ~> Exec[$cmd]
-    }
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aextension_3A_3Ainstall.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aextension_3A_3Ainstall.html deleted file mode 100644 index 3c73f7bfc..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Aextension_3A_3Ainstall.html +++ /dev/null @@ -1,356 +0,0 @@ - - - - - - - Defined Type: php::extension::install - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Defined Type: php::extension::install

    -
    -
    -
    Defined in:
    -
    - manifests/extension/install.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Install a PHP extension package

    - -

    === Parameters

    - -

    [ensure] - The ensure of the package to install - Could be "latest", "installed" or a pinned version

    - -

    [package_prefix] - Prefix to prepend to the package name for the package provider

    - -

    [provider] - The provider used to install the package - Could be "pecl", "apt", "dpkg" or any other OS package provider - If set to "none", no package will be installed

    - -

    [source] - The source to install the extension from. Possible values - depend on the provider used

    - -

    [header_packages] - System packages dependencies to install for extensions (e.g. for - memcached libmemcached-dev on Debian)

    - -

    [compiler_packages] - System packages dependencies to install for compiling extensions - (e.g. build-essential on Debian)

    - -

    [responsefile] - File containing answers for interactive extension setup. Supported - providers: pear, pecl.

    - -

    [install_options] - Array of String or Hash options to pass to the provider.

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - ensure - - - (String) - - - (defaults to: 'installed') - - -
      • - -
    • - - provider - - - (Optional[Php::Provider]) - - - (defaults to: undef) - - -
      • - -
    • - - source - - - (Optional[String]) - - - (defaults to: undef) - - -
      • - -
    • - - package_prefix - - - (String) - - - (defaults to: $::php::package_prefix) - - -
      • - -
    • - - responsefile - - - (Optional[Stdlib::AbsolutePath]) - - - (defaults to: undef) - - -
      • - -
    • - - header_packages - - - (Variant[String, Array[String]]) - - - (defaults to: []) - - -
      • - -
    • - - compiler_packages - - - (Variant[String, Array[String]]) - - - (defaults to: $::php::params::compiler_packages) - - -
      • - -
    • - - install_options - - - (Php::InstallOptions) - - - (defaults to: undef) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
    -     		- 
    # File 'manifests/extension/install.pp', line 36
-
-define php::extension::install (
-  String           $ensure                          = 'installed',
-  Optional[Php::Provider] $provider                 = undef,
-  Optional[String] $source                          = undef,
-  String           $package_prefix                  = $::php::package_prefix,
-  Optional[Stdlib::AbsolutePath] $responsefile      = undef,
-  Variant[String, Array[String]] $header_packages   = [],
-  Variant[String, Array[String]] $compiler_packages = $::php::params::compiler_packages,
-  Php::InstallOptions $install_options              = undef,
-) {
-
-  if ! defined(Class['php']) {
-    warning('php::extension::install is private')
-  }
-
-  case $provider {
-    /pecl|pear/: {
-      $real_package = $title
-
-      unless empty($header_packages) {
-        ensure_resource('package', $header_packages)
-        Package[$header_packages] -> Package[$real_package]
-      }
-      unless empty($compiler_packages) {
-        ensure_resource('package', $compiler_packages)
-        Package[$compiler_packages] -> Package[$real_package]
-      }
-
-      $package_require      = [
-        Class['::php::pear'],
-        Class['::php::dev'],
-      ]
-    }
-
-    'none' : {
-      debug("No package installed for php::extension: `${title}`.")
-    }
-
-    default: {
-      $real_package = "${package_prefix}${title}"
-      $package_require = undef
-    }
-  }
-
-  unless $provider == 'none' {
-    package { $real_package:
-      ensure          => $ensure,
-      provider        => $provider,
-      source          => $source,
-      responsefile    => $responsefile,
-      install_options => $install_options,
-      require         => $package_require,
-    }
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Afpm_3A_3Apool.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Afpm_3A_3Apool.html deleted file mode 100644 index c0e510c3d..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_defined_types/php_3A_3Afpm_3A_3Apool.html +++ /dev/null @@ -1,935 +0,0 @@ - - - - - - - Defined Type: php::fpm::pool - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Defined Type: php::fpm::pool

    -
    -
    -
    Defined in:
    -
    - manifests/fpm/pool.pp -
    -
    -
    - -

    Overview

    -
    -
    -

    Configure fpm pools

    - -

    === Parameters

    - -

    See the official php-fpm documentation for parameters that are not -documented here: http://php.net/manual/en/install.fpm.configuration.php.

    - -

    [ensure] - Remove pool if set to 'absent', add otherwise

    - -

    [listen] - On what socket to listen for FastCGI connections, i.e. - '127.0.0.1:9000'' or'/var/run/php5-fpm.sock'`

    - -

    [listen_backlog]

    - -

    [listen_allowed_clients]

    - -

    [listen_owner] - Set owner of the Unix socket

    - -

    [listen_group] - Set the group of the Unix socket

    - -

    [listen_mode]

    - -

    [user] - The user that php-fpm should run as

    - -

    [group] - The group that php-fpm should run as

    - -

    [pm]

    - -

    [pm_max_children]

    - -

    [pm_start_servers]

    - -

    [pm_min_spare_servers]

    - -

    [pm_max_spare_servers]

    - -

    [pm_max_requests]

    - -

    [pm_process_idle_timeout]

    - -

    [pm_status_path]

    - -

    [ping_path]

    - -

    [ping_response]

    - -

    [access_log] - The path to the file to write access log requests to

    - -

    [access_log_format] - The format to save the access log entries as

    - -

    [request_terminate_timeout]

    - -

    [request_slowlog_timeout]

    - -

    [security_limit_extensions]

    - -

    [slowlog]

    - -

    [template] - The template to use for the pool

    - -

    [rlimit_files]

    - -

    [rlimit_core]

    - -

    [chroot]

    - -

    [chdir]

    - -

    [catch_workers_output]

    - -

    [include] - Other configuration files to include on this pool

    - -

    [env] - List of environment variables that are passed to the php-fpm from the - outside and will be available to php scripts in this pool

    - -

    [env_value] - Hash of environment variables and values as strings to use in php - scripts in this pool

    - -

    [options] - An optional hash for any other data.

    - -

    [php_value] - Hash of php_value directives

    - -

    [php_flag] - Hash of php_flag directives

    - -

    [php_admin_value] - Hash of php_admin_value directives

    - -

    [php_admin_flag] - Hash of php_admin_flag directives

    - -

    [php_directives] - List of custom directives that are appended to the pool config

    - -

    [root_group] - UNIX group of the root user

    - -

    [base_dir] - The folder that contains the php-fpm pool configs. This defaults to a - sensible default depending on your operating system, like - '/etc/php5/fpm/pool.d' or '/etc/php-fpm.d'

    - -
    -
    -
    -

    Parameters:

    -
      - -
    • - - ensure - - - (Any) - - - (defaults to: 'present') - - -
      • - -
    • - - listen - - - (Any) - - - (defaults to: '127.0.0.1:9000') - - -
      • - -
    • - - listen_backlog - - - (Any) - - - (defaults to: '-1') - - -
      • - -
    • - - listen_allowed_clients - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - listen_owner - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - listen_group - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - listen_mode - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - user - - - (Any) - - - (defaults to: $::php::fpm::config::user) - - -
      • - -
    • - - group - - - (Any) - - - (defaults to: $::php::fpm::config::group) - - -
      • - -
    • - - pm - - - (Any) - - - (defaults to: 'dynamic') - - -
      • - -
    • - - pm_max_children - - - (Any) - - - (defaults to: '50') - - -
      • - -
    • - - pm_start_servers - - - (Any) - - - (defaults to: '5') - - -
      • - -
    • - - pm_min_spare_servers - - - (Any) - - - (defaults to: '5') - - -
      • - -
    • - - pm_max_spare_servers - - - (Any) - - - (defaults to: '35') - - -
      • - -
    • - - pm_max_requests - - - (Any) - - - (defaults to: '0') - - -
      • - -
    • - - pm_process_idle_timeout - - - (Any) - - - (defaults to: '10s') - - -
      • - -
    • - - pm_status_path - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - ping_path - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - ping_response - - - (Any) - - - (defaults to: 'pong') - - -
      • - -
    • - - access_log - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - access_log_format - - - (Any) - - - (defaults to: '"%R - %u %t \"%m %r\" %s"') - - -
      • - -
    • - - request_terminate_timeout - - - (Any) - - - (defaults to: '0') - - -
      • - -
    • - - request_slowlog_timeout - - - (Any) - - - (defaults to: '0') - - -
      • - -
    • - - security_limit_extensions - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - slowlog - - - (Any) - - - (defaults to: "/var/log/php-fpm/${name}-slow.log") - - -
      • - -
    • - - template - - - (Any) - - - (defaults to: 'php/fpm/pool.conf.erb') - - -
      • - -
    • - - rlimit_files - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - rlimit_core - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - chroot - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - chdir - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - catch_workers_output - - - (Any) - - - (defaults to: 'no') - - -
      • - -
    • - - include - - - (Any) - - - (defaults to: undef) - - -
      • - -
    • - - env - - - (Any) - - - (defaults to: []) - - -
      • - -
    • - - env_value - - - (Any) - - - (defaults to: {}) - - -
      • - -
    • - - options - - - (Any) - - - (defaults to: {}) - - -
      • - -
    • - - php_value - - - (Any) - - - (defaults to: {}) - - -
      • - -
    • - - php_flag - - - (Any) - - - (defaults to: {}) - - -
      • - -
    • - - php_admin_value - - - (Any) - - - (defaults to: {}) - - -
      • - -
    • - - php_admin_flag - - - (Any) - - - (defaults to: {}) - - -
      • - -
    • - - php_directives - - - (Any) - - - (defaults to: []) - - -
      • - -
    • - - root_group - - - (Any) - - - (defaults to: $::php::params::root_group) - - -
      • - -
    • - - base_dir - - - (Optional[Stdlib::Absolutepath]) - - - (defaults to: undef) - - -
      • - -
    - - -
    - - - - - -
    - 
    -
-
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163
-164
-165
-166
-167
-168
-169
-170
-171
-172
-173
-174
-175
-176
-177
-178
-179
-180
-181
-182
-183
-184
-185
-186
-187
-188
-189
-190
-191
-192
-193
-194
-195
-196
-197
-198
-199
    -     		- 
    # File 'manifests/fpm/pool.pp', line 117
-
-define php::fpm::pool (
-  $ensure                                  = 'present',
-  $listen                                  = '127.0.0.1:9000',
-  $listen_backlog                          = '-1',
-  $listen_allowed_clients                  = undef,
-  $listen_owner                            = undef,
-  $listen_group                            = undef,
-  $listen_mode                             = undef,
-  $user                                    = $::php::fpm::config::user,
-  $group                                   = $::php::fpm::config::group,
-  $pm                                      = 'dynamic',
-  $pm_max_children                         = '50',
-  $pm_start_servers                        = '5',
-  $pm_min_spare_servers                    = '5',
-  $pm_max_spare_servers                    = '35',
-  $pm_max_requests                         = '0',
-  $pm_process_idle_timeout                 = '10s',
-  $pm_status_path                          = undef,
-  $ping_path                               = undef,
-  $ping_response                           = 'pong',
-  $access_log                              = undef,
-  $access_log_format                       = '"%R - %u %t \"%m %r\" %s"',
-  $request_terminate_timeout               = '0',
-  $request_slowlog_timeout                 = '0',
-  $security_limit_extensions               = undef,
-  $slowlog                                 = "/var/log/php-fpm/${name}-slow.log",
-  $template                                = 'php/fpm/pool.conf.erb',
-  $rlimit_files                            = undef,
-  $rlimit_core                             = undef,
-  $chroot                                  = undef,
-  $chdir                                   = undef,
-  $catch_workers_output                    = 'no',
-  $include                                 = undef,
-  $env                                     = [],
-  $env_value                               = {},
-  $options                                 = {},
-  $php_value                               = {},
-  $php_flag                                = {},
-  $php_admin_value                         = {},
-  $php_admin_flag                          = {},
-  $php_directives                          = [],
-  $root_group                              = $::php::params::root_group,
-  Optional[Stdlib::Absolutepath] $base_dir = undef,
-) {
-
-  # The base class must be included first because it is used by parameter defaults
-  if ! defined(Class['php']) {
-    warning('You must include the php base class before using any php defined resources')
-  }
-
-  $pool = $title
-
-  # Hack-ish to default to user for group too
-  $group_final = $group ? {
-    undef   => $user,
-    default => $group
-  }
-
-  # On FreeBSD fpm is not a separate package, but included in the 'php' package.
-  # Implies that the option SET+=FPM was set when building the port.
-  $real_package = $facts['os']['name'] ? {
-    'FreeBSD' => [],
-    default   => $::php::fpm::package,
-  }
-
-  $pool_base_dir = pick_default($base_dir, $::php::fpm::config::pool_base_dir, $::php::params::fpm_pool_dir)
-  if ($ensure == 'absent') {
-    file { "${pool_base_dir}/${pool}.conf":
-      ensure => absent,
-      notify => Class['::php::fpm::service'],
-    }
-  } else {
-    file { "${pool_base_dir}/${pool}.conf":
-      ensure  => file,
-      notify  => Class['::php::fpm::service'],
-      require => Package[$real_package],
-      content => template($template),
-      owner   => root,
-      group   => $root_group,
-      mode    => '0644',
-    }
-  }
-}
    -
    -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_function_list.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_function_list.html deleted file mode 100644 index 10ceb73be..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_function_list.html +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - Puppet Function List - - - -
    -
    -

    Puppet Function List

    - - - -
    - - -
    - - diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_functions_ruby3x/ensure_prefix.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_functions_ruby3x/ensure_prefix.html deleted file mode 100644 index c76012015..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_functions_ruby3x/ensure_prefix.html +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - Puppet Function: ensure_prefix (Ruby 3.x API) - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Function: ensure_prefix

    -
    -
    -
    Defined in:
    -
    - lib/puppet/parser/functions/ensure_prefix.rb -
    -
    -
    -
    Function type:
    -
    Ruby 3.x API
    -
    -
    - -

    Overview

    -
    - -
    - - - ensure_prefix() ⇒ Any - - -
    - -
    -
    -

    This function ensures a prefix for all elements in an array or the keys in a hash.

    - -

    Examples:

    - -

    ensure_prefix(=> 1, 'b' => 2, 'p.c' => 3, 'p.')

    - -

    Will return: - { - 'p.a' => 1, - 'p.b' => 2, - 'p.c' => 3, - }

    - -

    ensure_prefix(['a', 'p.b', 'c'], 'p.')

    - -

    Will return: - ['p.a', 'p.b', 'p.c']

    - -
    -
    -
    - - -

    Returns:

    -
      - -
    • - - - (Any) - - - -
      • - -
    - -
    - - - - - -
    - 
    -
-
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
    -     		- 
    # File 'lib/puppet/parser/functions/ensure_prefix.rb', line 3
-
-newfunction(:ensure_prefix, type: :rvalue, doc: <<-EOS
-  This function ensures a prefix for all elements in an array or the keys in a hash.
-
-  *Examples:*
-
-    ensure_prefix({'a' => 1, 'b' => 2, 'p.c' => 3}, 'p.')
-
-  Will return:
-    {
-      'p.a' => 1,
-      'p.b' => 2,
-      'p.c' => 3,
-    }
-
-    ensure_prefix(['a', 'p.b', 'c'], 'p.')
-
-  Will return:
-    ['p.a', 'p.b', 'p.c']
-EOS
-           ) do |arguments|
-  if arguments.size < 2
-    raise(Puppet::ParseError, 'ensure_prefix(): Wrong number of arguments ' \
-      "given (#{arguments.size} for 2)")
-  end
-
-  enumerable = arguments[0]
-
-  unless enumerable.is_a?(Array) || enumerable.is_a?(Hash)
-    raise Puppet::ParseError, "ensure_prefix(): expected first argument to be an Array or a Hash, got #{enumerable.inspect}"
-  end
-
-  prefix = arguments[1] if arguments[1]
-
-  if prefix
-    unless prefix.is_a?(String)
-      raise Puppet::ParseError, "ensure_prefix(): expected second argument to be a String, got #{prefix.inspect}"
-    end
-  end
-
-  result = if enumerable.is_a?(Array)
-             # Turn everything into string same as join would do ...
-             enumerable.map do |i|
-               i = i.to_s
-               prefix && !i.start_with?(prefix) ? prefix + i : i
-             end
-           else
-             Hash[enumerable.map do |k, v|
-               k = k.to_s
-               [prefix && !k.start_with?(prefix) ? prefix + k : k, v]
-             end]
-           end
-
-  return result
-end
    -
    -
    - -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_functions_ruby3x/to_hash_settings.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_functions_ruby3x/to_hash_settings.html deleted file mode 100644 index 973706b7a..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_functions_ruby3x/to_hash_settings.html +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - Puppet Function: to_hash_settings (Ruby 3.x API) - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Puppet Function: to_hash_settings

    -
    -
    -
    Defined in:
    -
    - lib/puppet/parser/functions/to_hash_settings.rb -
    -
    -
    -
    Function type:
    -
    Ruby 3.x API
    -
    -
    - -

    Overview

    -
    - -
    - - - to_hash_settings() ⇒ Any - - -
    - -
    -
    -

    This function converts a +=> value+ hash into a nested hash and can add an id to the outer key. -The optional id string as second parameter is prepended to the resource name.

    - -

    Examples:

    - -

    to_hash_settings(=> 1, 'b' => 2)

    - -

    Would return: - { - 'a' => => 'a', 'value' => 1, - 'b' => => 'b', 'value' => 2 - }

    - -

    and:

    - -

    to_hash_settings(=> 1, 'b' => 2, 'foo')

    - -

    Would return: - { - 'foo: a' => => 'a', 'value' => 1, - 'foo: b' => => 'b', 'value' => 2 - }

    - -
    -
    -
    - - -

    Returns:

    -
      - -
    • - - - (Any) - - - -
      • - -
    - -
    - - - - - -
    - 
    -
-
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
    -     		- 
    # File 'lib/puppet/parser/functions/to_hash_settings.rb', line 3
-
-newfunction(:to_hash_settings, type: :rvalue, doc: <<-EOS
-  This function converts a +{key => value}+ hash into a nested hash and can add an id to the outer key.
-  The optional id string as second parameter is prepended to the resource name.
-
-  *Examples:*
-
-    to_hash_settings({'a' => 1, 'b' => 2})
-
-  Would return:
-    {
-      'a' => {'key' => 'a', 'value' => 1},
-      'b' => {'key' => 'b', 'value' => 2}
-    }
-
-  and:
-
-    to_hash_settings({'a' => 1, 'b' => 2}, 'foo')
-
-  Would return:
-    {
-      'foo: a' => {'key' => 'a', 'value' => 1},
-      'foo: b' => {'key' => 'b', 'value' => 2}
-    }
-EOS
-           ) do |arguments|
-  hash, id = arguments
-  id = (id.nil? ? '' : "#{id}: ")
-
-  raise(Puppet::ParseError, 'to_hash_settings(): Requires hash to work with') unless hash.is_a?(Hash)
-
-  return hash.each_with_object({}) do |kv, acc|
-    acc[id + kv[0]] = { 'key' => kv[0], 'value' => kv[1] }
-  end
-end
    -
    -
    - -
    -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_provider_list.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_provider_list.html deleted file mode 100644 index 7881a220f..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_provider_list.html +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - Provider List - - - -
    -
    -

    Provider List

    - - - -
    - -
      - - -
    • -
      - pear - Resource type: package -
      -
      • - - -
    • -
      - pecl - Resource type: package -
      -
      • - - - -
    -
    - - diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_providers_package/pear.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_providers_package/pear.html deleted file mode 100644 index 5621549a9..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_providers_package/pear.html +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - Provider: pear - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Provider: pear

    -
    -
    -
    Defined in:
    -
    - lib/puppet/provider/package/pear.rb -
    -
    -
    -
    Resource type:
    -
    package
    -
    -
    - -

    Overview

    -
    -
    -

    Package management via pear.

    - -
    -
    -
    - - -
    -
    -

    Features

    -
      - -
    • - versionable -
      • - -
    • - upgradeable -
      • - -
    • - install_options -
      • - -
    -
    - - - - -
    -

    Commands

    -
      - - - -
    • pear — pear
      • - - -
    -
    - -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/puppet_providers_package/pecl.html b/modules/utilities/unix/web_frameworks/php/docs/puppet_providers_package/pecl.html deleted file mode 100644 index 29c68d69f..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/puppet_providers_package/pecl.html +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - Provider: pecl - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Provider: pecl

    -
    -
    -
    Defined in:
    -
    - lib/puppet/provider/package/pecl.rb -
    -
    -
    -
    Resource type:
    -
    package
    -
    -
    - -

    Overview

    -
    -
    -

    Package management via pecl.

    - -
    -
    -
    - - -
    -
    -

    Features

    -
      - -
    • - versionable -
      • - -
    • - upgradeable -
      • - -
    • - install_options -
      • - -
    -
    - - - - -
    -

    Commands

    -
      - - - -
    • pear — pear
      • - - -
    -
    - -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/docs/top-level-namespace.html b/modules/utilities/unix/web_frameworks/php/docs/top-level-namespace.html deleted file mode 100644 index a5696897f..000000000 --- a/modules/utilities/unix/web_frameworks/php/docs/top-level-namespace.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - Top Level Namespace - - — Documentation by YARD 0.9.9 - - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    - - -

    Top Level Namespace - - - -

    -
    - - - - - - - - - - - -
    - - - - - - - - - - -
    - - - -
    - - \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/manifests/cli.pp b/modules/utilities/unix/web_frameworks/php/manifests/cli.pp deleted file mode 100644 index 61ca93bb8..000000000 --- a/modules/utilities/unix/web_frameworks/php/manifests/cli.pp +++ /dev/null @@ -1,26 +0,0 @@ -# Install and configure php CLI -# -# === Parameters -# -# [*inifile*] -# The path to the ini php5-cli ini file -# -# [*settings*] -# Hash with nested hash of key => value to set in inifile -# -class php::cli( - Stdlib::Absolutepath $inifile = $::php::params::cli_inifile, - Hash $settings = {} -) inherits ::php::params { - - if $caller_module_name != $module_name { - warning('php::cli is private') - } - - $real_settings = deep_merge($settings, hiera_hash('php::cli::settings', {})) - - ::php::config { 'cli': - file => $inifile, - config => $real_settings, - } -} diff --git a/modules/utilities/unix/web_frameworks/php/manifests/globals.pp b/modules/utilities/unix/web_frameworks/php/manifests/globals.pp deleted file mode 100644 index a2fbcf11e..000000000 --- a/modules/utilities/unix/web_frameworks/php/manifests/globals.pp +++ /dev/null @@ -1,126 +0,0 @@ -# PHP globals class -# -# === Parameters -# -# [*php_version*] -# The version of php. -# -# [*config_root*] -# The configuration root directory. -# -# [*fpm_pid_file*] -# Path to pid file for fpm - -class php::globals ( - Optional[Pattern[/^[57].[0-9]/]] $php_version = undef, - Optional[Stdlib::Absolutepath] $config_root = undef, - Optional[Stdlib::Absolutepath] $fpm_pid_file = undef, -) { - - $default_php_version = $facts['os']['family'] ? { - 'Debian' => $facts['os']['name'] ? { - 'Ubuntu' => $facts['os']['release']['full'] ? { - /^(1[67].04)$/ => '7.0', - default => '5.x', - }, - default => '5.x', - }, - default => '5.x', - } - - $globals_php_version = pick($php_version, $default_php_version) - - case $facts['os']['family'] { - 'Debian': { - if $facts['os']['name'] == 'Ubuntu' { - case $globals_php_version { - /^5\.4/: { - $default_config_root = '/etc/php5' - $default_fpm_pid_file = "/var/run/php/php${globals_php_version}-fpm.pid" - $fpm_error_log = '/var/log/php5-fpm.log' - $fpm_service_name = 'php5-fpm' - $ext_tool_enable = '/usr/sbin/php5enmod' - $ext_tool_query = '/usr/sbin/php5query' - $package_prefix = 'php5-' - } - /^[57].[0-9]/: { - $default_config_root = "/etc/php/${globals_php_version}" - $default_fpm_pid_file = "/var/run/php/php${globals_php_version}-fpm.pid" - $fpm_error_log = "/var/log/php${globals_php_version}-fpm.log" - $fpm_service_name = "php${globals_php_version}-fpm" - $ext_tool_enable = "/usr/sbin/phpenmod -v ${globals_php_version}" - $ext_tool_query = "/usr/sbin/phpquery -v ${globals_php_version}" - $package_prefix = "php${globals_php_version}-" - } - default: { - # Default php installation from Ubuntu official repository use the following paths until 16.04 - # For PPA please use the $php_version to override it. - $default_config_root = '/etc/php5' - $default_fpm_pid_file = '/var/run/php5-fpm.pid' - $fpm_error_log = '/var/log/php5-fpm.log' - $fpm_service_name = 'php5-fpm' - $ext_tool_enable = '/usr/sbin/php5enmod' - $ext_tool_query = '/usr/sbin/php5query' - $package_prefix = 'php5-' - } - } - } else { - case $globals_php_version { - /^7\.[0-9]/: { - $default_config_root = "/etc/php/${globals_php_version}" - $default_fpm_pid_file = "/var/run/php/php${globals_php_version}-fpm.pid" - $fpm_error_log = "/var/log/php${globals_php_version}-fpm.log" - $fpm_service_name = "php${globals_php_version}-fpm" - $ext_tool_enable = "/usr/sbin/phpenmod -v ${globals_php_version}" - $ext_tool_query = "/usr/sbin/phpquery -v ${globals_php_version}" - $package_prefix = "php${globals_php_version}-" - } - default: { - $default_config_root = '/etc/php5' - $default_fpm_pid_file = '/var/run/php5-fpm.pid' - $fpm_error_log = '/var/log/php5-fpm.log' - $fpm_service_name = 'php5-fpm' - $ext_tool_enable = '/usr/sbin/php5enmod' - $ext_tool_query = '/usr/sbin/php5query' - $package_prefix = 'php5-' - } - } - } - } - 'Suse': { - case $globals_php_version { - /^7/: { - $default_config_root = '/etc/php7' - $package_prefix = 'php7-' - $default_fpm_pid_file = '/var/run/php7-fpm.pid' - $fpm_error_log = '/var/log/php7-fpm.log' - } - default: { - $default_config_root = '/etc/php5' - $package_prefix = 'php5-' - $default_fpm_pid_file = '/var/run/php5-fpm.pid' - $fpm_error_log = '/var/log/php5-fpm.log' - } - } - } - 'RedHat': { - $default_config_root = '/etc' - $default_fpm_pid_file = '/var/run/php-fpm/php-fpm.pid' - } - 'FreeBSD': { - $default_config_root = '/usr/local/etc' - $default_fpm_pid_file = '/var/run/php-fpm.pid' - } - 'Archlinux': { - $default_config_root = '/etc/php' - $default_fpm_pid_file = '/run/php-fpm/php-fpm.pid' - } - default: { - fail("Unsupported osfamily: ${facts['os']['family']}") - } - } - - $globals_config_root = pick($config_root, $default_config_root) - - $globals_fpm_pid_file = pick($fpm_pid_file, $default_fpm_pid_file) -} diff --git a/modules/utilities/unix/web_frameworks/php/php.pp b/modules/utilities/unix/web_frameworks/php/php.pp deleted file mode 100644 index e4524e861..000000000 --- a/modules/utilities/unix/web_frameworks/php/php.pp +++ /dev/null @@ -1 +0,0 @@ -include '::php' \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/secgen_metadata.xml b/modules/utilities/unix/web_frameworks/php/secgen_metadata.xml deleted file mode 100644 index d9a8f7acc..000000000 --- a/modules/utilities/unix/web_frameworks/php/secgen_metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - PHP - Thomas Shaw - MIT - Module for installing and configuring the PHP framework. - - web_framework - linux - - PHP - MIT - - - Stretch - - - - update - - diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/centos-5.yml b/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/centos-5.yml deleted file mode 100644 index c17bc3d00..000000000 --- a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/centos-5.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - centos-5-x64: - platform: el-5-x86_64 - hypervisor: docker - image: centos:5 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which' - - 'sed -i -e "/mingetty/d" /etc/inittab' -CONFIG: - trace_limit: 200 - masterless: true -... -# vim: syntax=yaml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/centos-6.yml b/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/centos-6.yml deleted file mode 100644 index d93f884cb..000000000 --- a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/centos-6.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - centos-6-x64: - platform: el-6-x86_64 - hypervisor: docker - image: centos:6 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'rm -rf /var/run/network/*' - - 'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which' - - 'rm /etc/init/tty.conf' -CONFIG: - trace_limit: 200 - masterless: true -... -# vim: syntax=yaml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/centos-7.yml b/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/centos-7.yml deleted file mode 100644 index 41e924b50..000000000 --- a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/centos-7.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - centos-7-x64: - platform: el-7-x86_64 - hypervisor: docker - image: centos:7 - docker_preserve_image: true - docker_cmd: '["/usr/sbin/init"]' - docker_image_commands: - - 'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which ss' - - 'systemctl mask getty@tty1.service' -CONFIG: - trace_limit: 200 - masterless: true -... -# vim: syntax=yaml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/debian-7.yml b/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/debian-7.yml deleted file mode 100644 index 41b284d39..000000000 --- a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/debian-7.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - debian-7-x64: - platform: debian-7-amd64 - hypervisor: docker - image: debian:7 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get update && apt-get install -y cron locales-all net-tools wget' -CONFIG: - trace_limit: 200 - masterless: true -... -# vim: syntax=yaml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/debian-8.yml b/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/debian-8.yml deleted file mode 100644 index a630b7efd..000000000 --- a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/debian-8.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -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 cron locales-all net-tools wget' - - 'rm -f /usr/sbin/policy-rc.d' - - 'systemctl mask getty@tty1.service getty-static.service' -CONFIG: - trace_limit: 200 - masterless: true -... -# vim: syntax=yaml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/debian-9.yml b/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/debian-9.yml deleted file mode 100644 index dfc8e9c09..000000000 --- a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/debian-9.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/theforeman/foreman-installer-modulesync -HOSTS: - debian-9-x64: - platform: debian-9-amd64 - hypervisor: docker - image: debian:9 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get update && apt-get install -y cron locales-all net-tools wget systemd-sysv' - - 'rm -f /usr/sbin/policy-rc.d' - - 'systemctl mask getty@tty1.service getty-static.service' -CONFIG: - trace_limit: 200 - masterless: true -... -# vim: syntax=yaml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/ubuntu-12.04.yml b/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/ubuntu-12.04.yml deleted file mode 100644 index ab77cda48..000000000 --- a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/ubuntu-12.04.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - ubuntu-1204-x64: - platform: ubuntu-12.04-amd64 - hypervisor: docker - image: ubuntu:12.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y net-tools wget' - - 'locale-gen en_US.UTF-8' -CONFIG: - trace_limit: 200 - masterless: true -... -# vim: syntax=yaml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/ubuntu-14.04.yml deleted file mode 100644 index ae4530444..000000000 --- a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/ubuntu-14.04.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -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: - - 'rm /usr/sbin/policy-rc.d' - - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl' - - 'apt-get install -y net-tools wget apt-transport-https' - - 'locale-gen en_US.UTF-8' -CONFIG: - trace_limit: 200 - masterless: true -... -# vim: syntax=yaml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/ubuntu-16.04.yml b/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/ubuntu-16.04.yml deleted file mode 100644 index 2d173c5b9..000000000 --- a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/docker/ubuntu-16.04.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - ubuntu-1604-x64: - platform: ubuntu-16.04-amd64 - hypervisor: docker - image: ubuntu:16.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y net-tools wget locales apt-transport-https' - - 'locale-gen en_US.UTF-8' -CONFIG: - trace_limit: 200 - masterless: true -... -# vim: syntax=yaml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/php_spec.rb b/modules/utilities/unix/web_frameworks/php/spec/acceptance/php_spec.rb deleted file mode 100644 index f7e3263b7..000000000 --- a/modules/utilities/unix/web_frameworks/php/spec/acceptance/php_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'php' do - it 'works with defaults' do - pp = 'include php' - # Run it twice and test for idempotency - apply_manifest(pp, catch_failures: true) - apply_manifest(pp, catch_changes: true) - end - - case default[:platform] - when %r{16.04} - describe package('php7.0-fpm') do - it { is_expected.to be_installed } - end - when %r{14.04} - describe package('php5-fpm') do - it { is_expected.to be_installed } - end - when %(7) - describe package('php-fpm') do - it { is_expected.to be_installed } - end - end -end diff --git a/modules/utilities/unix/web_frameworks/php/spec/classes/php_spec.rb b/modules/utilities/unix/web_frameworks/php/spec/classes/php_spec.rb deleted file mode 100644 index 75f624ced..000000000 --- a/modules/utilities/unix/web_frameworks/php/spec/classes/php_spec.rb +++ /dev/null @@ -1,125 +0,0 @@ -require 'spec_helper' - -describe 'php', type: :class do - on_supported_os.each do |os, facts| - context "on #{os}" do - let :facts do - facts - end - - describe 'when called with no parameters' do - case facts[:osfamily] - when 'Debian' - it { is_expected.not_to contain_class('php::global') } - it { is_expected.to contain_class('php::fpm') } - it { is_expected.to contain_package('php-pear').with_ensure('present') } - it { is_expected.to contain_class('php::composer') } - case facts[:os]['release']['major'] - when '14.04' - it { is_expected.to contain_package('php5-cli').with_ensure('present') } - it { is_expected.to contain_package('php5-fpm').with_ensure('present') } - it { is_expected.to contain_package('php5-dev').with_ensure('present') } - when '16.04' - it { is_expected.to contain_package('php7.0-cli').with_ensure('present') } - it { is_expected.to contain_package('php7.0-fpm').with_ensure('present') } - it { is_expected.to contain_package('php7.0-dev').with_ensure('present') } - end - when 'Suse' - it { is_expected.to contain_class('php::global') } - it { is_expected.to contain_package('php5').with_ensure('present') } - it { is_expected.to contain_package('php5-devel').with_ensure('present') } - it { is_expected.to contain_package('php5-pear').with_ensure('present') } - it { is_expected.not_to contain_package('php5-cli') } - it { is_expected.not_to contain_package('php5-dev') } - it { is_expected.not_to contain_package('php-pear') } - end - end - - describe 'when called with package_prefix parameter' do - let(:params) { { package_prefix: 'myphp-' } } - - case facts[:osfamily] - when 'Debian' - it { is_expected.not_to contain_class('php::global') } - it { is_expected.to contain_class('php::fpm') } - it { is_expected.to contain_package('myphp-cli').with_ensure('present') } - it { is_expected.to contain_package('myphp-fpm').with_ensure('present') } - it { is_expected.to contain_package('myphp-dev').with_ensure('present') } - it { is_expected.to contain_package('php-pear').with_ensure('present') } - it { is_expected.to contain_class('php::composer') } - when 'Suse' - it { is_expected.to contain_class('php::global') } - it { is_expected.to contain_package('php5').with_ensure('present') } - it { is_expected.to contain_package('myphp-devel').with_ensure('present') } - it { is_expected.to contain_package('myphp-pear').with_ensure('present') } - it { is_expected.not_to contain_package('myphp-cli') } - it { is_expected.not_to contain_package('myphp-dev') } - it { is_expected.not_to contain_package('php-pear') } - end - end - - describe 'when called with fpm_user parameter' do - let(:params) { { fpm_user: 'nginx' } } - - it { is_expected.to contain_class('php::fpm').with(user: 'nginx') } - it { is_expected.to contain_php__fpm__pool('www').with(user: 'nginx') } - - dstfile = case facts[:osfamily] - when 'Debian' - case facts[:os]['release']['major'] - when '16.04' - '/etc/php/7.0/fpm/pool.d/www.conf' - else - '/etc/php5/fpm/pool.d/www.conf' - end - when 'Archlinux' - '/etc/php/php-fpm.d/www.conf' - when 'Suse' - '/etc/php5/fpm/pool.d/www.conf' - when 'RedHat' - '/etc/php-fpm.d/www.conf' - when 'FreeBSD' - '/usr/local/etc/php-fpm.d/www.conf' - end - - it { is_expected.to contain_file(dstfile).with_content(%r{user = nginx}) } - end - describe 'when called with fpm_group parameter' do - let(:params) { { fpm_group: 'nginx' } } - - it { is_expected.to contain_class('php::fpm').with(group: 'nginx') } - it { is_expected.to contain_php__fpm__pool('www').with(group: 'nginx') } - dstfile = case facts[:osfamily] - when 'Debian' - case facts[:os]['release']['major'] - when '16.04' - '/etc/php/7.0/fpm/pool.d/www.conf' - else - '/etc/php5/fpm/pool.d/www.conf' - end - when 'Archlinux' - '/etc/php/php-fpm.d/www.conf' - when 'Suse' - '/etc/php5/fpm/pool.d/www.conf' - when 'RedHat' - '/etc/php-fpm.d/www.conf' - when 'FreeBSD' - '/usr/local/etc/php-fpm.d/www.conf' - end - - it { is_expected.to contain_file(dstfile).with_content(%r{group = nginx}) } - end - - describe 'when fpm is disabled' do - let(:params) { { fpm: false } } - - it { is_expected.not_to contain_class('php::fpm') } - end - describe 'when composer is disabled' do - let(:params) { { composer: false } } - - it { is_expected.not_to contain_class('php::composer') } - end - end - end -end diff --git a/modules/utilities/unix/web_frameworks/php/spec/defines/fpm_pool_spec.rb b/modules/utilities/unix/web_frameworks/php/spec/defines/fpm_pool_spec.rb deleted file mode 100644 index dc3c51652..000000000 --- a/modules/utilities/unix/web_frameworks/php/spec/defines/fpm_pool_spec.rb +++ /dev/null @@ -1,37 +0,0 @@ -require 'spec_helper' - -describe 'php::fpm::pool' do - on_supported_os.each do |os, facts| - context "on #{os}" do - let :facts do - facts - end - let(:pre_condition) { 'include php' } - - case facts[:osfamily] - when 'Debian' - case facts[:operatingsystem] - when 'Ubuntu' - context 'plain config' do - let(:title) { 'unique-name' } - let(:params) { {} } - - case facts[:os]['release']['major'] - when '14.04' - it { is_expected.to contain_file('/etc/php5/fpm/pool.d/unique-name.conf') } - when '16.04' - it { is_expected.to contain_file('/etc/php/7.0/fpm/pool.d/unique-name.conf') } - end - end - when 'Debian' - context 'plain config' do - let(:title) { 'unique-name' } - let(:params) { {} } - - it { is_expected.to contain_file('/etc/php5/fpm/pool.d/unique-name.conf') } - end - end - end - end - end -end diff --git a/modules/utilities/unix/web_frameworks/php/CHANGELOG.md b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/CHANGELOG.md similarity index 71% rename from modules/utilities/unix/web_frameworks/php/CHANGELOG.md rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/CHANGELOG.md index 9db584158..0472789ff 100644 --- a/modules/utilities/unix/web_frameworks/php/CHANGELOG.md +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/CHANGELOG.md @@ -4,6 +4,87 @@ All notable changes to this project will be documented in this file. Each new release typically also includes the latest modulesync defaults. These should not affect the functionality of the module. +## [v6.0.1](https://github.com/voxpupuli/puppet-php/tree/v6.0.1) (2018-10-07) + +[Full Changelog](https://github.com/voxpupuli/puppet-php/compare/v6.0.0...v6.0.1) + +**Fixed bugs:** + +- Fix enable extension when there is no module associated [\#479](https://github.com/voxpupuli/puppet-php/pull/479) ([amateo](https://github.com/amateo)) +- Remove config when module is ensured to absent [\#478](https://github.com/voxpupuli/puppet-php/pull/478) ([amateo](https://github.com/amateo)) + +**Closed issues:** + +- "php::manage\_repos: true" causes failure on Ubuntu 18.04, needs newer puppetlabs-apt version\(\>=5.0.0\) [\#467](https://github.com/voxpupuli/puppet-php/issues/467) + +**Merged pull requests:** + +- modulesync 2.1.0 and allow puppet 6.x [\#481](https://github.com/voxpupuli/puppet-php/pull/481) ([bastelfreak](https://github.com/bastelfreak)) +- Add acceptance tests for system php with extensions [\#476](https://github.com/voxpupuli/puppet-php/pull/476) ([bastelfreak](https://github.com/bastelfreak)) +- Allow puppetlabs/stdlib 5.x and puppetlabs/apt 6.x [\#472](https://github.com/voxpupuli/puppet-php/pull/472) ([bastelfreak](https://github.com/bastelfreak)) + +## [v6.0.0](https://github.com/voxpupuli/puppet-php/tree/v6.0.0) (2018-07-29) + +[Full Changelog](https://github.com/voxpupuli/puppet-php/compare/v5.3.0...v6.0.0) + +**Breaking changes:** + +- Tests failing under debian8 [\#433](https://github.com/voxpupuli/puppet-php/issues/433) +- fixed hiera merge bug [\#435](https://github.com/voxpupuli/puppet-php/pull/435) ([c33s](https://github.com/c33s)) + +**Implemented enhancements:** + +- Compatibility with Software collections \(SCL\) [\#451](https://github.com/voxpupuli/puppet-php/pull/451) ([oranenj](https://github.com/oranenj)) +- Add Debian 9 support [\#440](https://github.com/voxpupuli/puppet-php/pull/440) ([SimonHoenscheid](https://github.com/SimonHoenscheid)) +- Add initial ubuntu 18.04 support [\#428](https://github.com/voxpupuli/puppet-php/pull/428) ([jkroepke](https://github.com/jkroepke)) + +**Fixed bugs:** + +- php.ini not updated [\#422](https://github.com/voxpupuli/puppet-php/issues/422) +- Error: Could not upgrade module 'puppet-php' \(v4.0.0 -\> v5.0.0\) [\#378](https://github.com/voxpupuli/puppet-php/issues/378) +- Fix paths for phpunit on FreeBSD [\#291](https://github.com/voxpupuli/puppet-php/pull/291) ([bitnexus](https://github.com/bitnexus)) + +**Closed issues:** + +- Debian 9 \(Stretch\) support [\#439](https://github.com/voxpupuli/puppet-php/issues/439) +- Repository class switch failing on Ubuntu [\#392](https://github.com/voxpupuli/puppet-php/issues/392) +- Next stable release? [\#352](https://github.com/voxpupuli/puppet-php/issues/352) +- PHP extensions loaded twice [\#341](https://github.com/voxpupuli/puppet-php/issues/341) +- PECL/Extension checks for beta packages [\#73](https://github.com/voxpupuli/puppet-php/issues/73) + +**Merged pull requests:** + +- Update README.md with working RHSCL example. [\#463](https://github.com/voxpupuli/puppet-php/pull/463) ([Tamerz](https://github.com/Tamerz)) +- enable ubuntu 18.04 acceptance tests [\#462](https://github.com/voxpupuli/puppet-php/pull/462) ([bastelfreak](https://github.com/bastelfreak)) +- drop EOL OSs; fix puppet version range [\#453](https://github.com/voxpupuli/puppet-php/pull/453) ([bastelfreak](https://github.com/bastelfreak)) +- Rely on beaker-hostgenerator for docker nodesets [\#452](https://github.com/voxpupuli/puppet-php/pull/452) ([ekohl](https://github.com/ekohl)) +- mark private classes with assert\_private\(\) [\#447](https://github.com/voxpupuli/puppet-php/pull/447) ([bastelfreak](https://github.com/bastelfreak)) +- migrate vars from topscope to relative scope [\#444](https://github.com/voxpupuli/puppet-php/pull/444) ([bastelfreak](https://github.com/bastelfreak)) +- bump puppet to latest supported version 4.10.0 [\#443](https://github.com/voxpupuli/puppet-php/pull/443) ([bastelfreak](https://github.com/bastelfreak)) +- Update puppet/archive dependency [\#438](https://github.com/voxpupuli/puppet-php/pull/438) ([marknl](https://github.com/marknl)) +- switch the dotdeb repo url to https [\#431](https://github.com/voxpupuli/puppet-php/pull/431) ([bastelfreak](https://github.com/bastelfreak)) + +## [v5.3.0](https://github.com/voxpupuli/puppet-php/tree/v5.3.0) (2018-03-06) + +[Full Changelog](https://github.com/voxpupuli/puppet-php/compare/v5.2.0...v5.3.0) + +**Implemented enhancements:** + +- mark Ubuntu 16.04 as supported and fix its tests [\#221](https://github.com/voxpupuli/puppet-php/issues/221) +- Using the new facts hash instead of the global var in repo/debian.pp [\#425](https://github.com/voxpupuli/puppet-php/pull/425) ([c33s](https://github.com/c33s)) +- Add Acceptance tests [\#414](https://github.com/voxpupuli/puppet-php/pull/414) ([bastelfreak](https://github.com/bastelfreak)) + +**Fixed bugs:** + +- Fix Archlinux support [\#423](https://github.com/voxpupuli/puppet-php/pull/423) ([bastelfreak](https://github.com/bastelfreak)) +- Fix wrongly named parameters for apt::source/key [\#420](https://github.com/voxpupuli/puppet-php/pull/420) ([bitcrush](https://github.com/bitcrush)) +- manage software-properties-common on ubuntu [\#419](https://github.com/voxpupuli/puppet-php/pull/419) ([bastelfreak](https://github.com/bastelfreak)) + +**Merged pull requests:** + +- add examples for php-fpm/nginx [\#424](https://github.com/voxpupuli/puppet-php/pull/424) ([bastelfreak](https://github.com/bastelfreak)) +- add tests for php5.6 [\#418](https://github.com/voxpupuli/puppet-php/pull/418) ([bastelfreak](https://github.com/bastelfreak)) + ## [v5.2.0](https://github.com/voxpupuli/puppet-php/tree/v5.2.0) (2018-02-14) [Full Changelog](https://github.com/voxpupuli/puppet-php/compare/v5.1.0...v5.2.0) @@ -52,13 +133,10 @@ These should not affect the functionality of the module. **Merged pull requests:** -- release 5.1.0 [\#394](https://github.com/voxpupuli/puppet-php/pull/394) ([bastelfreak](https://github.com/bastelfreak)) - Proposed fix for failing parallel spec tests [\#386](https://github.com/voxpupuli/puppet-php/pull/386) ([wyardley](https://github.com/wyardley)) - update dependencies in metadata [\#379](https://github.com/voxpupuli/puppet-php/pull/379) ([mmoll](https://github.com/mmoll)) - Bump metadata.json version to 5.0.1-rc [\#377](https://github.com/voxpupuli/puppet-php/pull/377) ([dhollinger](https://github.com/dhollinger)) - bump dep on puppet/archive to '\< 3.0.0' [\#376](https://github.com/voxpupuli/puppet-php/pull/376) ([costela](https://github.com/costela)) -- Release 5.0.0 [\#371](https://github.com/voxpupuli/puppet-php/pull/371) ([hunner](https://github.com/hunner)) -- Backport of \#355 remove example42/yum dependency on puppet3 branch [\#366](https://github.com/voxpupuli/puppet-php/pull/366) ([LEDfan](https://github.com/LEDfan)) - Add missing php-fpm user and group class param docs [\#346](https://github.com/voxpupuli/puppet-php/pull/346) ([dbeckham](https://github.com/dbeckham)) ## [v5.0.0](https://github.com/voxpupuli/puppet-php/tree/v5.0.0) (2017-08-07) @@ -285,4 +363,4 @@ Initial release [4.0.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v3.4.2...v4.0.0 -\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* diff --git a/modules/utilities/unix/web_frameworks/php/Gemfile b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/Gemfile similarity index 76% rename from modules/utilities/unix/web_frameworks/php/Gemfile rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/Gemfile index 57fcafa19..dd1b03a6d 100644 --- a/modules/utilities/unix/web_frameworks/php/Gemfile +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/Gemfile @@ -11,8 +11,7 @@ def location_for(place, fake_version = nil) end group :test do - gem 'puppetlabs_spec_helper', '~> 2.6.0', :require => false - gem 'rspec-puppet', '~> 2.5', :require => false + gem 'puppetlabs_spec_helper', '>= 2.11.0', :require => false gem 'rspec-puppet-facts', :require => false gem 'rspec-puppet-utils', :require => false gem 'puppet-lint-leading_zero-check', :require => false @@ -25,7 +24,7 @@ group :test do gem 'redcarpet', :require => false gem 'rubocop', '~> 0.49.1', :require => false if RUBY_VERSION >= '2.3.0' gem 'rubocop-rspec', '~> 1.15.0', :require => false if RUBY_VERSION >= '2.3.0' - gem 'mocha', '>= 1.2.1', :require => false + gem 'mocha', '~> 1.4.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false gem 'rack', '~> 1.0', :require => false if RUBY_VERSION < '2.2.2' @@ -40,7 +39,7 @@ group :development do end group :system_tests do - gem 'winrm', :require => false + gem 'winrm', :require => false if beaker_version = ENV['BEAKER_VERSION'] gem 'beaker', *location_for(beaker_version) else @@ -51,16 +50,22 @@ group :system_tests do else gem 'beaker-rspec', :require => false end - gem 'serverspec', :require => false - gem 'beaker-puppet_install_helper', :require => false - gem 'beaker-module_install_helper', :require => false + gem 'serverspec', :require => false + gem 'beaker-hostgenerator', '>= 1.1.10', :require => false + gem 'beaker-docker', :require => false + gem 'beaker-puppet', :require => false + gem 'beaker-puppet_install_helper', :require => false + gem 'beaker-module_install_helper', :require => false + gem 'rbnacl', '>= 4', :require => false if RUBY_VERSION >= '2.2.6' + gem 'rbnacl-libsodium', :require => false if RUBY_VERSION >= '2.2.6' + gem 'bcrypt_pbkdf', :require => false end group :release do - gem 'github_changelog_generator', :require => false, :git => 'https://github.com/skywinder/github-changelog-generator' if RUBY_VERSION >= '2.2.2' + gem 'github_changelog_generator', :require => false, :git => 'https://github.com/github-changelog-generator/github-changelog-generator' if RUBY_VERSION >= '2.2.2' gem 'puppet-blacksmith', :require => false gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem' - gem 'puppet-strings', '~> 1.0', :require => false + gem 'puppet-strings', '>= 1.0', :require => false end diff --git a/modules/utilities/unix/web_frameworks/php/HISTORY.md b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/HISTORY.md similarity index 100% rename from modules/utilities/unix/web_frameworks/php/HISTORY.md rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/HISTORY.md diff --git a/modules/utilities/unix/web_frameworks/php/LICENSE.txt b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/LICENSE.txt similarity index 100% rename from modules/utilities/unix/web_frameworks/php/LICENSE.txt rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/LICENSE.txt diff --git a/modules/utilities/unix/web_frameworks/php/README.md b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/README.md similarity index 76% rename from modules/utilities/unix/web_frameworks/php/README.md rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/README.md index c49ed40af..2fd636a6b 100644 --- a/modules/utilities/unix/web_frameworks/php/README.md +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/README.md @@ -200,6 +200,7 @@ Alternative to the Puppet DSL code examples above, you may optionally define you Below are all the examples you see above, but defined in YAML format for use with Hiera. ```yaml + --- php::ensure: latest php::manage_repos: true @@ -259,7 +260,7 @@ The older Ubuntu PPAs run by Ondřej have been deprecated (ondrej/php5, ondrej/p in favor of a new PPA: ondrej/php which contains all 3 versions of PHP: 5.5, 5.6, and 7.0 Here's an example in hiera of getting PHP 5.6 installed with php-fpm, pear/pecl, and composer: -``` +```puppet php::globals::php_version: '5.6' php::fpm: true php::dev: true @@ -280,6 +281,124 @@ We prefer using php-fpm. You can find an example Apache vhost in `manifests/apache_vhost.pp` that shows you how to use `mod_proxy_fcgi` to connect to php-fpm. + +### RedHat/CentOS SCL Users +If you plan to use the SCL repositories with this module you must do the following adjustments: + +#### General config +This ensures that the module will create configurations in the directory ``/etc/opt/rh//` (also in php.d/ +for extensions). Anyway you have to manage the SCL repo's by your own. + +```puppet +class { '::php::globals': + php_version => 'rh-php71', + rhscl_mode => 'rhscl', +} +-> class { '::php': + manage_repos => false +} +``` + +#### Extensions +Extensions in SCL are being installed with packages that cover 1 or more .so files. This is kinda incompatible with +this module, since this module specifies an extension by name and derives the name of the package and the config (.ini) +from it. To manage extensions of SCL packages you must use the following parameters: + +```puppet +class { '::php': + ... + extensions => { + 'soap' => { + ini_prefix => '20-', + }, + } +} +``` + +By this you tell the module to configure bz2 and calender while ensuring only the package `common`. Additionally to the +installation of 'common' the inifiles 'calender.ini' and 'bz2.ini' will be created by the scheme +``. + +A list of commonly used modules: +```puppet + { + extensions => { + 'xml' => { + ini_prefix => '20-', + multifile_settings => true, + settings => { + 'dom' => {}, + 'simplexml' => {}, + 'xmlwriter' => {}, + 'xsl' => {}, + 'wddx' => {}, + 'xmlreader' => {}, + }, + }, + 'soap' => { + ini_prefix => '20-', + }, + 'imap' => { + ini_prefix => '20-', + }, + 'intl' => { + ini_prefix => '20-', + }, + 'gd' => { + ini_prefix => '20-', + }, + 'mbstring' => { + ini_prefix => '20-', + }, + 'xmlrpc' => { + ini_prefix => '20-', + }, + 'pdo' => { + ini_prefix => '20-', + multifile_settings => true, + settings => { + 'pdo' => {}, + 'pdo_sqlite' => {}, + 'sqlite3' => {}, + }, + }, + 'process' => { + ini_prefix => '20-', + multifile_settings => true, + settings => { + 'posix' => {}, + 'shmop' => {}, + 'sysvmsg' => {}, + 'sysvsem' => {}, + 'sysvshm' => {}, + }, + }, + 'mysqlnd' => { + ini_prefix => '30-', + multifile_settings => true, + settings => { + 'mysqlnd' => {}, + 'mysql' => {}, + 'mysqli' => {}, + 'pdo_mysql' => {}, + 'sysvshm' => {}, + }, + }, + 'mysqlnd' => { + ini_prefix => '30-', + multifile_settings => true, + settings => { + 'mysqlnd' => {}, + 'mysql' => {}, + 'mysqli' => {}, + 'pdo_mysql' => {}, + 'sysvshm' => {}, + }, + }, + } + } +``` + ### Facts We deliver a `phpversion` fact with this module. This is explicitly **NOT** intended diff --git a/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/REFERENCE.md b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/REFERENCE.md new file mode 100644 index 000000000..a82cca46d --- /dev/null +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/REFERENCE.md @@ -0,0 +1,2771 @@ +# Reference + + +## Table of Contents + +**Classes** + +* [`php`](#php): Base class with global configuration parameters that pulls in all enabled components. === Parameters [*ensure*] Specify which version of +* [`php::apache_config`](#phpapache_config): Install and configure php apache settings === Parameters [*inifile*] The path to the ini php-apache ini file [*settings*] Hash with ne +* [`php::cli`](#phpcli): Install and configure php CLI === Parameters [*inifile*] The path to the ini php5-cli ini file [*settings*] Hash with nested hash of k +* [`php::composer`](#phpcomposer): Install composer package manager === Parameters [*source*] Holds URL to the Composer source file [*path*] Holds path to the Composer e +* [`php::composer::auto_update`](#phpcomposerauto_update): Install composer package manager === Parameters [*max_age*] Defines number of days after which Composer should be updated [*source*] H +* [`php::dev`](#phpdev): Install the development package with headers for PHP === Parameters [*ensure*] The PHP ensure of PHP dev to install [*package*] The pa +* [`php::embedded`](#phpembedded): Install and configure php embedded SAPI === Parameters [*inifile*] The path to the ini php5-embeded ini file [*settings*] Hash with ne +* [`php::fpm`](#phpfpm): Install and configure mod_php for fpm === Parameters [*user*] The user that php-fpm should run as [*group*] The group that php-fpm sho +* [`php::fpm::config`](#phpfpmconfig): Configure php-fpm service === Parameters [*config_file*] The path to the fpm config file [*user*] The user that runs php-fpm [*group* +* [`php::fpm::service`](#phpfpmservice): Manage fpm service === Parameters [*service_name*] name of the php-fpm service [*ensure*] 'ensure' value for the service [*enable*] +* [`php::global`](#phpglobal): +* [`php::globals`](#phpglobals): +* [`php::packages`](#phppackages): Install common PHP packages === Parameters [*ensure*] Specify which version of PHP packages to install [*names*] List of the names of +* [`php::params`](#phpparams): PHP params class +* [`php::pear`](#phppear): Install PEAR package manager === Parameters [*ensure*] The package ensure of PHP pear to install and run pear auto_discover [*package*] +* [`php::phpunit`](#phpphpunit): Install phpunit, PHP testing framework === Parameters [*source*] Holds URL to the phpunit source file [*path*] Holds path to the phpun +* [`php::phpunit::auto_update`](#phpphpunitauto_update): Install phpunit package manager === Parameters [*max_age*] Defines number of days after which phpunit should be updated [*source*] Hol +* [`php::repo`](#phprepo): Configure package repository +* [`php::repo::debian`](#phprepodebian): Configure debian apt repo === Parameters [*location*] Location of the apt repository [*release*] Release of the apt repository [*repo +* [`php::repo::redhat`](#phpreporedhat): +* [`php::repo::suse`](#phpreposuse): Configure suse repo === Parameters [*reponame*] Name of the Zypper repository [*baseurl*] Base URL of the Zypper repository +* [`php::repo::ubuntu`](#phprepoubuntu): Configure ubuntu ppa === Parameters [*version*] PHP version to manage (e.g. 5.6) + +**Defined types** + +* [`php::apache_vhost`](#phpapache_vhost): Configures an apache vhost for php === Parameters [*vhost*] The vhost address [*docroot*] The vhost docroot [*port*] The vhost port +* [`php::config`](#phpconfig): Configure php.ini settings for a PHP SAPI === Parameters [*file*] The path to ini file [*config*] Nested hash of key => value to apply +* [`php::config::setting`](#phpconfigsetting): Configure php.ini settings === Parameters [*key*] The key of the value, like `ini_setting` [*file*] The path to ini file [*value*] +* [`php::extension`](#phpextension): Install a PHP extension package === Parameters [*ensure*] The ensure of the package to install Could be "latest", "installed" or a pinn +* [`php::extension::config`](#phpextensionconfig): Configure a PHP extension package === Parameters [*ensure*] The ensure of the package to install Could be "latest", "installed" or a pi +* [`php::extension::install`](#phpextensioninstall): Install a PHP extension package === Parameters [*ensure*] The ensure of the package to install Could be "latest", "installed" or a pinn +* [`php::fpm::pool`](#phpfpmpool): Configure fpm pools === Parameters See the official php-fpm documentation for parameters that are not documented here: http://php.net/manua + +**Functions** + +* [`ensure_prefix`](#ensure_prefix): This function ensures a prefix for all elements in an array or the keys in a hash. *Examples:* ensure_prefix({'a' => 1, 'b' => 2, 'p.c' = +* [`to_hash_settings`](#to_hash_settings): This function converts a +{key => value}+ hash into a nested hash and can add an id to the outer key. The optional id string as second parame + +## Classes + +### php + +Base class with global configuration parameters that pulls in all +enabled components. + +=== Parameters + +[*ensure*] + Specify which version of PHP packages to install, defaults to 'present'. + Please note that 'absent' to remove packages is not supported! + +[*manage_repos*] + Include repository (dotdeb, ppa, etc.) to install recent PHP from + +[*fpm*] + Install and configure php-fpm + +[*fpm_service_enable*] + Enable/disable FPM service + +[*fpm_service_ensure*] + Ensure FPM service is either 'running' or 'stopped' + +[*fpm_service_name*] + This is the name of the php-fpm service. It defaults to reasonable OS + defaults but can be different in case of using php7.0/other OS/custom fpm service + +[*fpm_service_provider*] + This is the name of the service provider, in case there is a non + OS default service provider used to start FPM. + Defaults to 'undef', pick system defaults. + +[*fpm_pools*] + Hash of php::fpm::pool resources that will be created. Defaults + to a single php::fpm::pool named www with default parameters. + +[*fpm_global_pool_settings*] + Hash of defaults params php::fpm::pool resources that will be created. + Defaults to empty hash. + +[*fpm_inifile*] + Path to php.ini for fpm + +[*fpm_package*] + Name of fpm package to install + +[*fpm_user*] + The user that php-fpm should run as + +[*fpm_group*] + The group that php-fpm should run as + +[*dev*] + Install php header files, needed to install pecl modules + +[*composer*] + Install and auto-update composer + +[*pear*] + Install PEAR + +[*phpunit*] + Install phpunit + +[*apache_config*] + Manage apache's mod_php configuration + +[*proxy_type*] + proxy server type (none|http|https|ftp) + +[*proxy_server*] + specify a proxy server, with port number if needed. ie: https://example.com:8080. + +[*extensions*] + Install PHP extensions, this is overwritten by hiera hash `php::extensions` + +[*package_prefix*] + This is the prefix for constructing names of php packages. This defaults + to a sensible default depending on your operating system, like 'php-' or + 'php5-'. + +[*config_root_ini*] + This is the path to the config .ini files of the extensions. This defaults + to a sensible default depending on your operating system, like + '/etc/php5/mods-available' or '/etc/php5/conf.d'. + +[*config_root_inifile*] + The path to the global php.ini file. This defaults to a sensible default + depending on your operating system. + +[*ext_tool_enable*] + Absolute path to php tool for enabling extensions in debian/ubuntu systems. + This defaults to '/usr/sbin/php5enmod'. + +[*ext_tool_query*] + Absolute path to php tool for querying information about extensions in + debian/ubuntu systems. This defaults to '/usr/sbin/php5query'. + +[*ext_tool_enabled*] + Enable or disable the use of php tools on debian based systems + debian/ubuntu systems. This defaults to 'true'. + +[*log_owner*] + The php-fpm log owner + +[*log_group*] + The group owning php-fpm logs + +[*embedded*] + Enable embedded SAPI + +[*pear_ensure*] + The package ensure of PHP pear to install and run pear auto_discover + +[*settings*] + +#### Parameters + +The following parameters are available in the `php` class. + +##### `ensure` + +Data type: `String` + + + +Default value: $php::params::ensure + +##### `manage_repos` + +Data type: `Boolean` + + + +Default value: $php::params::manage_repos + +##### `fpm` + +Data type: `Boolean` + + + +Default value: `true` + +##### `fpm_service_enable` + +Data type: `Any` + + + +Default value: $php::params::fpm_service_enable + +##### `fpm_service_ensure` + +Data type: `Any` + + + +Default value: $php::params::fpm_service_ensure + +##### `fpm_service_name` + +Data type: `Any` + + + +Default value: $php::params::fpm_service_name + +##### `fpm_service_provider` + +Data type: `Any` + + + +Default value: `undef` + +##### `fpm_pools` + +Data type: `Hash` + + + +Default value: { 'www' => {} } + +##### `fpm_global_pool_settings` + +Data type: `Hash` + + + +Default value: {} + +##### `fpm_inifile` + +Data type: `Any` + + + +Default value: $php::params::fpm_inifile + +##### `fpm_package` + +Data type: `Any` + + + +Default value: `undef` + +##### `fpm_user` + +Data type: `Any` + + + +Default value: $php::params::fpm_user + +##### `fpm_group` + +Data type: `Any` + + + +Default value: $php::params::fpm_group + +##### `embedded` + +Data type: `Boolean` + + + +Default value: `false` + +##### `dev` + +Data type: `Boolean` + + + +Default value: `true` + +##### `composer` + +Data type: `Boolean` + + + +Default value: `true` + +##### `pear` + +Data type: `Boolean` + + + +Default value: `true` + +##### `pear_ensure` + +Data type: `String` + + + +Default value: $php::params::pear_ensure + +##### `phpunit` + +Data type: `Boolean` + + + +Default value: `false` + +##### `apache_config` + +Data type: `Boolean` + + + +Default value: `false` + +##### `proxy_type` + +Data type: `Any` + + + +Default value: `undef` + +##### `proxy_server` + +Data type: `Any` + + + +Default value: `undef` + +##### `extensions` + +Data type: `Hash` + + + +Default value: {} + +##### `settings` + +Data type: `Hash` + + + +Default value: {} + +##### `package_prefix` + +Data type: `Any` + + + +Default value: $php::params::package_prefix + +##### `config_root_ini` + +Data type: `Stdlib::Absolutepath` + + + +Default value: $php::params::config_root_ini + +##### `config_root_inifile` + +Data type: `Stdlib::Absolutepath` + + + +Default value: $php::params::config_root_inifile + +##### `ext_tool_enable` + +Data type: `Optional[Stdlib::Absolutepath]` + + + +Default value: $php::params::ext_tool_enable + +##### `ext_tool_query` + +Data type: `Optional[Stdlib::Absolutepath]` + + + +Default value: $php::params::ext_tool_query + +##### `ext_tool_enabled` + +Data type: `Boolean` + + + +Default value: $php::params::ext_tool_enabled + +##### `log_owner` + +Data type: `String` + + + +Default value: $php::params::fpm_user + +##### `log_group` + +Data type: `String` + + + +Default value: $php::params::fpm_group + +### php::apache_config + +Install and configure php apache settings + +=== Parameters + +[*inifile*] + The path to the ini php-apache ini file + +[*settings*] + Hash with nested hash of key => value to set in inifile + +#### Parameters + +The following parameters are available in the `php::apache_config` class. + +##### `inifile` + +Data type: `Stdlib::Absolutepath` + + + +Default value: $php::params::apache_inifile + +##### `settings` + +Data type: `Hash` + + + +Default value: {} + +### php::cli + +Install and configure php CLI + +=== Parameters + +[*inifile*] + The path to the ini php5-cli ini file + +[*settings*] + Hash with nested hash of key => value to set in inifile + +#### Parameters + +The following parameters are available in the `php::cli` class. + +##### `inifile` + +Data type: `Stdlib::Absolutepath` + + + +Default value: $php::params::cli_inifile + +##### `settings` + +Data type: `Hash` + + + +Default value: {} + +### php::composer + +Install composer package manager + +=== Parameters + +[*source*] + Holds URL to the Composer source file + +[*path*] + Holds path to the Composer executable + +[*proxy_type*] + proxy server type (none|http|https|ftp) + +[*proxy_server*] + specify a proxy server, with port number if needed. ie: https://example.com:8080. + +[*auto_update*] + Defines if composer should be auto updated + +[*max_age*] + Defines the time in days after which an auto-update gets executed + +[*root_group*] + UNIX group of the root user + +#### Parameters + +The following parameters are available in the `php::composer` class. + +##### `source` + +Data type: `String` + + + +Default value: $php::params::composer_source + +##### `path` + +Data type: `Stdlib::Absolutepath` + + + +Default value: $php::params::composer_path + +##### `proxy_type` + +Data type: `Any` + + + +Default value: `undef` + +##### `proxy_server` + +Data type: `Any` + + + +Default value: `undef` + +##### `auto_update` + +Data type: `Boolean` + + + +Default value: `true` + +##### `max_age` + +Data type: `Integer` + + + +Default value: $php::params::composer_max_age + +##### `root_group` + +Data type: `Variant[Integer, String]` + + + +Default value: $php::params::root_group + +### php::composer::auto_update + +Install composer package manager + +=== Parameters + +[*max_age*] + Defines number of days after which Composer should be updated + +[*source*] + Holds URL to the Composer source file + +[*path*] + Holds path to the Composer executable + +[*proxy_type*] + proxy server type (none|http|https|ftp) + +[*proxy_server*] + specify a proxy server, with port number if needed. ie: https://example.com:8080. + + +=== Examples + + include php::composer::auto_update + class { "php::composer::auto_update": + "max_age" => 90 + } + +#### Parameters + +The following parameters are available in the `php::composer::auto_update` class. + +##### `max_age` + +Data type: `Any` + + + +##### `source` + +Data type: `Any` + + + +##### `path` + +Data type: `Any` + + + +##### `proxy_type` + +Data type: `Any` + + + +Default value: `undef` + +##### `proxy_server` + +Data type: `Any` + + + +Default value: `undef` + +### php::dev + +Install the development package with headers for PHP + +=== Parameters + +[*ensure*] + The PHP ensure of PHP dev to install + +[*package*] + The package name for the PHP development files + +#### Parameters + +The following parameters are available in the `php::dev` class. + +##### `ensure` + +Data type: `String` + + + +Default value: $php::ensure + +##### `package` + +Data type: `String` + + + +Default value: "${php::package_prefix}${php::params::dev_package_suffix}" + +##### `manage_repos` + +Data type: `Boolean` + + + +Default value: $php::manage_repos + +### php::embedded + +Install and configure php embedded SAPI + +=== Parameters + +[*inifile*] + The path to the ini php5-embeded ini file + +[*settings*] + Hash with nested hash of key => value to set in inifile + +[*package*] + Specify which package to install + +[*ensure*] + Specify which version of the package to install + +#### Parameters + +The following parameters are available in the `php::embedded` class. + +##### `ensure` + +Data type: `String` + + + +Default value: $php::ensure + +##### `package` + +Data type: `String` + + + +Default value: "${php::package_prefix}${php::params::embedded_package_suffix}" + +##### `inifile` + +Data type: `Stdlib::Absolutepath` + + + +Default value: $php::params::embedded_inifile + +##### `settings` + +Data type: `Hash` + + + +Default value: {} + +### php::fpm + +Install and configure mod_php for fpm + +=== Parameters + +[*user*] + The user that php-fpm should run as + +[*group*] + The group that php-fpm should run as + +[*service_enable*] + Enable/disable FPM service + +[*service_ensure*] + Ensure FPM service is either 'running' or 'stopped' + +[*service_name*] + This is the name of the php-fpm service. It defaults to reasonable OS + defaults but can be different in case of using php7.0/other OS/custom fpm service + +[*service_provider*] + This is the name of the service provider, in case there is a non + OS default service provider used to start FPM. + Defaults to 'undef', pick system defaults. + +[*pools*] + Hash of php::fpm::pool resources that will be created. Defaults + to a single php::fpm::pool named www with default parameters. + +[*log_owner*] + The php-fpm log owner + +[*log_group*] + The group owning php-fpm logs + +[*package*] + Specify which package to install + +[*ensure*] + Specify which version of the package to install + +[*inifile*] + Path to php.ini for fpm + +[*settings*] + fpm settings hash + +[*global_pool_settings*] + Hash of defaults params php::fpm::pool resources that will be created. + Defaults is empty hash. + +#### Parameters + +The following parameters are available in the `php::fpm` class. + +##### `ensure` + +Data type: `String` + + + +Default value: $php::ensure + +##### `user` + +Data type: `Any` + + + +Default value: $php::fpm_user + +##### `group` + +Data type: `Any` + + + +Default value: $php::fpm_group + +##### `service_ensure` + +Data type: `Any` + + + +Default value: $php::fpm_service_ensure + +##### `service_enable` + +Data type: `Any` + + + +Default value: $php::fpm_service_enable + +##### `service_name` + +Data type: `Any` + + + +Default value: $php::fpm_service_name + +##### `service_provider` + +Data type: `Any` + + + +Default value: $php::fpm_service_provider + +##### `package` + +Data type: `String` + + + +Default value: $php::real_fpm_package + +##### `inifile` + +Data type: `Stdlib::Absolutepath` + + + +Default value: $php::fpm_inifile + +##### `settings` + +Data type: `Hash` + + + +Default value: $php::real_settings + +##### `global_pool_settings` + +Data type: `Any` + + + +Default value: $php::real_fpm_global_pool_settings + +##### `pools` + +Data type: `Hash` + + + +Default value: $php::real_fpm_pools + +##### `log_owner` + +Data type: `Any` + + + +Default value: $php::log_owner + +##### `log_group` + +Data type: `Any` + + + +Default value: $php::log_group + +### php::fpm::config + +Configure php-fpm service + +=== Parameters + +[*config_file*] + The path to the fpm config file + +[*user*] + The user that runs php-fpm + +[*group*] + The group that runs php-fpm + +[*inifile*] + The path to ini file + +[*settings*] + Nested hash of key => value to apply to php.ini + +[*pool_base_dir*] + The folder that contains the php-fpm pool configs + +[*pool_purge*] + Whether to purge pool config files not created + by this module + +[*error_log*] + Path to error log file. If it's set to "syslog", log is + sent to syslogd instead of being written in a local file. + +[*log_level*] + The php-fpm log level + +[*emergency_restart_threshold*] + The php-fpm emergency_restart_threshold + +[*emergency_restart_interval*] + The php-fpm emergency_restart_interval + +[*process_control_timeout*] + The php-fpm process_control_timeout + +[*process_max*] + The maximum number of processes FPM will fork. + +[*rlimit_files*] + Set open file descriptor rlimit for the master process. + +[*systemd_interval*] + The interval between health report notification to systemd + +[*log_owner*] + The php-fpm log owner + +[*log_group*] + The group owning php-fpm logs + +[*log_dir_mode*] + The octal mode of the directory + +[*syslog_facility*] + Used to specify what type of program is logging the message + +[*syslog_ident*] + Prepended to every message + +[*root_group*] + UNIX group of the root user + +[*pid_file*] + Path to fpm pid file + +#### Parameters + +The following parameters are available in the `php::fpm::config` class. + +##### `config_file` + +Data type: `Any` + + + +Default value: $php::params::fpm_config_file + +##### `user` + +Data type: `String` + + + +Default value: $php::params::fpm_user + +##### `group` + +Data type: `String` + + + +Default value: $php::params::fpm_group + +##### `inifile` + +Data type: `String` + + + +Default value: $php::params::fpm_inifile + +##### `pid_file` + +Data type: `Any` + + + +Default value: $php::params::fpm_pid_file + +##### `settings` + +Data type: `Hash` + + + +Default value: {} + +##### `pool_base_dir` + +Data type: `Stdlib::Absolutepath` + + + +Default value: $php::params::fpm_pool_dir + +##### `pool_purge` + +Data type: `Any` + + + +Default value: `false` + +##### `error_log` + +Data type: `String` + + + +Default value: $php::params::fpm_error_log + +##### `log_level` + +Data type: `String` + + + +Default value: 'notice' + +##### `emergency_restart_threshold` + +Data type: `Integer` + + + +Default value: 0 + +##### `emergency_restart_interval` + +Data type: `Variant[Integer, Pattern[/^\d+[smhd]?$/]]` + + + +Default value: 0 + +##### `process_control_timeout` + +Data type: `Variant[Integer, Pattern[/^\d+[smhd]?$/]]` + + + +Default value: 0 + +##### `process_max` + +Data type: `Integer` + + + +Default value: 0 + +##### `rlimit_files` + +Data type: `Any` + + + +Default value: `undef` + +##### `systemd_interval` + +Data type: `Optional[Variant[Integer,Pattern[/^\d+[smhd]?$/]]]` + + + +Default value: `undef` + +##### `log_owner` + +Data type: `String` + + + +Default value: $php::params::fpm_user + +##### `log_group` + +Data type: `String` + + + +Default value: $php::params::fpm_group + +##### `log_dir_mode` + +Data type: `Pattern[/^\d+$/]` + + + +Default value: '0770' + +##### `root_group` + +Data type: `Any` + + + +Default value: $php::params::root_group + +##### `syslog_facility` + +Data type: `String` + + + +Default value: 'daemon' + +##### `syslog_ident` + +Data type: `String` + + + +Default value: 'php-fpm' + +### php::fpm::service + +Manage fpm service + +=== Parameters + +[*service_name*] + name of the php-fpm service + +[*ensure*] + 'ensure' value for the service + +[*enable*] + Defines if the service is enabled + +[*provider*] + Defines if the service provider to use + +#### Parameters + +The following parameters are available in the `php::fpm::service` class. + +##### `service_name` + +Data type: `Any` + + + +Default value: $php::fpm::service_name + +##### `ensure` + +Data type: `Any` + + + +Default value: $php::fpm::service_ensure + +##### `enable` + +Data type: `Any` + + + +Default value: $php::fpm::service_enable + +##### `provider` + +Data type: `Any` + + + +Default value: $php::fpm::service_provider + +### php::global + +The php::global class. + +#### Parameters + +The following parameters are available in the `php::global` class. + +##### `inifile` + +Data type: `Stdlib::Absolutepath` + + + +Default value: $php::config_root_inifile + +##### `settings` + +Data type: `Hash` + + + +Default value: {} + +### php::globals + +The php::globals class. + +#### Parameters + +The following parameters are available in the `php::globals` class. + +##### `php_version` + +Data type: `Optional[Pattern[/^(rh-)?(php)?[57](\.)?[0-9]/]]` + + + +Default value: `undef` + +##### `config_root` + +Data type: `Optional[Stdlib::Absolutepath]` + + + +Default value: `undef` + +##### `fpm_pid_file` + +Data type: `Optional[Stdlib::Absolutepath]` + + + +Default value: `undef` + +##### `rhscl_mode` + +Data type: `Any` + + + +Default value: `undef` + +### php::packages + +Install common PHP packages + +=== Parameters + +[*ensure*] + Specify which version of PHP packages to install + +[*names*] + List of the names of the package to install + +[*names_to_prefix*] + List of packages names that should be prefixed with the common + package prefix `$php::package_prefix` + +#### Parameters + +The following parameters are available in the `php::packages` class. + +##### `ensure` + +Data type: `String` + + + +Default value: $php::ensure + +##### `manage_repos` + +Data type: `Boolean` + + + +Default value: $php::manage_repos + +##### `names_to_prefix` + +Data type: `Array` + + + +Default value: prefix($php::params::common_package_suffixes, $php::package_prefix) + +##### `names` + +Data type: `Array` + + + +Default value: $php::params::common_package_names + +### php::params + +PHP params class + +### php::pear + +Install PEAR package manager + +=== Parameters + +[*ensure*] + The package ensure of PHP pear to install and run pear auto_discover + +[*package*] + The package name for PHP pear + +#### Parameters + +The following parameters are available in the `php::pear` class. + +##### `ensure` + +Data type: `String` + + + +Default value: $php::pear_ensure + +##### `package` + +Data type: `Optional[String]` + + + +Default value: `undef` + +##### `manage_repos` + +Data type: `Boolean` + + + +Default value: $php::manage_repos + +### php::phpunit + +Install phpunit, PHP testing framework + +=== Parameters + +[*source*] + Holds URL to the phpunit source file + +[*path*] + Holds path to the phpunit executable + +[*auto_update*] + Defines if phpunit should be auto updated + +[*max_age*] + Defines the time in days after which an auto-update gets executed + +#### Parameters + +The following parameters are available in the `php::phpunit` class. + +##### `source` + +Data type: `String` + + + +Default value: $php::params::phpunit_source + +##### `path` + +Data type: `Stdlib::Absolutepath` + + + +Default value: $php::params::phpunit_path + +##### `root_group` + +Data type: `String[1]` + + + +Default value: $php::params::root_group + +##### `auto_update` + +Data type: `Boolean` + + + +Default value: `true` + +##### `max_age` + +Data type: `Integer` + + + +Default value: $php::params::phpunit_max_age + +### php::phpunit::auto_update + +Install phpunit package manager + +=== Parameters + +[*max_age*] + Defines number of days after which phpunit should be updated + +[*source*] + Holds URL to the phpunit source file + +[*path*] + Holds path to the phpunit executable + +#### Parameters + +The following parameters are available in the `php::phpunit::auto_update` class. + +##### `max_age` + +Data type: `Any` + + + +##### `source` + +Data type: `Any` + + + +##### `path` + +Data type: `Any` + + + +### php::repo + +Configure package repository + +### php::repo::debian + +Configure debian apt repo + +=== Parameters + +[*location*] + Location of the apt repository + +[*release*] + Release of the apt repository + +[*repos*] + Apt repository names + +[*include_src*] + Add source source repository + +[*key*] + Public key in apt::key format + +[*dotdeb*] + Enable special dotdeb handling + +[*sury*] + Enable special sury handling + +#### Parameters + +The following parameters are available in the `php::repo::debian` class. + +##### `location` + +Data type: `Any` + + + +Default value: 'https://packages.dotdeb.org' + +##### `release` + +Data type: `Any` + + + +Default value: 'wheezy-php56' + +##### `repos` + +Data type: `Any` + + + +Default value: 'all' + +##### `include_src` + +Data type: `Any` + + + +Default value: `false` + +##### `key` + +Data type: `Any` + + + +Default value: { + 'id' => '6572BBEF1B5FF28B28B706837E3F070089DF5277', + 'source' => 'http://www.dotdeb.org/dotdeb.gpg', + } + +##### `dotdeb` + +Data type: `Any` + + + +Default value: `true` + +##### `sury` + +Data type: `Any` + + + +Default value: `true` + +### php::repo::redhat + +The php::repo::redhat class. + +#### Parameters + +The following parameters are available in the `php::repo::redhat` class. + +##### `yum_repo` + +Data type: `Any` + + + +Default value: 'remi_php56' + +### php::repo::suse + +Configure suse repo + +=== Parameters + +[*reponame*] + Name of the Zypper repository + +[*baseurl*] + Base URL of the Zypper repository + +#### Parameters + +The following parameters are available in the `php::repo::suse` class. + +##### `reponame` + +Data type: `Any` + + + +Default value: 'mayflower-php56' + +##### `baseurl` + +Data type: `Any` + + + +Default value: 'http://download.opensuse.org/repositories/home:/mayflower:/php5.6_based/SLE_11_SP3/' + +### php::repo::ubuntu + +Configure ubuntu ppa + +=== Parameters + +[*version*] + PHP version to manage (e.g. 5.6) + +#### Parameters + +The following parameters are available in the `php::repo::ubuntu` class. + +##### `version` + +Data type: `Any` + + + +Default value: `undef` + +## Defined types + +### php::apache_vhost + +Configures an apache vhost for php + +=== Parameters + +[*vhost*] + The vhost address + +[*docroot*] + The vhost docroot + +[*port*] + The vhost port + +[*default_vhost*] + defines if vhost is the default vhost + +[*fastcgi_socket*] + address of the fastcgi socket + +#### Parameters + +The following parameters are available in the `php::apache_vhost` defined type. + +##### `vhost` + +Data type: `Any` + + + +Default value: 'example.com' + +##### `docroot` + +Data type: `Any` + + + +Default value: '/var/www' + +##### `port` + +Data type: `Any` + + + +Default value: 80 + +##### `default_vhost` + +Data type: `Any` + + + +Default value: `true` + +##### `fastcgi_socket` + +Data type: `Any` + + + +Default value: 'fcgi://127.0.0.1:9000/$1' + +### php::config + +Configure php.ini settings for a PHP SAPI + +=== Parameters + +[*file*] + The path to ini file + +[*config*] + Nested hash of key => value to apply to php.ini + +=== Examples + + php::config { '$unique-name': + file => '$full_path_to_ini_file' + config => { + {'Date/date.timezone' => 'Europe/Berlin'} + } + } + +#### Parameters + +The following parameters are available in the `php::config` defined type. + +##### `file` + +Data type: `Stdlib::Absolutepath` + + + +##### `config` + +Data type: `Hash` + + + +### php::config::setting + +Configure php.ini settings + +=== Parameters + +[*key*] + The key of the value, like `ini_setting` + +[*file*] + The path to ini file + +[*value*] + The value to set + +=== Examples + + php::config::setting { 'Date/date.timezone': + file => '$full_path_to_ini_file' + value => 'Europe/Berlin' + } + +#### Parameters + +The following parameters are available in the `php::config::setting` defined type. + +##### `key` + +Data type: `Any` + + + +##### `value` + +Data type: `Any` + + + +##### `file` + +Data type: `Stdlib::Absolutepath` + + + +### php::extension + +Install a PHP extension package + +=== Parameters + +[*ensure*] + The ensure of the package to install + Could be "latest", "installed" or a pinned version + +[*package_prefix*] + Prefix to prepend to the package name for the package provider + +[*provider*] + The provider used to install the package + Could be "pecl", "apt", "dpkg" or any other OS package provider + If set to "none", no package will be installed + +[*source*] + The source to install the extension from. Possible values + depend on the *provider* used + +[*so_name*] + The DSO name of the package (e.g. opcache for zendopcache) + +[*ini_prefix*] + An optional filename prefix for the settings file of the extension + +[*php_api_version*] + This parameter is used to build the full path to the extension + directory for zend_extension in PHP < 5.5 (e.g. 20100525) + +[*header_packages*] + System packages dependencies to install for extensions (e.g. for + memcached libmemcached-dev on Debian) + +[*compiler_packages*] + System packages dependencies to install for compiling extensions + (e.g. build-essential on Debian) + +[*zend*] + Boolean parameter, whether to load extension as zend_extension. + Defaults to false. + +[*settings*] + Hash of parameters for the specific extension, which will be written to the extensions config file by + php::extension::config or a hash of mutliple settings files, each with parameters + (multifile_settings must be true) + (f.ex. {p => '..'} or {'bz2' => {..}, {'math' => {...}}) + +[*multifile_settings*] + Set this to true if you specify multiple setting files in *settings*. This must be used when the PHP package + distribution bundles extensions in a single package (like 'common' bundles extensions 'bz2', ...) and each of + the extension comes with a separate settings file. + +[*settings_prefix*] + Boolean/String parameter, whether to prefix all setting keys with + the extension name or specified name. Defaults to false. + +[*sapi*] + String parameter, whether to specify ALL sapi or a specific sapi. + Defaults to ALL. + +[*responsefile*] + File containing answers for interactive extension setup. Supported + *providers*: pear, pecl. + +[*install_options*] + Array of String or Hash options to pass to the provider. + +#### Parameters + +The following parameters are available in the `php::extension` defined type. + +##### `ensure` + +Data type: `String` + + + +Default value: 'installed' + +##### `provider` + +Data type: `Optional[Php::Provider]` + + + +Default value: `undef` + +##### `source` + +Data type: `Optional[String]` + + + +Default value: `undef` + +##### `so_name` + +Data type: `Optional[String]` + + + +Default value: `undef` + +##### `ini_prefix` + +Data type: `Optional[String]` + + + +Default value: `undef` + +##### `php_api_version` + +Data type: `Optional[String]` + + + +Default value: `undef` + +##### `package_prefix` + +Data type: `String` + + + +Default value: $php::package_prefix + +##### `zend` + +Data type: `Boolean` + + + +Default value: `false` + +##### `settings` + +Data type: `Variant[Hash, Hash[String, Hash]]` + + + +Default value: {} + +##### `multifile_settings` + +Data type: `Boolean` + + + +Default value: `false` + +##### `sapi` + +Data type: `Php::Sapi` + + + +Default value: 'ALL' + +##### `settings_prefix` + +Data type: `Variant[Boolean, String]` + + + +Default value: `false` + +##### `responsefile` + +Data type: `Optional[Stdlib::AbsolutePath]` + + + +Default value: `undef` + +##### `header_packages` + +Data type: `Variant[String, Array[String]]` + + + +Default value: [] + +##### `compiler_packages` + +Data type: `Variant[String, Array[String]]` + + + +Default value: $php::params::compiler_packages + +##### `install_options` + +Data type: `Php::InstallOptions` + + + +Default value: `undef` + +### php::extension::config + +Configure a PHP extension package + +=== Parameters + +[*ensure*] + The ensure of the package to install + Could be "latest", "installed" or a pinned version + +[*provider*] + The provider used to install the package + Could be "pecl", "apt", "dpkg" or any other OS package provider + If set to "none", no package will be installed + +[*so_name*] + The DSO name of the package (e.g. opcache for zendopcache) + +[*ini_prefix*] + An optional filename prefix for the settings file of the extension + +[*php_api_version*] + This parameter is used to build the full path to the extension + directory for zend_extension in PHP < 5.5 (e.g. 20100525) + +[*header_packages*] + System packages dependencies to install for extensions (e.g. for + memcached libmemcached-dev on Debian) + +[*compiler_packages*] + System packages dependencies to install for compiling extensions + (e.g. build-essential on Debian) + +[*zend*] + Boolean parameter, whether to load extension as zend_extension. + Defaults to false. + +[*settings*] + Nested hash of global config parameters for php.ini + +[*settings_prefix*] + Boolean/String parameter, whether to prefix all setting keys with + the extension name or specified name. Defaults to false. + +[*sapi*] + String parameter, whether to specify ALL sapi or a specific sapi. + Defaults to ALL. + +#### Parameters + +The following parameters are available in the `php::extension::config` defined type. + +##### `ensure` + +Data type: `String` + + + +Default value: 'installed' + +##### `provider` + +Data type: `Optional[Php::Provider]` + + + +Default value: `undef` + +##### `so_name` + +Data type: `Optional[String]` + + + +Default value: downcase($name) + +##### `ini_prefix` + +Data type: `Optional[String]` + + + +Default value: `undef` + +##### `php_api_version` + +Data type: `Optional[String]` + + + +Default value: `undef` + +##### `zend` + +Data type: `Boolean` + + + +Default value: `false` + +##### `settings` + +Data type: `Hash` + + + +Default value: {} + +##### `settings_prefix` + +Data type: `Variant[Boolean, String]` + + + +Default value: `false` + +##### `sapi` + +Data type: `Php::Sapi` + + + +Default value: 'ALL' + +### php::extension::install + +Install a PHP extension package + +=== Parameters + +[*ensure*] + The ensure of the package to install + Could be "latest", "installed" or a pinned version + +[*package_prefix*] + Prefix to prepend to the package name for the package provider + +[*provider*] + The provider used to install the package + Could be "pecl", "apt", "dpkg" or any other OS package provider + If set to "none", no package will be installed + +[*source*] + The source to install the extension from. Possible values + depend on the *provider* used + +[*header_packages*] + System packages dependencies to install for extensions (e.g. for + memcached libmemcached-dev on Debian) + +[*compiler_packages*] + System packages dependencies to install for compiling extensions + (e.g. build-essential on Debian) + +[*responsefile*] + File containing answers for interactive extension setup. Supported + *providers*: pear, pecl. + +[*install_options*] + Array of String or Hash options to pass to the provider. + +#### Parameters + +The following parameters are available in the `php::extension::install` defined type. + +##### `ensure` + +Data type: `String` + + + +Default value: 'installed' + +##### `provider` + +Data type: `Optional[Php::Provider]` + + + +Default value: `undef` + +##### `source` + +Data type: `Optional[String]` + + + +Default value: `undef` + +##### `package_prefix` + +Data type: `String` + + + +Default value: $php::package_prefix + +##### `responsefile` + +Data type: `Optional[Stdlib::AbsolutePath]` + + + +Default value: `undef` + +##### `header_packages` + +Data type: `Variant[String, Array[String]]` + + + +Default value: [] + +##### `compiler_packages` + +Data type: `Variant[String, Array[String]]` + + + +Default value: $php::params::compiler_packages + +##### `install_options` + +Data type: `Php::InstallOptions` + + + +Default value: `undef` + +### php::fpm::pool + +Configure fpm pools + +=== Parameters + +See the official php-fpm documentation for parameters that are not +documented here: http://php.net/manual/en/install.fpm.configuration.php. + +[*ensure*] + Remove pool if set to `'absent'`, add otherwise + +[*listen*] + On what socket to listen for FastCGI connections, i.e. + `'127.0.0.1:9000'' or `'/var/run/php5-fpm.sock'` + +[*listen_backlog*] + +[*listen_allowed_clients*] + +[*listen_owner*] + Set owner of the Unix socket + +[*listen_group*] + Set the group of the Unix socket + +[*listen_mode*] + +[*user*] + The user that php-fpm should run as + +[*group*] + The group that php-fpm should run as + +[*pm*] + +[*pm_max_children*] + +[*pm_start_servers*] + +[*pm_min_spare_servers*] + +[*pm_max_spare_servers*] + +[*pm_max_requests*] + +[*pm_process_idle_timeout*] + +[*pm_status_path*] + +[*ping_path*] + +[*ping_response*] + +[*access_log*] + The path to the file to write access log requests to + +[*access_log_format*] + The format to save the access log entries as + +[*request_terminate_timeout*] + +[*request_slowlog_timeout*] + +[*security_limit_extensions*] + +[*slowlog*] + +[*template*] + The template to use for the pool + +[*rlimit_files*] + +[*rlimit_core*] + +[*chroot*] + +[*chdir*] + +[*catch_workers_output*] + +[*include*] + Other configuration files to include on this pool + +[*env*] + List of environment variables that are passed to the php-fpm from the + outside and will be available to php scripts in this pool + +[*env_value*] + Hash of environment variables and values as strings to use in php + scripts in this pool + +[*options*] + An optional hash for any other data. + +[*php_value*] + Hash of php_value directives + +[*php_flag*] + Hash of php_flag directives + +[*php_admin_value*] + Hash of php_admin_value directives + +[*php_admin_flag*] + Hash of php_admin_flag directives + +[*php_directives*] + List of custom directives that are appended to the pool config + +[*root_group*] + UNIX group of the root user + +[*base_dir*] + The folder that contains the php-fpm pool configs. This defaults to a + sensible default depending on your operating system, like + '/etc/php5/fpm/pool.d' or '/etc/php-fpm.d' + +#### Parameters + +The following parameters are available in the `php::fpm::pool` defined type. + +##### `ensure` + +Data type: `Any` + + + +Default value: 'present' + +##### `listen` + +Data type: `Any` + + + +Default value: '127.0.0.1:9000' + +##### `listen_backlog` + +Data type: `Any` + + + +Default value: '-1' + +##### `listen_allowed_clients` + +Data type: `Any` + + + +Default value: `undef` + +##### `listen_owner` + +Data type: `Any` + + + +Default value: `undef` + +##### `listen_group` + +Data type: `Any` + + + +Default value: `undef` + +##### `listen_mode` + +Data type: `Any` + + + +Default value: `undef` + +##### `user` + +Data type: `Any` + + + +Default value: $php::fpm::config::user + +##### `group` + +Data type: `Any` + + + +Default value: $php::fpm::config::group + +##### `pm` + +Data type: `Any` + + + +Default value: 'dynamic' + +##### `pm_max_children` + +Data type: `Any` + + + +Default value: '50' + +##### `pm_start_servers` + +Data type: `Any` + + + +Default value: '5' + +##### `pm_min_spare_servers` + +Data type: `Any` + + + +Default value: '5' + +##### `pm_max_spare_servers` + +Data type: `Any` + + + +Default value: '35' + +##### `pm_max_requests` + +Data type: `Any` + + + +Default value: '0' + +##### `pm_process_idle_timeout` + +Data type: `Any` + + + +Default value: '10s' + +##### `pm_status_path` + +Data type: `Any` + + + +Default value: `undef` + +##### `ping_path` + +Data type: `Any` + + + +Default value: `undef` + +##### `ping_response` + +Data type: `Any` + + + +Default value: 'pong' + +##### `access_log` + +Data type: `Any` + + + +Default value: `undef` + +##### `access_log_format` + +Data type: `Any` + + + +Default value: '"%R - %u %t \"%m %r\" %s"' + +##### `request_terminate_timeout` + +Data type: `Any` + + + +Default value: '0' + +##### `request_slowlog_timeout` + +Data type: `Any` + + + +Default value: '0' + +##### `security_limit_extensions` + +Data type: `Any` + + + +Default value: `undef` + +##### `slowlog` + +Data type: `Any` + + + +Default value: "/var/log/php-fpm/${name}-slow.log" + +##### `template` + +Data type: `Any` + + + +Default value: 'php/fpm/pool.conf.erb' + +##### `rlimit_files` + +Data type: `Any` + + + +Default value: `undef` + +##### `rlimit_core` + +Data type: `Any` + + + +Default value: `undef` + +##### `chroot` + +Data type: `Any` + + + +Default value: `undef` + +##### `chdir` + +Data type: `Any` + + + +Default value: `undef` + +##### `catch_workers_output` + +Data type: `Any` + + + +Default value: 'no' + +##### `include` + +Data type: `Any` + + + +Default value: `undef` + +##### `env` + +Data type: `Any` + + + +Default value: [] + +##### `env_value` + +Data type: `Any` + + + +Default value: {} + +##### `options` + +Data type: `Any` + + + +Default value: {} + +##### `php_value` + +Data type: `Any` + + + +Default value: {} + +##### `php_flag` + +Data type: `Any` + + + +Default value: {} + +##### `php_admin_value` + +Data type: `Any` + + + +Default value: {} + +##### `php_admin_flag` + +Data type: `Any` + + + +Default value: {} + +##### `php_directives` + +Data type: `Any` + + + +Default value: [] + +##### `root_group` + +Data type: `Any` + + + +Default value: $php::params::root_group + +##### `base_dir` + +Data type: `Optional[Stdlib::Absolutepath]` + + + +Default value: `undef` + +## Functions + +### ensure_prefix + +Type: Ruby 3.x API + +This function ensures a prefix for all elements in an array or the keys in a hash. + +*Examples:* + + ensure_prefix({'a' => 1, 'b' => 2, 'p.c' => 3}, 'p.') + +Will return: + { + 'p.a' => 1, + 'p.b' => 2, + 'p.c' => 3, + } + + ensure_prefix(['a', 'p.b', 'c'], 'p.') + +Will return: + ['p.a', 'p.b', 'p.c'] + +#### `ensure_prefix()` + +This function ensures a prefix for all elements in an array or the keys in a hash. + +*Examples:* + + ensure_prefix({'a' => 1, 'b' => 2, 'p.c' => 3}, 'p.') + +Will return: + { + 'p.a' => 1, + 'p.b' => 2, + 'p.c' => 3, + } + + ensure_prefix(['a', 'p.b', 'c'], 'p.') + +Will return: + ['p.a', 'p.b', 'p.c'] + +Returns: `Any` + +### to_hash_settings + +Type: Ruby 3.x API + +This function converts a +{key => value}+ hash into a nested hash and can add an id to the outer key. +The optional id string as second parameter is prepended to the resource name. + +*Examples:* + + to_hash_settings({'a' => 1, 'b' => 2}) + +Would return: + { + 'a' => {'key' => 'a', 'value' => 1}, + 'b' => {'key' => 'b', 'value' => 2} + } + +and: + + to_hash_settings({'a' => 1, 'b' => 2}, 'foo') + +Would return: + { + 'foo: a' => {'key' => 'a', 'value' => 1}, + 'foo: b' => {'key' => 'b', 'value' => 2} + } + +#### `to_hash_settings()` + +This function converts a +{key => value}+ hash into a nested hash and can add an id to the outer key. +The optional id string as second parameter is prepended to the resource name. + +*Examples:* + + to_hash_settings({'a' => 1, 'b' => 2}) + +Would return: + { + 'a' => {'key' => 'a', 'value' => 1}, + 'b' => {'key' => 'b', 'value' => 2} + } + +and: + + to_hash_settings({'a' => 1, 'b' => 2}, 'foo') + +Would return: + { + 'foo: a' => {'key' => 'a', 'value' => 1}, + 'foo: b' => {'key' => 'b', 'value' => 2} + } + +Returns: `Any` + diff --git a/modules/utilities/unix/web_frameworks/php/Rakefile b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/Rakefile similarity index 100% rename from modules/utilities/unix/web_frameworks/php/Rakefile rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/Rakefile diff --git a/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/checksums.json b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/checksums.json new file mode 100644 index 000000000..a241988ad --- /dev/null +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/checksums.json @@ -0,0 +1,93 @@ +{ + "CHANGELOG.md": "99a71b1e83bac9edf7966b4d47515317", + "Gemfile": "c118755e95766d6cbb843ad994062315", + "HISTORY.md": "af2c8adc63323368a08b1a4502f817f0", + "LICENSE.txt": "334e7e7d67642f88ea02717044cae990", + "README.md": "188b7ae3bfdedacdaae1c40d6f2d1ac9", + "REFERENCE.md": "31e45ced8323d7d694452c23f5a0b417", + "Rakefile": "3c6f218e7e63e1a6e24251f365423e49", + "lib/facter/phpversion.rb": "194eb2dcabcc462ab5b932e58284dc93", + "lib/puppet/parser/functions/ensure_prefix.rb": "f24c41ac785953666f35f26acff8380e", + "lib/puppet/parser/functions/to_hash_settings.rb": "940ee2a3e3f86bfe607e04babb434bf7", + "lib/puppet/provider/package/pear.rb": "be0a6f107f20d305732eec4b1f9f6418", + "lib/puppet/provider/package/pecl.rb": "c7619a858faaeb5d913e1c222b56878a", + "manifests/apache_config.pp": "e2cd06418eadd579e4713c3b3be03aad", + "manifests/apache_vhost.pp": "b48fb423c168dac2aff6f409996682dd", + "manifests/cli.pp": "20b4ff44d1cc07a6d12f1040feb49547", + "manifests/composer/auto_update.pp": "56086bcfa3e2550f908113ecf8feaa1b", + "manifests/composer.pp": "260f4d807a861d9b8b714ace1776b9fe", + "manifests/config/setting.pp": "93271dacf07aea9723287020193dd03c", + "manifests/config.pp": "8f43eae524ba5a71c33667b32415cf08", + "manifests/dev.pp": "01cbc9f4820d67c9a4c5cc467bee1a7d", + "manifests/embedded.pp": "a13c1895cc26c57b0c0fc7f0e0518532", + "manifests/extension/config.pp": "4480161d2e6312449205a22fb6d2a6b6", + "manifests/extension/install.pp": "020a50067193628f49c7389a9ef954e7", + "manifests/extension.pp": "0ee2cfff67d2e2f4e651f2451d797977", + "manifests/fpm/config.pp": "75c44ee7df1c096692160e7220816690", + "manifests/fpm/pool.pp": "a720a013e7c31e56a6936f76589b58ad", + "manifests/fpm/service.pp": "27b25d9e85e59101b52aacd5c71facb8", + "manifests/fpm.pp": "0ebb84e240dd878c56bb825398222147", + "manifests/global.pp": "49397c82fcf2f5798b260083faf4b74a", + "manifests/globals.pp": "9c1c626cbaf17987f5ec46ce16b16532", + "manifests/init.pp": "1394e610b0499278cb9257d9e526e647", + "manifests/packages.pp": "f1214743c25187e6186e85ca7e9b27cf", + "manifests/params.pp": "dc229c06154487257750c1be8fe655e6", + "manifests/pear.pp": "693c7a91b6c3f68cace2d9ae0dd70eae", + "manifests/phpunit/auto_update.pp": "48e2519cfdd6093dbc71df19b89a4291", + "manifests/phpunit.pp": "44e693b66b426cdbee6e2881351cda0d", + "manifests/repo/debian.pp": "621435c64a1bcb9ac6ad73b986826d59", + "manifests/repo/redhat.pp": "35d0dcabf16c6e0f887bd372ec46ce7a", + "manifests/repo/suse.pp": "40e46e9cf1270a65bbd73514fb0233c5", + "manifests/repo/ubuntu.pp": "41d2c1007b71f07dc7ea11e227e8db92", + "manifests/repo.pp": "1282593ceecbfd30823cad7ecc4301f1", + "metadata.json": "4f1f2e6bb8eda085718de74d835d7e73", + "spec/acceptance/nodesets/archlinux-2-x64.yml": "daafcfcb4c8c8766856f52cec6ae5e86", + "spec/acceptance/nodesets/centos-511-x64.yml": "ca8258bc835dd985a1754689d124cd66", + "spec/acceptance/nodesets/centos-6-x64.yml": "58065782a8d40780d9728257a23504cd", + "spec/acceptance/nodesets/centos-66-x64-pe.yml": "e68e03dc562bf58f7c5bba54a1a34619", + "spec/acceptance/nodesets/centos-66-x64.yml": "7ffa6d9164a88668fcd51a1988c4dc03", + "spec/acceptance/nodesets/centos-7-x64.yml": "68d3556f670b8ac0a169a8270ff8c37a", + "spec/acceptance/nodesets/centos-72-x64.yml": "194841a65e8835ac9ee6620e60b58f80", + "spec/acceptance/nodesets/debian-78-x64.yml": "56af2760a64c13a0bccd59404435939c", + "spec/acceptance/nodesets/debian-82-x64.yml": "26f2f696e6073549fe0a844f9a46f85b", + "spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml": "b3dc2d81918fcc6d56855c88ba5b7ce8", + "spec/acceptance/nodesets/ec2/image_templates.yaml": "516f9c4c3407993a100090ce9e1a643c", + "spec/acceptance/nodesets/ec2/rhel-73-x64.yml": "e74670a1cb8eea32afc879a5d786f9bd", + "spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml": "2506efcc9fb420132edc37bf88d6e21d", + "spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml": "87efd97ff1b073c3448f429a8ffc5a7c", + "spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml": "e9db4dd16c60c52b433694130c2583a0", + "spec/acceptance/nodesets/fedora-24-x64.yml": "431cd85b87a65a55af193a360aa52f26", + "spec/acceptance/nodesets/fedora-25-x64.yml": "807fbf45f95fc7bc2af8c689d34e4160", + "spec/acceptance/nodesets/fedora-26-x64.yml": "e7ee1e18590548ff098192c2127c6697", + "spec/acceptance/nodesets/fedora-27-x64.yml": "326a10c4eb327ccd85775dfa0f76e5c1", + "spec/acceptance/nodesets/ubuntu-server-1204-x64.yml": "0dd7639bf95bfb18169ebba9a2bac163", + "spec/acceptance/nodesets/ubuntu-server-1404-x64.yml": "7455367b784060b921360b29a56cd74c", + "spec/acceptance/nodesets/ubuntu-server-1604-x64.yml": "37673118cc3bf052755d65fb5dd90226", + "spec/acceptance/php56_spec.rb": "79a5371c11b60caaaebf90d3a3e0edfe", + "spec/acceptance/php_spec.rb": "268d78421a73d026ce6cc8dc5081b887", + "spec/classes/coverage_spec.rb": "166c74e93a4e70e9de79ae69f3c10e1d", + "spec/classes/php_fpm_config_spec.rb": "550e629393c4f90b22851a17b92e517d", + "spec/classes/php_fpm_service_spec.rb": "48920117c9393e0134c43c73d805c87e", + "spec/classes/php_fpm_spec.rb": "61db280801c531152a20f3646b658a3d", + "spec/classes/php_repo_spec.rb": "d61d779b4681ccdc002de6462f2fccaa", + "spec/classes/php_repo_ubuntu_spec.rb": "ae6db63d74befee2e3819fb57fa07fb2", + "spec/classes/php_spec.rb": "dd7ec4861ebab4f4ff82d965238a7eb5", + "spec/default_facts.yml": "3da74b0aff340a4fbcca9cc4eba104c1", + "spec/defines/config_spec.rb": "3a0faff5e42f58f4a868328588ac5715", + "spec/defines/extension_rhscl_spec.rb": "474ab7d83c28fb524d377a71b87f4209", + "spec/defines/extension_spec.rb": "0a3a570da733e4399d6ea8b7d9d373b0", + "spec/defines/fpm_pool_spec.rb": "7ae5bc8b5ae57f5cd9ca0c9721f347ef", + "spec/fixtures/unit/provider/package/pear/list_a": "e21e3019f1115de0c5f7754bc59d88f9", + "spec/fixtures/unit/provider/package/pear/remote-info_benchmark": "699128db50f31977c8866a5c8efd1e34", + "spec/fixtures/unit/provider/package/pear/remote-info_zip": "87e53069d6d61fcace02bd6895e759e2", + "spec/functions/to_hash_settings_spec.rb": "012c5a367409e8e881bfafb2774931c5", + "spec/spec_helper.rb": "72093296acb026b92861c5ba6d724836", + "spec/spec_helper_acceptance.rb": "7b58925fe0572a9f06d2d6b6aa2a024b", + "spec/unit/provider/package/pear_spec.rb": "cd1ac9b8220c5678d4aae871f4323e1a", + "spec/unit/provider/package/pecl_spec.rb": "9da69117867f17e6c96e3ed85832a09d", + "templates/fpm/php-fpm.conf.erb": "bdfc482191a65740840baff959f9ff34", + "templates/fpm/pool.conf.erb": "c63f2c7b8843a95b257843cad2c9218e", + "types/installoptions.pp": "6fbf1667dd8ee74d71c3cbd6ff656218", + "types/provider.pp": "fee028f7797609a228ccddede25d8594", + "types/sapi.pp": "8ea1c07f0b2d6853a14c5d7ed4aec051" +} \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php/lib/facter/phpversion.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/lib/facter/phpversion.rb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/lib/facter/phpversion.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/lib/facter/phpversion.rb diff --git a/modules/utilities/unix/web_frameworks/php/lib/puppet/parser/functions/ensure_prefix.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/lib/puppet/parser/functions/ensure_prefix.rb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/lib/puppet/parser/functions/ensure_prefix.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/lib/puppet/parser/functions/ensure_prefix.rb diff --git a/modules/utilities/unix/web_frameworks/php/lib/puppet/parser/functions/to_hash_settings.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/lib/puppet/parser/functions/to_hash_settings.rb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/lib/puppet/parser/functions/to_hash_settings.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/lib/puppet/parser/functions/to_hash_settings.rb diff --git a/modules/utilities/unix/web_frameworks/php/lib/puppet/provider/package/pear.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/lib/puppet/provider/package/pear.rb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/lib/puppet/provider/package/pear.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/lib/puppet/provider/package/pear.rb diff --git a/modules/utilities/unix/web_frameworks/php/lib/puppet/provider/package/pecl.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/lib/puppet/provider/package/pecl.rb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/lib/puppet/provider/package/pecl.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/lib/puppet/provider/package/pecl.rb diff --git a/modules/utilities/unix/web_frameworks/php/manifests/apache_config.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/apache_config.pp similarity index 65% rename from modules/utilities/unix/web_frameworks/php/manifests/apache_config.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/apache_config.pp index d7730f62c..6cd8757d7 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/apache_config.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/apache_config.pp @@ -9,17 +9,15 @@ # Hash with nested hash of key => value to set in inifile # class php::apache_config( - Stdlib::Absolutepath $inifile = $::php::params::apache_inifile, + Stdlib::Absolutepath $inifile = $php::params::apache_inifile, Hash $settings = {} -) inherits ::php::params { +) inherits php::params { - if $caller_module_name != $module_name { - warning('php::apache_config is private') - } + assert_private() $real_settings = deep_merge($settings, hiera_hash('php::apache::settings', {})) - ::php::config { 'apache': + php::config { 'apache': file => $inifile, config => $real_settings, } diff --git a/modules/utilities/unix/web_frameworks/php/manifests/apache_vhost.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/apache_vhost.pp similarity index 100% rename from modules/utilities/unix/web_frameworks/php/manifests/apache_vhost.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/apache_vhost.pp diff --git a/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/cli.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/cli.pp new file mode 100644 index 000000000..c29619ceb --- /dev/null +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/cli.pp @@ -0,0 +1,45 @@ +# Install and configure php CLI +# +# === Parameters +# +# [*inifile*] +# The path to the ini php5-cli ini file +# +# [*settings*] +# Hash with nested hash of key => value to set in inifile +# +class php::cli( + Stdlib::Absolutepath $inifile = $php::params::cli_inifile, + Hash $settings = {} +) inherits php::params { + + assert_private() + + if $php::globals::rhscl_mode { + # stupid fixes for scl + file {'/usr/bin/pear': + ensure => 'link', + target => "${$php::params::php_bin_dir}/pear", + } + + file {'/usr/bin/pecl': + ensure => 'link', + target => "${$php::params::php_bin_dir}/pecl", + } + + file {'/usr/bin/php': + ensure => 'link', + target => "${$php::params::php_bin_dir}/php", + } + } + + $real_settings = deep_merge($settings, hiera_hash('php::cli::settings', {})) + + if $inifile != $php::params::config_root_inifile { + # only create a cli specific inifile if the filenames are different + ::php::config { 'cli': + file => $inifile, + config => $real_settings, + } + } +} diff --git a/modules/utilities/unix/web_frameworks/php/manifests/composer.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/composer.pp similarity index 72% rename from modules/utilities/unix/web_frameworks/php/manifests/composer.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/composer.pp index 807129770..a3c6fdb5b 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/composer.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/composer.pp @@ -24,18 +24,16 @@ # UNIX group of the root user # class php::composer ( - String $source = $::php::params::composer_source, - Stdlib::Absolutepath $path = $::php::params::composer_path, + String $source = $php::params::composer_source, + Stdlib::Absolutepath $path = $php::params::composer_path, $proxy_type = undef, $proxy_server = undef, Boolean $auto_update = true, - Integer $max_age = $::php::params::composer_max_age, - Variant[Integer, String] $root_group = $::php::params::root_group, -) inherits ::php::params { + Integer $max_age = $php::params::composer_max_age, + Variant[Integer, String] $root_group = $php::params::root_group, +) inherits php::params { - if $caller_module_name != $module_name { - warning('php::composer is private') - } + assert_private() archive { 'download composer': path => $path, @@ -50,7 +48,7 @@ class php::composer ( } if $auto_update { - class { '::php::composer::auto_update': + class { 'php::composer::auto_update': max_age => $max_age, source => $source, path => $path, diff --git a/modules/utilities/unix/web_frameworks/php/manifests/composer/auto_update.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/composer/auto_update.pp similarity index 92% rename from modules/utilities/unix/web_frameworks/php/manifests/composer/auto_update.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/composer/auto_update.pp index a60b765ae..66f73db29 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/composer/auto_update.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/composer/auto_update.pp @@ -33,9 +33,8 @@ class php::composer::auto_update ( $proxy_server = undef, ) { - if $caller_module_name != $module_name { - warning('php::composer::auto_update is private') - } + assert_private() + if $proxy_type and $proxy_server { $env = [ 'HOME=/root', "${proxy_type}_proxy=${proxy_server}" ] diff --git a/modules/utilities/unix/web_frameworks/php/manifests/config.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/config.pp similarity index 100% rename from modules/utilities/unix/web_frameworks/php/manifests/config.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/config.pp diff --git a/modules/utilities/unix/web_frameworks/php/manifests/config/setting.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/config/setting.pp similarity index 90% rename from modules/utilities/unix/web_frameworks/php/manifests/config/setting.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/config/setting.pp index 44439d388..1094a9f95 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/config/setting.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/config/setting.pp @@ -24,9 +24,8 @@ define php::config::setting( Stdlib::Absolutepath $file, ) { - if $caller_module_name != $module_name { - warning('php::config::setting is private') - } + + assert_private() $split_name = split($key, '/') if count($split_name) == 1 { diff --git a/modules/utilities/unix/web_frameworks/php/manifests/dev.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/dev.pp similarity index 77% rename from modules/utilities/unix/web_frameworks/php/manifests/dev.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/dev.pp index 4ebc2b2ad..c90efef42 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/dev.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/dev.pp @@ -9,14 +9,12 @@ # The package name for the PHP development files # class php::dev( - String $ensure = $::php::ensure, - String $package = "${::php::package_prefix}${::php::params::dev_package_suffix}", + String $ensure = $php::ensure, + String $package = "${php::package_prefix}${php::params::dev_package_suffix}", Boolean $manage_repos = $php::manage_repos, -) inherits ::php::params { +) inherits php::params { - if $caller_module_name != $module_name { - warning('php::dev is private') - } + assert_private() # On FreeBSD there is no 'devel' package. $real_package = $facts['os']['family'] ? { @@ -43,6 +41,6 @@ class php::dev( } package { $real_package: ensure => $ensure, - require => Class['::php::packages'], + require => Class['php::packages'], } } diff --git a/modules/utilities/unix/web_frameworks/php/manifests/embedded.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/embedded.pp similarity index 63% rename from modules/utilities/unix/web_frameworks/php/manifests/embedded.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/embedded.pp index 5c40ee52b..4049a0034 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/embedded.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/embedded.pp @@ -15,15 +15,13 @@ # Specify which version of the package to install # class php::embedded( - String $ensure = $::php::ensure, - String $package = "${::php::package_prefix}${::php::params::embedded_package_suffix}", - Stdlib::Absolutepath $inifile = $::php::params::embedded_inifile, + String $ensure = $php::ensure, + String $package = "${php::package_prefix}${php::params::embedded_package_suffix}", + Stdlib::Absolutepath $inifile = $php::params::embedded_inifile, Hash $settings = {}, -) inherits ::php::params { +) inherits php::params { - if $caller_module_name != $module_name { - warning('php::embedded is private') - } + assert_private() $real_settings = deep_merge( $settings, @@ -37,9 +35,9 @@ class php::embedded( package { $real_package: ensure => $ensure, - require => Class['::php::packages'], + require => Class['php::packages'], } - -> ::php::config { 'embedded': + -> php::config { 'embedded': file => $inifile, config => $real_settings, } diff --git a/modules/utilities/unix/web_frameworks/php/manifests/extension.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/extension.pp similarity index 59% rename from modules/utilities/unix/web_frameworks/php/manifests/extension.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/extension.pp index 313054ac5..aa593686d 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/extension.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/extension.pp @@ -41,7 +41,15 @@ # Defaults to false. # # [*settings*] -# Nested hash of global config parameters for php.ini +# Hash of parameters for the specific extension, which will be written to the extensions config file by +# php::extension::config or a hash of mutliple settings files, each with parameters +# (multifile_settings must be true) +# (f.ex. {p => '..'} or {'bz2' => {..}, {'math' => {...}}) +# +# [*multifile_settings*] +# Set this to true if you specify multiple setting files in *settings*. This must be used when the PHP package +# distribution bundles extensions in a single package (like 'common' bundles extensions 'bz2', ...) and each of +# the extension comes with a separate settings file. # # [*settings_prefix*] # Boolean/String parameter, whether to prefix all setting keys with @@ -62,17 +70,18 @@ define php::extension ( String $ensure = 'installed', Optional[Php::Provider] $provider = undef, Optional[String] $source = undef, - Optional[String] $so_name = downcase($name), + Optional[String] $so_name = undef, Optional[String] $ini_prefix = undef, Optional[String] $php_api_version = undef, - String $package_prefix = $::php::package_prefix, + String $package_prefix = $php::package_prefix, Boolean $zend = false, - Hash $settings = {}, + Variant[Hash, Hash[String, Hash]] $settings = {}, + Boolean $multifile_settings = false, Php::Sapi $sapi = 'ALL', Variant[Boolean, String] $settings_prefix = false, Optional[Stdlib::AbsolutePath] $responsefile = undef, Variant[String, Array[String]] $header_packages = [], - Variant[String, Array[String]] $compiler_packages = $::php::params::compiler_packages, + Variant[String, Array[String]] $compiler_packages = $php::params::compiler_packages, Php::InstallOptions $install_options = undef, ) { @@ -93,17 +102,36 @@ define php::extension ( # PEAR packages don't require any further configuration, they just need to "be there". if $provider != 'pear' { - php::extension::config { $title: - ensure => $ensure, - provider => $provider, - so_name => $so_name, - ini_prefix => $ini_prefix, - php_api_version => $php_api_version, - zend => $zend, - settings => $settings, - settings_prefix => $settings_prefix, - sapi => $sapi, - subscribe => Php::Extension::Install[$title], + $_settings = $multifile_settings ? { + true => $settings, + false => { downcase($title) => $settings } # emulate a hash if no multifile settings + } + + $_settings.each |$settings_name, $settings_hash| { + if $so_name { + $so_name = $multifile_settings ? { + true => downcase($settings_name), + false => pick(downcase($so_name), downcase($name), downcase($settings_name)), + } + } else { + $so_name = $multifile_settings ? { + true => downcase($settings_name), + false => pick(downcase($name), downcase($settings_name)), + } + } + + php::extension::config { $settings_name: + ensure => $ensure, + provider => $provider, + so_name => $so_name, + ini_prefix => $ini_prefix, + php_api_version => $php_api_version, + zend => $zend, + settings => $settings_hash, + settings_prefix => $settings_prefix, + sapi => $sapi, + subscribe => Php::Extension::Install[$title], + } } } } diff --git a/modules/utilities/unix/web_frameworks/php/manifests/extension/config.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/extension/config.pp similarity index 67% rename from modules/utilities/unix/web_frameworks/php/manifests/extension/config.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/extension/config.pp index 5a2a45177..83a1f2502 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/extension/config.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/extension/config.pp @@ -89,32 +89,40 @@ define php::extension::config ( $final_settings = $full_settings } - $config_root_ini = pick_default($::php::config_root_ini, $::php::params::config_root_ini) - ::php::config { $title: - file => "${config_root_ini}/${ini_prefix}${ini_name}.ini", - config => $final_settings, - } - - # Ubuntu/Debian systems use the mods-available folder. We need to enable - # settings files ourselves with php5enmod command. - $ext_tool_enable = pick_default($::php::ext_tool_enable, $::php::params::ext_tool_enable) - $ext_tool_query = pick_default($::php::ext_tool_query, $::php::params::ext_tool_query) - $ext_tool_enabled = pick_default($::php::ext_tool_enabled, $::php::params::ext_tool_enabled) - - if $facts['os']['family'] == 'Debian' and $ext_tool_enabled { - $cmd = "${ext_tool_enable} -s ${sapi} ${so_name}" - - $_sapi = $sapi? { - 'ALL' => 'cli', - default => $sapi, - } - exec { $cmd: - onlyif => "${ext_tool_query} -s ${_sapi} -m ${so_name} | /bin/grep 'No module matches ${so_name}'", - require => ::Php::Config[$title], + $config_root_ini = pick_default($php::config_root_ini, $php::params::config_root_ini) + if $ensure == 'present' or $ensure == 'installed' { + ::php::config { $title: + file => "${config_root_ini}/${ini_prefix}${ini_name}.ini", + config => $final_settings, } - if $::php::fpm { - Package[$::php::fpm::package] ~> Exec[$cmd] + # Ubuntu/Debian systems use the mods-available folder. We need to enable + # settings files ourselves with php5enmod command. + $ext_tool_enable = pick_default($php::ext_tool_enable, $php::params::ext_tool_enable) + $ext_tool_query = pick_default($php::ext_tool_query, $php::params::ext_tool_query) + $ext_tool_enabled = pick_default($php::ext_tool_enabled, $php::params::ext_tool_enabled) + + if $facts['os']['family'] == 'Debian' and $ext_tool_enabled { + $cmd = "${ext_tool_enable} -s ${sapi} ${so_name}" + + $_sapi = $sapi? { + 'ALL' => 'cli', + default => $sapi, + } + if has_key($final_settings, 'extension') and $final_settings[extension] { + exec { $cmd: + onlyif => "${ext_tool_query} -s ${_sapi} -m ${so_name} | /bin/grep 'No module matches ${so_name}'", + require => ::Php::Config[$title], + } + + if $php::fpm { + Package[$php::fpm::package] ~> Exec[$cmd] + } + } + } + } else { + file {"${config_root_ini}/${ini_prefix}${ini_name}.ini": + ensure => 'absent', } } } diff --git a/modules/utilities/unix/web_frameworks/php/manifests/extension/install.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/extension/install.pp similarity index 93% rename from modules/utilities/unix/web_frameworks/php/manifests/extension/install.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/extension/install.pp index 47795e004..64c7cdcc3 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/extension/install.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/extension/install.pp @@ -37,10 +37,10 @@ define php::extension::install ( String $ensure = 'installed', Optional[Php::Provider] $provider = undef, Optional[String] $source = undef, - String $package_prefix = $::php::package_prefix, + String $package_prefix = $php::package_prefix, Optional[Stdlib::AbsolutePath] $responsefile = undef, Variant[String, Array[String]] $header_packages = [], - Variant[String, Array[String]] $compiler_packages = $::php::params::compiler_packages, + Variant[String, Array[String]] $compiler_packages = $php::params::compiler_packages, Php::InstallOptions $install_options = undef, ) { diff --git a/modules/utilities/unix/web_frameworks/php/manifests/fpm.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/fpm.pp similarity index 74% rename from modules/utilities/unix/web_frameworks/php/manifests/fpm.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/fpm.pp index 4b22d9b0d..aa9c953ac 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/fpm.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/fpm.pp @@ -50,20 +50,20 @@ # Defaults is empty hash. # class php::fpm ( - String $ensure = $::php::ensure, - $user = $::php::fpm_user, - $group = $::php::fpm_group, - $service_ensure = $::php::fpm_service_ensure, - $service_enable = $::php::fpm_service_enable, - $service_name = $::php::fpm_service_name, - $service_provider = $::php::fpm_service_provider, - String $package = $::php::real_fpm_package, - Stdlib::Absolutepath $inifile = $::php::fpm_inifile, - Hash $settings = $::php::real_settings, - $global_pool_settings = $::php::real_fpm_global_pool_settings, - Hash $pools = $::php::real_fpm_pools, - $log_owner = $::php::log_owner, - $log_group = $::php::log_group, + String $ensure = $php::ensure, + $user = $php::fpm_user, + $group = $php::fpm_group, + $service_ensure = $php::fpm_service_ensure, + $service_enable = $php::fpm_service_enable, + $service_name = $php::fpm_service_name, + $service_provider = $php::fpm_service_provider, + String $package = $php::real_fpm_package, + Stdlib::Absolutepath $inifile = $php::fpm_inifile, + Hash $settings = $php::real_settings, + $global_pool_settings = $php::real_fpm_global_pool_settings, + Hash $pools = $php::real_fpm_pools, + $log_owner = $php::log_owner, + $log_group = $php::log_group, ) { if ! defined(Class['php']) { @@ -81,10 +81,10 @@ class php::fpm ( package { $real_package: ensure => $ensure, - require => Class['::php::packages'], + require => Class['php::packages'], } - class { '::php::fpm::config': + class { 'php::fpm::config': user => $user, group => $group, inifile => $inifile, @@ -93,8 +93,9 @@ class php::fpm ( log_group => $log_group, require => Package[$real_package], } - contain '::php::fpm::config' - contain '::php::fpm::service' + + contain 'php::fpm::config' + contain 'php::fpm::service' Class['php::fpm::config'] ~> Class['php::fpm::service'] diff --git a/modules/utilities/unix/web_frameworks/php/manifests/fpm/config.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/fpm/config.pp similarity index 84% rename from modules/utilities/unix/web_frameworks/php/manifests/fpm/config.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/fpm/config.pp index 691869078..c255a853b 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/fpm/config.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/fpm/config.pp @@ -71,15 +71,15 @@ # Path to fpm pid file # class php::fpm::config( - $config_file = $::php::params::fpm_config_file, - String $user = $::php::params::fpm_user, - String $group = $::php::params::fpm_group, - String $inifile = $::php::params::fpm_inifile, - $pid_file = $::php::params::fpm_pid_file, + $config_file = $php::params::fpm_config_file, + String $user = $php::params::fpm_user, + String $group = $php::params::fpm_group, + String $inifile = $php::params::fpm_inifile, + $pid_file = $php::params::fpm_pid_file, Hash $settings = {}, - Stdlib::Absolutepath $pool_base_dir = $::php::params::fpm_pool_dir, + Stdlib::Absolutepath $pool_base_dir = $php::params::fpm_pool_dir, $pool_purge = false, - String $error_log = $::php::params::fpm_error_log, + String $error_log = $php::params::fpm_error_log, String $log_level = 'notice', Integer $emergency_restart_threshold = 0, Variant[Integer, Pattern[/^\d+[smhd]?$/]] $emergency_restart_interval = 0, @@ -87,17 +87,15 @@ class php::fpm::config( Integer $process_max = 0, $rlimit_files = undef, Optional[Variant[Integer,Pattern[/^\d+[smhd]?$/]]] $systemd_interval = undef, - String $log_owner = $::php::params::fpm_user, - String $log_group = $::php::params::fpm_group, + String $log_owner = $php::params::fpm_user, + String $log_group = $php::params::fpm_group, Pattern[/^\d+$/] $log_dir_mode = '0770', - $root_group = $::php::params::root_group, + $root_group = $php::params::root_group, String $syslog_facility = 'daemon', String $syslog_ident = 'php-fpm', -) inherits ::php::params { +) inherits php::params { - if $caller_module_name != $module_name { - warning('php::fpm::config is private') - } + assert_private() # Hack-ish to default to user for group too $log_group_final = $log_group ? { @@ -113,6 +111,12 @@ class php::fpm::config( mode => '0644', } + ensure_resource('file', ['/var/run/php-fpm/', '/var/log/php-fpm/'], { + ensure => directory, + owner => $user, + group => $group, + }) + file { $pool_base_dir: ensure => directory, owner => root, @@ -127,8 +131,10 @@ class php::fpm::config( } } - ::php::config { 'fpm': - file => $inifile, - config => $settings, + if $inifile != $php::params::config_root_inifile { + ::php::config { 'fpm': + file => $inifile, + config => $settings, + } } } diff --git a/modules/utilities/unix/web_frameworks/php/manifests/fpm/pool.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/fpm/pool.pp similarity index 93% rename from modules/utilities/unix/web_frameworks/php/manifests/fpm/pool.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/fpm/pool.pp index d765e037b..7027d389f 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/fpm/pool.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/fpm/pool.pp @@ -122,8 +122,8 @@ define php::fpm::pool ( $listen_owner = undef, $listen_group = undef, $listen_mode = undef, - $user = $::php::fpm::config::user, - $group = $::php::fpm::config::group, + $user = $php::fpm::config::user, + $group = $php::fpm::config::group, $pm = 'dynamic', $pm_max_children = '50', $pm_start_servers = '5', @@ -155,7 +155,7 @@ define php::fpm::pool ( $php_admin_value = {}, $php_admin_flag = {}, $php_directives = [], - $root_group = $::php::params::root_group, + $root_group = $php::params::root_group, Optional[Stdlib::Absolutepath] $base_dir = undef, ) { @@ -176,10 +176,10 @@ define php::fpm::pool ( # Implies that the option SET+=FPM was set when building the port. $real_package = $facts['os']['name'] ? { 'FreeBSD' => [], - default => $::php::fpm::package, + default => $php::fpm::package, } - $pool_base_dir = pick_default($base_dir, $::php::fpm::config::pool_base_dir, $::php::params::fpm_pool_dir) + $pool_base_dir = pick_default($base_dir, $php::fpm::config::pool_base_dir, $php::params::fpm_pool_dir) if ($ensure == 'absent') { file { "${pool_base_dir}/${pool}.conf": ensure => absent, diff --git a/modules/utilities/unix/web_frameworks/php/manifests/fpm/service.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/fpm/service.pp similarity index 84% rename from modules/utilities/unix/web_frameworks/php/manifests/fpm/service.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/fpm/service.pp index d9748a4de..b4398cc81 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/fpm/service.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/fpm/service.pp @@ -15,10 +15,10 @@ # Defines if the service provider to use # class php::fpm::service( - $service_name = $::php::fpm::service_name, - $ensure = $::php::fpm::service_ensure, - $enable = $::php::fpm::service_enable, - $provider = $::php::fpm::service_provider, + $service_name = $php::fpm::service_name, + $ensure = $php::fpm::service_ensure, + $enable = $php::fpm::service_enable, + $provider = $php::fpm::service_provider, ) { if ! defined(Class['php::fpm']) { diff --git a/modules/utilities/unix/web_frameworks/php/manifests/global.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/global.pp similarity index 80% rename from modules/utilities/unix/web_frameworks/php/manifests/global.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/global.pp index dd35f186d..d5237e384 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/global.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/global.pp @@ -12,13 +12,11 @@ # class php::global( - Stdlib::Absolutepath $inifile = $::php::config_root_inifile, + Stdlib::Absolutepath $inifile = $php::config_root_inifile, Hash $settings = {} ) inherits ::php { - if $caller_module_name != $module_name { - warning('php::global is private') - } + assert_private() # No deep merging required since the settings we have are the global settings. $real_settings = $settings diff --git a/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/globals.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/globals.pp new file mode 100644 index 000000000..c2414b8fe --- /dev/null +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/globals.pp @@ -0,0 +1,160 @@ +# PHP globals class +# +# === Parameters +# +# [*php_version*] +# The version of php. +# +# [*config_root*] +# The configuration root directory. +# +# [*fpm_pid_file*] +# Path to pid file for fpm +# +# [*rhscl_mode*] +# The mode specifies the specifics in paths for the various RedHat SCL environments so that the module is configured +# correctly on their pathnames. +# +# Valid modes are: 'rhscl', 'remi' +# + +class php::globals ( + + Optional[Pattern[/^(rh-)?(php)?[57](\.)?[0-9]/]] $php_version = undef, + Optional[Stdlib::Absolutepath] $config_root = undef, + Optional[Stdlib::Absolutepath] $fpm_pid_file = undef, + $rhscl_mode = undef, +) { + + $default_php_version = $facts['os']['name'] ? { + 'Debian' => $facts['os']['release']['major'] ? { + '9' => '7.0', + default => '5.x', + }, + 'Ubuntu' => $facts['os']['release']['major'] ? { + '18.04' => '7.2', + '16.04' => '7.0', + default => '5.x', + }, + default => '5.x', + } + + $globals_php_version = pick($php_version, $default_php_version) + + case $facts['os']['family'] { + 'Debian': { + if $facts['os']['name'] == 'Ubuntu' { + case $globals_php_version { + /^5\.4/: { + $default_config_root = '/etc/php5' + $default_fpm_pid_file = "/var/run/php/php${globals_php_version}-fpm.pid" + $fpm_error_log = '/var/log/php5-fpm.log' + $fpm_service_name = 'php5-fpm' + $ext_tool_enable = '/usr/sbin/php5enmod' + $ext_tool_query = '/usr/sbin/php5query' + $package_prefix = 'php5-' + } + /^[57].[0-9]/: { + $default_config_root = "/etc/php/${globals_php_version}" + $default_fpm_pid_file = "/var/run/php/php${globals_php_version}-fpm.pid" + $fpm_error_log = "/var/log/php${globals_php_version}-fpm.log" + $fpm_service_name = "php${globals_php_version}-fpm" + $ext_tool_enable = "/usr/sbin/phpenmod -v ${globals_php_version}" + $ext_tool_query = "/usr/sbin/phpquery -v ${globals_php_version}" + $package_prefix = "php${globals_php_version}-" + } + default: { + # Default php installation from Ubuntu official repository use the following paths until 16.04 + # For PPA please use the $php_version to override it. + $default_config_root = '/etc/php5' + $default_fpm_pid_file = '/var/run/php5-fpm.pid' + $fpm_error_log = '/var/log/php5-fpm.log' + $fpm_service_name = 'php5-fpm' + $ext_tool_enable = '/usr/sbin/php5enmod' + $ext_tool_query = '/usr/sbin/php5query' + $package_prefix = 'php5-' + } + } + } else { + case $globals_php_version { + /^7\.[0-9]/: { + $default_config_root = "/etc/php/${globals_php_version}" + $default_fpm_pid_file = "/var/run/php/php${globals_php_version}-fpm.pid" + $fpm_error_log = "/var/log/php${globals_php_version}-fpm.log" + $fpm_service_name = "php${globals_php_version}-fpm" + $ext_tool_enable = "/usr/sbin/phpenmod -v ${globals_php_version}" + $ext_tool_query = "/usr/sbin/phpquery -v ${globals_php_version}" + $package_prefix = "php${globals_php_version}-" + } + default: { + $default_config_root = '/etc/php5' + $default_fpm_pid_file = '/var/run/php5-fpm.pid' + $fpm_error_log = '/var/log/php5-fpm.log' + $fpm_service_name = 'php5-fpm' + $ext_tool_enable = '/usr/sbin/php5enmod' + $ext_tool_query = '/usr/sbin/php5query' + $package_prefix = 'php5-' + } + } + } + } + 'Suse': { + case $globals_php_version { + /^7/: { + $default_config_root = '/etc/php7' + $package_prefix = 'php7-' + $default_fpm_pid_file = '/var/run/php7-fpm.pid' + $fpm_error_log = '/var/log/php7-fpm.log' + } + default: { + $default_config_root = '/etc/php5' + $package_prefix = 'php5-' + $default_fpm_pid_file = '/var/run/php5-fpm.pid' + $fpm_error_log = '/var/log/php5-fpm.log' + } + } + } + 'RedHat': { + case $rhscl_mode { + 'remi': { + $rhscl_root = "/opt/remi/${php_version}/root" + $default_config_root = "/etc/opt/remi/${php_version}" + $default_fpm_pid_file = '/var/run/php-fpm/php-fpm.pid' + $package_prefix = "${php_version}-php-" + $fpm_service_name = "${php_version}-php-fpm" + } + 'rhscl': { + $rhscl_root = "/opt/rh/${php_version}/root" + $default_config_root = "/etc/opt/rh/${php_version}" # rhscl registers contents by copy in /etc/opt/rh + $default_fpm_pid_file = "/var/opt/rh/${php_version}/run/php-fpm/php-fpm.pid" + $package_prefix = "${php_version}-php-" + $fpm_service_name = "${php_version}-php-fpm" + } + undef: { + $default_config_root = '/etc/php.d' + $default_fpm_pid_file = '/var/run/php-fpm/php-fpm.pid' + $fpm_service_name = undef + $package_prefix = undef + } + default: { + fail("Unsupported rhscl_mode '${rhscl_mode}'") + } + } + } + 'FreeBSD': { + $default_config_root = '/usr/local/etc' + $default_fpm_pid_file = '/var/run/php-fpm.pid' + $fpm_service_name = undef + } + 'Archlinux': { + $default_config_root = '/etc/php' + $default_fpm_pid_file = '/run/php-fpm/php-fpm.pid' + } + default: { + fail("Unsupported osfamily: ${facts['os']['family']}") + } + } + + $globals_config_root = pick($config_root, $default_config_root) + $globals_fpm_pid_file = pick($fpm_pid_file, $default_fpm_pid_file) +} diff --git a/modules/utilities/unix/web_frameworks/php/manifests/init.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/init.pp similarity index 67% rename from modules/utilities/unix/web_frameworks/php/manifests/init.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/init.pp index c77f04d19..3bc6e3bd4 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/init.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/init.pp @@ -113,62 +113,55 @@ # [*settings*] # class php ( - String $ensure = $::php::params::ensure, - Boolean $manage_repos = $::php::params::manage_repos, + String $ensure = $php::params::ensure, + Boolean $manage_repos = $php::params::manage_repos, Boolean $fpm = true, - $fpm_service_enable = $::php::params::fpm_service_enable, - $fpm_service_ensure = $::php::params::fpm_service_ensure, - $fpm_service_name = $::php::params::fpm_service_name, + $fpm_service_enable = $php::params::fpm_service_enable, + $fpm_service_ensure = $php::params::fpm_service_ensure, + $fpm_service_name = $php::params::fpm_service_name, $fpm_service_provider = undef, Hash $fpm_pools = { 'www' => {} }, Hash $fpm_global_pool_settings = {}, - $fpm_inifile = $::php::params::fpm_inifile, + $fpm_inifile = $php::params::fpm_inifile, $fpm_package = undef, - $fpm_user = $::php::params::fpm_user, - $fpm_group = $::php::params::fpm_group, + $fpm_user = $php::params::fpm_user, + $fpm_group = $php::params::fpm_group, Boolean $embedded = false, Boolean $dev = true, Boolean $composer = true, Boolean $pear = true, - String $pear_ensure = $::php::params::pear_ensure, + String $pear_ensure = $php::params::pear_ensure, Boolean $phpunit = false, Boolean $apache_config = false, $proxy_type = undef, $proxy_server = undef, Hash $extensions = {}, Hash $settings = {}, - $package_prefix = $::php::params::package_prefix, - Stdlib::Absolutepath $config_root_ini = $::php::params::config_root_ini, - Stdlib::Absolutepath $config_root_inifile = $::php::params::config_root_inifile, - Optional[Stdlib::Absolutepath] $ext_tool_enable = $::php::params::ext_tool_enable, - Optional[Stdlib::Absolutepath] $ext_tool_query = $::php::params::ext_tool_query, - Boolean $ext_tool_enabled = $::php::params::ext_tool_enabled, - String $log_owner = $::php::params::fpm_user, - String $log_group = $::php::params::fpm_group, -) inherits ::php::params { + $package_prefix = $php::params::package_prefix, + Stdlib::Absolutepath $config_root_ini = $php::params::config_root_ini, + Stdlib::Absolutepath $config_root_inifile = $php::params::config_root_inifile, + Optional[Stdlib::Absolutepath] $ext_tool_enable = $php::params::ext_tool_enable, + Optional[Stdlib::Absolutepath] $ext_tool_query = $php::params::ext_tool_query, + Boolean $ext_tool_enabled = $php::params::ext_tool_enabled, + String $log_owner = $php::params::fpm_user, + String $log_group = $php::params::fpm_group, +) inherits php::params { $real_fpm_package = pick($fpm_package, "${package_prefix}${::php::params::fpm_package_suffix}") - # Deep merge global php settings - $real_settings = deep_merge($settings, lookup('php::settings', {value_type => Hash, merge => 'deep', default_value => {}})) - - # Deep merge global php extensions - $real_extensions = deep_merge($extensions, lookup('php::extensions', {value_type => Hash, merge => 'deep', default_value => {}})) - - # Deep merge fpm_pools - $real_fpm_pools = deep_merge($fpm_pools, lookup('php::fpm_pools', {value_type => Hash, merge => 'deep', default_value => {}})) - - # Deep merge fpm_global_pool_settings - $real_fpm_global_pool_settings = deep_merge($fpm_global_pool_settings, lookup('php::fpm_global_pool_settings', {value_type => Hash, merge => 'deep', default_value => {}})) + $real_settings = $settings + $real_extensions = $extensions + $real_fpm_pools = $fpm_pools + $real_fpm_global_pool_settings = $fpm_global_pool_settings if $manage_repos { - class { '::php::repo': } + class { 'php::repo': } -> Anchor['php::begin'] } anchor { 'php::begin': } - -> class { '::php::packages': } - -> class { '::php::cli': + -> class { 'php::packages': } + -> class { 'php::cli': settings => $real_settings, } -> anchor { 'php::end': } @@ -176,13 +169,13 @@ class php ( # Configure global PHP settings in php.ini if $facts['os']['family'] != 'Debian' { Class['php::packages'] - -> class {'::php::global': + -> class {'php::global': settings => $real_settings, } -> Anchor['php::end'] } - if $fpm { contain '::php::fpm' } + if $fpm { contain 'php::fpm' } if $embedded { if $facts['os']['family'] == 'RedHat' and $fpm { # Both fpm and embeded SAPIs are using same php.ini @@ -190,19 +183,19 @@ class php ( } Anchor['php::begin'] - -> class { '::php::embedded': + -> class { 'php::embedded': settings => $real_settings, } -> Anchor['php::end'] } if $dev { Anchor['php::begin'] - -> class { '::php::dev': } + -> class { 'php::dev': } -> Anchor['php::end'] } if $composer { Anchor['php::begin'] - -> class { '::php::composer': + -> class { 'php::composer': proxy_type => $proxy_type, proxy_server => $proxy_server, } @@ -210,36 +203,36 @@ class php ( } if $pear { Anchor['php::begin'] - -> class { '::php::pear': + -> class { 'php::pear': ensure => $pear_ensure, } -> Anchor['php::end'] } if $phpunit { Anchor['php::begin'] - -> class { '::php::phpunit': } + -> class { 'php::phpunit': } -> Anchor['php::end'] } if $apache_config { Anchor['php::begin'] - -> class { '::php::apache_config': + -> class { 'php::apache_config': settings => $real_settings, } -> Anchor['php::end'] } - create_resources('::php::extension', $real_extensions, { - require => Class['::php::cli'], + create_resources('php::extension', $real_extensions, { + require => Class['php::cli'], before => Anchor['php::end'] }) # On FreeBSD purge the system-wide extensions.ini. It is going # to be replaced with per-module configuration files. - if $::osfamily == 'FreeBSD' { + if $facts['os']['family'] == 'FreeBSD' { # Purge the system-wide extensions.ini file { '/usr/local/etc/php/extensions.ini': ensure => absent, - require => Class['::php::packages'], + require => Class['php::packages'], } } } diff --git a/modules/utilities/unix/web_frameworks/php/manifests/packages.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/packages.pp similarity index 64% rename from modules/utilities/unix/web_frameworks/php/manifests/packages.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/packages.pp index 7c95156d4..aa274b369 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/packages.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/packages.pp @@ -13,15 +13,13 @@ # package prefix `$php::package_prefix` # class php::packages ( - String $ensure = $::php::ensure, - Boolean $manage_repos = $::php::manage_repos, - Array $names_to_prefix = prefix($::php::params::common_package_suffixes, $::php::package_prefix), - Array $names = $::php::params::common_package_names, -) inherits ::php::params { + String $ensure = $php::ensure, + Boolean $manage_repos = $php::manage_repos, + Array $names_to_prefix = prefix($php::params::common_package_suffixes, $php::package_prefix), + Array $names = $php::params::common_package_names, +) inherits php::params { - if $caller_module_name != $module_name { - warning('php::packages is private') - } + assert_private() $real_names = union($names, $names_to_prefix) if $facts['os']['family'] == 'debian' { diff --git a/modules/utilities/unix/web_frameworks/php/manifests/params.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/params.pp similarity index 80% rename from modules/utilities/unix/web_frameworks/php/manifests/params.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/params.pp index f4d9acd58..6c83eebb6 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/params.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/params.pp @@ -101,26 +101,54 @@ class php::params inherits php::globals { } } 'RedHat': { - $config_root = $php::globals::globals_config_root - $config_root_ini = "${config_root}/php.d" - $config_root_inifile = "${config_root}/php.ini" + $config_root = $php::globals::globals_config_root + + case $php::globals::rhscl_mode { + 'remi': { + $config_root_ini = "${config_root}/php.d" + $config_root_inifile = "${config_root}/php.ini" + $cli_inifile = $config_root_inifile + $fpm_inifile = $config_root_inifile + $fpm_config_file = "${config_root}/php-fpm.conf" + $fpm_pool_dir = "${config_root}/php-fpm.d" + $php_bin_dir = "${php::globals::rhscl_root}/bin" + } + 'rhscl': { + $config_root_ini = "${config_root}/php.d" + $config_root_inifile = "${config_root}/php.ini" + $cli_inifile = "${config_root}/php-cli.ini" + $fpm_inifile = "${config_root}/php-fpm.ini" + $fpm_config_file = "${config_root}/php-fpm.conf" + $fpm_pool_dir = "${config_root}/php-fpm.d" + $php_bin_dir = "${php::globals::rhscl_root}/bin" + } + undef: { + # no rhscl + $config_root_ini = $config_root + $config_root_inifile = '/etc/php.ini' + $cli_inifile = '/etc/php-cli.ini' + $fpm_inifile = '/etc/php-fpm.ini' + $fpm_config_file = '/etc/php-fpm.conf' + $fpm_pool_dir = '/etc/php-fpm.d' + } + default: { + fail("Unsupported rhscl_mode '${php::globals::rhscl_mode}'") + } + } + + $apache_inifile = $config_root_inifile + $embedded_inifile = $config_root_inifile $common_package_names = [] $common_package_suffixes = ['cli', 'common'] - $cli_inifile = "${config_root}/php-cli.ini" $dev_package_suffix = 'devel' $fpm_pid_file = $php::globals::globals_fpm_pid_file - $fpm_config_file = "${config_root}/php-fpm.conf" $fpm_error_log = '/var/log/php-fpm/error.log' - $fpm_inifile = "${config_root}/php-fpm.ini" $fpm_package_suffix = 'fpm' - $fpm_pool_dir = "${config_root}/php-fpm.d" - $fpm_service_name = 'php-fpm' + $fpm_service_name = pick($php::globals::fpm_service_name, 'php-fpm') $fpm_user = 'apache' $fpm_group = 'apache' - $apache_inifile = "${config_root}/php.ini" $embedded_package_suffix = 'embedded' - $embedded_inifile = "${config_root}/php.ini" - $package_prefix = 'php-' + $package_prefix = pick($php::globals::package_prefix, 'php-') $compiler_packages = ['gcc', 'gcc-c++', 'make'] $manage_repos = false $root_group = 'root' diff --git a/modules/utilities/unix/web_frameworks/php/manifests/pear.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/pear.pp similarity index 84% rename from modules/utilities/unix/web_frameworks/php/manifests/pear.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/pear.pp index f5a6a916e..dec0acc57 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/pear.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/pear.pp @@ -9,14 +9,12 @@ # The package name for PHP pear # class php::pear ( - String $ensure = $::php::pear_ensure, + String $ensure = $php::pear_ensure, Optional[String] $package = undef, Boolean $manage_repos = $php::manage_repos, -) inherits ::php::params { +) inherits php::params { - if $caller_module_name != $module_name { - warning('php::pear is private') - } + assert_private() # Defaults for the pear package name if $package { @@ -37,7 +35,7 @@ class php::pear ( } 'FreeBSD': { # On FreeBSD the package name is just 'pear'. - $package_name = $::php::params::pear_package_suffix + $package_name = $php::params::pear_package_suffix } default: { # This is the default for all other architectures @@ -61,12 +59,12 @@ class php::pear ( package { $package_name: ensure => $ensure, - require => [$require,Class['::php::cli'],Package["${php::package_prefix}xml"]], + require => [$require,Class['php::cli'],Package["${php::package_prefix}xml"]], } } else { package { $package_name: ensure => $ensure, - require => Class['::php::cli'], + require => Class['php::cli'], } } } diff --git a/modules/utilities/unix/web_frameworks/php/manifests/phpunit.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/phpunit.pp similarity index 57% rename from modules/utilities/unix/web_frameworks/php/manifests/phpunit.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/phpunit.pp index 5832be2bd..3ff308861 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/phpunit.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/phpunit.pp @@ -15,32 +15,31 @@ # Defines the time in days after which an auto-update gets executed # class php::phpunit ( - String $source = $::php::params::phpunit_source, - Stdlib::Absolutepath $path = $::php::params::phpunit_path, + String $source = $php::params::phpunit_source, + Stdlib::Absolutepath $path = $php::params::phpunit_path, + String[1] $root_group = $php::params::root_group, Boolean $auto_update = true, - Integer $max_age = $::php::params::phpunit_max_age, -) inherits ::php::params { + Integer $max_age = $php::params::phpunit_max_age, +) inherits php::params { - if $caller_module_name != $module_name { - warning('php::phpunit is private') - } + assert_private() ensure_packages(['wget']) exec { 'download phpunit': command => "wget ${source} -O ${path}", creates => $path, - path => ['/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/'], - require => [Class['::php::cli'],Package['wget']], + path => ['/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/', '/usr/local/bin', '/usr/local/sbin'], + require => [Class['php::cli'],Package['wget']], } -> file { $path: mode => '0555', owner => root, - group => root, + group => $root_group, } if $auto_update { - class { '::php::phpunit::auto_update': + class { 'php::phpunit::auto_update': max_age => $max_age, source => $source, path => $path, diff --git a/modules/utilities/unix/web_frameworks/php/manifests/phpunit/auto_update.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/phpunit/auto_update.pp similarity index 74% rename from modules/utilities/unix/web_frameworks/php/manifests/phpunit/auto_update.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/phpunit/auto_update.pp index 2bdea1312..2510553c5 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/phpunit/auto_update.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/phpunit/auto_update.pp @@ -17,14 +17,12 @@ class php::phpunit::auto_update ( $path, ) { - if $caller_module_name != $module_name { - warning('php::phpunit::auto_update is private') - } + assert_private() exec { 'update phpunit': command => "wget ${source} -O ${path}", onlyif => "test `find '${path}' -mtime +${max_age}`", - path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ], + path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/', '/usr/local/bin', '/usr/local/sbin' ], require => File[$path], } } diff --git a/modules/utilities/unix/web_frameworks/php/manifests/repo.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/repo.pp similarity index 94% rename from modules/utilities/unix/web_frameworks/php/manifests/repo.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/repo.pp index b02e65ae8..85b808d4c 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/repo.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/repo.pp @@ -24,7 +24,7 @@ class php::repo { contain ::php::repo::suse } 'RedHat': { - contain '::php::repo::redhat' + contain 'php::repo::redhat' } default: { fail($msg_no_repo) diff --git a/modules/utilities/unix/web_frameworks/php/manifests/repo/debian.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/repo/debian.pp similarity index 92% rename from modules/utilities/unix/web_frameworks/php/manifests/repo/debian.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/repo/debian.pp index fed406340..f267201f6 100644 --- a/modules/utilities/unix/web_frameworks/php/manifests/repo/debian.pp +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/repo/debian.pp @@ -24,7 +24,7 @@ # Enable special sury handling # class php::repo::debian( - $location = 'http://packages.dotdeb.org', + $location = 'https://packages.dotdeb.org', $release = 'wheezy-php56', $repos = 'all', $include_src = false, @@ -36,9 +36,7 @@ class php::repo::debian( $sury = true, ) { - if $caller_module_name != $module_name { - warning('php::repo::debian is private') - } + assert_private() include '::apt' @@ -86,7 +84,7 @@ class php::repo::debian( ::apt::source { 'source_php_71': location => 'https://packages.sury.org/php/', - release => $::lsbdistcodename, + release => $facts['os']['distro']['codename'], repos => 'main', include => { 'src' => $include_src, diff --git a/modules/utilities/unix/web_frameworks/php/manifests/repo/redhat.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/repo/redhat.pp similarity index 100% rename from modules/utilities/unix/web_frameworks/php/manifests/repo/redhat.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/repo/redhat.pp diff --git a/modules/utilities/unix/web_frameworks/php/manifests/repo/suse.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/repo/suse.pp similarity index 100% rename from modules/utilities/unix/web_frameworks/php/manifests/repo/suse.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/repo/suse.pp diff --git a/modules/utilities/unix/web_frameworks/php/manifests/repo/ubuntu.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/repo/ubuntu.pp similarity index 100% rename from modules/utilities/unix/web_frameworks/php/manifests/repo/ubuntu.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/manifests/repo/ubuntu.pp diff --git a/modules/utilities/unix/web_frameworks/php/metadata.json b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/metadata.json similarity index 84% rename from modules/utilities/unix/web_frameworks/php/metadata.json rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/metadata.json index 00d86f582..77dd4ad9d 100644 --- a/modules/utilities/unix/web_frameworks/php/metadata.json +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/metadata.json @@ -1,21 +1,20 @@ { "name": "puppet-php", - "version": "5.2.1-rc0", + "version": "6.0.1", "author": "Vox Pupuli", "summary": "Generic PHP module that supports many platforms", "license": "MIT", "source": "https://github.com/voxpupuli/puppet-php", "project_page": "https://github.com/voxpupuli/puppet-php", "issues_url": "https://github.com/voxpupuli/puppet-php/issues", - "description": "Puppet module that aims to manage PHP and extensions in a generic way on many platforms with sane defaults and easy configuration", "dependencies": [ { "name": "puppetlabs/stdlib", - "version_requirement": ">= 4.16.0 < 5.0.0" + "version_requirement": ">= 4.16.0 < 6.0.0" }, { "name": "puppetlabs/apt", - "version_requirement": ">= 4.4.0 < 5.0.0" + "version_requirement": ">= 4.4.0 < 7.0.0" }, { "name": "puppetlabs/inifile", @@ -27,13 +26,15 @@ }, { "name": "puppet/archive", - "version_requirement": ">= 1.0.0 < 3.0.0" + "version_requirement": ">= 1.0.0 < 4.0.0" } ], + "data_provider": null, + "description": "Puppet module that aims to manage PHP and extensions in a generic way on many platforms with sane defaults and easy configuration", "requirements": [ { "name": "puppet", - "version_requirement": ">= 4.7.0 < 6.0.0" + "version_requirement": ">= 4.10.0 < 7.0.0" } ], "operatingsystem_support": [ @@ -41,14 +42,15 @@ "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "14.04", - "16.04" + "16.04", + "18.04" ] }, { "operatingsystem": "Debian", "operatingsystemrelease": [ - "7", - "8" + "8", + "9" ] }, { diff --git a/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/php.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/php.pp new file mode 100644 index 000000000..cde24b447 --- /dev/null +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/php.pp @@ -0,0 +1,3 @@ +ensure_packages(['php-mysql','libapache2-mod-php']) + +class { '::php': } \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/secgen_metadata.xml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/secgen_metadata.xml new file mode 100644 index 000000000..e829e07b0 --- /dev/null +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/secgen_metadata.xml @@ -0,0 +1,33 @@ + + + + PHP Server - Stretch / Kali Compatible + Thomas Shaw + Vox Pupuli + Apache v2 + An installation of PHP for Stretch / Kali + + web_server + linux + + + http://php.net + https://forge.puppet.com/puppet/php + php + PHP License v3.01 + + + .*Wheezy.* + + + update + + + .*apache_stretch.* + + + .*mysql_stretch.* + + diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/archlinux-2-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/archlinux-2-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/archlinux-2-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/archlinux-2-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/centos-511-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/centos-511-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/centos-511-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/centos-511-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/centos-6-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/centos-6-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/centos-6-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/centos-6-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/centos-66-x64-pe.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/centos-66-x64-pe.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/centos-66-x64-pe.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/centos-66-x64-pe.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/centos-66-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/centos-66-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/centos-66-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/centos-66-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/centos-7-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/centos-7-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/centos-7-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/centos-7-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/centos-72-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/centos-72-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/centos-72-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/centos-72-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/debian-78-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/debian-78-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/debian-78-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/debian-78-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/debian-82-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/debian-82-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/debian-82-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/debian-82-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ec2/image_templates.yaml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ec2/image_templates.yaml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ec2/image_templates.yaml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ec2/image_templates.yaml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ec2/rhel-73-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ec2/rhel-73-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ec2/rhel-73-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ec2/rhel-73-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/fedora-24-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/fedora-24-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/fedora-24-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/fedora-24-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/fedora-25-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/fedora-25-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/fedora-25-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/fedora-25-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/fedora-26-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/fedora-26-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/fedora-26-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/fedora-26-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/fedora-27-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/fedora-27-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/fedora-27-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/fedora-27-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml diff --git a/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/php56_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/php56_spec.rb new file mode 100644 index 000000000..11d625052 --- /dev/null +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/php56_spec.rb @@ -0,0 +1,47 @@ +require 'spec_helper_acceptance' + +describe 'with specific php version' do + case default[:platform] + when %r{ubuntu} + packagename = 'php5.6-fpm' + when %r{el} + # ell = Enterprise Linux = CentOS.... + packagename = 'php-fpm' + when %r{debian} + packagename = 'php5-fpm' + end + + context 'with params' do + it 'works with 5.6' do + pp = <<-EOS + class { 'php::globals': + php_version => '5.6', + } + -> class { 'php': + ensure => 'present', + manage_repos => true, + fpm => true, + dev => true, + composer => true, + pear => true, + phpunit => false, + } + EOS + + # Run it twice and test for idempotency + apply_manifest(pp, catch_failures: true) + apply_manifest(pp, catch_changes: true) + end + + describe package(packagename) do + it { is_expected.to be_installed } + end + describe service(packagename) do + it { is_expected.to be_running } + it { is_expected.to be_enabled } + end + describe command('php --version') do + its(:stdout) { is_expected.to match %r{5\.6} } + end + end +end diff --git a/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/php_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/php_spec.rb new file mode 100644 index 000000000..7a3dff6e5 --- /dev/null +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/acceptance/php_spec.rb @@ -0,0 +1,96 @@ +require 'spec_helper_acceptance' + +describe 'php with default settings' do + context 'default parameters' do + it 'works with defaults' do + pp = 'include php' + # Run it twice and test for idempotency + apply_manifest(pp, catch_failures: true) + apply_manifest(pp, catch_changes: true) + end + + case default[:platform] + when %r{ubuntu-18.04} + packagename = 'php7.2-fpm' + when %r{ubuntu-16.04} + packagename = 'php7.0-fpm' + when %r{ubuntu-14.04} + packagename = 'php5-fpm' + when %r{el} + packagename = 'php-fpm' + when %r{debian-8} + packagename = 'php5-fpm' + when %r{debian-9} + packagename = 'php7.0-fpm' + end + describe package(packagename) do + it { is_expected.to be_installed } + end + + describe service(packagename) do + it { is_expected.to be_running } + it { is_expected.to be_enabled } + end + end + context 'default parameters with extensions' do + case default[:platform] + when %r{ubuntu-18.04}, %r{ubuntu-16.04}, %r{ubuntu-14.04} + it 'works with defaults' do + pp = <<-EOS + class{'php': + extensions => { + 'mysql' => {}, + 'gd' => {}, + 'net-url' => { + package_prefix => 'php-', + settings => { + extension => undef + } + } + } + } + EOS + # Run it twice and test for idempotency + apply_manifest(pp, catch_failures: true) + apply_manifest(pp, catch_changes: true) + end + else + it 'works with defaults' do + pp = <<-EOS + class{'php': + extensions => { + 'mysql' => {}, + 'gd' => {} + } + } + EOS + # Run it twice and test for idempotency + apply_manifest(pp, catch_failures: true) + apply_manifest(pp, catch_changes: true) + end + end + + case default[:platform] + when %r{ubuntu-18.04} + packagename = 'php7.2-fpm' + when %r{ubuntu-16.04} + packagename = 'php7.0-fpm' + when %r{ubuntu-14.04} + packagename = 'php5-fpm' + when %r{el} + packagename = 'php-fpm' + when %r{debian-8} + packagename = 'php5-fpm' + when %r{debian-9} + packagename = 'php7.0-fpm' + end + describe package(packagename) do + it { is_expected.to be_installed } + end + + describe service(packagename) do + it { is_expected.to be_running } + it { is_expected.to be_enabled } + end + end +end diff --git a/modules/utilities/unix/web_frameworks/php/spec/classes/coverage_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/coverage_spec.rb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/classes/coverage_spec.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/coverage_spec.rb diff --git a/modules/utilities/unix/web_frameworks/php/spec/classes/php_fpm_config_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/php_fpm_config_spec.rb similarity index 98% rename from modules/utilities/unix/web_frameworks/php/spec/classes/php_fpm_config_spec.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/php_fpm_config_spec.rb index bf78b3ce7..3e6d4c914 100644 --- a/modules/utilities/unix/web_frameworks/php/spec/classes/php_fpm_config_spec.rb +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/php_fpm_config_spec.rb @@ -1,3 +1,4 @@ +require 'rspec' require 'spec_helper' describe 'php::fpm::config' do diff --git a/modules/utilities/unix/web_frameworks/php/spec/classes/php_fpm_service_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/php_fpm_service_spec.rb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/classes/php_fpm_service_spec.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/php_fpm_service_spec.rb diff --git a/modules/utilities/unix/web_frameworks/php/spec/classes/php_fpm_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/php_fpm_spec.rb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/classes/php_fpm_spec.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/php_fpm_spec.rb diff --git a/modules/utilities/unix/web_frameworks/php/spec/classes/php_repo_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/php_repo_spec.rb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/classes/php_repo_spec.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/php_repo_spec.rb diff --git a/modules/utilities/unix/web_frameworks/php/spec/classes/php_repo_ubuntu_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/php_repo_ubuntu_spec.rb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/classes/php_repo_ubuntu_spec.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/php_repo_ubuntu_spec.rb diff --git a/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/php_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/php_spec.rb new file mode 100644 index 000000000..e25389986 --- /dev/null +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/classes/php_spec.rb @@ -0,0 +1,265 @@ +require 'spec_helper' + +describe 'php', type: :class do + on_supported_os.each do |os, facts| + context "on #{os}" do + let :facts do + facts + end + + php_cli_package = case facts[:os]['name'] + when 'Debian' + case facts[:os]['release']['major'] + when '9' + 'php7.0-cli' + else + 'php5-cli' + end + when 'Ubuntu' + case facts[:os]['release']['major'] + when '18.04' + 'php7.2-cli' + when '16.04' + 'php7.0-cli' + else + 'php5-cli' + end + end + php_fpm_ackage = case facts[:os]['name'] + when 'Debian' + case facts[:os]['release']['major'] + when '9' + 'php7.0-fpm' + else + 'php5-fpm' + end + when 'Ubuntu' + case facts[:os]['release']['major'] + when '18.04' + 'php7.2-fpm' + when '16.04' + 'php7.0-fpm' + else + 'php5-fpm' + end + end + php_dev_ackage = case facts[:os]['name'] + when 'Debian' + case facts[:os]['release']['major'] + when '9' + 'php7.0-dev' + else + 'php5-dev' + end + when 'Ubuntu' + case facts[:os]['release']['major'] + when '18.04' + 'php7.2-dev' + when '16.04' + 'php7.0-dev' + else + 'php5-dev' + end + end + + describe 'when called with no parameters' do + case facts[:osfamily] + when 'Suse', 'RedHat', 'CentOS' + it { is_expected.to contain_class('php::global') } + end + + case facts[:osfamily] + when 'Debian' + it { is_expected.not_to contain_class('php::global') } + it { is_expected.to contain_class('php::fpm') } + it { is_expected.to contain_package('php-pear').with_ensure('present') } + it { is_expected.to contain_class('php::composer') } + it { is_expected.to contain_package(php_cli_package).with_ensure('present') } + it { is_expected.to contain_package(php_fpm_ackage).with_ensure('present') } + it { is_expected.to contain_package(php_dev_ackage).with_ensure('present') } + when 'Suse' + it { is_expected.to contain_package('php5').with_ensure('present') } + it { is_expected.to contain_package('php5-devel').with_ensure('present') } + it { is_expected.to contain_package('php5-pear').with_ensure('present') } + it { is_expected.not_to contain_package('php5-cli') } + it { is_expected.not_to contain_package('php5-dev') } + it { is_expected.not_to contain_package('php-pear') } + when 'RedHat', 'CentOS' + it { is_expected.to contain_package('php-cli').with_ensure('present') } + it { is_expected.to contain_package('php-common').with_ensure('present') } + end + end + + describe 'when called with package_prefix parameter' do + package_prefix = 'myphp-' + let(:params) { { package_prefix: package_prefix } } + + case facts[:osfamily] + when 'Suse', 'RedHat', 'CentOS' + it { is_expected.to contain_class('php::global') } + end + + case facts[:osfamily] + when 'Debian', 'RedHat', 'CentOS' + it { is_expected.to contain_package("#{package_prefix}cli").with_ensure('present') } + end + + case facts[:osfamily] + when 'Debian' + it { is_expected.not_to contain_class('php::global') } + it { is_expected.to contain_class('php::fpm') } + it { is_expected.to contain_class('php::composer') } + it { is_expected.to contain_package('php-pear').with_ensure('present') } + it { is_expected.to contain_package("#{package_prefix}dev").with_ensure('present') } + it { is_expected.to contain_package("#{package_prefix}fpm").with_ensure('present') } + when 'Suse' + it { is_expected.to contain_package('php5').with_ensure('present') } + it { is_expected.to contain_package("#{package_prefix}devel").with_ensure('present') } + it { is_expected.to contain_package("#{package_prefix}pear").with_ensure('present') } + it { is_expected.not_to contain_package("#{package_prefix}cli").with_ensure('present') } + it { is_expected.not_to contain_package("#{package_prefix}dev") } + it { is_expected.not_to contain_package('php-pear') } + when 'RedHat', 'CentOS' + it { is_expected.to contain_package("#{package_prefix}common").with_ensure('present') } + end + end + + describe 'when called with fpm_user parameter' do + let(:params) { { fpm_user: 'nginx' } } + + it { is_expected.to contain_class('php::fpm').with(user: 'nginx') } + it { is_expected.to contain_php__fpm__pool('www').with(user: 'nginx') } + + dstfile = case facts[:osfamily] + when 'Debian' + case facts[:os]['name'] + when 'Debian' + case facts[:os]['release']['major'] + when '9' + '/etc/php/7.0/fpm/pool.d/www.conf' + else + '/etc/php5/fpm/pool.d/www.conf' + end + when 'Ubuntu' + case facts[:os]['release']['major'] + when '18.04' + '/etc/php/7.2/fpm/pool.d/www.conf' + when '16.04' + '/etc/php/7.0/fpm/pool.d/www.conf' + else + '/etc/php5/fpm/pool.d/www.conf' + end + end + when 'Archlinux' + '/etc/php/php-fpm.d/www.conf' + when 'Suse' + '/etc/php5/fpm/pool.d/www.conf' + when 'RedHat' + '/etc/php-fpm.d/www.conf' + when 'FreeBSD' + '/usr/local/etc/php-fpm.d/www.conf' + end + + it { is_expected.to contain_file(dstfile).with_content(%r{user = nginx}) } + end + describe 'when called with fpm_group parameter' do + let(:params) { { fpm_group: 'nginx' } } + + it { is_expected.to contain_class('php::fpm').with(group: 'nginx') } + it { is_expected.to contain_php__fpm__pool('www').with(group: 'nginx') } + + dstfile = case facts[:osfamily] + when 'Debian' + case facts[:os]['name'] + when 'Debian' + case facts[:os]['release']['major'] + when '9' + '/etc/php/7.0/fpm/pool.d/www.conf' + else + '/etc/php5/fpm/pool.d/www.conf' + end + when 'Ubuntu' + case facts[:os]['release']['major'] + when '18.04' + '/etc/php/7.2/fpm/pool.d/www.conf' + when '16.04' + '/etc/php/7.0/fpm/pool.d/www.conf' + else + '/etc/php5/fpm/pool.d/www.conf' + end + end + when 'Archlinux' + '/etc/php/php-fpm.d/www.conf' + when 'Suse' + '/etc/php5/fpm/pool.d/www.conf' + when 'RedHat' + '/etc/php-fpm.d/www.conf' + when 'FreeBSD' + '/usr/local/etc/php-fpm.d/www.conf' + end + + it { is_expected.to contain_file(dstfile).with_content(%r{group = nginx}) } + end + + describe 'when fpm is disabled' do + let(:params) { { fpm: false } } + + it { is_expected.not_to contain_class('php::fpm') } + end + + describe 'when composer is disabled' do + let(:params) { { composer: false } } + + it { is_expected.not_to contain_class('php::composer') } + end + + if facts[:osfamily] == 'RedHat' || facts[:osfamily] == 'CentOS' + describe 'when called with global option for rhscl_mode' do + describe 'when called with mode "remi"' do + scl_php_version = 'php56' + rhscl_mode = 'remi' + let(:pre_condition) do + "class {'::php::globals': + php_version => '#{scl_php_version}', + rhscl_mode => '#{rhscl_mode}' + }" + end + let(:params) do + { settings: { 'Date/date.timezone' => 'Europe/Berlin' } } + end + + it { is_expected.to contain_class('php::global') } + it { is_expected.to contain_package("#{scl_php_version}-php-cli").with_ensure('present') } + it { is_expected.to contain_package("#{scl_php_version}-php-common").with_ensure('present') } + it { is_expected.to contain_php__config('global').with(file: "/etc/opt/#{rhscl_mode}/#{scl_php_version}/php.ini") } + it { is_expected.not_to contain_php__config('cli') } + + # see: https://github.com/voxpupuli/puppet-php/blob/master/lib/puppet/parser/functions/to_hash_settings.rb + it { is_expected.to contain_php__config__setting("/etc/opt/#{rhscl_mode}/#{scl_php_version}/php.ini: Date/date.timezone").with_value('Europe/Berlin') } + end + + describe 'when called with mode "rhscl"' do + scl_php_version = 'rh-php56' + rhscl_mode = 'rhscl' + let(:pre_condition) do + "class {'::php::globals': + php_version => '#{scl_php_version}', + rhscl_mode => '#{rhscl_mode}' + }" + end + let(:params) do + { settings: { 'Date/date.timezone' => 'Europe/Berlin' } } + end + + it { is_expected.to contain_class('php::global') } + it { is_expected.to contain_package("#{scl_php_version}-php-cli").with_ensure('present') } + it { is_expected.to contain_package("#{scl_php_version}-php-common").with_ensure('present') } + it { is_expected.to contain_php__config('global').with(file: "/etc/opt/rh/#{scl_php_version}/php.ini") } + it { is_expected.to contain_php__config('cli').with(file: "/etc/opt/rh/#{scl_php_version}/php-cli.ini") } + it { is_expected.to contain_php__config__setting("/etc/opt/rh/#{scl_php_version}/php.ini: Date/date.timezone").with_value('Europe/Berlin') } + end + end + end + end + end +end diff --git a/modules/utilities/unix/web_frameworks/php/spec/default_facts.yml b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/default_facts.yml similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/default_facts.yml rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/default_facts.yml diff --git a/modules/utilities/unix/web_frameworks/php/spec/defines/config_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/defines/config_spec.rb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/defines/config_spec.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/defines/config_spec.rb diff --git a/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/defines/extension_rhscl_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/defines/extension_rhscl_spec.rb new file mode 100644 index 000000000..213844e05 --- /dev/null +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/defines/extension_rhscl_spec.rb @@ -0,0 +1,53 @@ +require 'spec_helper' + +describe 'php::extension' do + on_supported_os.each do |os, facts| + next unless facts[:osfamily] == 'RedHat' || facts[:osfamily] == 'CentOS' + + context "on #{os}" do + let :facts do + facts + end + + describe 'with rhscl_mode "remi" enabled: install one extension' do + scl_php_version = 'php56' + rhscl_mode = 'remi' + configs_root = "/etc/opt/#{rhscl_mode}/#{scl_php_version}" + + let(:pre_condition) do + "class {'::php::globals': + php_version => '#{scl_php_version}', + rhscl_mode => '#{rhscl_mode}' + }-> + class {'::php': + ensure => installed, + manage_repos => false, + fpm => false, + dev => true, # must be true since we are using the provider => pecl (option installs header files) + composer => false, + pear => true, + phpunit => false, + }" + end + + let(:title) { 'soap' } + let(:params) do + { + ini_prefix: '20-', + settings: { + 'bz2' => { + 'Date/date.timezone' => 'Europe/Berlin' + } + }, + multifile_settings: true + } + end + + it { is_expected.to contain_class('php::global') } + it { is_expected.to contain_class('php') } + it { is_expected.to contain_php__config('bz2').with(file: "#{configs_root}/php.d/20-bz2.ini") } + it { is_expected.to contain_php__config__setting("#{configs_root}/php.d/20-bz2.ini: Date/date.timezone").with_value('Europe/Berlin') } + end + end + end +end diff --git a/modules/utilities/unix/web_frameworks/php/spec/defines/extension_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/defines/extension_spec.rb similarity index 84% rename from modules/utilities/unix/web_frameworks/php/spec/defines/extension_spec.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/defines/extension_spec.rb index db74f2ff3..14f5d23bb 100644 --- a/modules/utilities/unix/web_frameworks/php/spec/defines/extension_spec.rb +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/defines/extension_spec.rb @@ -6,23 +6,31 @@ describe 'php::extension' do let :facts do facts end - let(:pre_condition) { 'include php' } unless facts[:osfamily] == 'Suse' || facts[:osfamily] == 'FreeBSD' # FIXME: something is wrong on these - etcdir = case facts[:osfamily] - when 'Debian' - case facts[:os]['release']['major'] - when '16.04' - '/etc/php/7.0/mods-available' - else - '/etc/php5/mods-available' - end - when 'Archlinux' - '/etc/php/conf.d' - else - '/etc/php.d' - end + etcdir = case facts[:os]['name'] + when 'Debian' + case facts[:os]['release']['major'] + when '9' + '/etc/php/7.0/mods-available' + else + '/etc/php5/mods-available' + end + when 'Ubuntu' + case facts[:os]['release']['major'] + when '18.04' + '/etc/php/7.2/mods-available' + when '16.04' + '/etc/php/7.0/mods-available' + else + '/etc/php5/mods-available' + end + when 'Archlinux' + '/etc/php/conf.d' + else + '/etc/php.d' + end context 'installation from repository' do let(:title) { 'json' } @@ -185,6 +193,9 @@ describe 'php::extension' do let(:title) { 'xdebug' } it { is_expected.to contain_php__config('xdebug').with_file("#{etcdir}/xdebug.ini") } + + # note to consider: As of PHP 5.2.0, the JSON extension is bundled and compiled into PHP by default + # http://php.net/manual/en/json.installation.php context 'pecl installation' do let(:title) { 'json' } let(:params) do diff --git a/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/defines/fpm_pool_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/defines/fpm_pool_spec.rb new file mode 100644 index 000000000..8cb30d32e --- /dev/null +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/defines/fpm_pool_spec.rb @@ -0,0 +1,41 @@ +require 'spec_helper' + +describe 'php::fpm::pool' do + on_supported_os.each do |os, facts| + context "on #{os}" do + let :facts do + facts + end + let(:pre_condition) { 'include php' } + + case facts[:os]['name'] + when 'Debian' + context 'plain config' do + let(:title) { 'unique-name' } + let(:params) { {} } + + case facts[:os]['release']['major'] + when '9' + it { is_expected.to contain_file('/etc/php/7.0/fpm/pool.d/unique-name.conf') } + else + it { is_expected.to contain_file('/etc/php5/fpm/pool.d/unique-name.conf') } + end + end + when 'Ubuntu' + context 'plain config' do + let(:title) { 'unique-name' } + let(:params) { {} } + + case facts[:os]['release']['major'] + when '18.04' + it { is_expected.to contain_file('/etc/php/7.2/fpm/pool.d/unique-name.conf') } + when '16.04' + it { is_expected.to contain_file('/etc/php/7.0/fpm/pool.d/unique-name.conf') } + else + it { is_expected.to contain_file('/etc/php5/fpm/pool.d/unique-name.conf') } + end + end + end + end + end +end diff --git a/modules/utilities/unix/web_frameworks/php/spec/fixtures/unit/provider/package/pear/list_a b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/fixtures/unit/provider/package/pear/list_a similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/fixtures/unit/provider/package/pear/list_a rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/fixtures/unit/provider/package/pear/list_a diff --git a/modules/utilities/unix/web_frameworks/php/spec/fixtures/unit/provider/package/pear/remote-info_benchmark b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/fixtures/unit/provider/package/pear/remote-info_benchmark similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/fixtures/unit/provider/package/pear/remote-info_benchmark rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/fixtures/unit/provider/package/pear/remote-info_benchmark diff --git a/modules/utilities/unix/web_frameworks/php/spec/fixtures/unit/provider/package/pear/remote-info_zip b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/fixtures/unit/provider/package/pear/remote-info_zip similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/fixtures/unit/provider/package/pear/remote-info_zip rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/fixtures/unit/provider/package/pear/remote-info_zip diff --git a/modules/utilities/unix/web_frameworks/php/spec/functions/to_hash_settings_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/functions/to_hash_settings_spec.rb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/functions/to_hash_settings_spec.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/functions/to_hash_settings_spec.rb diff --git a/modules/utilities/unix/web_frameworks/php/spec/spec_helper.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/spec_helper.rb similarity index 88% rename from modules/utilities/unix/web_frameworks/php/spec/spec_helper.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/spec_helper.rb index cdd493591..ea74a52a3 100644 --- a/modules/utilities/unix/web_frameworks/php/spec/spec_helper.rb +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/spec_helper.rb @@ -2,6 +2,10 @@ require 'puppetlabs_spec_helper/module_spec_helper' require 'rspec-puppet-facts' include RspecPuppetFacts +# This file is managed via modulesync +# https://github.com/voxpupuli/modulesync +# https://github.com/voxpupuli/modulesync_config + if Dir.exist?(File.expand_path('../../lib', __FILE__)) require 'coveralls' require 'simplecov' diff --git a/modules/utilities/unix/web_frameworks/php/spec/spec_helper_acceptance.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/spec_helper_acceptance.rb similarity index 95% rename from modules/utilities/unix/web_frameworks/php/spec/spec_helper_acceptance.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/spec_helper_acceptance.rb index b94ec1b11..c978c402e 100644 --- a/modules/utilities/unix/web_frameworks/php/spec/spec_helper_acceptance.rb +++ b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/spec_helper_acceptance.rb @@ -1,4 +1,5 @@ require 'beaker-rspec' +require 'beaker-puppet' require 'beaker/puppet_install_helper' require 'beaker/module_install_helper' diff --git a/modules/utilities/unix/web_frameworks/php/spec/unit/provider/package/pear_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/unit/provider/package/pear_spec.rb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/unit/provider/package/pear_spec.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/unit/provider/package/pear_spec.rb diff --git a/modules/utilities/unix/web_frameworks/php/spec/unit/provider/package/pecl_spec.rb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/unit/provider/package/pecl_spec.rb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/spec/unit/provider/package/pecl_spec.rb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/spec/unit/provider/package/pecl_spec.rb diff --git a/modules/utilities/unix/web_frameworks/php/templates/fpm/php-fpm.conf.erb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/templates/fpm/php-fpm.conf.erb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/templates/fpm/php-fpm.conf.erb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/templates/fpm/php-fpm.conf.erb diff --git a/modules/utilities/unix/web_frameworks/php/templates/fpm/pool.conf.erb b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/templates/fpm/pool.conf.erb similarity index 100% rename from modules/utilities/unix/web_frameworks/php/templates/fpm/pool.conf.erb rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/templates/fpm/pool.conf.erb diff --git a/modules/utilities/unix/web_frameworks/php/types/installoptions.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/types/installoptions.pp similarity index 100% rename from modules/utilities/unix/web_frameworks/php/types/installoptions.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/types/installoptions.pp diff --git a/modules/utilities/unix/web_frameworks/php/types/provider.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/types/provider.pp similarity index 100% rename from modules/utilities/unix/web_frameworks/php/types/provider.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/types/provider.pp diff --git a/modules/utilities/unix/web_frameworks/php/types/sapi.pp b/modules/utilities/unix/web_frameworks/php_stretch_compatible/php/types/sapi.pp similarity index 100% rename from modules/utilities/unix/web_frameworks/php/types/sapi.pp rename to modules/utilities/unix/web_frameworks/php_stretch_compatible/php/types/sapi.pp diff --git a/modules/utilities/unix/web_frameworks/php_wheezy_compatible/php/manifests/install.pp b/modules/utilities/unix/web_frameworks/php_wheezy_compatible/php/manifests/install.pp new file mode 100644 index 000000000..21fb1bda6 --- /dev/null +++ b/modules/utilities/unix/web_frameworks/php_wheezy_compatible/php/manifests/install.pp @@ -0,0 +1,5 @@ +class php::install { + package { ['php5', 'mysql-client','php5-mysql']: + ensure => installed, + } +} \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php_wheezy_compatible/php/php.pp b/modules/utilities/unix/web_frameworks/php_wheezy_compatible/php/php.pp new file mode 100644 index 000000000..db73f2645 --- /dev/null +++ b/modules/utilities/unix/web_frameworks/php_wheezy_compatible/php/php.pp @@ -0,0 +1 @@ +include php::install \ No newline at end of file diff --git a/modules/utilities/unix/web_frameworks/php_wheezy_compatible/php/secgen_metadata.xml b/modules/utilities/unix/web_frameworks/php_wheezy_compatible/php/secgen_metadata.xml new file mode 100644 index 000000000..957c34373 --- /dev/null +++ b/modules/utilities/unix/web_frameworks/php_wheezy_compatible/php/secgen_metadata.xml @@ -0,0 +1,34 @@ + + + + PHP Server - Wheezy Compatible + Thomas Shaw + Apache v2 + An installation of PHP for Wheezy + + web_server + linux + + + http://php.net + php + PHP License v3.01 + + + .*Kali.* + + + .*Stretch.* + + + update + + + .*apache_wheezy.* + + + .*mysql_wheezy.* + + diff --git a/modules/vulnerabilities/unix/bash/shellshock/manifests/install.pp b/modules/vulnerabilities/unix/bash/shellshock/manifests/install.pp index 2823a0d62..752bd9381 100644 --- a/modules/vulnerabilities/unix/bash/shellshock/manifests/install.pp +++ b/modules/vulnerabilities/unix/bash/shellshock/manifests/install.pp @@ -11,9 +11,8 @@ class shellshock::install{ creates => '/usr/local/src/bash-4.1/', } - package { ['build-essential', 'gcc-multilib']: - ensure => installed, - } + ensure_packages('build-essential') + ensure_packages('gcc-multilib') exec { 'configure-make-make-install-bash': cwd => '/usr/local/src/bash-4.1/', diff --git a/modules/vulnerabilities/unix/bash/shellshock/secgen_metadata.xml b/modules/vulnerabilities/unix/bash/shellshock/secgen_metadata.xml index 5b4853b41..9be1e9198 100644 --- a/modules/vulnerabilities/unix/bash/shellshock/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/bash/shellshock/secgen_metadata.xml @@ -24,4 +24,8 @@ bash GPLv3+ + + update + + \ No newline at end of file diff --git a/modules/vulnerabilities/unix/ctf/defcon_quals_2016/dc16_amadhj/secgen_metadata.xml b/modules/vulnerabilities/unix/ctf/defcon_quals_2016/dc16_amadhj/secgen_metadata.xml index 7a337264a..bff6d2e10 100644 --- a/modules/vulnerabilities/unix/ctf/defcon_quals_2016/dc16_amadhj/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/ctf/defcon_quals_2016/dc16_amadhj/secgen_metadata.xml @@ -53,6 +53,10 @@ Reverse me and get the flag. + + update + + utilities/unix/system/accounts diff --git a/modules/vulnerabilities/unix/ctf/defcon_quals_2016/dc16_b3s23/secgen_metadata.xml b/modules/vulnerabilities/unix/ctf/defcon_quals_2016/dc16_b3s23/secgen_metadata.xml index 642e712a7..36187e53b 100644 --- a/modules/vulnerabilities/unix/ctf/defcon_quals_2016/dc16_b3s23/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/ctf/defcon_quals_2016/dc16_b3s23/secgen_metadata.xml @@ -53,6 +53,10 @@ Reverse me to find the solution + + update + + utilities/unix/system/accounts diff --git a/modules/vulnerabilities/unix/ctf/defcon_quals_2016/dc16_feedme/secgen_metadata.xml b/modules/vulnerabilities/unix/ctf/defcon_quals_2016/dc16_feedme/secgen_metadata.xml index 3474aba70..d11895520 100644 --- a/modules/vulnerabilities/unix/ctf/defcon_quals_2016/dc16_feedme/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/ctf/defcon_quals_2016/dc16_feedme/secgen_metadata.xml @@ -53,6 +53,10 @@ Reverse me / pwn the binary to get the flag. + + update + + utilities/unix/system/accounts diff --git a/modules/vulnerabilities/unix/ftp/proftpd_133c_backdoor/manifests/install.pp b/modules/vulnerabilities/unix/ftp/proftpd_133c_backdoor/manifests/install.pp index 5aabff46c..532b4658b 100644 --- a/modules/vulnerabilities/unix/ftp/proftpd_133c_backdoor/manifests/install.pp +++ b/modules/vulnerabilities/unix/ftp/proftpd_133c_backdoor/manifests/install.pp @@ -19,9 +19,8 @@ class proftpd_133c_backdoor::install { notify => Exec['install_proftpd-1.3.3c'], } - package { ['build-essential', 'gcc-multilib']: - ensure => installed, - } + ensure_packages('build-essential') + ensure_packages('gcc-multilib') exec { 'install_proftpd-1.3.3c': cwd => '/usr/local/src/backdoored_proftpd-1.3.3c/', diff --git a/modules/vulnerabilities/unix/ftp/proftpd_133c_backdoor/secgen_metadata.xml b/modules/vulnerabilities/unix/ftp/proftpd_133c_backdoor/secgen_metadata.xml index d33c3db4a..6b4f828d4 100644 --- a/modules/vulnerabilities/unix/ftp/proftpd_133c_backdoor/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/ftp/proftpd_133c_backdoor/secgen_metadata.xml @@ -59,4 +59,9 @@ proftpd + + + update + + \ No newline at end of file diff --git a/modules/vulnerabilities/unix/local/chkrootkit/manifests/install.pp b/modules/vulnerabilities/unix/local/chkrootkit/manifests/install.pp index a3e623046..3cf0df123 100644 --- a/modules/vulnerabilities/unix/local/chkrootkit/manifests/install.pp +++ b/modules/vulnerabilities/unix/local/chkrootkit/manifests/install.pp @@ -15,9 +15,8 @@ class chkrootkit::install { command => "tar -xzf $archive", } - package { ['build-essential', 'gcc-multilib']: - ensure => installed, - } + ensure_packages('build-essential') + ensure_packages('gcc-multilib') exec { 'make-chkrootkit': cwd => '/usr/local/chkrootkit-0.49/', diff --git a/modules/vulnerabilities/unix/local/chkrootkit/secgen_metadata.xml b/modules/vulnerabilities/unix/local/chkrootkit/secgen_metadata.xml index bd0c8b5be..d16534848 100644 --- a/modules/vulnerabilities/unix/local/chkrootkit/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/local/chkrootkit/secgen_metadata.xml @@ -45,4 +45,8 @@ exploit/unix/local/chkrootkit + + update + + \ No newline at end of file diff --git a/modules/vulnerabilities/unix/system/symlinks/manifests/account.pp b/modules/vulnerabilities/unix/system/symlinks/manifests/account.pp index b701f4b5e..b3cc12569 100644 --- a/modules/vulnerabilities/unix/system/symlinks/manifests/account.pp +++ b/modules/vulnerabilities/unix/system/symlinks/manifests/account.pp @@ -30,9 +30,9 @@ define symlinks::account($username, $password, $strings_to_leak, $leaked_filenam source => 'puppet:///modules/symlinks/prompt.c', } - package { ['build-essential', 'gcc-multilib']: - ensure => installed, - } + ensure_packages('build-essential') + ensure_packages('gcc-multilib') + exec { "$username-compileandsetup1": cwd => "/home/$username/", diff --git a/modules/vulnerabilities/unix/system/symlinks/secgen_metadata.xml b/modules/vulnerabilities/unix/system/symlinks/secgen_metadata.xml index 55ed23c46..8059755cc 100644 --- a/modules/vulnerabilities/unix/system/symlinks/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/system/symlinks/secgen_metadata.xml @@ -35,6 +35,10 @@ + + update + + utilities/unix/system/accounts diff --git a/modules/vulnerabilities/unix/system/two_shell_calls/secgen_metadata.xml b/modules/vulnerabilities/unix/system/two_shell_calls/secgen_metadata.xml index 38bcf066a..37be2c2ae 100644 --- a/modules/vulnerabilities/unix/system/two_shell_calls/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/system/two_shell_calls/secgen_metadata.xml @@ -50,6 +50,10 @@ Find the 2 user accounts with '~/shell' binaries, investigate the shell.c code and their permissions. Try to combine the two binaries to make something interesting happen. + + update + + utilities/unix/system/accounts diff --git a/modules/vulnerabilities/unix/web_training/dvwa/secgen_metadata.xml b/modules/vulnerabilities/unix/web_training/dvwa/secgen_metadata.xml index 4d1e89ceb..eefe84168 100644 --- a/modules/vulnerabilities/unix/web_training/dvwa/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/web_training/dvwa/secgen_metadata.xml @@ -38,10 +38,10 @@ - .*/apache + .*/apache.* - .*/mysql + .*/mysql.* diff --git a/modules/vulnerabilities/unix/webapp/gitlist_040/manifests/apache.pp b/modules/vulnerabilities/unix/webapp/gitlist_040/manifests/apache.pp index 288a4208c..3045f7d0a 100644 --- a/modules/vulnerabilities/unix/webapp/gitlist_040/manifests/apache.pp +++ b/modules/vulnerabilities/unix/webapp/gitlist_040/manifests/apache.pp @@ -3,13 +3,6 @@ class gitlist_040::apache { $port = $secgen_parameters['port'][0] $docroot = '/var/www/gitlist' - package { 'php': - ensure => installed, - } - # - # include ::apache::mod::rewrite - # include ::apache::mod::php - class { '::apache': default_vhost => false, default_mods => ['rewrite', 'php'], diff --git a/modules/vulnerabilities/unix/webapp/gitlist_040/manifests/install.pp b/modules/vulnerabilities/unix/webapp/gitlist_040/manifests/install.pp index 5bde69e20..ce6b849d4 100644 --- a/modules/vulnerabilities/unix/webapp/gitlist_040/manifests/install.pp +++ b/modules/vulnerabilities/unix/webapp/gitlist_040/manifests/install.pp @@ -29,11 +29,14 @@ class gitlist_040::install { mode => '777', } - # TODO: This should only be run on apache_kali_compat - file { '/var/www/gitlist/.htaccess': - require => Exec['unpack-gitlist'], - ensure => present, - content => template('gitlist_040/.htaccess.erb') - } + case $operatingsystemrelease { + /^9.*/: { # do 9.x stretch stuff + file { '/var/www/gitlist/.htaccess': + require => Exec['unpack-gitlist'], + ensure => present, + content => template('gitlist_040/.htaccess.erb') + } + } + } } \ No newline at end of file diff --git a/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml index 9273d7539..33588d598 100644 --- a/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml @@ -49,13 +49,16 @@ exploit/linux/http/gitlist_exec Visit the webapp in a browser at: ip:80/gitlist - - - - .*apache.* - httpd + + + + .*mysql.* + + + + .*php.* diff --git a/modules/vulnerabilities/unix/webapp/moinmoin_195/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/moinmoin_195/secgen_metadata.xml index 42afece4f..8cc294920 100644 --- a/modules/vulnerabilities/unix/webapp/moinmoin_195/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/webapp/moinmoin_195/secgen_metadata.xml @@ -69,7 +69,7 @@ - Stretch + .*Stretch.* diff --git a/modules/vulnerabilities/unix/webapp/onlinestore/manifests/apache.pp b/modules/vulnerabilities/unix/webapp/onlinestore/manifests/apache.pp index de7b4f580..7de819d48 100644 --- a/modules/vulnerabilities/unix/webapp/onlinestore/manifests/apache.pp +++ b/modules/vulnerabilities/unix/webapp/onlinestore/manifests/apache.pp @@ -3,10 +3,6 @@ class onlinestore::apache { $port = $secgen_parameters['port'][0] $docroot = '/var/www/onlinestore' - package { ['php5', 'mysql-client','php5-mysql']: - ensure => installed, - } - class { '::apache': default_vhost => false, default_mods => 'php', diff --git a/modules/vulnerabilities/unix/webapp/onlinestore/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/onlinestore/secgen_metadata.xml index 4e5929412..569e7a682 100644 --- a/modules/vulnerabilities/unix/webapp/onlinestore/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/webapp/onlinestore/secgen_metadata.xml @@ -138,13 +138,26 @@ There are automated tools, such as sqlmap, that will probe database through the web application and retrieve the data. You can dump the database with the following command: 'sqlmap --url=http://url:port/product?filter=* --dump' and follow the instructions when prompted. + + + .*Stretch.* + + + + .*Kali.* + + .*apache httpd - .*/mysql_wheezy.* + .*/mysql.* + + + + .*/php.* diff --git a/modules/vulnerabilities/unix/webapp/userspice_43/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/userspice_43/secgen_metadata.xml index fb970641d..e0bbb6431 100644 --- a/modules/vulnerabilities/unix/webapp/userspice_43/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/webapp/userspice_43/secgen_metadata.xml @@ -58,11 +58,15 @@ - .*/apache_kali.* + .*/apache_wheezy.* - .*/mysql + .*/mysql_wheezy.* + + + + .*/php_wheezy.* diff --git a/modules/vulnerabilities/unix/webapp/wordpress_1x/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/wordpress_1x/secgen_metadata.xml index f9ef52b1b..2600bc2a7 100644 --- a/modules/vulnerabilities/unix/webapp/wordpress_1x/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/webapp/wordpress_1x/secgen_metadata.xml @@ -10,7 +10,7 @@ webapp in_the_wild - info_leak + various remote linux @@ -63,11 +63,15 @@     - .*/apache.* + .*/apache_wheezy.* .*/mysql_wheezy.* + + .*/php_wheezy.* + + diff --git a/modules/vulnerabilities/unix/webapp/wordpress_2x/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/wordpress_2x/secgen_metadata.xml index 9a9d1498b..8079ea4c9 100644 --- a/modules/vulnerabilities/unix/webapp/wordpress_2x/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/webapp/wordpress_2x/secgen_metadata.xml @@ -10,7 +10,7 @@ webapp in_the_wild - info_leak + various remote linux @@ -56,7 +56,7 @@ - Wheezy + Stretch @@ -68,11 +68,15 @@ - .*/apache.* + .*/apache_wheezy.* - .*/mysql_stretch.* + .*/mysql_wheezy.* + + + + .*/php_wheezy.* diff --git a/modules/vulnerabilities/unix/webapp/wordpress_3x/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/wordpress_3x/secgen_metadata.xml index 387cc446f..add1e1450 100644 --- a/modules/vulnerabilities/unix/webapp/wordpress_3x/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/webapp/wordpress_3x/secgen_metadata.xml @@ -10,7 +10,7 @@ webapp in_the_wild - info_leak + various remote linux @@ -55,6 +55,9 @@ + + Stretch + .*/cron @@ -69,11 +72,15 @@ - .*/apache.* + .*/apache_wheezy.* .*/mysql_wheezy.* + + .*/php_wheezy.* + + diff --git a/modules/vulnerabilities/unix/webapp/wordpress_4x/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/wordpress_4x/secgen_metadata.xml index 06041736f..71e670698 100644 --- a/modules/vulnerabilities/unix/webapp/wordpress_4x/secgen_metadata.xml +++ b/modules/vulnerabilities/unix/webapp/wordpress_4x/secgen_metadata.xml @@ -10,7 +10,7 @@ webapp in_the_wild - info_leak + various remote linux @@ -55,6 +55,10 @@ + + Wheezy + + .*/puppet_module/wordpress @@ -64,11 +68,15 @@     - .*/apache.* + .*/apache_stretch.* .*/mysql_stretch.* + + .*/php_stretch.* + + diff --git a/scenarios/test_scenario.xml b/scenarios/test_scenario.xml index f10d41d6d..25e29f3b1 100644 --- a/scenarios/test_scenario.xml +++ b/scenarios/test_scenario.xml @@ -1,22 +1,37 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.github/cliffe/SecGen/scenario"> - - - userspice - + + + gitlist + - + + 172.16.0.2 + 172.16.0.3 + - - - 172.16.0.3 - - + - + + + IP_addresses + + + + + + + desktop + + + + IP_addresses + + +