puppet 6.21.1 → 6.25.0
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/CONTRIBUTING.md +5 -5
- data/Gemfile +3 -3
- data/Gemfile.lock +34 -28
- data/README.md +4 -4
- data/{ext → examples/enc}/regexp_nodes/classes/databases +0 -0
- data/{ext → examples/enc}/regexp_nodes/classes/webservers +0 -0
- data/{ext → examples/enc}/regexp_nodes/environment/development +0 -0
- data/{ext → examples/enc}/regexp_nodes/parameters/service/prod +0 -0
- data/{ext → examples/enc}/regexp_nodes/parameters/service/qa +0 -0
- data/{ext → examples/enc}/regexp_nodes/parameters/service/sandbox +0 -0
- data/{ext → examples/enc}/regexp_nodes/regexp_nodes.rb +0 -0
- data/{ext → examples}/nagios/check_puppet.rb +2 -2
- data/ext/README.md +13 -0
- data/ext/osx/puppet.plist +2 -0
- data/ext/project_data.yaml +3 -2
- data/lib/puppet/application/agent.rb +16 -5
- data/lib/puppet/application/apply.rb +22 -3
- data/lib/puppet/application/device.rb +2 -1
- data/lib/puppet/application/filebucket.rb +1 -0
- data/lib/puppet/application/resource.rb +32 -16
- data/lib/puppet/application/script.rb +2 -1
- data/lib/puppet/application/ssl.rb +12 -0
- data/lib/puppet/concurrent/thread_local_singleton.rb +1 -0
- data/lib/puppet/configurer/downloader.rb +2 -1
- data/lib/puppet/configurer.rb +85 -57
- data/lib/puppet/confine/variable.rb +1 -1
- data/lib/puppet/defaults.rb +63 -35
- data/lib/puppet/environments.rb +91 -26
- data/lib/puppet/face/facts.rb +129 -31
- data/lib/puppet/face/help/action.erb +1 -0
- data/lib/puppet/face/help/face.erb +1 -0
- data/lib/puppet/face/node/clean.rb +11 -0
- data/lib/puppet/facter_impl.rb +96 -0
- data/lib/puppet/file_serving/configuration/parser.rb +2 -0
- data/lib/puppet/file_serving/configuration.rb +3 -0
- data/lib/puppet/file_serving/fileset.rb +14 -2
- data/lib/puppet/file_serving/mount/file.rb +4 -4
- data/lib/puppet/file_serving/mount/scripts.rb +24 -0
- data/lib/puppet/file_system/file_impl.rb +3 -1
- data/lib/puppet/file_system/memory_file.rb +8 -1
- data/lib/puppet/file_system/windows.rb +4 -2
- data/lib/puppet/forge.rb +4 -4
- data/lib/puppet/functions/all.rb +1 -1
- data/lib/puppet/functions/camelcase.rb +1 -1
- data/lib/puppet/functions/capitalize.rb +2 -2
- data/lib/puppet/functions/downcase.rb +2 -2
- data/lib/puppet/functions/empty.rb +8 -0
- data/lib/puppet/functions/find_template.rb +2 -2
- data/lib/puppet/functions/get.rb +5 -5
- data/lib/puppet/functions/group_by.rb +13 -5
- data/lib/puppet/functions/lest.rb +1 -1
- data/lib/puppet/functions/new.rb +100 -100
- data/lib/puppet/functions/partition.rb +12 -4
- data/lib/puppet/functions/require.rb +5 -5
- data/lib/puppet/functions/sort.rb +3 -3
- data/lib/puppet/functions/strftime.rb +1 -0
- data/lib/puppet/functions/tree_each.rb +7 -9
- data/lib/puppet/functions/type.rb +4 -4
- data/lib/puppet/functions/unwrap.rb +17 -2
- data/lib/puppet/functions/upcase.rb +2 -2
- data/lib/puppet/http/resolver/server_list.rb +15 -4
- data/lib/puppet/http/service/compiler.rb +75 -1
- data/lib/puppet/http/service/file_server.rb +2 -1
- data/lib/puppet/indirector/catalog/compiler.rb +25 -6
- data/lib/puppet/indirector/catalog/rest.rb +1 -0
- data/lib/puppet/indirector/facts/facter.rb +28 -7
- data/lib/puppet/indirector/file_metadata/rest.rb +1 -0
- data/lib/puppet/indirector/indirection.rb +1 -1
- data/lib/puppet/indirector/resource/ral.rb +6 -1
- data/lib/puppet/indirector/terminus.rb +4 -0
- data/lib/puppet/interface/documentation.rb +1 -0
- data/lib/puppet/module/plan.rb +0 -1
- data/lib/puppet/module/task.rb +1 -1
- data/lib/puppet/module.rb +1 -0
- data/lib/puppet/module_tool/applications/installer.rb +12 -4
- data/lib/puppet/module_tool/applications/uninstaller.rb +1 -1
- data/lib/puppet/module_tool/applications/upgrader.rb +1 -1
- data/lib/puppet/module_tool/errors/shared.rb +17 -0
- data/lib/puppet/network/formats.rb +67 -0
- data/lib/puppet/network/http/api/indirected_routes.rb +1 -1
- data/lib/puppet/network/http/factory.rb +4 -0
- data/lib/puppet/node/environment.rb +10 -11
- data/lib/puppet/pal/pal_impl.rb +1 -1
- data/lib/puppet/parser/functions/fqdn_rand.rb +14 -6
- data/lib/puppet/parser/scope.rb +1 -0
- data/lib/puppet/parser/templatewrapper.rb +1 -0
- data/lib/puppet/pops/lookup/lookup_adapter.rb +3 -2
- data/lib/puppet/pops/model/ast.rb +1 -0
- data/lib/puppet/pops/model/factory.rb +2 -1
- data/lib/puppet/pops/parser/eparser.rb +201 -201
- data/lib/puppet/pops/parser/lexer2.rb +92 -91
- data/lib/puppet/pops/parser/slurp_support.rb +1 -0
- data/lib/puppet/pops/serialization/to_data_converter.rb +18 -6
- data/lib/puppet/pops/serialization/to_stringified_converter.rb +1 -1
- data/lib/puppet/pops/types/p_sem_ver_type.rb +8 -2
- data/lib/puppet/pops/types/p_sensitive_type.rb +10 -0
- data/lib/puppet/pops/types/type_formatter.rb +4 -3
- data/lib/puppet/pops/types/type_mismatch_describer.rb +1 -1
- data/lib/puppet/pops/types/types.rb +1 -1
- data/lib/puppet/provider/aix_object.rb +1 -1
- data/lib/puppet/provider/exec/posix.rb +16 -4
- data/lib/puppet/provider/group/groupadd.rb +5 -2
- data/lib/puppet/provider/package/dnfmodule.rb +1 -1
- data/lib/puppet/provider/package/nim.rb +11 -6
- data/lib/puppet/provider/package/pip.rb +15 -3
- data/lib/puppet/provider/package/pkg.rb +19 -2
- data/lib/puppet/provider/package/puppetserver_gem.rb +1 -1
- data/lib/puppet/provider/package/yum.rb +1 -1
- data/lib/puppet/provider/parsedfile.rb +3 -0
- data/lib/puppet/provider/service/base.rb +1 -1
- data/lib/puppet/provider/service/init.rb +5 -5
- data/lib/puppet/provider/service/launchd.rb +2 -2
- data/lib/puppet/provider/service/redhat.rb +1 -1
- data/lib/puppet/provider/service/smf.rb +3 -3
- data/lib/puppet/provider/service/systemd.rb +16 -6
- data/lib/puppet/provider/service/upstart.rb +5 -5
- data/lib/puppet/provider/service/windows.rb +38 -0
- data/lib/puppet/provider/user/aix.rb +44 -1
- data/lib/puppet/provider/user/directoryservice.rb +26 -13
- data/lib/puppet/provider/user/useradd.rb +73 -17
- data/lib/puppet/provider.rb +1 -1
- data/lib/puppet/reference/configuration.rb +1 -1
- data/lib/puppet/reference/providers.rb +2 -2
- data/lib/puppet/resource/type_collection.rb +1 -0
- data/lib/puppet/runtime.rb +11 -1
- data/lib/puppet/settings/environment_conf.rb +1 -0
- data/lib/puppet/settings.rb +32 -9
- data/lib/puppet/test/test_helper.rb +4 -1
- data/lib/puppet/transaction/additional_resource_generator.rb +1 -1
- data/lib/puppet/transaction/persistence.rb +11 -1
- data/lib/puppet/transaction/report.rb +15 -1
- data/lib/puppet/type/exec.rb +35 -5
- data/lib/puppet/type/file/mode.rb +6 -0
- data/lib/puppet/type/file/selcontext.rb +1 -1
- data/lib/puppet/type/file.rb +25 -7
- data/lib/puppet/type/filebucket.rb +3 -3
- data/lib/puppet/type/group.rb +0 -1
- data/lib/puppet/type/resources.rb +1 -1
- data/lib/puppet/type/service.rb +26 -41
- data/lib/puppet/type/tidy.rb +22 -3
- data/lib/puppet/type/user.rb +38 -21
- data/lib/puppet/type.rb +1 -1
- data/lib/puppet/util/command_line.rb +1 -1
- data/lib/puppet/util/fact_dif.rb +36 -17
- data/lib/puppet/util/filetype.rb +2 -2
- data/lib/puppet/util/json.rb +3 -0
- data/lib/puppet/util/log.rb +1 -2
- data/lib/puppet/util/logging.rb +1 -25
- data/lib/puppet/util/monkey_patches.rb +7 -0
- data/lib/puppet/util/pidlock.rb +1 -1
- data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +1 -1
- data/lib/puppet/util/selinux.rb +30 -4
- data/lib/puppet/util/suidmanager.rb +1 -2
- data/lib/puppet/util/symbolic_file_mode.rb +29 -17
- data/lib/puppet/util/tagging.rb +1 -0
- data/lib/puppet/util/windows/adsi.rb +46 -0
- data/lib/puppet/util/windows/api_types.rb +1 -1
- data/lib/puppet/util/windows/principal.rb +9 -2
- data/lib/puppet/util/windows/sid.rb +6 -2
- data/lib/puppet/util/windows/user.rb +0 -2
- data/lib/puppet/util.rb +4 -3
- data/lib/puppet/version.rb +1 -1
- data/lib/puppet.rb +5 -9
- data/locales/puppet.pot +506 -410
- data/man/man5/puppet.conf.5 +310 -274
- data/man/man8/puppet-agent.8 +4 -1
- data/man/man8/puppet-apply.8 +1 -1
- data/man/man8/puppet-catalog.8 +9 -9
- data/man/man8/puppet-config.8 +1 -1
- data/man/man8/puppet-describe.8 +1 -1
- data/man/man8/puppet-device.8 +1 -1
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +1 -1
- data/man/man8/puppet-facts.8 +65 -7
- data/man/man8/puppet-filebucket.8 +1 -1
- data/man/man8/puppet-generate.8 +1 -1
- data/man/man8/puppet-help.8 +1 -1
- data/man/man8/puppet-key.8 +7 -7
- data/man/man8/puppet-lookup.8 +1 -1
- data/man/man8/puppet-man.8 +1 -1
- data/man/man8/puppet-module.8 +3 -3
- data/man/man8/puppet-node.8 +5 -5
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +5 -5
- data/man/man8/puppet-resource.8 +1 -1
- data/man/man8/puppet-script.8 +1 -1
- data/man/man8/puppet-ssl.8 +5 -1
- data/man/man8/puppet-status.8 +4 -4
- data/man/man8/puppet.8 +2 -2
- data/spec/fixtures/integration/application/agent/lib/facter/agent_spec_role.rb +3 -0
- data/spec/fixtures/integration/l10n/envs/prod/modules/demo/Gemfile +4 -0
- data/spec/fixtures/integration/l10n/envs/prod/modules/demo/Rakefile +3 -0
- data/spec/fixtures/integration/l10n/envs/prod/modules/demo/lib/puppet/functions/l10n.rb +8 -0
- data/spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/config.yaml +25 -0
- data/spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/ja/puppet-l10n.po +19 -0
- data/spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/puppet-l10n.pot +20 -0
- data/spec/fixtures/integration/l10n/envs/prod/modules/demo/metadata.json +8 -0
- data/spec/fixtures/ssl/127.0.0.1-key.pem +107 -57
- data/spec/fixtures/ssl/127.0.0.1.pem +52 -31
- data/spec/fixtures/ssl/bad-basic-constraints.pem +57 -35
- data/spec/fixtures/ssl/bad-int-basic-constraints.pem +57 -35
- data/spec/fixtures/ssl/ca.pem +57 -35
- data/spec/fixtures/ssl/crl.pem +28 -18
- data/spec/fixtures/ssl/ec-key.pem +11 -11
- data/spec/fixtures/ssl/ec.pem +33 -24
- data/spec/fixtures/ssl/encrypted-ec-key.pem +12 -12
- data/spec/fixtures/ssl/encrypted-key.pem +108 -58
- data/spec/fixtures/ssl/intermediate-agent-crl.pem +28 -19
- data/spec/fixtures/ssl/intermediate-agent.pem +57 -36
- data/spec/fixtures/ssl/intermediate-crl.pem +31 -21
- data/spec/fixtures/ssl/intermediate.pem +57 -36
- data/spec/fixtures/ssl/oid-key.pem +117 -0
- data/spec/fixtures/ssl/oid.pem +69 -0
- data/spec/fixtures/ssl/pluto-key.pem +107 -57
- data/spec/fixtures/ssl/pluto.pem +52 -30
- data/spec/fixtures/ssl/request-key.pem +107 -57
- data/spec/fixtures/ssl/request.pem +47 -26
- data/spec/fixtures/ssl/revoked-key.pem +107 -57
- data/spec/fixtures/ssl/revoked.pem +52 -30
- data/spec/fixtures/ssl/signed-key.pem +107 -57
- data/spec/fixtures/ssl/signed.pem +52 -30
- data/spec/fixtures/ssl/tampered-cert.pem +52 -30
- data/spec/fixtures/ssl/tampered-csr.pem +47 -26
- data/spec/fixtures/ssl/trusted_oid_mapping.yaml +5 -0
- data/spec/fixtures/ssl/unknown-127.0.0.1-key.pem +107 -57
- data/spec/fixtures/ssl/unknown-127.0.0.1.pem +50 -29
- data/spec/fixtures/ssl/unknown-ca-key.pem +107 -57
- data/spec/fixtures/ssl/unknown-ca.pem +55 -33
- data/spec/fixtures/unit/provider/service/systemd/list_unit_files_services_vendor_preset +9 -0
- data/spec/integration/application/agent_spec.rb +113 -37
- data/spec/integration/application/filebucket_spec.rb +16 -0
- data/spec/integration/application/module_spec.rb +21 -0
- data/spec/integration/application/plugin_spec.rb +1 -1
- data/spec/integration/application/resource_spec.rb +64 -0
- data/spec/integration/application/ssl_spec.rb +20 -0
- data/spec/integration/configurer_spec.rb +18 -2
- data/spec/integration/environments/settings_interpolation_spec.rb +0 -4
- data/spec/integration/http/client_spec.rb +12 -0
- data/spec/integration/indirector/direct_file_server_spec.rb +1 -3
- data/spec/integration/indirector/facts/facter_spec.rb +93 -39
- data/spec/integration/l10n/compiler_spec.rb +37 -0
- data/spec/integration/transaction/report_spec.rb +1 -1
- data/spec/integration/type/exec_spec.rb +70 -45
- data/spec/integration/type/file_spec.rb +2 -2
- data/spec/integration/type/package_spec.rb +6 -6
- data/spec/integration/util/rdoc/parser_spec.rb +1 -1
- data/spec/integration/util/windows/adsi_spec.rb +18 -0
- data/spec/integration/util/windows/principal_spec.rb +21 -0
- data/spec/integration/util/windows/process_spec.rb +1 -9
- data/spec/integration/util/windows/registry_spec.rb +6 -0
- data/spec/lib/puppet/test_ca.rb +7 -2
- data/spec/lib/puppet_spec/modules.rb +13 -2
- data/spec/lib/puppet_spec/puppetserver.rb +15 -0
- data/spec/lib/puppet_spec/settings.rb +1 -0
- data/spec/shared_behaviours/documentation_on_faces.rb +0 -2
- data/spec/shared_contexts/l10n.rb +27 -0
- data/spec/spec_helper.rb +12 -11
- data/spec/unit/application/agent_spec.rb +7 -2
- data/spec/unit/application/apply_spec.rb +76 -56
- data/spec/unit/application/facts_spec.rb +482 -3
- data/spec/unit/application/resource_spec.rb +29 -0
- data/spec/unit/application/ssl_spec.rb +23 -0
- data/spec/unit/configurer/downloader_spec.rb +6 -0
- data/spec/unit/configurer_spec.rb +194 -56
- data/spec/unit/defaults_spec.rb +17 -0
- data/spec/unit/environments_spec.rb +348 -88
- data/spec/unit/face/facts_spec.rb +4 -0
- data/spec/unit/facter_impl_spec.rb +31 -0
- data/spec/unit/file_bucket/dipper_spec.rb +2 -2
- data/spec/unit/file_serving/configuration/parser_spec.rb +23 -0
- data/spec/unit/file_serving/configuration_spec.rb +14 -4
- data/spec/unit/file_serving/fileset_spec.rb +60 -0
- data/spec/unit/file_serving/mount/scripts_spec.rb +69 -0
- data/spec/unit/file_system_spec.rb +22 -0
- data/spec/unit/functions/assert_type_spec.rb +1 -1
- data/spec/unit/functions/empty_spec.rb +10 -0
- data/spec/unit/functions/logging_spec.rb +1 -0
- data/spec/unit/functions/lookup_spec.rb +64 -0
- data/spec/unit/functions/unwrap_spec.rb +8 -0
- data/spec/unit/functions4_spec.rb +2 -2
- data/spec/unit/gettext/config_spec.rb +12 -0
- data/spec/unit/http/service/compiler_spec.rb +131 -0
- data/spec/unit/indirector/catalog/compiler_spec.rb +101 -10
- data/spec/unit/indirector/catalog/rest_spec.rb +8 -0
- data/spec/unit/indirector/facts/facter_spec.rb +95 -0
- data/spec/unit/indirector/indirection_spec.rb +10 -3
- data/spec/unit/indirector/resource/ral_spec.rb +40 -75
- data/spec/unit/interface/action_spec.rb +0 -9
- data/spec/unit/module_spec.rb +15 -1
- data/spec/unit/module_tool/applications/installer_spec.rb +51 -12
- data/spec/unit/network/authstore_spec.rb +0 -15
- data/spec/unit/network/formats_spec.rb +47 -0
- data/spec/unit/network/http/factory_spec.rb +19 -0
- data/spec/unit/parser/functions/fqdn_rand_spec.rb +15 -1
- data/spec/unit/parser/templatewrapper_spec.rb +12 -2
- data/spec/unit/pops/parser/parse_containers_spec.rb +0 -11
- data/spec/unit/pops/serialization/to_from_hr_spec.rb +58 -0
- data/spec/unit/pops/serialization/to_stringified_spec.rb +5 -0
- data/spec/unit/pops/types/p_sem_ver_type_spec.rb +18 -0
- data/spec/unit/pops/types/p_sensitive_type_spec.rb +18 -0
- data/spec/unit/pops/types/type_calculator_spec.rb +6 -0
- data/spec/unit/provider/package/dnfmodule_spec.rb +10 -1
- data/spec/unit/provider/package/gem_spec.rb +1 -1
- data/spec/unit/provider/package/nim_spec.rb +42 -0
- data/spec/unit/provider/package/pip2_spec.rb +1 -1
- data/spec/unit/provider/package/pip3_spec.rb +1 -1
- data/spec/unit/provider/package/pip_spec.rb +38 -1
- data/spec/unit/provider/package/pkg_spec.rb +29 -4
- data/spec/unit/provider/package/puppet_gem_spec.rb +1 -1
- data/spec/unit/provider/package/puppetserver_gem_spec.rb +1 -1
- data/spec/unit/provider/parsedfile_spec.rb +10 -0
- data/spec/unit/provider/service/init_spec.rb +1 -0
- data/spec/unit/provider/service/launchd_spec.rb +11 -0
- data/spec/unit/provider/service/openwrt_spec.rb +3 -1
- data/spec/unit/provider/service/systemd_spec.rb +54 -9
- data/spec/unit/provider/service/windows_spec.rb +202 -0
- data/spec/unit/provider/user/aix_spec.rb +100 -0
- data/spec/unit/provider/user/directoryservice_spec.rb +68 -36
- data/spec/unit/provider/user/useradd_spec.rb +61 -5
- data/spec/unit/provider_spec.rb +4 -4
- data/spec/unit/puppet_spec.rb +12 -4
- data/spec/unit/resource/catalog_spec.rb +1 -1
- data/spec/unit/settings_spec.rb +97 -56
- data/spec/unit/ssl/certificate_request_spec.rb +8 -14
- data/spec/unit/ssl/state_machine_spec.rb +19 -5
- data/spec/unit/transaction/additional_resource_generator_spec.rb +0 -2
- data/spec/unit/transaction_spec.rb +18 -20
- data/spec/unit/type/exec_spec.rb +76 -29
- data/spec/unit/type/file/selinux_spec.rb +3 -3
- data/spec/unit/type/file/source_spec.rb +4 -4
- data/spec/unit/type/service_spec.rb +86 -188
- data/spec/unit/type/tidy_spec.rb +24 -7
- data/spec/unit/type/user_spec.rb +45 -0
- data/spec/unit/type_spec.rb +2 -2
- data/spec/unit/util/logging_spec.rb +2 -0
- data/spec/unit/util/selinux_spec.rb +87 -16
- data/spec/unit/util/windows/sid_spec.rb +41 -0
- data/tasks/generate_cert_fixtures.rake +12 -3
- data/tasks/parallel.rake +3 -3
- metadata +51 -99
- data/ext/README.environment +0 -8
- data/ext/dbfix.sql +0 -132
- data/ext/debian/README.Debian +0 -8
- data/ext/debian/README.source +0 -2
- data/ext/debian/TODO.Debian +0 -1
- data/ext/debian/changelog.erb +0 -1122
- data/ext/debian/compat +0 -1
- data/ext/debian/control +0 -144
- data/ext/debian/copyright +0 -339
- data/ext/debian/docs +0 -1
- data/ext/debian/fileserver.conf +0 -41
- data/ext/debian/puppet-common.dirs +0 -13
- data/ext/debian/puppet-common.install +0 -3
- data/ext/debian/puppet-common.lintian-overrides +0 -5
- data/ext/debian/puppet-common.manpages +0 -28
- data/ext/debian/puppet-common.postinst +0 -35
- data/ext/debian/puppet-common.postrm +0 -33
- data/ext/debian/puppet-el.dirs +0 -1
- data/ext/debian/puppet-el.emacsen-install +0 -25
- data/ext/debian/puppet-el.emacsen-remove +0 -11
- data/ext/debian/puppet-el.emacsen-startup +0 -9
- data/ext/debian/puppet-el.install +0 -1
- data/ext/debian/puppet-testsuite.install +0 -2
- data/ext/debian/puppet-testsuite.lintian-overrides +0 -4
- data/ext/debian/puppet.lintian-overrides +0 -3
- data/ext/debian/puppet.logrotate +0 -20
- data/ext/debian/puppet.postinst +0 -20
- data/ext/debian/puppet.postrm +0 -20
- data/ext/debian/puppet.preinst +0 -20
- data/ext/debian/puppetmaster-common.install +0 -2
- data/ext/debian/puppetmaster-common.manpages +0 -2
- data/ext/debian/puppetmaster-common.postinst +0 -6
- data/ext/debian/puppetmaster-passenger.dirs +0 -4
- data/ext/debian/puppetmaster-passenger.postinst +0 -162
- data/ext/debian/puppetmaster-passenger.postrm +0 -61
- data/ext/debian/puppetmaster.README.debian +0 -17
- data/ext/debian/puppetmaster.default +0 -14
- data/ext/debian/puppetmaster.init +0 -137
- data/ext/debian/puppetmaster.lintian-overrides +0 -3
- data/ext/debian/puppetmaster.postinst +0 -20
- data/ext/debian/puppetmaster.postrm +0 -5
- data/ext/debian/puppetmaster.preinst +0 -22
- data/ext/debian/rules +0 -132
- data/ext/debian/source/format +0 -1
- data/ext/debian/source/options +0 -1
- data/ext/debian/vim-puppet.README.Debian +0 -13
- data/ext/debian/vim-puppet.dirs +0 -5
- data/ext/debian/vim-puppet.yaml +0 -7
- data/ext/debian/watch +0 -2
- data/ext/freebsd/puppetd +0 -26
- data/ext/freebsd/puppetmasterd +0 -26
- data/ext/gentoo/conf.d/puppet +0 -5
- data/ext/gentoo/conf.d/puppetmaster +0 -12
- data/ext/gentoo/init.d/puppet +0 -38
- data/ext/gentoo/init.d/puppetmaster +0 -51
- data/ext/gentoo/puppet/fileserver.conf +0 -41
- data/ext/ips/puppet-agent +0 -44
- data/ext/ips/puppet-master +0 -44
- data/ext/ips/puppet.p5m.erb +0 -12
- data/ext/ips/puppetagent.xml +0 -42
- data/ext/ips/puppetmaster.xml +0 -42
- data/ext/ips/rules +0 -19
- data/ext/ips/transforms +0 -34
- data/ext/ldap/puppet.schema +0 -24
- data/ext/logcheck/puppet +0 -23
- data/ext/osx/file_mapping.yaml +0 -33
- data/ext/osx/postflight.erb +0 -109
- data/ext/osx/preflight.erb +0 -52
- data/ext/osx/prototype.plist.erb +0 -38
- data/ext/redhat/fileserver.conf +0 -41
- data/ext/redhat/logrotate +0 -21
- data/ext/redhat/puppet.spec.erb +0 -842
- data/ext/redhat/server.init +0 -128
- data/ext/redhat/server.sysconfig +0 -13
- data/ext/solaris/pkginfo +0 -6
- data/ext/solaris/smf/puppetd.xml +0 -77
- data/ext/solaris/smf/puppetmasterd.xml +0 -77
- data/ext/solaris/smf/svc-puppetd +0 -71
- data/ext/solaris/smf/svc-puppetmasterd +0 -67
- data/ext/suse/puppet.spec +0 -310
- data/ext/suse/server.init +0 -173
- data/ext/yaml_nodes.rb +0 -105
- data/spec/lib/matchers/include.rb +0 -27
- data/spec/lib/matchers/include_spec.rb +0 -32
- data/spec/unit/indirector/store_configs_spec.rb +0 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 20f0aaf2ac1082c2478a0c9635aa43f9a37fa77da75a724f8284d580fcab7010
|
4
|
+
data.tar.gz: c561e1428455cf0ab78eab68cb4633f5f0bdc4ff020a90dcd8672d6ee309e509
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fc33aacf4281d0dd2f2da42bfebaf45c1e81716dc67f8dbb0e95eb797e24469b46f4df5d95c89afac6146775b91d388ba84c443c4c3ea6edb1474483d0ec1ed7
|
7
|
+
data.tar.gz: c22eab4267770be1607ddf4b3f30042c028e72c8585b0d215115d5f35d7c5f02fbfdad4ca3b0df2eb79f40d3f87349fb281cf85bbc02f277e93b1366cf5bb4a6
|
data/CONTRIBUTING.md
CHANGED
@@ -38,12 +38,12 @@ the [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev
|
|
38
38
|
## Making Changes
|
39
39
|
|
40
40
|
* Create a topic branch from where you want to base your work.
|
41
|
-
* This is usually the
|
41
|
+
* This is usually the main branch.
|
42
42
|
* Only target release branches if you are certain your fix must be on that
|
43
43
|
branch.
|
44
|
-
* To quickly create a topic branch based on
|
45
|
-
fix/
|
46
|
-
`
|
44
|
+
* To quickly create a topic branch based on main, run `git checkout -b
|
45
|
+
fix/main/my_contribution main`. Please avoid working directly on the
|
46
|
+
`main` branch.
|
47
47
|
* Make commits of logical and atomic units.
|
48
48
|
* Check for unnecessary whitespace with `git diff --check` before committing.
|
49
49
|
* Make sure your commit messages are in the proper format. If the commit
|
@@ -65,7 +65,7 @@ the [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev
|
|
65
65
|
why this is a problem, and how the patch fixes the problem when applied.
|
66
66
|
```
|
67
67
|
* Make sure you have added the necessary tests for your changes.
|
68
|
-
* For details on how to run tests, please see [the quickstart guide](https://github.com/puppetlabs/puppet/blob/
|
68
|
+
* For details on how to run tests, please see [the quickstart guide](https://github.com/puppetlabs/puppet/blob/main/docs/quickstart.md)
|
69
69
|
|
70
70
|
## Writing Translatable Code
|
71
71
|
|
data/Gemfile
CHANGED
@@ -55,8 +55,8 @@ end
|
|
55
55
|
group(:development, optional: true) do
|
56
56
|
gem 'memory_profiler', require: false, platforms: [:mri]
|
57
57
|
gem 'pry', require: false, platforms: [:ruby]
|
58
|
-
gem "racc", "1.
|
59
|
-
if RUBY_PLATFORM != 'java'
|
58
|
+
gem "racc", "1.5.2", require: false, platforms: [:ruby]
|
59
|
+
if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 2.5
|
60
60
|
gem 'ruby-prof', '>= 0.16.0', require: false
|
61
61
|
end
|
62
62
|
end
|
@@ -65,7 +65,7 @@ group(:packaging) do
|
|
65
65
|
gem 'packaging', *location_for(ENV['PACKAGING_LOCATION'] || '~> 0.99')
|
66
66
|
end
|
67
67
|
|
68
|
-
group(:documentation) do
|
68
|
+
group(:documentation, optional: true) do
|
69
69
|
gem 'gettext-setup', '~> 0.28', require: false, platforms: [:ruby]
|
70
70
|
gem 'ronn', '~> 0.7.3', require: false, platforms: [:ruby]
|
71
71
|
end
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,18 @@
|
|
1
|
+
GIT
|
2
|
+
remote: git://github.com/puppetlabs/packaging
|
3
|
+
revision: 48564f11abbc1f61a159d9caa44c8236d910575a
|
4
|
+
branch: 1.0.x
|
5
|
+
specs:
|
6
|
+
packaging (0.99.81)
|
7
|
+
artifactory (~> 2)
|
8
|
+
csv (= 3.1.5)
|
9
|
+
rake (>= 12.3)
|
10
|
+
release-metrics
|
11
|
+
|
1
12
|
PATH
|
2
13
|
remote: .
|
3
14
|
specs:
|
4
|
-
puppet (6.
|
15
|
+
puppet (6.25.0)
|
5
16
|
CFPropertyList (~> 2.2)
|
6
17
|
concurrent-ruby (~> 1.0)
|
7
18
|
deep_merge (~> 1.0)
|
@@ -17,23 +28,23 @@ GEM
|
|
17
28
|
remote: https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/
|
18
29
|
specs:
|
19
30
|
CFPropertyList (2.3.6)
|
20
|
-
addressable (2.
|
31
|
+
addressable (2.8.0)
|
21
32
|
public_suffix (>= 2.0.2, < 5.0)
|
22
33
|
artifactory (2.8.2)
|
23
34
|
ast (2.4.2)
|
24
35
|
coderay (1.1.3)
|
25
|
-
concurrent-ruby (1.1.
|
36
|
+
concurrent-ruby (1.1.9)
|
26
37
|
crack (0.4.5)
|
27
38
|
rexml
|
28
39
|
csv (3.1.5)
|
29
40
|
deep_merge (1.2.1)
|
30
41
|
diff-lcs (1.4.4)
|
31
42
|
docopt (0.6.1)
|
32
|
-
facter (4.
|
43
|
+
facter (4.2.5)
|
33
44
|
hocon (~> 1.3)
|
34
45
|
thor (>= 1.0.1, < 2.0)
|
35
46
|
fast_gettext (1.1.2)
|
36
|
-
ffi (1.
|
47
|
+
ffi (1.15.4)
|
37
48
|
gettext (3.2.9)
|
38
49
|
locale (>= 2.0.5)
|
39
50
|
text (>= 1.3.0)
|
@@ -42,11 +53,11 @@ GEM
|
|
42
53
|
gettext (>= 3.0.2, < 3.3.0)
|
43
54
|
locale
|
44
55
|
hashdiff (1.0.1)
|
45
|
-
hiera (3.
|
46
|
-
hiera-eyaml (3.2.
|
47
|
-
highline
|
56
|
+
hiera (3.7.0)
|
57
|
+
hiera-eyaml (3.2.2)
|
58
|
+
highline
|
48
59
|
optimist
|
49
|
-
highline (
|
60
|
+
highline (2.0.3)
|
50
61
|
hocon (1.3.1)
|
51
62
|
hpricot (0.8.6)
|
52
63
|
httpclient (2.8.3)
|
@@ -60,33 +71,28 @@ GEM
|
|
60
71
|
multi_json (1.15.0)
|
61
72
|
mustache (1.1.1)
|
62
73
|
optimist (3.0.1)
|
63
|
-
|
64
|
-
artifactory (~> 2)
|
65
|
-
csv (= 3.1.5)
|
66
|
-
rake (>= 12.3)
|
67
|
-
release-metrics
|
68
|
-
parallel (1.20.1)
|
74
|
+
parallel (1.21.0)
|
69
75
|
parser (2.7.2.0)
|
70
76
|
ast (~> 2.4.1)
|
71
77
|
powerpack (0.1.3)
|
72
|
-
pry (0.14.
|
78
|
+
pry (0.14.1)
|
73
79
|
coderay (~> 1.1)
|
74
80
|
method_source (~> 1.0)
|
75
81
|
public_suffix (4.0.6)
|
76
|
-
puppet-resource_api (1.8.
|
82
|
+
puppet-resource_api (1.8.14)
|
77
83
|
hocon (>= 1.0)
|
78
|
-
puppetserver-ca (1.
|
84
|
+
puppetserver-ca (1.11.6)
|
79
85
|
facter (>= 2.0.1, < 5)
|
80
|
-
racc (1.
|
86
|
+
racc (1.5.2)
|
81
87
|
rainbow (2.2.2)
|
82
88
|
rake
|
83
89
|
rake (12.3.3)
|
84
90
|
rdiscount (2.2.0.2)
|
85
|
-
rdoc (6.3.
|
91
|
+
rdoc (6.3.2)
|
86
92
|
release-metrics (1.1.0)
|
87
93
|
csv
|
88
94
|
docopt
|
89
|
-
rexml (3.2.
|
95
|
+
rexml (3.2.5)
|
90
96
|
ronn (0.7.3)
|
91
97
|
hpricot (>= 0.8.2)
|
92
98
|
mustache (>= 0.7.0)
|
@@ -116,15 +122,15 @@ GEM
|
|
116
122
|
unicode-display_width (~> 1.0, >= 1.0.1)
|
117
123
|
rubocop-i18n (1.2.0)
|
118
124
|
rubocop (~> 0.49.0)
|
119
|
-
ruby-prof (1.4.
|
125
|
+
ruby-prof (1.4.3)
|
120
126
|
ruby-progressbar (1.11.0)
|
121
|
-
semantic_puppet (1.0.
|
127
|
+
semantic_puppet (1.0.4)
|
122
128
|
text (1.3.1)
|
123
129
|
thor (1.1.0)
|
124
|
-
unicode-display_width (1.
|
130
|
+
unicode-display_width (1.8.0)
|
125
131
|
vcr (5.1.0)
|
126
|
-
webmock (3.
|
127
|
-
addressable (>= 2.
|
132
|
+
webmock (3.14.0)
|
133
|
+
addressable (>= 2.8.0)
|
128
134
|
crack (>= 0.3.2)
|
129
135
|
hashdiff (>= 0.4.0, < 2.0.0)
|
130
136
|
yard (0.9.26)
|
@@ -142,12 +148,12 @@ DEPENDENCIES
|
|
142
148
|
memory_profiler
|
143
149
|
minitar (~> 0.9)
|
144
150
|
msgpack (~> 1.2)
|
145
|
-
packaging
|
151
|
+
packaging!
|
146
152
|
pry
|
147
153
|
puppet!
|
148
154
|
puppet-resource_api (~> 1.5)
|
149
155
|
puppetserver-ca (~> 1.1)
|
150
|
-
racc (= 1.
|
156
|
+
racc (= 1.5.2)
|
151
157
|
rake (~> 12.2)
|
152
158
|
rdoc (~> 6.0)
|
153
159
|
ronn (~> 0.7.3)
|
data/README.md
CHANGED
@@ -33,16 +33,16 @@ see the [Quick Start to Developing on Puppet](docs/quickstart.md) guide.
|
|
33
33
|
|
34
34
|
We'd love to get contributions from you! For a quick guide to getting your
|
35
35
|
system setup for developing, take a look at our [Quickstart
|
36
|
-
Guide](https://github.com/puppetlabs/puppet/blob/
|
37
|
-
[Contribution Documents](https://github.com/puppetlabs/puppet/blob/
|
36
|
+
Guide](https://github.com/puppetlabs/puppet/blob/main/docs/quickstart.md). Once you are up and running, take a look at the
|
37
|
+
[Contribution Documents](https://github.com/puppetlabs/puppet/blob/main/CONTRIBUTING.md) to see how to get your changes merged
|
38
38
|
in.
|
39
39
|
|
40
40
|
For more complete docs on developing with Puppet, take a look at the
|
41
|
-
rest of the [developer documents](https://github.com/puppetlabs/puppet/blob/
|
41
|
+
rest of the [developer documents](https://github.com/puppetlabs/puppet/blob/main/docs/index.md).
|
42
42
|
|
43
43
|
## Licensing
|
44
44
|
|
45
|
-
See [LICENSE](https://github.com/puppetlabs/puppet/blob/
|
45
|
+
See [LICENSE](https://github.com/puppetlabs/puppet/blob/main/LICENSE) file. Puppet is licensed by Puppet, Inc. under the Apache license. Puppet, Inc. can be contacted at: info@puppet.com
|
46
46
|
|
47
47
|
## Support
|
48
48
|
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/ext/README.md
ADDED
@@ -0,0 +1,13 @@
|
|
1
|
+
# `ext/` directory details
|
2
|
+
This directory contains files used internally when packaging [puppet](https://github.com/puppetlabs/puppet) and [puppet-agent](https://github.com/puppetlabs/puppet-agent)
|
3
|
+
What follows is a more detailed description of each directory/file:
|
4
|
+
* `debian/` - init scripts for puppet (used for Debian-based platforms that do not support systemd)
|
5
|
+
* `hiera/hiera.yaml` - installed to `$codedir/environments/production`as a default Hiera configuration file
|
6
|
+
* `osx/puppet.plist` - puppet launchd plist for macOS
|
7
|
+
* `redhat/` - init scripts for puppet (used for EL-based platforms that do not support systemd)
|
8
|
+
* `solaris/smf/` - service manifests for Solaris 11
|
9
|
+
* `suse/client.init` - init script for puppet (used for SUSE-based platforms that do not support systemd)
|
10
|
+
* `systemd/puppet.service` - systemd unit file for puppet
|
11
|
+
* `windows/` - the puppet daemon for Windows, and other useful `.bat` helper wrappers
|
12
|
+
* `build_defaults.yaml` - information pertaining to the puppetlabs build automation
|
13
|
+
* `project_data.yaml` - information used when packaging the puppet gem
|
data/ext/osx/puppet.plist
CHANGED
data/ext/project_data.yaml
CHANGED
@@ -13,6 +13,7 @@ gem_files: '[A-Z]* install.rb bin lib conf man examples ext tasks spec locales'
|
|
13
13
|
gem_test_files: 'spec/**/*'
|
14
14
|
gem_executables: 'puppet'
|
15
15
|
gem_default_executables: 'puppet'
|
16
|
+
gem_license: 'Apache-2.0'
|
16
17
|
gem_forge_project: 'puppet'
|
17
18
|
gem_required_ruby_version: '>= 2.3.0'
|
18
19
|
gem_required_rubygems_version: '> 1.3.1'
|
@@ -41,7 +42,7 @@ gem_platform_dependencies:
|
|
41
42
|
gem_runtime_dependencies:
|
42
43
|
ffi: ['> 1.9.24', '< 2']
|
43
44
|
# win32-xxxx gems are pinned due to PUP-6445
|
44
|
-
win32-dir: '
|
45
|
+
win32-dir: ['>= 0.4.9', '<= 0.7.2']
|
45
46
|
win32-process: '= 0.7.5'
|
46
47
|
# Use of win32-security is deprecated
|
47
48
|
win32-security: '= 0.2.5'
|
@@ -51,7 +52,7 @@ gem_platform_dependencies:
|
|
51
52
|
gem_runtime_dependencies:
|
52
53
|
ffi: ['> 1.9.24', '< 2']
|
53
54
|
# win32-xxxx gems are pinned due to PUP-6445
|
54
|
-
win32-dir: '
|
55
|
+
win32-dir: ['>= 0.4.9', '<= 0.7.2']
|
55
56
|
win32-process: '= 0.7.5'
|
56
57
|
# Use of win32-security is deprecated
|
57
58
|
win32-security: '= 0.2.5'
|
@@ -133,9 +133,12 @@ Some flags are meant specifically for interactive use --- in particular,
|
|
133
133
|
'test', 'tags' and 'fingerprint' are useful.
|
134
134
|
|
135
135
|
'--test' runs once in the foreground with verbose logging, then exits.
|
136
|
-
It also exits if it can't get a valid catalog. `--test` includes the
|
136
|
+
It also exits if it can't get a valid catalog. `--test` includes the
|
137
|
+
'--detailed-exitcodes' option by default and exits with one of the following
|
138
|
+
exit codes:
|
137
139
|
|
138
|
-
* 0: The run succeeded with no changes or failures; the system was already in
|
140
|
+
* 0: The run succeeded with no changes or failures; the system was already in
|
141
|
+
the desired state.
|
139
142
|
* 1: The run failed, or wasn't attempted due to another run already in progress.
|
140
143
|
* 2: The run succeeded, and some resources were changed.
|
141
144
|
* 4: The run succeeded, and some resources failed.
|
@@ -246,7 +249,9 @@ generated by running puppet agent with '--genconfig'.
|
|
246
249
|
'puppet agent' exits after executing this.
|
247
250
|
|
248
251
|
* --evaltrace:
|
249
|
-
Logs each resource as it is being evaluated. This allows you to interactively
|
252
|
+
Logs each resource as it is being evaluated. This allows you to interactively
|
253
|
+
see exactly what is being done. (This is a Puppet setting, and can go in
|
254
|
+
puppet.conf. Note the special 'no-' prefix for boolean settings on the command line.)
|
250
255
|
|
251
256
|
* --fingerprint:
|
252
257
|
Display the current certificate or certificate signing request
|
@@ -267,7 +272,8 @@ generated by running puppet agent with '--genconfig'.
|
|
267
272
|
service), 'eventlog' (the Windows Event Log), 'console', or the path to a log
|
268
273
|
file. If debugging or verbosity is enabled, this defaults to 'console'.
|
269
274
|
Otherwise, it defaults to 'syslog' on POSIX systems and 'eventlog' on Windows.
|
270
|
-
Multiple destinations can be set using a comma separated list
|
275
|
+
Multiple destinations can be set using a comma separated list
|
276
|
+
(eg: `/path/file1,console,/path/file2`)"
|
271
277
|
|
272
278
|
A path ending with '.json' will receive structured output in JSON format. The
|
273
279
|
log file will not have an ending ']' automatically written to it due to the
|
@@ -310,7 +316,8 @@ generated by running puppet agent with '--genconfig'.
|
|
310
316
|
'no-splay', and 'show_diff'.
|
311
317
|
|
312
318
|
* --trace
|
313
|
-
Prints stack traces on some errors. (This is a Puppet setting, and can go in
|
319
|
+
Prints stack traces on some errors. (This is a Puppet setting, and can go in
|
320
|
+
puppet.conf. Note the special 'no-' prefix for boolean settings on the command line.)
|
314
321
|
|
315
322
|
* --verbose:
|
316
323
|
Turn on verbose reporting.
|
@@ -327,6 +334,10 @@ generated by running puppet agent with '--genconfig'.
|
|
327
334
|
specifying a time of 0.
|
328
335
|
(This is a Puppet setting, and can go in puppet.conf.)
|
329
336
|
|
337
|
+
* --write_catalog_summary
|
338
|
+
After compiling the catalog saves the resource list and classes list to the node
|
339
|
+
in the state directory named classes.txt and resources.txt
|
340
|
+
(This is a Puppet setting, and can go in puppet.conf.)
|
330
341
|
|
331
342
|
EXAMPLE
|
332
343
|
-------
|
@@ -16,7 +16,9 @@ class Puppet::Application::Apply < Puppet::Application
|
|
16
16
|
option("--use-nodes")
|
17
17
|
option("--detailed-exitcodes")
|
18
18
|
|
19
|
-
option("--write-catalog-summary")
|
19
|
+
option("--write-catalog-summary") do |arg|
|
20
|
+
Puppet[:write_catalog_summary] = arg
|
21
|
+
end
|
20
22
|
|
21
23
|
option("--catalog catalog", "-c catalog") do |arg|
|
22
24
|
options[:catalog] = arg
|
@@ -113,7 +115,8 @@ configuration options by running puppet with
|
|
113
115
|
Where to send log messages. Choose between 'syslog' (the POSIX syslog
|
114
116
|
service), 'eventlog' (the Windows Event Log), 'console', or the path to a log
|
115
117
|
file. Defaults to 'console'.
|
116
|
-
Multiple destinations can be set using a comma separated list
|
118
|
+
Multiple destinations can be set using a comma separated list
|
119
|
+
(eg: `/path/file1,console,/path/file2`)"
|
117
120
|
|
118
121
|
A path ending with '.json' will receive structured output in JSON format. The
|
119
122
|
log file will not have an ending ']' automatically written to it due to the
|
@@ -168,6 +171,7 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
|
|
168
171
|
def app_defaults
|
169
172
|
super.merge({
|
170
173
|
:default_file_terminus => :file_server,
|
174
|
+
:write_catalog_summary => false
|
171
175
|
})
|
172
176
|
end
|
173
177
|
|
@@ -246,7 +250,22 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
|
|
246
250
|
|
247
251
|
catalog.retrieval_duration = Time.now - starttime
|
248
252
|
|
249
|
-
|
253
|
+
# We accept either the global option `--write_catalog_summary`
|
254
|
+
# corresponding to the new setting, or the application option
|
255
|
+
# `--write-catalog-summary`. The latter is needed to maintain backwards
|
256
|
+
# compatibility.
|
257
|
+
#
|
258
|
+
# Puppet settings parse global options using PuppetOptionParser, but it
|
259
|
+
# only recognizes underscores, not dashes.
|
260
|
+
# The base application parses app specific options using ruby's builtin
|
261
|
+
# OptionParser. As of ruby 2.4, it will accept either underscores or
|
262
|
+
# dashes, but prefer dashes.
|
263
|
+
#
|
264
|
+
# So if underscores are used, the PuppetOptionParser will parse it and
|
265
|
+
# store that in Puppet[:write_catalog_summary]. If dashes are used,
|
266
|
+
# OptionParser will parse it, and set Puppet[:write_catalog_summary]. In
|
267
|
+
# either case, settings will contain the correct value.
|
268
|
+
if Puppet[:write_catalog_summary]
|
250
269
|
catalog.write_class_file
|
251
270
|
catalog.write_resource_file
|
252
271
|
end
|
@@ -155,7 +155,8 @@ you can specify '--server <servername>' as an argument.
|
|
155
155
|
Where to send log messages. Choose between 'syslog' (the POSIX syslog
|
156
156
|
service), 'console', or the path to a log file. If debugging or verbosity is
|
157
157
|
enabled, this defaults to 'console'. Otherwise, it defaults to 'syslog'.
|
158
|
-
Multiple destinations can be set using a comma separated list
|
158
|
+
Multiple destinations can be set using a comma separated list
|
159
|
+
(eg: `/path/file1,console,/path/file2`)"
|
159
160
|
|
160
161
|
A path ending with '.json' will receive structured output in JSON format. The
|
161
162
|
log file will not have an ending ']' automatically written to it due to the
|
@@ -1,6 +1,7 @@
|
|
1
1
|
require 'puppet/application'
|
2
2
|
|
3
3
|
class Puppet::Application::Resource < Puppet::Application
|
4
|
+
environment_mode :not_required
|
4
5
|
|
5
6
|
attr_accessor :host, :extra_params
|
6
7
|
|
@@ -14,8 +15,9 @@ class Puppet::Application::Resource < Puppet::Application
|
|
14
15
|
option("--to_yaml","-y")
|
15
16
|
|
16
17
|
option("--types", "-t") do |arg|
|
18
|
+
env = Puppet.lookup(:environments).get(Puppet[:environment]) || create_default_environment
|
17
19
|
types = []
|
18
|
-
Puppet::Type.loadall
|
20
|
+
Puppet::Type.typeloader.loadall(env)
|
19
21
|
Puppet::Type.eachtype do |t|
|
20
22
|
next if t.name == :component
|
21
23
|
types << t.name.to_s
|
@@ -101,7 +103,8 @@ configuration options can also be generated by running puppet with
|
|
101
103
|
Print extra information.
|
102
104
|
|
103
105
|
* --to_yaml:
|
104
|
-
Output found resources in yaml format, suitable to use with Hiera and
|
106
|
+
Output found resources in yaml format, suitable to use with Hiera and
|
107
|
+
create_resources.
|
105
108
|
|
106
109
|
EXAMPLE
|
107
110
|
-------
|
@@ -133,7 +136,9 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
|
|
133
136
|
end
|
134
137
|
|
135
138
|
def main
|
136
|
-
|
139
|
+
# If the specified environment does not exist locally, fall back to the default (production) environment
|
140
|
+
env = Puppet.lookup(:environments).get(Puppet[:environment]) || create_default_environment
|
141
|
+
|
137
142
|
Puppet.override(:current_environment => env, :loaders => Puppet::Pops::Loaders.new(env)) do
|
138
143
|
type, name, params = parse_args(command_line.args)
|
139
144
|
|
@@ -208,24 +213,35 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
|
|
208
213
|
[type, name, params]
|
209
214
|
end
|
210
215
|
|
216
|
+
def create_default_environment
|
217
|
+
Puppet.debug("Specified environment '#{Puppet[:environment]}' does not exist on the filesystem, defaulting to 'production'")
|
218
|
+
Puppet[:environment] = :production
|
219
|
+
basemodulepath = Puppet::Node::Environment.split_path(Puppet[:basemodulepath])
|
220
|
+
modulepath = Puppet[:modulepath]
|
221
|
+
modulepath = (modulepath.nil? || modulepath.empty?) ? basemodulepath : Puppet::Node::Environment.split_path(modulepath)
|
222
|
+
Puppet::Node::Environment.create(Puppet[:environment], modulepath, Puppet::Node::Environment::NO_MANIFEST)
|
223
|
+
end
|
224
|
+
|
211
225
|
def find_or_save_resources(type, name, params)
|
212
226
|
key = local_key(type, name)
|
213
227
|
|
214
|
-
|
215
|
-
if
|
216
|
-
|
228
|
+
Puppet.override(stringify_rich: true) do
|
229
|
+
if name
|
230
|
+
if params.empty?
|
231
|
+
[ Puppet::Resource.indirection.find( key ) ]
|
232
|
+
else
|
233
|
+
resource = Puppet::Resource.new( type, name, :parameters => params )
|
234
|
+
|
235
|
+
# save returns [resource that was saved, transaction log from applying the resource]
|
236
|
+
save_result = Puppet::Resource.indirection.save(resource, key)
|
237
|
+
[ save_result.first ]
|
238
|
+
end
|
217
239
|
else
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
[ save_result.first ]
|
223
|
-
end
|
224
|
-
else
|
225
|
-
if type == "file"
|
226
|
-
raise _("Listing all file instances is not supported. Please specify a file or directory, e.g. puppet resource file /etc")
|
240
|
+
if type == "file"
|
241
|
+
raise _("Listing all file instances is not supported. Please specify a file or directory, e.g. puppet resource file /etc")
|
242
|
+
end
|
243
|
+
Puppet::Resource.indirection.search( key, {} )
|
227
244
|
end
|
228
|
-
Puppet::Resource.indirection.search( key, {} )
|
229
245
|
end
|
230
246
|
end
|
231
247
|
end
|
@@ -71,7 +71,8 @@ configuration options can also be generated by running puppet with
|
|
71
71
|
Where to send log messages. Choose between 'syslog' (the POSIX syslog
|
72
72
|
service), 'eventlog' (the Windows Event Log), 'console', or the path to a log
|
73
73
|
file. Defaults to 'console'.
|
74
|
-
Multiple destinations can be set using a comma separated list
|
74
|
+
Multiple destinations can be set using a comma separated list
|
75
|
+
(eg: `/path/file1,console,/path/file2`)"
|
75
76
|
|
76
77
|
A path ending with '.json' will receive structured output in JSON format. The
|
77
78
|
log file will not have an ending ']' automatically written to it due to the
|
@@ -74,6 +74,9 @@ ACTIONS
|
|
74
74
|
`--localca` is specified, then also remove this host's local copy of the
|
75
75
|
CA certificate(s) and CRL bundle. if `--target CERTNAME` is specified, then
|
76
76
|
remove the files for the specified device on this host instead of this host.
|
77
|
+
|
78
|
+
* show:
|
79
|
+
Print the full-text version of this host's certificate.
|
77
80
|
HELP
|
78
81
|
end
|
79
82
|
|
@@ -114,6 +117,7 @@ HELP
|
|
114
117
|
end
|
115
118
|
|
116
119
|
Puppet::SSL::Oids.register_puppet_oids
|
120
|
+
Puppet::SSL::Oids.load_custom_oid_file(Puppet[:trusted_oid_mapping_file])
|
117
121
|
|
118
122
|
certname = Puppet[:certname]
|
119
123
|
action = command_line.args.first
|
@@ -142,11 +146,19 @@ HELP
|
|
142
146
|
end
|
143
147
|
@machine.ensure_client_certificate
|
144
148
|
Puppet.notice(_("Completed SSL initialization"))
|
149
|
+
when 'show'
|
150
|
+
show(certname)
|
145
151
|
else
|
146
152
|
raise Puppet::Error, _("Unknown action '%{action}'") % { action: action }
|
147
153
|
end
|
148
154
|
end
|
149
155
|
|
156
|
+
def show(certname)
|
157
|
+
password = @cert_provider.load_private_key_password
|
158
|
+
ssl_context = @ssl_provider.load_context(certname: certname, password: password)
|
159
|
+
puts ssl_context.client_cert.to_text
|
160
|
+
end
|
161
|
+
|
150
162
|
def submit_request(ssl_context)
|
151
163
|
key = @cert_provider.load_private_key(Puppet[:certname])
|
152
164
|
unless key
|