puppet 6.19.0-x86-mingw32 → 7.3.0-x86-mingw32
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of puppet might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CODEOWNERS +2 -16
- data/Gemfile +3 -4
- data/Gemfile.lock +33 -28
- data/README.md +1 -1
- data/conf/fileserver.conf +5 -10
- data/ext/build_defaults.yaml +1 -1
- data/ext/osx/file_mapping.yaml +0 -5
- data/ext/project_data.yaml +2 -14
- data/ext/redhat/puppet.spec.erb +0 -1
- data/ext/windows/service/daemon.rb +6 -5
- data/install.rb +21 -17
- data/lib/puppet.rb +11 -20
- data/lib/puppet/application.rb +182 -104
- data/lib/puppet/application/agent.rb +1 -0
- data/lib/puppet/application/apply.rb +3 -2
- data/lib/puppet/application/device.rb +101 -104
- data/lib/puppet/application/filebucket.rb +15 -11
- data/lib/puppet/application/script.rb +1 -0
- data/lib/puppet/application/ssl.rb +1 -1
- data/lib/puppet/application_support.rb +7 -0
- data/lib/puppet/configurer.rb +44 -36
- data/lib/puppet/configurer/plugin_handler.rb +21 -19
- data/lib/puppet/defaults.rb +71 -170
- data/lib/puppet/environments.rb +44 -75
- data/lib/puppet/face/config.rb +10 -0
- data/lib/puppet/face/epp.rb +12 -2
- data/lib/puppet/face/facts.rb +80 -6
- data/lib/puppet/face/help.rb +1 -1
- data/lib/puppet/face/node/clean.rb +8 -0
- data/lib/puppet/face/plugin.rb +5 -8
- data/lib/puppet/ffi/posix.rb +10 -0
- data/lib/puppet/ffi/posix/constants.rb +14 -0
- data/lib/puppet/ffi/posix/functions.rb +24 -0
- data/lib/puppet/ffi/windows.rb +12 -0
- data/lib/puppet/ffi/windows/api_types.rb +311 -0
- data/lib/puppet/ffi/windows/constants.rb +404 -0
- data/lib/puppet/ffi/windows/functions.rb +628 -0
- data/lib/puppet/ffi/windows/structs.rb +338 -0
- data/lib/puppet/file_serving/configuration.rb +0 -5
- data/lib/puppet/file_serving/configuration/parser.rb +6 -32
- data/lib/puppet/file_serving/http_metadata.rb +1 -1
- data/lib/puppet/file_serving/mount.rb +1 -2
- data/lib/puppet/forge/repository.rb +0 -1
- data/lib/puppet/functions/epp.rb +1 -0
- data/lib/puppet/functions/inline_epp.rb +1 -0
- data/lib/puppet/generate/models/type/type.rb +4 -1
- data/lib/puppet/http.rb +22 -13
- data/lib/puppet/http/client.rb +164 -114
- data/lib/puppet/{network/resolver.rb → http/dns.rb} +2 -2
- data/lib/puppet/http/errors.rb +16 -0
- data/lib/puppet/http/external_client.rb +5 -7
- data/lib/puppet/{network/http → http}/factory.rb +8 -11
- data/lib/puppet/{network/http → http}/pool.rb +61 -26
- data/lib/puppet/{network/http/session.rb → http/pool_entry.rb} +2 -3
- data/lib/puppet/http/proxy.rb +137 -0
- data/lib/puppet/http/redirector.rb +4 -12
- data/lib/puppet/http/resolver.rb +5 -15
- data/lib/puppet/http/resolver/server_list.rb +6 -10
- data/lib/puppet/http/resolver/settings.rb +4 -7
- data/lib/puppet/http/resolver/srv.rb +7 -11
- data/lib/puppet/http/response.rb +36 -54
- data/lib/puppet/http/response_converter.rb +24 -0
- data/lib/puppet/http/response_net_http.rb +42 -0
- data/lib/puppet/http/retry_after_handler.rb +4 -13
- data/lib/puppet/http/service.rb +12 -26
- data/lib/puppet/http/service/ca.rb +11 -22
- data/lib/puppet/http/service/compiler.rb +22 -69
- data/lib/puppet/http/service/file_server.rb +18 -27
- data/lib/puppet/http/service/puppetserver.rb +26 -12
- data/lib/puppet/http/service/report.rb +8 -10
- data/lib/puppet/http/session.rb +11 -20
- data/lib/puppet/{network/http → http}/site.rb +1 -2
- data/lib/puppet/indirector/catalog/rest.rb +2 -4
- data/lib/puppet/indirector/fact_search.rb +60 -0
- data/lib/puppet/indirector/facts/facter.rb +24 -3
- data/lib/puppet/indirector/facts/json.rb +27 -0
- data/lib/puppet/indirector/facts/rest.rb +3 -22
- data/lib/puppet/indirector/facts/yaml.rb +3 -58
- data/lib/puppet/indirector/file_bucket_file/rest.rb +3 -9
- data/lib/puppet/indirector/file_content/rest.rb +2 -6
- data/lib/puppet/indirector/file_metadata/rest.rb +3 -9
- data/lib/puppet/indirector/file_server.rb +1 -8
- data/lib/puppet/indirector/generic_http.rb +0 -11
- data/lib/puppet/indirector/json.rb +5 -1
- data/lib/puppet/indirector/node/json.rb +8 -0
- data/lib/puppet/indirector/node/rest.rb +2 -4
- data/lib/puppet/indirector/report/json.rb +34 -0
- data/lib/puppet/indirector/report/rest.rb +3 -8
- data/lib/puppet/indirector/request.rb +0 -101
- data/lib/puppet/indirector/rest.rb +12 -263
- data/lib/puppet/module_tool/applications.rb +0 -1
- data/lib/puppet/module_tool/applications/installer.rb +48 -2
- data/lib/puppet/module_tool/errors/shared.rb +17 -2
- data/lib/puppet/network/authconfig.rb +2 -96
- data/lib/puppet/network/authorization.rb +13 -35
- data/lib/puppet/network/formats.rb +69 -1
- data/lib/puppet/network/http.rb +3 -3
- data/lib/puppet/network/http/api/indirected_routes.rb +2 -20
- data/lib/puppet/network/http/api/master/v3.rb +11 -13
- data/lib/puppet/network/http/connection.rb +247 -316
- data/lib/puppet/network/http/handler.rb +0 -1
- data/lib/puppet/network/http_pool.rb +16 -34
- data/lib/puppet/node.rb +1 -30
- data/lib/puppet/pal/json_catalog_encoder.rb +4 -0
- data/lib/puppet/pal/pal_impl.rb +73 -18
- data/lib/puppet/parser/ast/leaf.rb +3 -2
- data/lib/puppet/parser/ast/pops_bridge.rb +0 -38
- data/lib/puppet/parser/compiler.rb +0 -198
- data/lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb +14 -39
- data/lib/puppet/parser/resource.rb +0 -69
- data/lib/puppet/parser/templatewrapper.rb +1 -1
- data/lib/puppet/pops/evaluator/deferred_resolver.rb +5 -3
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +22 -8
- data/lib/puppet/pops/evaluator/runtime3_resource_support.rb +3 -3
- data/lib/puppet/pops/evaluator/runtime3_support.rb +1 -1
- data/lib/puppet/pops/issues.rb +0 -5
- data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +6 -8
- data/lib/puppet/pops/model/ast.pp +0 -42
- data/lib/puppet/pops/model/ast.rb +0 -290
- data/lib/puppet/pops/model/ast_transformer.rb +1 -1
- data/lib/puppet/pops/model/factory.rb +0 -45
- data/lib/puppet/pops/model/model_label_provider.rb +0 -5
- data/lib/puppet/pops/model/model_tree_dumper.rb +0 -22
- data/lib/puppet/pops/model/pn_transformer.rb +0 -16
- data/lib/puppet/pops/parser/egrammar.ra +0 -56
- data/lib/puppet/pops/parser/eparser.rb +1520 -1712
- data/lib/puppet/pops/parser/lexer2.rb +4 -4
- data/lib/puppet/pops/parser/parser_support.rb +0 -5
- data/lib/puppet/pops/resource/resource_type_impl.rb +2 -24
- data/lib/puppet/pops/types/type_calculator.rb +0 -7
- data/lib/puppet/pops/types/type_parser.rb +0 -4
- data/lib/puppet/pops/types/types.rb +0 -1
- data/lib/puppet/pops/validation/checker4_0.rb +9 -37
- data/lib/puppet/pops/validation/tasks_checker.rb +0 -12
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +1 -2
- data/lib/puppet/provider.rb +0 -13
- data/lib/puppet/provider/nameservice.rb +0 -18
- data/lib/puppet/provider/package/apt.rb +4 -0
- data/lib/puppet/provider/package/dpkg.rb +0 -10
- data/lib/puppet/provider/package/gem.rb +23 -3
- data/lib/puppet/provider/package/pip.rb +0 -1
- data/lib/puppet/provider/package/pkg.rb +0 -4
- data/lib/puppet/provider/package/portage.rb +1 -1
- data/lib/puppet/provider/package/puppet_gem.rb +1 -4
- data/lib/puppet/provider/service/smf.rb +191 -73
- data/lib/puppet/provider/user/aix.rb +2 -2
- data/lib/puppet/provider/user/directoryservice.rb +0 -10
- data/lib/puppet/reference/configuration.rb +8 -5
- data/lib/puppet/reference/indirection.rb +1 -1
- data/lib/puppet/resource.rb +1 -89
- data/lib/puppet/resource/catalog.rb +1 -14
- data/lib/puppet/resource/type.rb +3 -119
- data/lib/puppet/resource/type_collection.rb +3 -48
- data/lib/puppet/runtime.rb +1 -2
- data/lib/puppet/settings.rb +88 -48
- data/lib/puppet/settings/alias_setting.rb +37 -0
- data/lib/puppet/settings/base_setting.rb +26 -2
- data/lib/puppet/settings/integer_setting.rb +17 -0
- data/lib/puppet/settings/port_setting.rb +15 -0
- data/lib/puppet/settings/priority_setting.rb +5 -4
- data/lib/puppet/ssl.rb +10 -6
- data/lib/puppet/ssl/base.rb +3 -5
- data/lib/puppet/ssl/certificate.rb +0 -6
- data/lib/puppet/ssl/certificate_request.rb +1 -12
- data/lib/puppet/ssl/certificate_signer.rb +6 -0
- data/lib/puppet/ssl/oids.rb +3 -1
- data/lib/puppet/ssl/ssl_provider.rb +17 -0
- data/lib/puppet/ssl/state_machine.rb +3 -1
- data/lib/puppet/ssl/verifier.rb +2 -0
- data/lib/puppet/test/test_helper.rb +1 -3
- data/lib/puppet/transaction.rb +1 -7
- data/lib/puppet/transaction/report.rb +2 -4
- data/lib/puppet/type.rb +0 -76
- data/lib/puppet/type/file.rb +5 -7
- data/lib/puppet/type/file/checksum.rb +1 -1
- data/lib/puppet/type/file/source.rb +1 -1
- data/lib/puppet/type/filebucket.rb +3 -3
- data/lib/puppet/type/package.rb +5 -13
- data/lib/puppet/type/user.rb +1 -1
- data/lib/puppet/util/autoload.rb +1 -8
- data/lib/puppet/util/execution.rb +0 -11
- data/lib/puppet/util/http_proxy.rb +2 -215
- data/lib/puppet/util/monkey_patches.rb +0 -46
- data/lib/puppet/util/posix.rb +54 -5
- data/lib/puppet/util/rdoc.rb +0 -7
- data/lib/puppet/util/retry_action.rb +1 -1
- data/lib/puppet/util/rubygems.rb +5 -1
- data/lib/puppet/util/run_mode.rb +9 -1
- data/lib/puppet/util/windows.rb +3 -8
- data/lib/puppet/util/windows/daemon.rb +360 -0
- data/lib/puppet/util/windows/error.rb +1 -0
- data/lib/puppet/util/windows/eventlog.rb +4 -9
- data/lib/puppet/util/windows/file.rb +8 -242
- data/lib/puppet/util/windows/monkey_patches/process.rb +414 -0
- data/lib/puppet/util/windows/process.rb +4 -226
- data/lib/puppet/util/windows/service.rb +9 -460
- data/lib/puppet/util/windows/string.rb +12 -13
- data/lib/puppet/util/yaml.rb +0 -22
- data/lib/puppet/vendor/require_vendored.rb +0 -1
- data/lib/puppet/version.rb +1 -1
- data/lib/puppet/x509.rb +5 -1
- data/lib/puppet/x509/cert_provider.rb +29 -1
- data/locales/puppet.pot +629 -1314
- data/man/man5/puppet.conf.5 +39 -99
- data/man/man8/puppet-agent.8 +2 -2
- data/man/man8/puppet-apply.8 +2 -2
- data/man/man8/puppet-catalog.8 +1 -1
- data/man/man8/puppet-config.8 +1 -1
- data/man/man8/puppet-describe.8 +1 -1
- data/man/man8/puppet-device.8 +2 -2
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +1 -1
- data/man/man8/puppet-facts.8 +58 -9
- data/man/man8/puppet-filebucket.8 +6 -6
- data/man/man8/puppet-generate.8 +1 -1
- data/man/man8/puppet-help.8 +1 -1
- data/man/man8/puppet-lookup.8 +1 -1
- data/man/man8/puppet-module.8 +1 -58
- data/man/man8/puppet-node.8 +4 -1
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +4 -1
- data/man/man8/puppet-resource.8 +1 -1
- data/man/man8/puppet-script.8 +2 -2
- data/man/man8/puppet-ssl.8 +1 -1
- data/man/man8/puppet.8 +2 -2
- data/spec/fixtures/integration/application/agent/cached_deferred_catalog.json +91 -0
- data/spec/fixtures/unit/provider/service/smf/{svcs.out → svcs_instances.out} +0 -0
- data/spec/fixtures/unit/provider/user/aix/aix_passwd_file.out +4 -0
- data/spec/integration/application/agent_spec.rb +151 -14
- data/spec/integration/application/apply_spec.rb +20 -1
- data/spec/integration/application/filebucket_spec.rb +16 -16
- data/spec/integration/application/help_spec.rb +2 -0
- data/spec/integration/application/plugin_spec.rb +23 -1
- data/spec/integration/defaults_spec.rb +7 -10
- data/spec/integration/environments/setting_hooks_spec.rb +1 -1
- data/spec/integration/indirector/file_content/file_server_spec.rb +0 -2
- data/spec/integration/indirector/file_metadata/file_server_spec.rb +0 -2
- data/spec/integration/network/http_pool_spec.rb +3 -21
- data/spec/integration/parser/catalog_spec.rb +0 -38
- data/spec/integration/parser/node_spec.rb +0 -9
- data/spec/integration/parser/pcore_resource_spec.rb +0 -37
- data/spec/integration/resource/type_collection_spec.rb +2 -6
- data/spec/integration/transaction_spec.rb +4 -9
- data/spec/integration/type/file_spec.rb +5 -4
- data/spec/integration/util/windows/adsi_spec.rb +3 -1
- data/spec/integration/util/windows/monkey_patches/process_spec.rb +231 -0
- data/spec/integration/util/windows/registry_spec.rb +0 -10
- data/spec/integration/util/windows/security_spec.rb +1 -1
- data/spec/lib/puppet_spec/puppetserver.rb +1 -1
- data/spec/lib/puppet_spec/settings.rb +7 -1
- data/spec/spec_helper.rb +3 -4
- data/spec/unit/agent_spec.rb +8 -8
- data/spec/unit/application/agent_spec.rb +0 -1
- data/spec/unit/application/config_spec.rb +224 -4
- data/spec/unit/application/facts_spec.rb +35 -0
- data/spec/unit/application/filebucket_spec.rb +41 -41
- data/spec/unit/application/ssl_spec.rb +2 -2
- data/spec/unit/application_spec.rb +51 -9
- data/spec/unit/certificate_factory_spec.rb +1 -1
- data/spec/unit/configurer/downloader_spec.rb +6 -2
- data/spec/unit/configurer/plugin_handler_spec.rb +56 -18
- data/spec/unit/configurer_spec.rb +12 -9
- data/spec/unit/confine/feature_spec.rb +1 -1
- data/spec/unit/confine_spec.rb +8 -2
- data/spec/unit/context/trusted_information_spec.rb +2 -6
- data/spec/unit/defaults_spec.rb +26 -32
- data/spec/unit/environments_spec.rb +96 -22
- data/spec/unit/face/config_spec.rb +27 -32
- data/spec/unit/face/facts_spec.rb +4 -0
- data/spec/unit/face/node_spec.rb +14 -13
- data/spec/unit/face/plugin_spec.rb +73 -33
- data/spec/unit/file_bucket/file_spec.rb +1 -1
- data/spec/unit/file_serving/configuration/parser_spec.rb +22 -19
- data/spec/unit/file_serving/configuration_spec.rb +6 -12
- data/spec/unit/file_serving/metadata_spec.rb +3 -3
- data/spec/unit/file_serving/terminus_helper_spec.rb +11 -4
- data/spec/unit/forge/module_release_spec.rb +2 -7
- data/spec/unit/functions/camelcase_spec.rb +1 -1
- data/spec/unit/functions/capitalize_spec.rb +1 -1
- data/spec/unit/functions/downcase_spec.rb +1 -1
- data/spec/unit/functions/inline_epp_spec.rb +26 -1
- data/spec/unit/functions/upcase_spec.rb +1 -1
- data/spec/unit/http/client_spec.rb +7 -8
- data/spec/unit/{network/resolver_spec.rb → http/dns_spec.rb} +3 -3
- data/spec/unit/http/external_client_spec.rb +4 -4
- data/spec/unit/{network/http → http}/factory_spec.rb +5 -11
- data/spec/unit/{network/http/session_spec.rb → http/pool_entry_spec.rb} +3 -3
- data/spec/unit/{network/http → http}/pool_spec.rb +12 -17
- data/spec/unit/{util/http_proxy_spec.rb → http/proxy_spec.rb} +2 -69
- data/spec/unit/http/resolver_spec.rb +13 -13
- data/spec/unit/http/service/compiler_spec.rb +49 -62
- data/spec/unit/http/service/file_server_spec.rb +3 -3
- data/spec/unit/http/service/puppetserver_spec.rb +34 -4
- data/spec/unit/http/service_spec.rb +1 -2
- data/spec/unit/http/session_spec.rb +16 -14
- data/spec/unit/{network/http → http}/site_spec.rb +3 -3
- data/spec/unit/indirector/face_spec.rb +0 -1
- data/spec/unit/indirector/facts/facter_spec.rb +104 -1
- data/spec/unit/indirector/facts/json_spec.rb +255 -0
- data/spec/unit/indirector/file_bucket_file/file_spec.rb +5 -3
- data/spec/unit/indirector/file_bucket_file/selector_spec.rb +26 -8
- data/spec/unit/indirector/file_content/rest_spec.rb +0 -4
- data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -4
- data/spec/unit/indirector/file_server_spec.rb +1 -15
- data/spec/unit/indirector/indirection_spec.rb +8 -12
- data/spec/unit/indirector/node/json_spec.rb +33 -0
- data/spec/{integration/indirector/report/yaml.rb → unit/indirector/report/json_spec.rb} +13 -24
- data/spec/unit/indirector/report/rest_spec.rb +2 -17
- data/spec/unit/indirector/report/yaml_spec.rb +72 -8
- data/spec/unit/indirector/request_spec.rb +0 -264
- data/spec/unit/indirector/rest_spec.rb +98 -752
- data/spec/unit/indirector_spec.rb +2 -2
- data/spec/unit/module_tool/applications/installer_spec.rb +66 -0
- data/spec/unit/network/authconfig_spec.rb +2 -132
- data/spec/unit/network/authorization_spec.rb +2 -55
- data/spec/unit/network/formats_spec.rb +45 -4
- data/spec/unit/network/http/api/indirected_routes_spec.rb +1 -101
- data/spec/unit/network/http/api/master/v3_spec.rb +28 -7
- data/spec/unit/network/http/api_spec.rb +10 -0
- data/spec/unit/network/http/connection_spec.rb +19 -41
- data/spec/unit/network/http/handler_spec.rb +0 -6
- data/spec/unit/network/http_pool_spec.rb +0 -4
- data/spec/unit/node/environment_spec.rb +33 -21
- data/spec/unit/node_spec.rb +2 -54
- data/spec/unit/parser/compiler_spec.rb +3 -19
- data/spec/unit/parser/functions/create_resources_spec.rb +2 -20
- data/spec/unit/parser/resource_spec.rb +14 -8
- data/spec/unit/parser/templatewrapper_spec.rb +4 -3
- data/spec/unit/pops/evaluator/deferred_resolver_spec.rb +20 -0
- data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +4 -7
- data/spec/unit/pops/loaders/loaders_spec.rb +6 -21
- data/spec/unit/pops/parser/parse_application_spec.rb +4 -22
- data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
- data/spec/unit/pops/parser/parse_capabilities_spec.rb +8 -21
- data/spec/unit/pops/parser/parse_site_spec.rb +20 -24
- data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -71
- data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
- data/spec/unit/pops/types/type_calculator_spec.rb +6 -6
- data/spec/unit/pops/types/type_factory_spec.rb +1 -1
- data/spec/unit/pops/validator/validator_spec.rb +61 -46
- data/spec/unit/pops/visitor_spec.rb +1 -1
- data/spec/unit/property_spec.rb +1 -0
- data/spec/unit/provider/nameservice_spec.rb +66 -122
- data/spec/unit/provider/package/apt_spec.rb +4 -8
- data/spec/unit/provider/package/base_spec.rb +6 -5
- data/spec/unit/provider/package/dpkg_spec.rb +0 -48
- data/spec/unit/provider/package/gem_spec.rb +32 -0
- data/spec/unit/provider/package/pacman_spec.rb +18 -12
- data/spec/unit/provider/package/pip_spec.rb +6 -11
- data/spec/unit/provider/package/pkgdmg_spec.rb +0 -4
- data/spec/unit/provider/package/puppet_gem_spec.rb +3 -2
- data/spec/unit/provider/service/smf_spec.rb +401 -165
- data/spec/unit/provider/service/windows_spec.rb +0 -1
- data/spec/unit/provider/user/aix_spec.rb +5 -0
- data/spec/unit/provider/user/hpux_spec.rb +1 -1
- data/spec/unit/provider/user/pw_spec.rb +2 -0
- data/spec/unit/provider/user/useradd_spec.rb +1 -0
- data/spec/unit/provider_spec.rb +6 -20
- data/spec/unit/puppet_pal_catalog_spec.rb +45 -0
- data/spec/unit/resource/type_collection_spec.rb +2 -22
- data/spec/unit/resource/type_spec.rb +1 -1
- data/spec/unit/resource_spec.rb +11 -66
- data/spec/unit/settings/http_extra_headers_spec.rb +2 -4
- data/spec/unit/settings/integer_setting_spec.rb +42 -0
- data/spec/unit/settings/port_setting_spec.rb +31 -0
- data/spec/unit/settings/priority_setting_spec.rb +4 -4
- data/spec/unit/settings_spec.rb +560 -228
- data/spec/unit/ssl/base_spec.rb +36 -4
- data/spec/unit/ssl/certificate_request_spec.rb +15 -45
- data/spec/unit/ssl/certificate_spec.rb +2 -11
- data/spec/unit/ssl/ssl_provider_spec.rb +14 -8
- data/spec/unit/ssl/state_machine_spec.rb +0 -1
- data/spec/unit/ssl/verifier_spec.rb +0 -21
- data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -7
- data/spec/unit/transaction/event_manager_spec.rb +14 -11
- data/spec/unit/transaction/report_spec.rb +0 -2
- data/spec/unit/transaction/resource_harness_spec.rb +2 -2
- data/spec/unit/transaction_spec.rb +57 -82
- data/spec/unit/type/file/checksum_spec.rb +6 -6
- data/spec/unit/type/file/content_spec.rb +1 -2
- data/spec/unit/type/file/ensure_spec.rb +1 -1
- data/spec/unit/type/file/mode_spec.rb +1 -1
- data/spec/unit/type/file/selinux_spec.rb +0 -2
- data/spec/unit/type/file/source_spec.rb +0 -1
- data/spec/unit/type/file_spec.rb +12 -12
- data/spec/unit/type/group_spec.rb +13 -6
- data/spec/unit/type/package_spec.rb +1 -1
- data/spec/unit/type/resources_spec.rb +7 -7
- data/spec/unit/type/service_spec.rb +1 -1
- data/spec/unit/type/tidy_spec.rb +0 -1
- data/spec/unit/type_spec.rb +22 -2
- data/spec/unit/util/at_fork_spec.rb +2 -2
- data/spec/unit/util/autoload_spec.rb +5 -1
- data/spec/unit/util/backups_spec.rb +1 -4
- data/spec/unit/util/execution_spec.rb +15 -40
- data/spec/unit/util/inifile_spec.rb +6 -14
- data/spec/unit/util/log_spec.rb +8 -7
- data/spec/unit/util/logging_spec.rb +3 -3
- data/spec/unit/util/monkey_patches_spec.rb +0 -6
- data/spec/unit/util/posix_spec.rb +363 -15
- data/spec/unit/util/rubygems_spec.rb +2 -2
- data/spec/unit/util/run_mode_spec.rb +21 -121
- data/spec/unit/util/selinux_spec.rb +76 -52
- data/spec/unit/util/storage_spec.rb +3 -1
- data/spec/unit/util/suidmanager_spec.rb +44 -41
- data/spec/unit/util/windows/string_spec.rb +1 -3
- data/spec/unit/util/yaml_spec.rb +0 -54
- data/spec/unit/util_spec.rb +13 -24
- metadata +66 -226
- data/conf/auth.conf +0 -150
- data/lib/puppet/application/cert.rb +0 -76
- data/lib/puppet/application/key.rb +0 -4
- data/lib/puppet/application/man.rb +0 -4
- data/lib/puppet/application/status.rb +0 -4
- data/lib/puppet/face/key.rb +0 -16
- data/lib/puppet/face/man.rb +0 -145
- data/lib/puppet/face/module/build.rb +0 -14
- data/lib/puppet/face/module/generate.rb +0 -14
- data/lib/puppet/face/module/search.rb +0 -103
- data/lib/puppet/face/status.rb +0 -51
- data/lib/puppet/indirector/certificate/file.rb +0 -9
- data/lib/puppet/indirector/certificate/rest.rb +0 -18
- data/lib/puppet/indirector/certificate_request/file.rb +0 -9
- data/lib/puppet/indirector/certificate_request/memory.rb +0 -7
- data/lib/puppet/indirector/certificate_request/rest.rb +0 -11
- data/lib/puppet/indirector/file_content/http.rb +0 -22
- data/lib/puppet/indirector/key/file.rb +0 -46
- data/lib/puppet/indirector/key/memory.rb +0 -7
- data/lib/puppet/indirector/ssl_file.rb +0 -162
- data/lib/puppet/indirector/status.rb +0 -3
- data/lib/puppet/indirector/status/local.rb +0 -12
- data/lib/puppet/indirector/status/rest.rb +0 -27
- data/lib/puppet/module_tool/applications/searcher.rb +0 -29
- data/lib/puppet/network/auth_config_parser.rb +0 -90
- data/lib/puppet/network/authstore.rb +0 -283
- data/lib/puppet/network/http/api/master/v3/authorization.rb +0 -18
- data/lib/puppet/network/http/api/master/v3/environment.rb +0 -88
- data/lib/puppet/network/http/base_pool.rb +0 -36
- data/lib/puppet/network/http/compression.rb +0 -127
- data/lib/puppet/network/http/connection_adapter.rb +0 -184
- data/lib/puppet/network/http/nocache_pool.rb +0 -28
- data/lib/puppet/network/rest_controller.rb +0 -2
- data/lib/puppet/network/rights.rb +0 -210
- data/lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb +0 -66
- data/lib/puppet/parser/compiler/catalog_validator/site_validator.rb +0 -22
- data/lib/puppet/parser/environment_compiler.rb +0 -202
- data/lib/puppet/pops/types/enumeration.rb +0 -16
- data/lib/puppet/resource/capability_finder.rb +0 -154
- data/lib/puppet/rest/errors.rb +0 -15
- data/lib/puppet/rest/response.rb +0 -35
- data/lib/puppet/rest/route.rb +0 -85
- data/lib/puppet/rest/routes.rb +0 -135
- data/lib/puppet/ssl/host.rb +0 -505
- data/lib/puppet/ssl/key.rb +0 -61
- data/lib/puppet/ssl/validator.rb +0 -61
- data/lib/puppet/ssl/validator/default_validator.rb +0 -209
- data/lib/puppet/ssl/validator/no_validator.rb +0 -22
- data/lib/puppet/ssl/verifier_adapter.rb +0 -58
- data/lib/puppet/status.rb +0 -40
- data/lib/puppet/util/connection.rb +0 -88
- data/lib/puppet/util/ssl.rb +0 -83
- data/lib/puppet/util/windows/api_types.rb +0 -309
- data/lib/puppet/util/windows/monkey_patches/dir.rb +0 -40
- data/lib/puppet/vendor/load_pathspec.rb +0 -1
- data/lib/puppet/vendor/pathspec/CHANGELOG.md +0 -2
- data/lib/puppet/vendor/pathspec/LICENSE +0 -201
- data/lib/puppet/vendor/pathspec/PUPPET_README.md +0 -6
- data/lib/puppet/vendor/pathspec/README.md +0 -53
- data/lib/puppet/vendor/pathspec/lib/pathspec.rb +0 -122
- data/lib/puppet/vendor/pathspec/lib/pathspec/gitignorespec.rb +0 -275
- data/lib/puppet/vendor/pathspec/lib/pathspec/regexspec.rb +0 -17
- data/lib/puppet/vendor/pathspec/lib/pathspec/spec.rb +0 -14
- data/man/man8/puppet-key.8 +0 -126
- data/man/man8/puppet-man.8 +0 -76
- data/man/man8/puppet-status.8 +0 -108
- data/spec/integration/application/config_spec.rb +0 -74
- data/spec/integration/network/authconfig_spec.rb +0 -256
- data/spec/integration/util/windows/monkey_patches/dir_spec.rb +0 -11
- data/spec/unit/application/man_spec.rb +0 -52
- data/spec/unit/capability_spec.rb +0 -414
- data/spec/unit/face/catalog_spec.rb +0 -6
- data/spec/unit/face/key_spec.rb +0 -9
- data/spec/unit/face/module/search_spec.rb +0 -231
- data/spec/unit/face/module_spec.rb +0 -3
- data/spec/unit/face/status_spec.rb +0 -9
- data/spec/unit/indirector/certificate/file_spec.rb +0 -14
- data/spec/unit/indirector/certificate/rest_spec.rb +0 -61
- data/spec/unit/indirector/certificate_request/file_spec.rb +0 -14
- data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -25
- data/spec/unit/indirector/key/file_spec.rb +0 -79
- data/spec/unit/indirector/ssl_file_spec.rb +0 -305
- data/spec/unit/indirector/status/local_spec.rb +0 -10
- data/spec/unit/indirector/status/rest_spec.rb +0 -50
- data/spec/unit/module_tool/applications/searcher_spec.rb +0 -38
- data/spec/unit/network/auth_config_parser_spec.rb +0 -115
- data/spec/unit/network/authstore_spec.rb +0 -422
- data/spec/unit/network/http/api/master/v3/authorization_spec.rb +0 -57
- data/spec/unit/network/http/api/master/v3/environment_spec.rb +0 -185
- data/spec/unit/network/http/compression_spec.rb +0 -240
- data/spec/unit/network/http/nocache_pool_spec.rb +0 -64
- data/spec/unit/network/http_spec.rb +0 -9
- data/spec/unit/network/rights_spec.rb +0 -439
- data/spec/unit/parser/environment_compiler_spec.rb +0 -730
- data/spec/unit/pops/types/enumeration_spec.rb +0 -51
- data/spec/unit/resource/capability_finder_spec.rb +0 -143
- data/spec/unit/rest/route_spec.rb +0 -132
- data/spec/unit/ssl/host_spec.rb +0 -650
- data/spec/unit/ssl/key_spec.rb +0 -173
- data/spec/unit/ssl/validator_spec.rb +0 -278
- data/spec/unit/status_spec.rb +0 -45
- data/spec/unit/util/ssl_spec.rb +0 -91
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c9abc3b98a08bf2fbae8a4b474d2c129f15ad818c7af294d5584a610ba2b2f44
|
4
|
+
data.tar.gz: 7dc759d34c50b7d518b2710c46f8c104bd661c3bd1096fb5cb1e3dd9b64c403a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8f579bb03c7d948334721caf00b05dbb79b60761cd667c3c1cb91bd5ad9cc93a5852782ea498c731672789b5c4c282793e5a6e328476b5a48008fa9d2a45a49a
|
7
|
+
data.tar.gz: c6c3c47fafeab1a05f31968f9baf0e4844b266872966f884bb879f24634df5fbaacb271f8cf800f0fba0db1b42d401244e477f784a5561656e47ffea9fbdb288
|
data/CODEOWNERS
CHANGED
@@ -1,23 +1,9 @@
|
|
1
|
-
#
|
2
|
-
* @puppetlabs/platform-core @puppetlabs/puppetserver-maintainers
|
3
|
-
|
4
|
-
# Night's Watch
|
5
|
-
/lib/puppet/type/group @puppetlabs/night-s-watch
|
6
|
-
/lib/puppet/type/package @puppetlabs/night-s-watch
|
7
|
-
/lib/puppet/type/service @puppetlabs/night-s-watch
|
8
|
-
/lib/puppet/type/user @puppetlabs/night-s-watch
|
9
|
-
/lib/puppet/provider/group @puppetlabs/night-s-watch
|
10
|
-
/lib/puppet/provider/package @puppetlabs/night-s-watch
|
11
|
-
/lib/puppet/provider/service @puppetlabs/night-s-watch
|
12
|
-
/lib/puppet/provider/user @puppetlabs/night-s-watch
|
1
|
+
# defaults
|
2
|
+
* @puppetlabs/platform-core @puppetlabs/puppetserver-maintainers @puppetlabs/night-s-watch
|
13
3
|
|
14
4
|
# PAL
|
15
5
|
/lib/puppet/pal @puppetlabs/bolt
|
16
6
|
|
17
|
-
# puppet device
|
18
|
-
/lib/puppet/application/device.rb @puppetlabs/networking
|
19
|
-
/lib/puppet/util/network_device @puppetlabs/networking
|
20
|
-
|
21
7
|
# puppet module
|
22
8
|
/lib/puppet/application/module.rb @puppetlabs/pdk
|
23
9
|
/lib/puppet/face/module @puppetlabs/pdk
|
data/Gemfile
CHANGED
@@ -14,13 +14,10 @@ end
|
|
14
14
|
|
15
15
|
# override .gemspec deps - may issue warning depending on Bundler version
|
16
16
|
gem "facter", *location_for(ENV['FACTER_LOCATION']) if ENV.has_key?('FACTER_LOCATION')
|
17
|
-
gem "facter-ng", *location_for(ENV['FACTER_NG_LOCATION']) if ENV.has_key?('FACTER_NG_LOCATION')
|
18
17
|
gem "hiera", *location_for(ENV['HIERA_LOCATION']) if ENV.has_key?('HIERA_LOCATION')
|
19
18
|
gem "semantic_puppet", *location_for(ENV['SEMANTIC_PUPPET_LOCATION'] || ["~> 1.0"])
|
20
19
|
gem "puppet-resource_api", *location_for(ENV['RESOURCE_API_LOCATION'] || ["~> 1.5"])
|
21
20
|
|
22
|
-
gem "scanf" if RUBY_VERSION.to_f >= 2.7
|
23
|
-
|
24
21
|
group(:features) do
|
25
22
|
gem 'diff-lcs', '~> 1.3', require: false
|
26
23
|
gem 'hiera-eyaml', *location_for(ENV['HIERA_EYAML_LOCATION'])
|
@@ -34,13 +31,15 @@ group(:features) do
|
|
34
31
|
# gem 'ruby-augeas', require: false, platforms: [:ruby]
|
35
32
|
# requires native ldap headers/libs
|
36
33
|
# gem 'ruby-ldap', '~> 0.9', require: false, platforms: [:ruby]
|
37
|
-
gem 'puppetserver-ca', '~>
|
34
|
+
gem 'puppetserver-ca', '~> 2.0', require: false
|
38
35
|
end
|
39
36
|
|
40
37
|
group(:test) do
|
38
|
+
gem "ffi", require: false
|
41
39
|
gem "json-schema", "~> 2.0", require: false
|
42
40
|
gem "rake", *location_for(ENV['RAKE_LOCATION'] || '~> 12.2')
|
43
41
|
gem "rspec", "~> 3.1", require: false
|
42
|
+
gem "rspec-expectations", ["~> 3.9", "!= 3.9.3"]
|
44
43
|
gem "rspec-its", "~> 1.1", require: false
|
45
44
|
gem 'vcr', '~> 5.0', require: false
|
46
45
|
gem 'webmock', '~> 3.0', require: false
|
data/Gemfile.lock
CHANGED
@@ -1,16 +1,16 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
puppet (
|
4
|
+
puppet (7.3.0)
|
5
5
|
CFPropertyList (~> 2.2)
|
6
6
|
concurrent-ruby (~> 1.0)
|
7
7
|
deep_merge (~> 1.0)
|
8
8
|
facter (>= 2.4.0, < 5)
|
9
9
|
fast_gettext (~> 1.1)
|
10
10
|
hiera (>= 3.2.1, < 4)
|
11
|
-
httpclient (~> 2.8)
|
12
11
|
locale (~> 2.1)
|
13
12
|
multi_json (~> 1.13)
|
13
|
+
scanf (~> 1.0)
|
14
14
|
semantic_puppet (~> 1.0)
|
15
15
|
|
16
16
|
GEM
|
@@ -23,15 +23,17 @@ GEM
|
|
23
23
|
ast (2.4.1)
|
24
24
|
coderay (1.1.3)
|
25
25
|
concurrent-ruby (1.1.7)
|
26
|
-
crack (0.4.
|
26
|
+
crack (0.4.5)
|
27
|
+
rexml
|
27
28
|
csv (3.1.5)
|
28
29
|
deep_merge (1.2.1)
|
29
30
|
diff-lcs (1.4.4)
|
30
31
|
docopt (0.6.1)
|
31
|
-
facter (4.0.
|
32
|
+
facter (4.0.49)
|
32
33
|
hocon (~> 1.3)
|
33
34
|
thor (>= 1.0.1, < 2.0)
|
34
35
|
fast_gettext (1.1.2)
|
36
|
+
ffi (1.14.2)
|
35
37
|
gettext (3.2.9)
|
36
38
|
locale (>= 2.0.5)
|
37
39
|
text (>= 1.3.0)
|
@@ -47,63 +49,63 @@ GEM
|
|
47
49
|
highline (1.6.21)
|
48
50
|
hocon (1.3.1)
|
49
51
|
hpricot (0.8.6)
|
50
|
-
httpclient (2.8.3)
|
51
52
|
json-schema (2.8.1)
|
52
53
|
addressable (>= 2.4)
|
53
54
|
locale (2.1.3)
|
54
|
-
memory_profiler (0.
|
55
|
+
memory_profiler (1.0.0)
|
55
56
|
method_source (1.0.0)
|
56
57
|
minitar (0.9)
|
57
58
|
msgpack (1.3.3)
|
58
59
|
multi_json (1.15.0)
|
59
60
|
mustache (1.1.1)
|
60
61
|
optimist (3.0.1)
|
61
|
-
packaging (0.99.
|
62
|
+
packaging (0.99.75)
|
62
63
|
artifactory (~> 2)
|
63
64
|
csv (= 3.1.5)
|
64
65
|
rake (>= 12.3)
|
65
66
|
release-metrics
|
66
|
-
parallel (1.
|
67
|
+
parallel (1.20.1)
|
67
68
|
parser (2.7.2.0)
|
68
69
|
ast (~> 2.4.1)
|
69
|
-
powerpack (0.1.
|
70
|
+
powerpack (0.1.3)
|
70
71
|
pry (0.13.1)
|
71
72
|
coderay (~> 1.1)
|
72
73
|
method_source (~> 1.0)
|
73
74
|
public_suffix (4.0.6)
|
74
75
|
puppet-resource_api (1.8.13)
|
75
76
|
hocon (>= 1.0)
|
76
|
-
puppetserver-ca (
|
77
|
+
puppetserver-ca (2.0.1)
|
77
78
|
facter (>= 2.0.1, < 5)
|
78
79
|
racc (1.4.9)
|
79
80
|
rainbow (2.2.2)
|
80
81
|
rake
|
81
82
|
rake (12.3.3)
|
82
83
|
rdiscount (2.2.0.2)
|
83
|
-
rdoc (6.
|
84
|
+
rdoc (6.3.0)
|
84
85
|
release-metrics (1.1.0)
|
85
86
|
csv
|
86
87
|
docopt
|
88
|
+
rexml (3.2.4)
|
87
89
|
ronn (0.7.3)
|
88
90
|
hpricot (>= 0.8.2)
|
89
91
|
mustache (>= 0.7.0)
|
90
92
|
rdiscount (>= 1.5.8)
|
91
|
-
rspec (3.
|
92
|
-
rspec-core (~> 3.
|
93
|
-
rspec-expectations (~> 3.
|
94
|
-
rspec-mocks (~> 3.
|
95
|
-
rspec-core (3.
|
96
|
-
rspec-support (~> 3.
|
97
|
-
rspec-expectations (3.
|
93
|
+
rspec (3.10.0)
|
94
|
+
rspec-core (~> 3.10.0)
|
95
|
+
rspec-expectations (~> 3.10.0)
|
96
|
+
rspec-mocks (~> 3.10.0)
|
97
|
+
rspec-core (3.10.1)
|
98
|
+
rspec-support (~> 3.10.0)
|
99
|
+
rspec-expectations (3.10.1)
|
98
100
|
diff-lcs (>= 1.2.0, < 2.0)
|
99
|
-
rspec-support (~> 3.
|
101
|
+
rspec-support (~> 3.10.0)
|
100
102
|
rspec-its (1.3.0)
|
101
103
|
rspec-core (>= 3.0.0)
|
102
104
|
rspec-expectations (>= 3.0.0)
|
103
|
-
rspec-mocks (3.
|
105
|
+
rspec-mocks (3.10.1)
|
104
106
|
diff-lcs (>= 1.2.0, < 2.0)
|
105
|
-
rspec-support (~> 3.
|
106
|
-
rspec-support (3.
|
107
|
+
rspec-support (~> 3.10.0)
|
108
|
+
rspec-support (3.10.1)
|
107
109
|
rubocop (0.49.1)
|
108
110
|
parallel (~> 1.10)
|
109
111
|
parser (>= 2.3.3.1, < 3.0)
|
@@ -113,24 +115,26 @@ GEM
|
|
113
115
|
unicode-display_width (~> 1.0, >= 1.0.1)
|
114
116
|
rubocop-i18n (1.2.0)
|
115
117
|
rubocop (~> 0.49.0)
|
116
|
-
ruby-prof (1.4.
|
117
|
-
ruby-progressbar (1.
|
118
|
-
|
118
|
+
ruby-prof (1.4.2)
|
119
|
+
ruby-progressbar (1.11.0)
|
120
|
+
scanf (1.0.0)
|
121
|
+
semantic_puppet (1.0.3)
|
119
122
|
text (1.3.1)
|
120
123
|
thor (1.0.1)
|
121
124
|
unicode-display_width (1.7.0)
|
122
125
|
vcr (5.1.0)
|
123
|
-
webmock (3.
|
126
|
+
webmock (3.11.1)
|
124
127
|
addressable (>= 2.3.6)
|
125
128
|
crack (>= 0.3.2)
|
126
129
|
hashdiff (>= 0.4.0, < 2.0.0)
|
127
|
-
yard (0.9.
|
130
|
+
yard (0.9.26)
|
128
131
|
|
129
132
|
PLATFORMS
|
130
133
|
ruby
|
131
134
|
|
132
135
|
DEPENDENCIES
|
133
136
|
diff-lcs (~> 1.3)
|
137
|
+
ffi
|
134
138
|
gettext-setup (~> 0.28)
|
135
139
|
hiera-eyaml
|
136
140
|
hocon (~> 1.0)
|
@@ -142,12 +146,13 @@ DEPENDENCIES
|
|
142
146
|
pry
|
143
147
|
puppet!
|
144
148
|
puppet-resource_api (~> 1.5)
|
145
|
-
puppetserver-ca (~>
|
149
|
+
puppetserver-ca (~> 2.0)
|
146
150
|
racc (= 1.4.9)
|
147
151
|
rake (~> 12.2)
|
148
152
|
rdoc (~> 6.0)
|
149
153
|
ronn (~> 0.7.3)
|
150
154
|
rspec (~> 3.1)
|
155
|
+
rspec-expectations (~> 3.9, != 3.9.3)
|
151
156
|
rspec-its (~> 1.1)
|
152
157
|
rubocop (~> 0.49)
|
153
158
|
rubocop-i18n (~> 1.2.0)
|
data/README.md
CHANGED
@@ -15,7 +15,7 @@ Documentation for Puppet and related projects can be found online at the
|
|
15
15
|
|
16
16
|
### HTTP API
|
17
17
|
|
18
|
-
[HTTP API Index](https://puppet.com/docs/puppet/
|
18
|
+
[HTTP API Index](https://puppet.com/docs/puppet/latest/http_api/http_api_index.html)
|
19
19
|
|
20
20
|
## Installation
|
21
21
|
|
data/conf/fileserver.conf
CHANGED
@@ -12,10 +12,9 @@
|
|
12
12
|
#
|
13
13
|
# [extra_files]
|
14
14
|
# path /etc/puppetlabs/puppet/files
|
15
|
-
# allow *
|
16
15
|
#
|
17
|
-
# In the example above, anything in /etc/puppetlabs/puppet/files/<file name>
|
18
|
-
# available to authenticated nodes at puppet:///extra_files/<file name>.
|
16
|
+
# In the example above, anything in /etc/puppetlabs/puppet/files/<file name>
|
17
|
+
# would be available to authenticated nodes at puppet:///extra_files/<file name>.
|
19
18
|
#
|
20
19
|
# Mount points may also use three placeholders as part of their path:
|
21
20
|
#
|
@@ -28,10 +27,6 @@
|
|
28
27
|
# PERMISSIONS
|
29
28
|
|
30
29
|
# The ability to set permissions - for example, using the allow, allow_ip, or
|
31
|
-
# deny directives - has been removed. Instead, you can
|
32
|
-
# auth.conf
|
33
|
-
#
|
34
|
-
#
|
35
|
-
# For details and an example, see the auth.conf file. If you're using Puppet
|
36
|
-
# Server, see the Puppet Server documentation at
|
37
|
-
# https://puppet.com/docs/puppetserver/latest/config_file_auth.html.
|
30
|
+
# deny directives - has been removed from fileserver.conf. Instead, you can
|
31
|
+
# control file access in Puppet Server's auth.conf file. See the documentation
|
32
|
+
# at https://puppet.com/docs/puppetserver/latest/config_file_auth.html.
|
data/ext/build_defaults.yaml
CHANGED
@@ -16,4 +16,4 @@ apt_signing_server: 'apt.puppetlabs.com'
|
|
16
16
|
apt_repo_url: 'http://apt.puppetlabs.com'
|
17
17
|
apt_repo_path: '/opt/repository/incoming'
|
18
18
|
tar_host: 'downloads.puppetlabs.com'
|
19
|
-
nonfinal_gem_path: '/opt/repository-nightlies/downloads/gems/
|
19
|
+
nonfinal_gem_path: '/opt/repository-nightlies/downloads/gems/puppet7-nightly'
|
data/ext/osx/file_mapping.yaml
CHANGED
data/ext/project_data.yaml
CHANGED
@@ -14,7 +14,7 @@ gem_test_files: 'spec/**/*'
|
|
14
14
|
gem_executables: 'puppet'
|
15
15
|
gem_default_executables: 'puppet'
|
16
16
|
gem_forge_project: 'puppet'
|
17
|
-
gem_required_ruby_version: '>= 2.
|
17
|
+
gem_required_ruby_version: '>= 2.5.0'
|
18
18
|
gem_required_rubygems_version: '> 1.3.1'
|
19
19
|
gem_runtime_dependencies:
|
20
20
|
facter: ['> 2.0.1', '< 5']
|
@@ -23,10 +23,10 @@ gem_runtime_dependencies:
|
|
23
23
|
fast_gettext: '~> 1.1'
|
24
24
|
locale: '~> 2.1'
|
25
25
|
multi_json: '~> 1.10'
|
26
|
-
httpclient: '~> 2.8'
|
27
26
|
puppet-resource_api: '~>1.5'
|
28
27
|
concurrent-ruby: '~> 1.0'
|
29
28
|
deep_merge: '~> 1.0'
|
29
|
+
scanf: '~> 1.0'
|
30
30
|
gem_rdoc_options:
|
31
31
|
- --title
|
32
32
|
- "Puppet - Configuration Management"
|
@@ -40,22 +40,10 @@ gem_platform_dependencies:
|
|
40
40
|
x86-mingw32:
|
41
41
|
gem_runtime_dependencies:
|
42
42
|
ffi: ['> 1.9.24', '< 2']
|
43
|
-
# win32-xxxx gems are pinned due to PUP-6445
|
44
|
-
win32-dir: '= 0.4.9'
|
45
|
-
win32-process: '= 0.7.5'
|
46
|
-
# Use of win32-security is deprecated
|
47
|
-
win32-security: '= 0.2.5'
|
48
|
-
win32-service: '= 0.8.8'
|
49
43
|
minitar: '~> 0.9'
|
50
44
|
x64-mingw32:
|
51
45
|
gem_runtime_dependencies:
|
52
46
|
ffi: ['> 1.9.24', '< 2']
|
53
|
-
# win32-xxxx gems are pinned due to PUP-6445
|
54
|
-
win32-dir: '= 0.4.9'
|
55
|
-
win32-process: '= 0.7.5'
|
56
|
-
# Use of win32-security is deprecated
|
57
|
-
win32-security: '= 0.2.5'
|
58
|
-
win32-service: '= 0.8.8'
|
59
47
|
minitar: '~> 0.9'
|
60
48
|
bundle_platforms:
|
61
49
|
universal-darwin: all
|
data/ext/redhat/puppet.spec.erb
CHANGED
@@ -199,7 +199,6 @@ touch %{buildroot}%{_localstatedir}/log/puppet/masterhttp.log
|
|
199
199
|
%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
|
200
200
|
%endif
|
201
201
|
%config(noreplace) %{_sysconfdir}/puppet/puppet.conf
|
202
|
-
%config(noreplace) %{_sysconfdir}/puppet/auth.conf
|
203
202
|
%config(noreplace) %{_sysconfdir}/logrotate.d/puppet
|
204
203
|
# We don't want to require emacs or vim, so we need to own these dirs
|
205
204
|
%{_datadir}/emacs
|
@@ -1,22 +1,23 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
2
|
|
3
3
|
require 'fileutils'
|
4
|
-
require '
|
5
|
-
require 'win32/dir'
|
6
|
-
require 'win32/process'
|
4
|
+
require 'puppet/util/windows/daemon'
|
7
5
|
|
8
6
|
# This file defines utilities for logging to eventlog. While it lives inside
|
9
7
|
# Puppet, it is completely independent and loads no other parts of Puppet, so we
|
10
8
|
# can safely require *just* it.
|
11
9
|
require 'puppet/util/windows/eventlog'
|
12
10
|
|
13
|
-
|
11
|
+
# monkey patches ruby Process to add .create method
|
12
|
+
require 'puppet/util/windows/monkey_patches/process'
|
13
|
+
|
14
|
+
class WindowsDaemon < Puppet::Util::Windows::Daemon
|
14
15
|
CREATE_NEW_CONSOLE = 0x00000010
|
15
16
|
|
16
17
|
@run_thread = nil
|
17
18
|
@LOG_TO_FILE = false
|
18
19
|
@loglevel = 0
|
19
|
-
LOG_FILE = File.expand_path(File.join(
|
20
|
+
LOG_FILE = File.expand_path(File.join(ENV['ALLUSERSPROFILE'], 'PuppetLabs', 'puppet', 'var', 'log', 'windows.log'))
|
20
21
|
LEVELS = [:debug, :info, :notice, :warning, :err, :alert, :emerg, :crit]
|
21
22
|
LEVELS.each do |level|
|
22
23
|
define_method("log_#{level}") do |msg|
|
data/install.rb
CHANGED
@@ -178,6 +178,9 @@ def prepare_installation
|
|
178
178
|
opts.on('--vardir[=OPTIONAL]', 'Installation directory for var files', 'Default /opt/puppetlabs/puppet/cache') do |vardir|
|
179
179
|
InstallOptions.vardir = vardir
|
180
180
|
end
|
181
|
+
opts.on('--publicdir[=OPTIONAL]', 'Installation directory for public files such as the `last_run_summary.yaml` report', 'Default /opt/puppetlabs/puppet/public') do |publicdir|
|
182
|
+
InstallOptions.publicdir = publicdir
|
183
|
+
end
|
181
184
|
opts.on('--rundir[=OPTIONAL]', 'Installation directory for state files', 'Default /var/run/puppetlabs') do |rundir|
|
182
185
|
InstallOptions.rundir = rundir
|
183
186
|
end
|
@@ -242,20 +245,10 @@ def prepare_installation
|
|
242
245
|
$operatingsystem = Facter.value :operatingsystem
|
243
246
|
end
|
244
247
|
|
245
|
-
if $operatingsystem == "windows"
|
246
|
-
begin
|
247
|
-
# populates constants used to specify default Windows directories
|
248
|
-
require 'win32/dir'
|
249
|
-
rescue LoadError => e
|
250
|
-
puts "Cannot run on Microsoft Windows without the win32-process, win32-dir & win32-service gems: #{e}"
|
251
|
-
exit(-1)
|
252
|
-
end
|
253
|
-
end
|
254
|
-
|
255
248
|
if not InstallOptions.configdir.nil?
|
256
249
|
configdir = InstallOptions.configdir
|
257
250
|
elsif $operatingsystem == "windows"
|
258
|
-
configdir = File.join(
|
251
|
+
configdir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "etc")
|
259
252
|
else
|
260
253
|
configdir = "/etc/puppetlabs/puppet"
|
261
254
|
end
|
@@ -263,7 +256,7 @@ def prepare_installation
|
|
263
256
|
if not InstallOptions.codedir.nil?
|
264
257
|
codedir = InstallOptions.codedir
|
265
258
|
elsif $operatingsystem == "windows"
|
266
|
-
codedir = File.join(
|
259
|
+
codedir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "code")
|
267
260
|
else
|
268
261
|
codedir = "/etc/puppetlabs/code"
|
269
262
|
end
|
@@ -271,15 +264,23 @@ def prepare_installation
|
|
271
264
|
if not InstallOptions.vardir.nil?
|
272
265
|
vardir = InstallOptions.vardir
|
273
266
|
elsif $operatingsystem == "windows"
|
274
|
-
vardir = File.join(
|
267
|
+
vardir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "cache")
|
275
268
|
else
|
276
269
|
vardir = "/opt/puppetlabs/puppet/cache"
|
277
270
|
end
|
278
271
|
|
272
|
+
if not InstallOptions.publicdir.nil?
|
273
|
+
publicdir = InstallOptions.publicdir
|
274
|
+
elsif $operatingsystem == "windows"
|
275
|
+
publicdir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "public")
|
276
|
+
else
|
277
|
+
publicdir = "/opt/puppetlabs/puppet/public"
|
278
|
+
end
|
279
|
+
|
279
280
|
if not InstallOptions.rundir.nil?
|
280
281
|
rundir = InstallOptions.rundir
|
281
282
|
elsif $operatingsystem == "windows"
|
282
|
-
rundir = File.join(
|
283
|
+
rundir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "var", "run")
|
283
284
|
else
|
284
285
|
rundir = "/var/run/puppetlabs"
|
285
286
|
end
|
@@ -287,7 +288,7 @@ def prepare_installation
|
|
287
288
|
if not InstallOptions.logdir.nil?
|
288
289
|
logdir = InstallOptions.logdir
|
289
290
|
elsif $operatingsystem == "windows"
|
290
|
-
logdir = File.join(
|
291
|
+
logdir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "var", "log")
|
291
292
|
else
|
292
293
|
logdir = "/var/log/puppetlabs/puppet"
|
293
294
|
end
|
@@ -302,7 +303,7 @@ def prepare_installation
|
|
302
303
|
localedir = InstallOptions.localedir
|
303
304
|
else
|
304
305
|
if $operatingsystem == "windows"
|
305
|
-
localedir = File.join(
|
306
|
+
localedir = File.join(ENV['PROGRAMFILES'], "Puppet Labs", "Puppet", "puppet", "share", "locale")
|
306
307
|
else
|
307
308
|
localedir = "/opt/puppetlabs/puppet/share/locale"
|
308
309
|
end
|
@@ -342,6 +343,7 @@ def prepare_installation
|
|
342
343
|
configdir = join(destdir, configdir)
|
343
344
|
codedir = join(destdir, codedir)
|
344
345
|
vardir = join(destdir, vardir)
|
346
|
+
publicdir = join(destdir, publicdir)
|
345
347
|
rundir = join(destdir, rundir)
|
346
348
|
logdir = join(destdir, logdir)
|
347
349
|
bindir = join(destdir, bindir)
|
@@ -355,6 +357,7 @@ def prepare_installation
|
|
355
357
|
FileUtils.makedirs(mandir)
|
356
358
|
FileUtils.makedirs(sitelibdir)
|
357
359
|
FileUtils.makedirs(vardir)
|
360
|
+
FileUtils.makedirs(publicdir)
|
358
361
|
FileUtils.makedirs(rundir)
|
359
362
|
FileUtils.makedirs(logdir)
|
360
363
|
FileUtils.makedirs(localedir)
|
@@ -366,6 +369,7 @@ def prepare_installation
|
|
366
369
|
InstallOptions.lib_dir = libdir
|
367
370
|
InstallOptions.man_dir = mandir
|
368
371
|
InstallOptions.var_dir = vardir
|
372
|
+
InstallOptions.public_dir = publicdir
|
369
373
|
InstallOptions.run_dir = rundir
|
370
374
|
InstallOptions.log_dir = logdir
|
371
375
|
InstallOptions.locale_dir = localedir
|
@@ -474,7 +478,7 @@ end
|
|
474
478
|
# Change directory into the puppet root so we don't get the wrong files for install.
|
475
479
|
FileUtils.cd File.dirname(__FILE__) do
|
476
480
|
# Set these values to what you want installed.
|
477
|
-
configs = glob(%w{conf/
|
481
|
+
configs = glob(%w{conf/puppet.conf conf/hiera.yaml})
|
478
482
|
bins = glob(%w{bin/*})
|
479
483
|
#rdoc = glob(%w{bin/* lib/**/*.rb README* }).reject { |e| e=~ /\.(bat|cmd)$/ }
|
480
484
|
#ri = glob(%w{bin/*.rb lib/**/*.rb}).reject { |e| e=~ /\.(bat|cmd)$/ }
|