puppet 7.9.0-universal-darwin → 7.12.1-universal-darwin

Sign up to get free protection for your applications and to get access to all the features.
Files changed (292) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +2 -2
  3. data/Gemfile.lock +12 -12
  4. data/{ext → examples/enc}/regexp_nodes/classes/databases +0 -0
  5. data/{ext → examples/enc}/regexp_nodes/classes/webservers +0 -0
  6. data/{ext → examples/enc}/regexp_nodes/environment/development +0 -0
  7. data/{ext → examples/enc}/regexp_nodes/parameters/service/prod +0 -0
  8. data/{ext → examples/enc}/regexp_nodes/parameters/service/qa +0 -0
  9. data/{ext → examples/enc}/regexp_nodes/parameters/service/sandbox +0 -0
  10. data/{ext → examples/enc}/regexp_nodes/regexp_nodes.rb +0 -0
  11. data/{ext → examples}/nagios/check_puppet.rb +2 -2
  12. data/ext/README.md +13 -0
  13. data/lib/puppet/application/agent.rb +4 -0
  14. data/lib/puppet/application/apply.rb +20 -2
  15. data/lib/puppet/application/resource.rb +15 -13
  16. data/lib/puppet/concurrent/thread_local_singleton.rb +1 -0
  17. data/lib/puppet/configurer.rb +236 -58
  18. data/lib/puppet/confine/variable.rb +1 -1
  19. data/lib/puppet/defaults.rb +66 -29
  20. data/lib/puppet/environments.rb +66 -26
  21. data/lib/puppet/facter_impl.rb +96 -0
  22. data/lib/puppet/file_serving/configuration/parser.rb +2 -0
  23. data/lib/puppet/file_serving/configuration.rb +2 -0
  24. data/lib/puppet/file_serving/mount/file.rb +4 -4
  25. data/lib/puppet/file_serving/mount/scripts.rb +24 -0
  26. data/lib/puppet/file_system/file_impl.rb +3 -1
  27. data/lib/puppet/file_system.rb +2 -1
  28. data/lib/puppet/forge.rb +1 -1
  29. data/lib/puppet/functions/find_template.rb +2 -2
  30. data/lib/puppet/http/client.rb +1 -1
  31. data/lib/puppet/http/redirector.rb +5 -0
  32. data/lib/puppet/http/service/compiler.rb +6 -1
  33. data/lib/puppet/indirector/catalog/compiler.rb +24 -6
  34. data/lib/puppet/indirector/catalog/rest.rb +1 -0
  35. data/lib/puppet/indirector/facts/facter.rb +6 -6
  36. data/lib/puppet/indirector/indirection.rb +1 -1
  37. data/lib/puppet/indirector/terminus.rb +4 -0
  38. data/lib/puppet/module/plan.rb +0 -1
  39. data/lib/puppet/module/task.rb +1 -1
  40. data/lib/puppet/module_tool/applications/installer.rb +8 -4
  41. data/lib/puppet/module_tool/applications/uninstaller.rb +1 -1
  42. data/lib/puppet/module_tool/applications/upgrader.rb +1 -1
  43. data/lib/puppet/network/http/api/indirected_routes.rb +1 -1
  44. data/lib/puppet/node/environment.rb +10 -11
  45. data/lib/puppet/pal/pal_impl.rb +1 -1
  46. data/lib/puppet/parser/resource.rb +1 -1
  47. data/lib/puppet/parser/scope.rb +8 -7
  48. data/lib/puppet/parser/templatewrapper.rb +1 -0
  49. data/lib/puppet/pops/evaluator/closure.rb +7 -5
  50. data/lib/puppet/pops/evaluator/runtime3_resource_support.rb +1 -0
  51. data/lib/puppet/pops/lookup/lookup_adapter.rb +3 -2
  52. data/lib/puppet/pops/model/ast.rb +1 -0
  53. data/lib/puppet/pops/model/factory.rb +14 -13
  54. data/lib/puppet/pops/parser/egrammar.ra +2 -2
  55. data/lib/puppet/pops/parser/eparser.rb +752 -753
  56. data/lib/puppet/pops/parser/lexer2.rb +69 -68
  57. data/lib/puppet/pops/parser/slurp_support.rb +1 -0
  58. data/lib/puppet/pops/serialization/to_data_converter.rb +18 -6
  59. data/lib/puppet/pops/serialization/to_stringified_converter.rb +1 -1
  60. data/lib/puppet/pops/types/type_formatter.rb +7 -6
  61. data/lib/puppet/pops/types/types.rb +1 -1
  62. data/lib/puppet/provider/aix_object.rb +1 -1
  63. data/lib/puppet/provider/group/groupadd.rb +5 -2
  64. data/lib/puppet/provider/package/pkg.rb +19 -2
  65. data/lib/puppet/provider/package/puppet_gem.rb +1 -1
  66. data/lib/puppet/provider/package/puppetserver_gem.rb +1 -1
  67. data/lib/puppet/provider/package/yum.rb +1 -1
  68. data/lib/puppet/provider/service/base.rb +1 -1
  69. data/lib/puppet/provider/service/init.rb +5 -5
  70. data/lib/puppet/provider/service/launchd.rb +2 -2
  71. data/lib/puppet/provider/service/redhat.rb +1 -1
  72. data/lib/puppet/provider/service/smf.rb +3 -3
  73. data/lib/puppet/provider/service/systemd.rb +2 -2
  74. data/lib/puppet/provider/service/upstart.rb +5 -5
  75. data/lib/puppet/provider/user/aix.rb +44 -1
  76. data/lib/puppet/provider/user/directoryservice.rb +1 -1
  77. data/lib/puppet/provider/user/useradd.rb +72 -16
  78. data/lib/puppet/provider.rb +1 -1
  79. data/lib/puppet/reference/providers.rb +2 -2
  80. data/lib/puppet/resource/catalog.rb +1 -1
  81. data/lib/puppet/resource/type_collection.rb +2 -1
  82. data/lib/puppet/resource.rb +38 -5
  83. data/lib/puppet/runtime.rb +11 -1
  84. data/lib/puppet/settings/file_setting.rb +3 -8
  85. data/lib/puppet/settings.rb +2 -2
  86. data/lib/puppet/test/test_helper.rb +4 -1
  87. data/lib/puppet/transaction/persistence.rb +11 -1
  88. data/lib/puppet/transaction/report.rb +15 -1
  89. data/lib/puppet/type/exec.rb +19 -2
  90. data/lib/puppet/type/file.rb +6 -6
  91. data/lib/puppet/type/filebucket.rb +2 -2
  92. data/lib/puppet/type/group.rb +0 -1
  93. data/lib/puppet/type/resources.rb +1 -1
  94. data/lib/puppet/type/service.rb +8 -3
  95. data/lib/puppet/type/user.rb +0 -1
  96. data/lib/puppet/type.rb +1 -1
  97. data/lib/puppet/util/autoload.rb +1 -1
  98. data/lib/puppet/util/command_line.rb +1 -1
  99. data/lib/puppet/util/filetype.rb +2 -2
  100. data/lib/puppet/util/json.rb +3 -0
  101. data/lib/puppet/util/log.rb +1 -2
  102. data/lib/puppet/util/logging.rb +1 -25
  103. data/lib/puppet/util/pidlock.rb +1 -1
  104. data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +1 -1
  105. data/lib/puppet/util/suidmanager.rb +1 -2
  106. data/lib/puppet/util/tagging.rb +1 -0
  107. data/lib/puppet/util/windows/service.rb +0 -5
  108. data/lib/puppet/util/windows/user.rb +0 -1
  109. data/lib/puppet/util/windows.rb +3 -0
  110. data/lib/puppet/util.rb +4 -3
  111. data/lib/puppet/version.rb +1 -1
  112. data/lib/puppet.rb +2 -6
  113. data/locales/puppet.pot +265 -221
  114. data/man/man5/puppet.conf.5 +73 -25
  115. data/man/man8/puppet-agent.8 +4 -1
  116. data/man/man8/puppet-apply.8 +1 -1
  117. data/man/man8/puppet-catalog.8 +1 -1
  118. data/man/man8/puppet-config.8 +1 -1
  119. data/man/man8/puppet-describe.8 +1 -1
  120. data/man/man8/puppet-device.8 +1 -1
  121. data/man/man8/puppet-doc.8 +1 -1
  122. data/man/man8/puppet-epp.8 +1 -1
  123. data/man/man8/puppet-facts.8 +1 -1
  124. data/man/man8/puppet-filebucket.8 +1 -1
  125. data/man/man8/puppet-generate.8 +1 -1
  126. data/man/man8/puppet-help.8 +1 -1
  127. data/man/man8/puppet-lookup.8 +1 -1
  128. data/man/man8/puppet-module.8 +3 -3
  129. data/man/man8/puppet-node.8 +1 -1
  130. data/man/man8/puppet-parser.8 +1 -1
  131. data/man/man8/puppet-plugin.8 +1 -1
  132. data/man/man8/puppet-report.8 +1 -1
  133. data/man/man8/puppet-resource.8 +1 -1
  134. data/man/man8/puppet-script.8 +1 -1
  135. data/man/man8/puppet-ssl.8 +1 -1
  136. data/man/man8/puppet.8 +2 -2
  137. data/spec/fixtures/integration/application/agent/cached_deferred_catalog.json +2 -1
  138. data/spec/fixtures/integration/application/agent/lib/facter/agent_spec_role.rb +3 -0
  139. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/Gemfile +4 -0
  140. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/Rakefile +3 -0
  141. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/lib/puppet/functions/l10n.rb +8 -0
  142. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/config.yaml +25 -0
  143. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/ja/puppet-l10n.po +19 -0
  144. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/puppet-l10n.pot +20 -0
  145. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/metadata.json +8 -0
  146. data/spec/integration/application/agent_spec.rb +146 -52
  147. data/spec/integration/application/filebucket_spec.rb +5 -0
  148. data/spec/integration/configurer_spec.rb +18 -2
  149. data/spec/integration/indirector/facts/facter_spec.rb +3 -3
  150. data/spec/integration/l10n/compiler_spec.rb +37 -0
  151. data/spec/integration/parser/pcore_resource_spec.rb +10 -0
  152. data/spec/integration/transaction/report_spec.rb +1 -1
  153. data/spec/integration/type/file_spec.rb +2 -2
  154. data/spec/integration/type/package_spec.rb +6 -6
  155. data/spec/integration/util/rdoc/parser_spec.rb +1 -1
  156. data/spec/integration/util/windows/process_spec.rb +1 -9
  157. data/spec/lib/puppet_spec/modules.rb +13 -2
  158. data/spec/lib/puppet_spec/puppetserver.rb +15 -0
  159. data/spec/shared_behaviours/documentation_on_faces.rb +0 -2
  160. data/spec/shared_contexts/l10n.rb +27 -0
  161. data/spec/spec_helper.rb +1 -10
  162. data/spec/unit/application/apply_spec.rb +76 -56
  163. data/spec/unit/application/resource_spec.rb +29 -0
  164. data/spec/unit/configurer_spec.rb +353 -57
  165. data/spec/unit/environments_spec.rb +150 -1
  166. data/spec/unit/facter_impl_spec.rb +31 -0
  167. data/spec/unit/file_bucket/dipper_spec.rb +2 -2
  168. data/spec/unit/file_serving/configuration/parser_spec.rb +23 -0
  169. data/spec/unit/file_serving/configuration_spec.rb +12 -4
  170. data/spec/unit/file_serving/mount/scripts_spec.rb +69 -0
  171. data/spec/unit/file_system_spec.rb +7 -0
  172. data/spec/unit/functions/logging_spec.rb +1 -0
  173. data/spec/unit/functions/lookup_spec.rb +64 -0
  174. data/spec/unit/http/client_spec.rb +58 -1
  175. data/spec/unit/http/service/compiler_spec.rb +8 -0
  176. data/spec/unit/indirector/catalog/compiler_spec.rb +87 -0
  177. data/spec/unit/indirector/catalog/rest_spec.rb +8 -0
  178. data/spec/unit/indirector/indirection_spec.rb +10 -3
  179. data/spec/unit/interface/action_spec.rb +0 -9
  180. data/spec/unit/module_spec.rb +14 -0
  181. data/spec/unit/module_tool/applications/installer_spec.rb +39 -12
  182. data/spec/unit/network/formats_spec.rb +6 -0
  183. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -11
  184. data/spec/unit/pops/serialization/to_from_hr_spec.rb +58 -0
  185. data/spec/unit/pops/serialization/to_stringified_spec.rb +5 -0
  186. data/spec/unit/pops/types/type_calculator_spec.rb +6 -0
  187. data/spec/unit/provider/package/gem_spec.rb +1 -1
  188. data/spec/unit/provider/package/pip2_spec.rb +1 -1
  189. data/spec/unit/provider/package/pip3_spec.rb +1 -1
  190. data/spec/unit/provider/package/pip_spec.rb +1 -1
  191. data/spec/unit/provider/package/pkg_spec.rb +34 -5
  192. data/spec/unit/provider/package/puppet_gem_spec.rb +1 -1
  193. data/spec/unit/provider/package/puppetserver_gem_spec.rb +1 -1
  194. data/spec/unit/provider/service/launchd_spec.rb +11 -0
  195. data/spec/unit/provider/service/systemd_spec.rb +1 -1
  196. data/spec/unit/provider/user/aix_spec.rb +100 -0
  197. data/spec/unit/provider/user/directoryservice_spec.rb +1 -1
  198. data/spec/unit/provider/user/useradd_spec.rb +43 -2
  199. data/spec/unit/provider_spec.rb +4 -4
  200. data/spec/unit/puppet_spec.rb +12 -4
  201. data/spec/unit/resource/catalog_spec.rb +14 -1
  202. data/spec/unit/resource_spec.rb +58 -2
  203. data/spec/unit/settings/file_setting_spec.rb +10 -7
  204. data/spec/unit/type/service_spec.rb +27 -0
  205. data/spec/unit/type_spec.rb +2 -2
  206. data/spec/unit/util/autoload_spec.rb +25 -8
  207. data/spec/unit/util/logging_spec.rb +2 -0
  208. data/tasks/parallel.rake +3 -3
  209. metadata +37 -94
  210. data/ext/README.environment +0 -8
  211. data/ext/dbfix.sql +0 -132
  212. data/ext/debian/README.Debian +0 -8
  213. data/ext/debian/README.source +0 -2
  214. data/ext/debian/TODO.Debian +0 -1
  215. data/ext/debian/changelog.erb +0 -1122
  216. data/ext/debian/compat +0 -1
  217. data/ext/debian/control +0 -144
  218. data/ext/debian/copyright +0 -339
  219. data/ext/debian/docs +0 -1
  220. data/ext/debian/fileserver.conf +0 -41
  221. data/ext/debian/puppet-common.dirs +0 -13
  222. data/ext/debian/puppet-common.install +0 -3
  223. data/ext/debian/puppet-common.lintian-overrides +0 -5
  224. data/ext/debian/puppet-common.manpages +0 -28
  225. data/ext/debian/puppet-common.postinst +0 -35
  226. data/ext/debian/puppet-common.postrm +0 -33
  227. data/ext/debian/puppet-el.dirs +0 -1
  228. data/ext/debian/puppet-el.emacsen-install +0 -25
  229. data/ext/debian/puppet-el.emacsen-remove +0 -11
  230. data/ext/debian/puppet-el.emacsen-startup +0 -9
  231. data/ext/debian/puppet-el.install +0 -1
  232. data/ext/debian/puppet-testsuite.install +0 -2
  233. data/ext/debian/puppet-testsuite.lintian-overrides +0 -4
  234. data/ext/debian/puppet.lintian-overrides +0 -3
  235. data/ext/debian/puppet.logrotate +0 -20
  236. data/ext/debian/puppet.postinst +0 -20
  237. data/ext/debian/puppet.postrm +0 -20
  238. data/ext/debian/puppet.preinst +0 -20
  239. data/ext/debian/puppetmaster-common.install +0 -2
  240. data/ext/debian/puppetmaster-common.manpages +0 -2
  241. data/ext/debian/puppetmaster-common.postinst +0 -6
  242. data/ext/debian/puppetmaster-passenger.dirs +0 -4
  243. data/ext/debian/puppetmaster-passenger.postinst +0 -162
  244. data/ext/debian/puppetmaster-passenger.postrm +0 -61
  245. data/ext/debian/puppetmaster.README.debian +0 -17
  246. data/ext/debian/puppetmaster.default +0 -14
  247. data/ext/debian/puppetmaster.init +0 -137
  248. data/ext/debian/puppetmaster.lintian-overrides +0 -3
  249. data/ext/debian/puppetmaster.postinst +0 -20
  250. data/ext/debian/puppetmaster.postrm +0 -5
  251. data/ext/debian/puppetmaster.preinst +0 -22
  252. data/ext/debian/rules +0 -132
  253. data/ext/debian/source/format +0 -1
  254. data/ext/debian/source/options +0 -1
  255. data/ext/debian/vim-puppet.README.Debian +0 -13
  256. data/ext/debian/vim-puppet.dirs +0 -5
  257. data/ext/debian/vim-puppet.yaml +0 -7
  258. data/ext/debian/watch +0 -2
  259. data/ext/freebsd/puppetd +0 -26
  260. data/ext/freebsd/puppetmasterd +0 -26
  261. data/ext/gentoo/conf.d/puppet +0 -5
  262. data/ext/gentoo/conf.d/puppetmaster +0 -12
  263. data/ext/gentoo/init.d/puppet +0 -38
  264. data/ext/gentoo/init.d/puppetmaster +0 -51
  265. data/ext/gentoo/puppet/fileserver.conf +0 -41
  266. data/ext/ips/puppet-agent +0 -44
  267. data/ext/ips/puppet-master +0 -44
  268. data/ext/ips/puppet.p5m.erb +0 -12
  269. data/ext/ips/puppetagent.xml +0 -42
  270. data/ext/ips/puppetmaster.xml +0 -42
  271. data/ext/ips/rules +0 -19
  272. data/ext/ips/transforms +0 -34
  273. data/ext/ldap/puppet.schema +0 -24
  274. data/ext/logcheck/puppet +0 -23
  275. data/ext/osx/file_mapping.yaml +0 -28
  276. data/ext/osx/postflight.erb +0 -109
  277. data/ext/osx/preflight.erb +0 -52
  278. data/ext/osx/prototype.plist.erb +0 -38
  279. data/ext/redhat/fileserver.conf +0 -41
  280. data/ext/redhat/logrotate +0 -21
  281. data/ext/redhat/puppet.spec.erb +0 -841
  282. data/ext/redhat/server.init +0 -128
  283. data/ext/redhat/server.sysconfig +0 -13
  284. data/ext/solaris/pkginfo +0 -6
  285. data/ext/solaris/smf/puppetd.xml +0 -77
  286. data/ext/solaris/smf/puppetmasterd.xml +0 -77
  287. data/ext/solaris/smf/svc-puppetd +0 -71
  288. data/ext/solaris/smf/svc-puppetmasterd +0 -67
  289. data/ext/suse/puppet.spec +0 -310
  290. data/ext/suse/server.init +0 -173
  291. data/ext/yaml_nodes.rb +0 -105
  292. data/spec/unit/indirector/store_configs_spec.rb +0 -7
@@ -1,25 +0,0 @@
1
- #!/bin/sh
2
- #
3
- # emacsen install script for the Debian GNU/Linux puppet-el package
4
-
5
- FLAVOR=$1
6
- PACKAGE=puppet-el
7
-
8
- ELDIR=/usr/share/emacs/site-lisp/
9
- ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
10
- ELFILE="puppet-mode.el"
11
- FLAGS="-batch -no-site-file -l path.el -f batch-byte-compile"
12
-
13
- if [ ${FLAVOR} != emacs ]; then
14
- echo install/${PACKAGE}: Byte-compiling for ${FLAVOR}
15
-
16
- install -m 755 -d ${ELCDIR}
17
- cd ${ELDIR}
18
- cp ${ELFILE} ${ELCDIR}
19
- cd ${ELCDIR}
20
- cat << EOF > path.el
21
- (setq load-path (cons "." load-path) byte-compile-warnings nil)
22
- EOF
23
- ${FLAVOR} ${FLAGS} ${ELFILE}
24
- rm -f ${ELFILE} path.el
25
- fi
@@ -1,11 +0,0 @@
1
- #!/bin/sh
2
- set -e
3
-
4
- FLAVOR=$1
5
- PACKAGE=puppet-el
6
- ELCFILE=puppet-mode.elc
7
-
8
- if [ ${FLAVOR} != emacs ]; then
9
- echo remove/${PACKAGE}: Purging byte-compiled files for ${FLAVOR}
10
- rm -f /usr/share/${FLAVOR}/site-lisp/${ELCFILE}
11
- fi
@@ -1,9 +0,0 @@
1
- ;; -*-emacs-lisp-*-
2
- ;;
3
- ;; Emacs startup file for the Debian GNU/Linux puppet-el package
4
-
5
- (autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests")
6
-
7
- (add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode))
8
-
9
-
@@ -1 +0,0 @@
1
- ext/emacs/puppet-mode.el usr/share/emacs/site-lisp
@@ -1,2 +0,0 @@
1
- spec/* /usr/share/puppet-testsuite/spec
2
- Rakefile /usr/share/puppet-testsuite/
@@ -1,4 +0,0 @@
1
- # Upstream distributes it like this
2
- puppet-testsuite binary: executable-not-elf-or-script
3
- puppet-testsuite binary: script-not-executable
4
- puppet-testsuite binary: unusual-interpreter
@@ -1,3 +0,0 @@
1
- # Man pages are automatically generated, not much to do here
2
- puppet binary: manpage-has-bad-whatis-entry
3
- puppet binary: manpage-has-errors-from-man
@@ -1,20 +0,0 @@
1
- /var/log/puppetlabs/masterhttp.log /var/log/puppet/masterhttp.log {
2
- compress
3
- rotate 4
4
- missingok
5
- notifempty
6
- nocreate
7
- }
8
-
9
- /var/log/puppetlabs/puppetd.log /var/log/puppet/puppetd.log {
10
- compress
11
- rotate 4
12
- missingok
13
- notifempty
14
- nocreate
15
- sharedscripts
16
- postrotate
17
- ([ -x /etc/init.d/puppet ] && /etc/init.d/puppet reload > /dev/null 2>&1) ||
18
- ([ -x /usr/bin/systemctl ] && /usr/bin/systemctl kill -s USR2 puppet.service > /dev/null 2>&1) || true
19
- endscript
20
- }
@@ -1,20 +0,0 @@
1
- #!/bin/sh
2
-
3
- set -e
4
-
5
- # Remove renamed configuration files which are now handled by other
6
- # packages
7
- if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
8
-
9
- dpkg-maintscript-helper rm_conffile \
10
- /etc/logrotate.d/puppet 2.6.4-2 puppet -- "$@"
11
-
12
- dpkg-maintscript-helper rm_conffile \
13
- /etc/logcheck/ignore.d.server/puppet 2.6.4-2 puppet -- "$@"
14
-
15
- dpkg-maintscript-helper rm_conffile \
16
- /etc/emacs/site-start.d/50puppet-mode-init.el 2.6.4-2 puppet -- "$@"
17
-
18
- fi
19
-
20
- #DEBHELPER#
@@ -1,20 +0,0 @@
1
- #!/bin/sh
2
-
3
- set -e
4
-
5
- # Remove renamed configuration files which are now handled by other
6
- # packages
7
- if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
8
-
9
- dpkg-maintscript-helper rm_conffile \
10
- /etc/logrotate.d/puppet 2.6.4-2 puppet -- "$@"
11
-
12
- dpkg-maintscript-helper rm_conffile \
13
- /etc/logcheck/ignore.d.server/puppet 2.6.4-2 puppet -- "$@"
14
-
15
- dpkg-maintscript-helper rm_conffile \
16
- /etc/emacs/site-start.d/50puppet-mode-init.el 2.6.4-2 puppet -- "$@"
17
-
18
- fi
19
-
20
- #DEBHELPER#
@@ -1,20 +0,0 @@
1
- #!/bin/sh
2
-
3
- set -e
4
-
5
- # Remove renamed configuration files which are now handled by other
6
- # packages
7
- if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
8
-
9
- dpkg-maintscript-helper rm_conffile \
10
- /etc/logrotate.d/puppet 2.6.4-2 puppet -- "$@"
11
-
12
- dpkg-maintscript-helper rm_conffile \
13
- /etc/logcheck/ignore.d.server/puppet 2.6.4-2 puppet -- "$@"
14
-
15
- dpkg-maintscript-helper rm_conffile \
16
- /etc/emacs/site-start.d/50puppet-mode-init.el 2.6.4-2 puppet -- "$@"
17
-
18
- fi
19
-
20
- #DEBHELPER#
@@ -1,2 +0,0 @@
1
- debian/fileserver.conf etc/puppet
2
- conf/auth.conf etc/puppet
@@ -1,2 +0,0 @@
1
- man/man8/puppet-ca.8
2
- man/man8/puppet-master.8
@@ -1,6 +0,0 @@
1
- #!/bin/sh
2
-
3
- set -e
4
-
5
- rm -f /etc/init.d/puppetqd
6
- rm -f /etc/default/puppetqd
@@ -1,4 +0,0 @@
1
- usr/share/puppet/rack/puppetmasterd
2
- usr/share/puppet/rack/puppetmasterd/public
3
- usr/share/puppet/rack/puppetmasterd/tmp
4
- usr/share/puppetmaster-passenger/
@@ -1,162 +0,0 @@
1
- #!/bin/sh
2
-
3
- set -e
4
-
5
- sitename="puppetmaster"
6
- apache2_version="$(dpkg-query --showformat='${Version}\n' --show apache2)"
7
-
8
- # The debian provided a2* utils in Apache 2.4 uses "site name" as
9
- # argument, while the version in Apache 2.2 uses "file name".
10
- #
11
- # For added fun, the Apache 2.4 version requires files to have a
12
- # ".conf" suffix, but this must be stripped when using it as argument
13
- # for the a2* utilities.
14
- #
15
- # This will end in tears…
16
- # Can be removed when we only support apache >= 2.4
17
- apache2_puppetmaster_sitename() {
18
- if dpkg --compare-versions "$apache2_version" gt "2.4~"; then
19
- echo "${sitename}.conf"
20
- else
21
- echo "${sitename}"
22
- fi
23
- }
24
-
25
- # Can be removed when we only support apache >= 2.4
26
- restart_apache2() {
27
- if [ -x "/etc/init.d/apache2" ]; then
28
- # Seems that a restart is needed. reload breaks ssl apparently.
29
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
30
- invoke-rc.d apache2 restart || exit $?
31
- else
32
- /etc/init.d/apache2 restart || exit $?
33
- fi
34
- fi
35
- }
36
-
37
- # We may need to update the passenger directives in the apache vhost because
38
- # RailsAutoDetect and RackAutoDetect were removed in passenger 4.0.0
39
- # see http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsautodetect_rackautodetect_and_wsgiautodetect
40
- update_vhost_for_passenger4() {
41
- # Get passenger version from dpkg.
42
- # This will end in tears…
43
- passenger_version="$(dpkg-query --showformat='${Version}\n' --show libapache2-mod-passenger)"
44
- if dpkg --compare-versions "$passenger_version" gt "4.0~"; then
45
- sed -r -i \
46
- -e "/RailsAutoDetect/d" \
47
- -e "/RackAutoDetect/d" \
48
- $tempfile
49
- fi
50
- }
51
-
52
- # In Apache 2.2, if either the SSLCARevocationFile or SSLCARevocationPath
53
- # directives were specified then the specified file(s) would be checked when
54
- # establishing an SSL connection. Apache 2.4+ the SSLCARevocationCheck directive
55
- # was added to control how CRLs were checked when verifying a connection and had
56
- # a default value of none. This means that Apache defaults to ignoring CRLs even
57
- # if paths are specified to CRL files.
58
- #
59
- # This function automatically uncomments the SSLCARevocationCheck directive when
60
- # the currently installed version of Apache is 2.4.
61
- update_vhost_for_apache24() {
62
- if dpkg --compare-versions "$apache2_version" gt "2.4~"; then
63
- sed -r -i \
64
- -e "/# SSLCARevocationCheck/s/# //" \
65
- $tempfile
66
- fi
67
- }
68
-
69
- # Update an existing vhost definition with the SSLCARevocationCheck directive
70
- # on Apache 2.4+. This scans an existing vhost file for the SSLCARevocationCheck
71
- # directive and adds it to the file after the SSLCARevocationFile directive.
72
- #
73
- # See https://tickets.puppetlabs.com/browse/PUP-2533 for more information.
74
- update_vhost_for_apache24_upgrade() {
75
- APACHE2_SITE_FILE="/etc/apache2/sites-available/$(apache2_puppetmaster_sitename)"
76
-
77
- if dpkg --compare-versions "$apache2_version" gt "2.4~"; then
78
- if ! grep -q "^[[:space:]]*SSLCARevocationCheck" $APACHE2_SITE_FILE ; then
79
- tempfile=$(mktemp)
80
- sed -r \
81
- -e "/SSLCARevocationFile/a\\ SSLCARevocationCheck chain" \
82
- $APACHE2_SITE_FILE > $tempfile
83
- mv $tempfile $APACHE2_SITE_FILE
84
- fi
85
- fi
86
- }
87
-
88
-
89
- create_initial_puppetmaster_vhost() {
90
- # Check that puppet master --configprint works properly
91
- # If it doesn't the following steps to update the vhost will produce a very unhelpful and broken vhost
92
- if [ $(puppet master --configprint all 2>&1 | grep "Could not parse" | wc -l) != "0" ]; then
93
- echo "Puppet config print not working properly, exiting"
94
- exit 1
95
- fi
96
-
97
- # Initialize puppetmaster CA and generate the master certificate
98
- # only if the host doesn't already have any puppet ssl certificate.
99
- # The ssl key and cert need to be available (eg generated) before
100
- # apache2 is configured and started since apache2 ssl configuration
101
- # uses the puppetmaster ssl files.
102
- if [ ! -e "$(puppet master --configprint hostcert)" ]; then
103
- puppet cert generate $(puppet master --configprint certname)
104
- fi
105
-
106
- # Setup apache2 configuration files
107
- APACHE2_SITE_FILE="/etc/apache2/sites-available/$(apache2_puppetmaster_sitename)"
108
- if [ ! -e "${APACHE2_SITE_FILE}" ]; then
109
- tempfile=$(mktemp)
110
- sed -r \
111
- -e "s|(SSLCertificateFile\s+).+$|\1$(puppet master --configprint hostcert)|" \
112
- -e "s|(SSLCertificateKeyFile\s+).+$|\1$(puppet master --configprint hostprivkey)|" \
113
- -e "s|(SSLCACertificateFile\s+).+$|\1$(puppet master --configprint localcacert)|" \
114
- -e "s|(SSLCertificateChainFile\s+).+$|\1$(puppet master --configprint localcacert)|" \
115
- -e "s|(SSLCARevocationFile\s+).+$|\1$(puppet master --configprint cacrl)|" \
116
- -e "s|DocumentRoot /etc/puppet/rack/public|DocumentRoot /usr/share/puppet/rack/puppetmasterd/public|" \
117
- -e "s|<Directory /etc/puppet/rack/>|<Directory /usr/share/puppet/rack/puppetmasterd/>|" \
118
- /usr/share/puppetmaster-passenger/apache2.site.conf.tmpl > $tempfile
119
- update_vhost_for_passenger4
120
- update_vhost_for_apache24
121
- mv $tempfile "${APACHE2_SITE_FILE}"
122
- fi
123
-
124
- # Enable needed modules
125
- a2enmod ssl
126
- a2enmod headers
127
- a2ensite ${sitename}
128
- restart_apache2
129
- }
130
-
131
- update_existing_puppetmaster_vhost() {
132
- if dpkg --compare-versions "${1}" lt "3.6.2~"; then
133
- update_vhost_for_apache24_upgrade
134
- fi
135
- }
136
-
137
- if [ "$1" = "configure" ]; then
138
-
139
- # Change the owner of the rack config.ru to be the puppet user
140
- # because passenger will suid to that user, see #577366
141
- if ! dpkg-statoverride --list /usr/share/puppet/rack/puppetmasterd/config.ru >/dev/null 2>&1
142
- then
143
- dpkg-statoverride --update --add puppet puppet 0644 /usr/share/puppet/rack/puppetmasterd/config.ru
144
- fi
145
-
146
- # Setup puppetmaster passenger vhost
147
- if [ "$2" = "" ]; then
148
- create_initial_puppetmaster_vhost
149
- else
150
- update_existing_puppetmaster_vhost $2
151
- fi
152
-
153
- # Fix CRL file on upgrade to use the CA crl file instead of the host crl.
154
- if dpkg --compare-versions "$2" lt-nl "2.6.1-1"; then
155
- if [ -e /etc/apache2/sites-available/puppetmaster ]; then
156
- sed -r -i 's|SSLCARevocationFile[[:space:]]+/var/lib/puppet/ssl/crl.pem$|SSLCARevocationFile /var/lib/puppet/ssl/ca/ca_crl.pem|' /etc/apache2/sites-available/puppetmaster
157
- restart_apache2
158
- fi
159
- fi
160
- fi
161
-
162
- #DEBHELPER#
@@ -1,61 +0,0 @@
1
- #!/bin/sh
2
-
3
- set -e
4
-
5
- sitename="puppetmaster"
6
-
7
- # The debian provided a2* utils in Apache 2.4 uses "site name" as
8
- # argument, while the version in Apache 2.2 uses "file name".
9
- #
10
- # For added fun, the Apache 2.4 version requires files to have a
11
- # ".conf" suffix, but this must be stripped when using it as argument
12
- # for the a2* utilities.
13
- #
14
- # This will end in tears…
15
- # Can be removed when we only support apache >= 2.4
16
- apache2_puppetmaster_sitename() {
17
- apache2_version="$(dpkg-query --showformat='${Version}\n' --show apache2)"
18
- if dpkg --compare-versions "$apache2_version" gt "2.4~"; then
19
- echo "${sitename}.conf"
20
- else
21
- echo "${sitename}"
22
- fi
23
- }
24
-
25
- # Can be removed when we only support apache >= 2.4
26
- restart_apache2() {
27
- if [ -x "/etc/init.d/apache2" ]; then
28
- # Seems that a restart is needed. reload breaks ssl apparently.
29
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
30
- invoke-rc.d apache2 restart || exit $?
31
- else
32
- /etc/init.d/apache2 restart || exit $?
33
- fi
34
- fi
35
- }
36
-
37
- case "$1" in
38
- purge)
39
- if dpkg-statoverride --list /usr/share/puppet/rack/puppetmasterd/config.ru >/dev/null 2>&1
40
- then
41
- dpkg-statoverride --remove /usr/share/puppet/rack/puppetmasterd/config.ru
42
- fi
43
- # Remove the puppetmaster site configuration on purge
44
- rm -f /etc/apache2/sites-available/$(apache2_puppetmaster_sitename)
45
- ;;
46
- remove)
47
- # Disable the puppetmaster apache2 site configuration on package removal
48
- a2dissite ${sitename}
49
- restart_apache2
50
- ;;
51
- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
52
- ;;
53
- *)
54
- echo "postrm called with unknown argument \`$1'" >&2
55
- exit 1
56
-
57
- esac
58
-
59
- #DEBHELPER#
60
-
61
- exit 0
@@ -1,17 +0,0 @@
1
- By default, the puppetmaster package is configured in
2
- /etc/default/puppetmaster to use the WEBrick server included in
3
- the application. This server is single-threaded, very slow, and tends
4
- to fall over when you get close to 30 nodes. You will start to see
5
- connection-reset or End-of-file errors when this happens.
6
-
7
- For production deployments, use a server that can scale better than WEBrick,
8
- such as Passenger (aka mod_rails), with a front-end web-proxy such as Apache.
9
-
10
- To run Passenger with Apache, install the puppetmaster-passenger package. It
11
- automatically sets up an apache2 virtual host that runs puppetmaster under
12
- Passenger.
13
-
14
- For more information, see https://puppet.com/docs/puppet/latest/passenger.html.
15
- For information about the Puppet-designed Puppet Server, which deprecates
16
- the Passenger/Apache stack, see
17
- https://puppet.com/docs/puppetserver/latest/.
@@ -1,14 +0,0 @@
1
- # Defaults for puppetmaster - sourced by /etc/init.d/puppetmaster
2
-
3
- # Enable puppetmaster service?
4
- # Setting this to "yes" allows the puppet master service to run.
5
- # Setting this to "no" keeps the puppet master service from running.
6
- #
7
- # If you are using Passenger, you should have this set to "no."
8
- START=yes
9
-
10
- # Startup options
11
- DAEMON_OPTS=""
12
-
13
- # On what port should the puppet master listen? (default: 8140)
14
- PORT=8140
@@ -1,137 +0,0 @@
1
- #! /bin/sh
2
- ### BEGIN INIT INFO
3
- # Provides: puppetmaster
4
- # Required-Start: $network $named $remote_fs $syslog
5
- # Required-Stop: $network $named $remote_fs $syslog
6
- # Default-Start: 2 3 4 5
7
- # Default-Stop: 0 1 6
8
- ### END INIT INFO
9
-
10
- PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
11
- DAEMON=/usr/bin/puppet
12
- DAEMON_OPTS=""
13
- NAME=master
14
- DESC="puppet master"
15
-
16
- test -x $DAEMON || exit 0
17
-
18
- [ -r /etc/default/puppetmaster ] && . /etc/default/puppetmaster
19
-
20
- . /lib/lsb/init-functions
21
-
22
- if [ ! -d /var/run/puppet ]; then
23
- mkdir -p /var/run/puppet
24
- fi
25
-
26
- chown puppet:puppet /var/run/puppetlabs
27
-
28
- mongrel_warning="The mongrel servertype is no longer built-in to Puppet. It
29
- appears as though mongrel is being used, as the number of puppetmasters is
30
- greater than one. Starting the puppetmaster service will not behave as expected
31
- until this is resolved. Only the first port has been used in the service, and
32
- only one puppetmaster has been started. These settings are defined in
33
- /etc/default/puppetmaster"
34
-
35
-
36
- # Warn about removed and unsupported mongrel servertype
37
- if ([ -n "$PUPPETMASTERS" ] && [ ${PUPPETMASTERS} -gt 1 ]) || [ "${SERVERTYPE}" = "mongrel" ]; then
38
- echo $mongrel_warning
39
- echo
40
- fi
41
-
42
- is_true() {
43
- if [ "x$1" = "xtrue" -o "x$1" = "xyes" -o "x$1" = "x0" ] ; then
44
- return 0
45
- else
46
- return 1
47
- fi
48
- }
49
-
50
- start_puppet_master() {
51
- if is_true "$START" ; then
52
- start-stop-daemon --start --quiet --pidfile /var/run/puppetlabs/${NAME}.pid \
53
- --startas $DAEMON -- $NAME $DAEMON_OPTS --masterport=$PORT
54
- else
55
- echo ""
56
- echo "puppetmaster not configured to start, please edit /etc/default/puppetmaster to enable"
57
- fi
58
- }
59
-
60
- stop_puppet_master() {
61
- start-stop-daemon --stop --retry TERM/10/KILL/5 --quiet --oknodo --pidfile /var/run/puppetlabs/${NAME}.pid
62
- }
63
-
64
- status_puppet_master() {
65
- if ( ! type status_of_proc > /dev/null 2>&1 ) ; then
66
- status_of_proc() {
67
- local pidfile daemon name status
68
- pidfile=
69
- OPTIND=1
70
- while getopts p: opt ; do
71
- case "$opt" in
72
- p) pidfile="$OPTARG";;
73
- esac
74
- done
75
- shift $(($OPTIND - 1))
76
-
77
- if [ -n "$pidfile" ]; then
78
- pidfile="-p $pidfile"
79
- fi
80
- daemon="$1"
81
- name="$2"
82
-
83
- status="0"
84
- pidofproc $pidfile $daemon >/dev/null || status="$?"
85
- if [ "$status" = 0 ]; then
86
- log_success_msg "$name is running"
87
- return 0
88
- elif [ "$status" = 4 ]; then
89
- log_failure_msg "could not access PID file for $name"
90
- return $status
91
- else
92
- log_failure_msg "$name is not running"
93
- return $status
94
- fi
95
- }
96
- fi
97
-
98
- if is_true "$START" ; then
99
- status_of_proc -p "/var/run/puppetlabs/${NAME}.pid" "${DAEMON}" "${NAME}"
100
- else
101
- echo ""
102
- echo "puppetmaster not configured to start"
103
- status_of_proc -p "/var/run/puppetlabs/${NAME}.pid" "${DAEMON}" "${NAME}"
104
- fi
105
- }
106
-
107
-
108
- case "$1" in
109
- start)
110
- log_begin_msg "Starting $DESC"
111
- start_puppet_master
112
- log_end_msg $?
113
- ;;
114
- stop)
115
- log_begin_msg "Stopping $DESC"
116
- stop_puppet_master
117
- log_end_msg $?
118
- ;;
119
- reload)
120
- # Do nothing, as Puppetmaster rechecks its config automatically
121
- ;;
122
- status)
123
- status_puppet_master
124
- ;;
125
- restart|force-reload)
126
- log_begin_msg "Restarting $DESC"
127
- stop_puppet_master
128
- start_puppet_master
129
- log_end_msg $?
130
- ;;
131
- *)
132
- echo "Usage: $0 {start|stop|status|restart|force-reload}" >&2
133
- exit 1
134
- ;;
135
- esac
136
-
137
- # vim: tabstop=4:softtabstop=4:shiftwidth=4:expandtab
@@ -1,3 +0,0 @@
1
- # Man pages are automatically generated, not much to do here
2
- puppetmaster binary: manpage-has-bad-whatis-entry
3
- puppetmaster binary: manpage-has-errors-from-man
@@ -1,20 +0,0 @@
1
- #!/bin/sh
2
-
3
- set -e
4
-
5
- # Remove renamed configuration files which are now handled by other
6
- # packages
7
- if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
8
-
9
- dpkg-maintscript-helper rm_conffile \
10
- /etc/logrotate.d/puppetmaster 2.7.16-1puppetlabs1 puppetmaster -- "$@"
11
-
12
- # For systems with dpkg < 1.15.7-2
13
- else
14
-
15
- if [ -f /etc/logrotate.d/puppetmaster ]; then
16
- rm /etc/logrotate.d/puppetmaster || true
17
- fi
18
- fi
19
-
20
- #DEBHELPER#
@@ -1,5 +0,0 @@
1
- #!/bin/sh -e
2
-
3
- #DEBHELPER#
4
-
5
- exit 0
@@ -1,22 +0,0 @@
1
- #!/bin/sh
2
-
3
- set -e
4
-
5
- # Remove renamed configuration files which are now handled by other
6
- # packages
7
- if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
8
-
9
- dpkg-maintscript-helper rm_conffile \
10
- /etc/logrotate.d/puppetmaster 2.7.16-1puppetlabs1 puppetmaster -- "$@"
11
-
12
-
13
- # For systems with dpkg < 1.15.7-2
14
- else
15
-
16
- if [ -f /etc/logrotate.d/puppetmaster ]; then
17
- rm /etc/logrotate.d/puppetmaster || true
18
- fi
19
- fi
20
-
21
-
22
- #DEBHELPER#