puppet 6.29.0-x86-mingw32 → 7.0.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9319f17c70060bd811797e0bf45ffa7c0aacea87328c5f4129fa0ab4aba7d857
-  data.tar.gz: d57b6e4893d1a056b7bbd16b832542e7aee2c8c2868ff0cd86164e3234e23073
+  metadata.gz: ef1803dc5dcf51f27aab1442eb3155adc2f79076b4de59164e1422c93e360ae1
+  data.tar.gz: af31d1fe57d7151079f9bb9af0cf6f5bd99576171ce755b977d345d7881ba7e3
 SHA512:
-  metadata.gz: 6a87f47953cc7fa35dd3db88acb0184bad817771944779c761de00f829026cf42be0edebf2e475ffd41458b033233f0d7203608bac82f3c383c51a81f6e5d40e
-  data.tar.gz: 5d929ceb051ad7a612964c4318f8fc1c66ba3c7e9e476c619d0e9826898cfdf066a7245d21651e668de3928ccdf8c66e439d419ef76a1f769b98ab5d02d477b7
+  metadata.gz: b1e0bc648ea9545cf545c075b1824c102d2033b6326de5d212facdab90211f1b3ed7fef5ff96f34935e217034e124495287ef2f92cb844cdd8df93db9177e25d
+  data.tar.gz: 298a9cd084264133ab1431e311c025c1f50a1ee75980116f8db665871696ac091408eeb114f2e75d67fdb5969568fd4f4f8131f0991523976462fa21c725e1a3

data/CODEOWNERS

@@ -1,9 +1,23 @@
-# defaults
-* @puppetlabs/phoenix @puppetlabs/puppetserver-maintainers
+# default to platform-core
+* @puppetlabs/platform-core @puppetlabs/puppetserver-maintainers
+
+# Night's Watch
+/lib/puppet/type/group @puppetlabs/night-s-watch
+/lib/puppet/type/package @puppetlabs/night-s-watch
+/lib/puppet/type/service @puppetlabs/night-s-watch
+/lib/puppet/type/user @puppetlabs/night-s-watch
+/lib/puppet/provider/group @puppetlabs/night-s-watch
+/lib/puppet/provider/package @puppetlabs/night-s-watch
+/lib/puppet/provider/service @puppetlabs/night-s-watch
+/lib/puppet/provider/user @puppetlabs/night-s-watch
 
 # PAL
 /lib/puppet/pal @puppetlabs/bolt
 
+# puppet device
+/lib/puppet/application/device.rb @puppetlabs/networking
+/lib/puppet/util/network_device @puppetlabs/networking
+
 # puppet module
 /lib/puppet/application/module.rb @puppetlabs/pdk
 /lib/puppet/face/module @puppetlabs/pdk

data/CONTRIBUTING.md

@@ -38,12 +38,12 @@ the [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev
 ## Making Changes
 
 * Create a topic branch from where you want to base your work.
-  * This is usually the main branch.
+  * This is usually the master branch.
   * Only target release branches if you are certain your fix must be on that
     branch.
-  * To quickly create a topic branch based on main, run `git checkout -b
-    fix/main/my_contribution main`. Please avoid working directly on the
-    `main` branch.
+  * To quickly create a topic branch based on master, run `git checkout -b
+    fix/master/my_contribution master`. Please avoid working directly on the
+    `master` branch.
 * Make commits of logical and atomic units.
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * 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
       why this is a problem, and how the patch fixes the problem when applied.
   ```
 * Make sure you have added the necessary tests for your changes.
-* For details on how to run tests, please see [the quickstart guide](https://github.com/puppetlabs/puppet/blob/main/docs/quickstart.md)
+* For details on how to run tests, please see [the quickstart guide](https://github.com/puppetlabs/puppet/blob/master/docs/quickstart.md)
 
 ## Writing Translatable Code
 

data/Gemfile

@@ -3,7 +3,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 gemspec
 
 def location_for(place, fake_version = nil)
-  if place.is_a?(String) && place =~ /^((?:git[:@]|https:)[^#]*)#(.*)/
+  if place.is_a?(String) && place =~ /^(git[:@][^#]*)#(.*)/
     [fake_version, { git: $1, branch: $2, require: false }].compact
   elsif place.is_a?(String) && place =~ /^file:\/\/(.*)/
     ['>= 0', { path: File.expand_path($1), require: false }]
@@ -14,7 +14,6 @@ end
 
 # override .gemspec deps - may issue warning depending on Bundler version
 gem "facter", *location_for(ENV['FACTER_LOCATION']) if ENV.has_key?('FACTER_LOCATION')
-gem "facter-ng", *location_for(ENV['FACTER_NG_LOCATION']) if ENV.has_key?('FACTER_NG_LOCATION')
 gem "hiera", *location_for(ENV['HIERA_LOCATION']) if ENV.has_key?('HIERA_LOCATION')
 gem "semantic_puppet", *location_for(ENV['SEMANTIC_PUPPET_LOCATION'] || ["~> 1.0"])
 gem "puppet-resource_api", *location_for(ENV['RESOURCE_API_LOCATION'] || ["~> 1.5"])
@@ -29,7 +28,7 @@ group(:features) do
   #gem 'ruby-shadow', '~> 2.5', require: false, platforms: [:ruby]
   gem 'minitar', '~> 0.9', require: false
   gem 'msgpack', '~> 1.2', require: false
-  gem 'rdoc', ['~> 6.0', '< 6.4.0'], require: false, platforms: [:ruby]
+  gem 'rdoc', '~> 6.0', require: false, platforms: [:ruby]
   # requires native augeas headers/libs
   # gem 'ruby-augeas', require: false, platforms: [:ruby]
   # requires native ldap headers/libs
@@ -38,7 +37,6 @@ group(:features) do
 end
 
 group(:test) do
-  gem "ffi", require: false
   gem "json-schema", "~> 2.0", require: false
   gem "rake", *location_for(ENV['RAKE_LOCATION'] || '~> 12.2')
   gem "rspec", "~> 3.1", require: false
@@ -55,8 +53,8 @@ end
 group(:development, optional: true) do
   gem 'memory_profiler', require: false, platforms: [:mri]
   gem 'pry', require: false, platforms: [:ruby]
-  gem "racc", "1.5.2", require: false, platforms: [:ruby]
-  if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 2.5
+  gem "racc", "1.4.9", require: false, platforms: [:ruby]
+  if RUBY_PLATFORM != 'java'
     gem 'ruby-prof', '>= 0.16.0', require: false
   end
 end
@@ -65,7 +63,7 @@ group(:packaging) do
   gem 'packaging', *location_for(ENV['PACKAGING_LOCATION'] || '~> 0.99')
 end
 
-group(:documentation, optional: true) do
+group(:documentation) do
   gem 'gettext-setup', '~> 0.28', require: false, platforms: [:ruby]
   gem 'ronn', '~> 0.7.3', require: false, platforms: [:ruby]
 end

data/Gemfile.lock

@@ -1,67 +1,36 @@
 PATH
   remote: .
   specs:
-    puppet (6.29.0)
+    puppet (7.0.0)
       CFPropertyList (~> 2.2)
-      concurrent-ruby (~> 1.0, < 1.2.0)
+      concurrent-ruby (~> 1.0)
       deep_merge (~> 1.0)
       facter (>= 2.4.0, < 5)
       fast_gettext (~> 1.1)
       hiera (>= 3.2.1, < 4)
-      httpclient (~> 2.8)
       locale (~> 2.1)
       multi_json (~> 1.13)
       semantic_puppet (~> 1.0)
 
 GEM
-  remote: https://rubygems.org/
+  remote: https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/
   specs:
     CFPropertyList (2.3.6)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
-    apt_stage_artifacts (0.11.0)
-      docopt
-    artifactory (3.0.15)
-    ast (2.4.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    artifactory (2.8.2)
+    ast (2.4.1)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    crack (0.4.5)
-      rexml
+    concurrent-ruby (1.1.7)
+    crack (0.4.4)
     csv (3.1.5)
-    declarative (0.0.20)
-    deep_merge (1.2.2)
-    diff-lcs (1.5.0)
-    digest-crc (0.6.4)
-      rake (>= 12.0.0, < 14.0.0)
+    deep_merge (1.2.1)
+    diff-lcs (1.4.4)
     docopt (0.6.1)
-    facter (4.2.14)
+    facter (4.0.44)
       hocon (~> 1.3)
       thor (>= 1.0.1, < 2.0)
-    faraday (1.10.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
     fast_gettext (1.1.2)
-    ffi (1.15.5)
     gettext (3.2.9)
       locale (>= 2.0.5)
       text (>= 1.3.0)
@@ -69,119 +38,70 @@ GEM
       fast_gettext (~> 1.1.0)
       gettext (>= 3.0.2, < 3.3.0)
       locale
-    google-apis-core (0.9.5)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
-      mini_mime (~> 1.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.a)
-      rexml
-      webrick
-    google-apis-iamcredentials_v1 (0.16.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
-      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.0)
-    google-cloud-storage (1.44.0)
-      addressable (~> 2.8)
-      digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
-      google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
-      mini_mime (~> 1.0)
-    googleauth (1.1.3)
-      faraday (>= 0.17.3, < 3.a)
-      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
-      multi_json (~> 1.11)
-      os (>= 0.9, < 2.0)
-      signet (>= 0.16, < 2.a)
     hashdiff (1.0.1)
-    hiera (3.11.0)
-    hiera-eyaml (3.3.0)
-      highline
+    hiera (3.6.0)
+    hiera-eyaml (3.2.0)
+      highline (~> 1.6.19)
       optimist
-    highline (2.1.0)
+    highline (1.6.21)
     hocon (1.3.1)
     hpricot (0.8.6)
-    httpclient (2.8.3)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    jwt (2.6.0)
     locale (2.1.3)
-    memoist (0.16.2)
-    memory_profiler (1.0.1)
+    memory_profiler (0.9.14)
     method_source (1.0.0)
-    mini_mime (1.1.2)
     minitar (0.9)
-    msgpack (1.6.0)
+    msgpack (1.3.3)
     multi_json (1.15.0)
-    multipart-post (2.2.3)
     mustache (1.1.1)
     optimist (3.0.1)
-    os (1.1.4)
-    packaging (0.108.1)
-      apt_stage_artifacts
-      artifactory (~> 3)
+    packaging (0.99.73)
+      artifactory (~> 2)
       csv (= 3.1.5)
-      google-cloud-storage
-      googleauth
       rake (>= 12.3)
       release-metrics
-    parallel (1.22.1)
+    parallel (1.20.0)
     parser (2.7.2.0)
       ast (~> 2.4.1)
-    powerpack (0.1.3)
-    pry (0.14.2)
+    powerpack (0.1.2)
+    pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.7)
-    puppet-resource_api (1.8.14)
+    public_suffix (4.0.6)
+    puppet-resource_api (1.8.13)
       hocon (>= 1.0)
-    puppetserver-ca (1.11.7)
+    puppetserver-ca (1.9.0)
       facter (>= 2.0.1, < 5)
-    racc (1.5.2)
+    racc (1.4.9)
     rainbow (2.2.2)
       rake
     rake (12.3.3)
-    rdiscount (2.2.7)
-    rdoc (6.3.3)
+    rdiscount (2.2.0.2)
+    rdoc (6.2.1)
     release-metrics (1.1.0)
       csv
       docopt
-    representable (3.2.0)
-      declarative (< 0.1.0)
-      trailblazer-option (>= 0.1.1, < 0.2.0)
-      uber (< 0.2.0)
-    retriable (3.1.2)
-    rexml (3.2.5)
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
       rdiscount (>= 1.5.8)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.10.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -191,35 +111,24 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     rubocop-i18n (1.2.0)
       rubocop (~> 0.49.0)
-    ruby-prof (1.4.3)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
-    semantic_puppet (1.0.4)
-    signet (0.16.1)
-      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.0)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
+    ruby-prof (1.4.2)
+    ruby-progressbar (1.10.1)
+    semantic_puppet (1.0.2)
     text (1.3.1)
-    thor (1.2.1)
-    trailblazer-option (0.1.2)
-    uber (0.1.0)
-    unicode-display_width (1.8.0)
+    thor (1.0.1)
+    unicode-display_width (1.7.0)
     vcr (5.1.0)
-    webmock (3.18.1)
-      addressable (>= 2.8.0)
+    webmock (3.10.0)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.7.0)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
+    yard (0.9.25)
 
 PLATFORMS
-  x86_64-linux
+  ruby
 
 DEPENDENCIES
   diff-lcs (~> 1.3)
-  ffi
   gettext-setup (~> 0.28)
   hiera-eyaml
   hocon (~> 1.0)
@@ -232,9 +141,9 @@ DEPENDENCIES
   puppet!
   puppet-resource_api (~> 1.5)
   puppetserver-ca (~> 1.1)
-  racc (= 1.5.2)
+  racc (= 1.4.9)
   rake (~> 12.2)
-  rdoc (~> 6.0, < 6.4.0)
+  rdoc (~> 6.0)
   ronn (~> 0.7.3)
   rspec (~> 3.1)
   rspec-expectations (~> 3.9, != 3.9.3)
@@ -248,4 +157,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.3.22
+   2.0.0

data/README.md

@@ -15,7 +15,7 @@ Documentation for Puppet and related projects can be found online at the
 
 ### HTTP API
 
-[HTTP API Index](https://puppet.com/docs/puppet/5.5/http_api/http_api_index.html)
+[HTTP API Index](https://puppet.com/docs/puppet/latest/http_api/http_api_index.html)
 
 ## Installation
 
@@ -33,16 +33,16 @@ see the [Quick Start to Developing on Puppet](docs/quickstart.md) guide.
 
 We'd love to get contributions from you! For a quick guide to getting your
 system setup for developing, take a look at our [Quickstart
-Guide](https://github.com/puppetlabs/puppet/blob/main/docs/quickstart.md). Once you are up and running, take a look at the
-[Contribution Documents](https://github.com/puppetlabs/puppet/blob/main/CONTRIBUTING.md) to see how to get your changes merged
+Guide](https://github.com/puppetlabs/puppet/blob/master/docs/quickstart.md). Once you are up and running, take a look at the
+[Contribution Documents](https://github.com/puppetlabs/puppet/blob/master/CONTRIBUTING.md) to see how to get your changes merged
 in.
 
 For more complete docs on developing with Puppet, take a look at the
-rest of the [developer documents](https://github.com/puppetlabs/puppet/blob/main/docs/index.md).
+rest of the [developer documents](https://github.com/puppetlabs/puppet/blob/master/docs/index.md).
 
 ## Licensing
 
-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
+See [LICENSE](https://github.com/puppetlabs/puppet/blob/master/LICENSE) file. Puppet is licensed by Puppet, Inc. under the Apache license. Puppet, Inc. can be contacted at: info@puppet.com
 
 ## Support
 

data/conf/fileserver.conf

@@ -12,10 +12,9 @@
 #
 # [extra_files]
 #   path /etc/puppetlabs/puppet/files
-#   allow *
 #
-# In the example above, anything in /etc/puppetlabs/puppet/files/<file name> would be
-# available to authenticated nodes at puppet:///extra_files/<file name>.
+# In the example above, anything in /etc/puppetlabs/puppet/files/<file name>
+# would be available to authenticated nodes at puppet:///extra_files/<file name>.
 #
 # Mount points may also use three placeholders as part of their path:
 #
@@ -28,10 +27,6 @@
 # PERMISSIONS
 
 # The ability to set permissions - for example, using the allow, allow_ip, or
-# deny directives - has been removed. Instead, you can control file access in
-# auth.conf by controlling the /file_metadata(s)/<mount point> and
-# /file_content(s)/<mount point> paths.
-#
-# For details and an example, see the auth.conf file. If you're using Puppet
-# Server, see the Puppet Server documentation at
-# https://puppet.com/docs/puppetserver/latest/config_file_auth.html.
+# deny directives - has been removed from fileserver.conf. Instead, you can
+# control file access in Puppet Server's auth.conf file. See the documentation
+# at https://puppet.com/docs/puppetserver/latest/config_file_auth.html.

data/ext/README.environment

@@ -0,0 +1,8 @@
+This is an example environment directory. The environment's modules can be
+placed in a "modules" subdirectory. The environments initial manifests are
+placed in a "manifests" subdirectory. By default the environment also has any
+modules that are installed globally (normally in /etc/puppetlabs/code/modules) for the
+puppet master.
+
+For more information see
+https://puppet.com/docs/puppet/latest/environments_about.html

data/ext/build_defaults.yaml

@@ -16,4 +16,4 @@ apt_signing_server: 'apt.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'
 apt_repo_path: '/opt/repository/incoming'
 tar_host: 'downloads.puppetlabs.com'
-nonfinal_gem_path: '/opt/repository-nightlies/downloads/gems/puppet6-nightly'
+nonfinal_gem_path: '/opt/repository-nightlies/downloads/gems/puppet7-nightly'

data/ext/dbfix.sql

@@ -0,0 +1,132 @@
+-- MySQL DB consistency check/fix
+--
+-- Usage:
+-- cat dbfix.sql | mysql -u user -p puppet
+--
+-- WARNING: perform a database backup before running this script
+
+-- Remove duplicate resources, and keep the latest one
+DELETE bad_rows.*
+FROM resources AS bad_rows
+  INNER JOIN (
+    SELECT title,restype,host_id, MAX(id) as max_id
+    FROM resources
+    GROUP BY title,restype,host_id
+    HAVING count(*) > 1
+  ) AS good_rows
+  ON
+    good_rows.title = bad_rows.title AND
+    good_rows.restype = bad_rows.restype AND
+    good_rows.host_id = bad_rows.host_id AND
+    good_rows.max_id <> bad_rows.id;
+
+-- Remove duplicate param_values, and keep the latest one
+DELETE bad_rows.*
+FROM param_values AS bad_rows
+  INNER JOIN (
+    SELECT value,param_name_id,resource_id, MAX(id) as max_id
+    FROM param_values
+    GROUP BY value,param_name_id,resource_id
+    HAVING count(*) > 1
+  ) AS good_rows
+  ON
+    good_rows.value = bad_rows.value AND
+    good_rows.param_name_id = bad_rows.param_name_id AND
+    good_rows.resource_id = bad_rows.resource_id AND
+    good_rows.max_id <> bad_rows.id;
+
+-- rewrite param_values that points to duplicated param_names
+-- to point to the highest param_name id.
+UPDATE
+  param_values v
+  INNER JOIN
+  param_names n
+  ON n.id = v.param_name_id
+  INNER JOIN
+  (
+    SELECT name, MAX(id) as max_id
+    FROM param_names
+    GROUP BY name
+    HAVING count(*) > 1
+  ) nmax ON n.name = nmax.name
+SET
+  v.param_name_id = nmax.max_id;
+
+-- Remove duplicate param_names, and keep the latest one
+DELETE bad_rows.*
+FROM param_names AS bad_rows
+  INNER JOIN (
+    SELECT name, MAX(id) as max_id
+    FROM param_names
+    GROUP BY name
+    HAVING count(*) > 1
+  ) AS good_rows
+  ON
+    good_rows.name = bad_rows.name AND
+    good_rows.max_id <> bad_rows.id;
+
+-- Remove duplicate resource_tags, and keep the highest one
+DELETE bad_rows.*
+FROM resource_tags AS bad_rows
+  INNER JOIN (
+    SELECT resource_id,puppet_tag_id, MAX(id) as max_id
+    FROM resource_tags
+    GROUP BY resource_id,puppet_tag_id
+    HAVING count(*) > 1
+  ) AS good_rows
+  ON
+    good_rows.resource_id = bad_rows.resource_id AND
+    good_rows.puppet_tag_id = bad_rows.puppet_tag_id AND
+    good_rows.max_id <> bad_rows.id;
+
+-- rewrite resource_tags that points to duplicated puppet_tags
+-- to point to the highest puppet_tags id.
+UPDATE
+  resource_tags v
+  INNER JOIN
+  puppet_tags n
+  ON n.id = v.puppet_tag_id
+  INNER JOIN
+  (
+    SELECT name, MAX(id) as max_id
+    FROM puppet_tags
+    GROUP BY name
+    HAVING count(*) > 1
+  ) nmax ON n.name = nmax.name
+SET
+  v.puppet_tag_id = nmax.max_id;
+
+-- Remove duplicate puppet_tags, and keep the highest one
+DELETE bad_rows.*
+FROM puppet_tags AS bad_rows
+  INNER JOIN (
+    SELECT name, MAX(id) as max_id
+    FROM puppet_tags
+    GROUP BY name
+    HAVING count(*) > 1
+  ) AS good_rows
+  ON
+    good_rows.name = bad_rows.name AND
+    good_rows.max_id <> bad_rows.id;
+
+-- Fix dangling resources
+-- note: we use a table to not exceed the number of InnoDB locks if there are two much
+-- rows to delete.
+-- this is an alternative to: DELETE resources FROM resources r LEFT JOIN hosts h ON h.id=r.host_id WHERE h.id IS NULL;
+--
+CREATE TABLE resources_c LIKE resources;
+INSERT INTO resources_c SELECT r.* FROM resources r INNER JOIN hosts h ON h.id=r.host_id;
+RENAME TABLE resources TO resources_old, resources_c TO resources;
+DROP TABLE resources_old;
+
+-- Fix dangling param_values
+CREATE TABLE param_values_c LIKE param_values;
+INSERT INTO param_values_c SELECT v.* FROM param_values v INNER JOIN resources r ON r.id=v.resource_id;
+RENAME TABLE param_values TO param_values_old, param_values_c TO param_values;
+DROP TABLE param_values_old;
+
+-- Fix dangling resource_tags
+CREATE TABLE resource_tags_c LIKE resource_tags;
+INSERT INTO resource_tags_c SELECT t.* FROM resource_tags t INNER JOIN resources r ON r.id=t.resource_id;
+RENAME TABLE resource_tags TO resource_tags_old, resource_tags_c TO resource_tags;
+DROP TABLE resource_tags_old;

data/ext/debian/README.Debian

@@ -0,0 +1,8 @@
+puppet for Debian
+------------------
+
+The default puppet configuration in Debian will automatically integrate with
+etckeeper if etckeeper is installed. puppet will automatically commit any
+changes made to files in /etc via etckeeper before and after its run.
+
+ -- Mathias Gug <mathiaz@ubuntu.com>  Wed, 18 Aug 2010 15:06:06 -0400

data/ext/debian/README.source

@@ -0,0 +1,2 @@
+The debian directory is now maintained on Alioth in git. 
+See https://pkg-puppet.alioth.debian.org/ for more information.

data/ext/debian/TODO.Debian

@@ -0,0 +1 @@
+* clean up initscripts per http://mail.madstop.com/pipermail/puppet-dev/2006-June/001069.html