puppet 3.0.0.rc5 → 3.0.0.rc7

data/ext/ips/rules

@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+LIBDIR=$(shell /usr/bin/ruby18 -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')
+DESTDIR=$(CURDIR)/pkg/ips/proto
+
+binary-install/puppet::
+	/usr/bin/ruby18 install.rb --destdir=$(DESTDIR) --bindir=/usr/bin --sbindir=/usr/sbin --sitelibdir=$(LIBDIR) --mandir=/usr/share/man
+	mkdir -p $(DESTDIR)/var/{lib,log}/puppet/
+	mkdir -p $(DESTDIR)/var/svc/manifest/network/puppet/
+	mkdir -p $(DESTDIR)/lib/svc/method/
+	mkdir -p $(DESTDIR)/etc/puppet/
+	svccfg validate ext/ips/puppetagent.xml
+	svccfg validate ext/ips/puppetmaster.xml
+	cp ext/ips/puppetagent.xml $(DESTDIR)/var/svc/manifest/network/puppet/
+	cp ext/ips/puppetmaster.xml $(DESTDIR)/var/svc/manifest/network/puppet/
+	cp ext/ips/puppet-agent $(DESTDIR)/lib/svc/method/
+	cp ext/ips/puppet-master $(DESTDIR)/lib/svc/method/
+	cp ext/ips/puppet.conf $(DESTDIR)/etc/puppet/puppet.conf
+	chmod 700  $(DESTDIR)/lib/svc/method/puppet-{agent,master}

data/ext/ips/transforms

@@ -0,0 +1,34 @@
+<transform file dir link hardlink path=usr/share/man/.+(/.+)? -> default facet.doc.man true>
+<transform file path=usr/share/man/.+(/.+)? -> add restart_fmri svc:/application/man-index:default>
+
+# drop opt and user
+<transform dir path=(lib|etc|usr|var)$->drop>
+<transform dir path=usr/(share|ruby)$->drop>
+<transform dir path=usr/share/man$->drop>
+<transform dir path=usr/ruby/1.8$->drop>
+<transform dir path=usr/ruby/1.8/lib$->drop>
+<transform dir path=usr/ruby/1.8/ruby$->drop>
+<transform dir path=usr/ruby/1.8/ruby/1.8$->drop>
+<transform dir path=(var|lib)/svc$->drop>
+<transform dir path=lib/svc/method$->drop>
+<transform dir path=var/svc/manifest$->drop>
+<transform dir path=var/svc/manifest/network$->drop>
+
+# drop var/lib var/log
+<transform dir path=var/(lib|log)$->drop>
+
+# saner dependencies
+<transform depend -> edit fmri "@[^ \t\n\r\f\v]*" "">
+
+# make sure /var/log/puppet and /var/lib/puppet are owned by puppet
+<transform dir path=var/(log|lib)/puppet$ -> edit group bin puppet>
+<transform dir path=var/(log|lib)/puppet$ -> edit owner root puppet>
+
+<transform file path=var/svc/manifest/.*\.xml -> add restart_fmri svc:/system/manifest-import:default>
+
+# we depend on facter
+<transform pkg -> emit depend type=require fmri=application/facter@1.6.12>
+
+# preserve the old conf file on upgrade.
+<transform file path=etc/puppet/(puppet|auth).conf -> add overlay true>
+<transform file path=etc/puppet/(puppet|auth).conf -> add preserve renamenew>

data/{conf → ext}/osx/createpackage.sh

@@ -60,7 +60,7 @@ function install_docs() {
   echo "Installing docs to ${pkgroot}"
   docdir="${pkgroot}/usr/share/doc/puppet" 
   mkdir -p "${docdir}"
-  for docfile in CHANGELOG CHANGELOG.old COPYING LICENSE README README.queueing README.rst; do
+  for docfile in COPYING LICENSE README README.queueing README.rst; do
     install -m 0644 "${puppet_root}/${docfile}" "${docdir}"
   done
   chown -R root:wheel "${docdir}"

data/ext/osx/file_mapping.yaml

@@ -0,0 +1,33 @@
+directories:
+  lib:
+    path: 'usr/lib/ruby/site_ruby/1.8'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0644'
+  bin:
+    path: 'usr/bin'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0755'
+  'man/man8':
+    path: 'usr/share/man/man8'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0755'
+files:
+  'conf/auth.conf':
+    path: 'private/etc/puppet'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0644'
+  'man/man5/puppet.conf.5':
+    path: 'usr/share/man/man5'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0644'
+  '[A-Z]*':
+    path: 'usr/share/doc/puppet'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0644'
+

data/ext/osx/preflight.erb

@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# Make sure that old puppet cruft is removed
+# This also allows us to downgrade puppet as
+# it's more likely that installing old versions
+# over new will cause issues.
+#
+# ${3} is the destination volume so that this works correctly
+# when being installed to volumes other than the current OS.
+
+<% begin %>
+<% require 'rubygems' %>
+<% rescue LoadError %>
+<% end %>
+<% require 'rake' %>
+
+<% Dir.chdir("lib") %>
+<% FileList["**/*"].select {|i| File.file?(i)}.each do |file| %>
+/bin/rm -Rf "${3}<%= @apple_libdir %>/<%=file%>"
+<% end %>
+
+<% Dir.chdir("../bin") %>
+<% FileList["**/*"].select {|i| File.file?(i)}.each do |file| %>
+/bin/rm -Rf "${3}<%= @apple_bindir %>/<%=file%>"
+<% end %>
+<% Dir.chdir("..") %>
+
+# remove old doc files
+/bin/rm -Rf "${3}<%= @apple_docdir %>/<%= @package_name %>"
+
+# These files used to live in the sbindir but were
+# removed in Pupppet >= 3.0. Remove them
+/bin/rm -Rf "${3}<%= @apple_sbindir %>/puppetca"
+/bin/rm -Rf "${3}<%= @apple_sbindir %>/puppetd"
+/bin/rm -Rf "${3}<%= @apple_sbindir %>/puppetmasterd"
+/bin/rm -Rf "${3}<%= @apple_sbindir %>/puppetqd"
+/bin/rm -Rf "${3}<%= @apple_sbindir %>/puppetrun"

data/ext/packaging/README-Solaris.md

@@ -0,0 +1,117 @@
+## Create self signed certificate
+
+- Generate the key pair
+
+        | keytool -genkey -keyalg RSA -alias selfsigned -keystore keystore.jks -storepass password -validity 360 -keysize 2048
+
+
+- Extract Certificate
+
+        | keytool -export -rfc -keystore keystore.jks -storepass password -alias selfsigned -file mycert.pem
+
+- Extract Cert Key to PEM format
+
+        | keytool -importkeystore -srcstoretype JKS -srckeystore keystore.jks -deststoretype PKCS12 -destkeystore mykey.der
+        | openssl pkcs12 -in mykey.der -nodes -out mykey.pem
+
+## For installation.
+
+- Check the publishers
+
+        | pkg publisher
+        solaris                               origin   online   http://pkg.oracle.com/solaris/release/
+
+- Add puppetlabs.com as a publisher
+
+        | pkg set-publisher -p http://solaris-11-ips-repo.acctest.dc1.puppetlabs.net puppetlabs.com
+
+- Check that we have it correct
+
+        | pkg publisher
+        solaris                               origin   online   http://pkg.oracle.com/solaris/release/
+        puppetlabs.com                        origin   online   http://solaris-11-ips-repo.acctest.dc1.puppetlabs.net/
+
+- Verify that puppetlabs.com was set correctly,
+
+        | pkg publisher puppetlabs.com
+                Publisher: puppetlabs.com
+                    Alias:
+               Origin URI: http://solaris-11-ips-repo.acctest.dc1.puppetlabs.net/
+                  SSL Key: None
+                 SSL Cert: None
+              Client UUID: 37084c4a-fdc6-11e1-832b-8800273bd610
+          Catalog Updated: September 13, 2012 08:31:25 PM
+                  Enabled: Yes
+         Signature Policy: verify
+
+- Try installing puppet
+
+        | pkg install puppet
+        Creating Plan |
+        pkg install: Chain was rooted in an untrusted self-signed certificate.
+          The package involved is:pkg://puppetlabs.com/system/management/puppet@3.0.0,5.11-6.192:20120913T212942Z
+
+- We have two choices here, first, to ignore the signature policy for both publisher and image
+
+        | pkg set-publisher --set-property=signature-policy=ignore  puppetlabs.com
+        | pkg publisher puppetlabs.com
+                Publisher: puppetlabs.com
+                    Alias: 
+               Origin URI: http://solaris-11-ips-repo.acctest.dc1.puppetlabs.net/
+                  SSL Key: None
+                 SSL Cert: None
+              Client UUID: 140bb5c8-fe62-11e1-af70-8800273bd610
+          Catalog Updated: September 14, 2012 05:11:45 PM 
+                  Enabled: Yes
+         Signature Policy: ignore
+        | pkg set-property signature-policy ignore
+        | pkg install puppet
+
+- Or trust the self signed certificate from puppetlabs.com (this certificate needs to be published in our web site)
+
+        | pkg set-publisher --approve-ca-cert /root/mycert.pem puppetlabs.com
+
+- Verify that approve cert went well.
+
+        | pkg publisher puppetlabs.com
+
+                Publisher: puppetlabs.com
+                    Alias: 
+               Origin URI: http://solaris-11-ips-repo.acctest.dc1.puppetlabs.net/
+                  SSL Key: None
+                 SSL Cert: None
+              Client UUID: 37084c4a-fdc6-11e1-832b-8800273bd610
+          Catalog Updated: September 13, 2012 08:31:25 PM 
+             Approved CAs: 791b5791a81e9c2eb3fb9f84f4f86f8ea6fcd672
+                  Enabled: Yes
+         Signature Policy: verify
+
+        | pkg install puppet
+
+- Checking about information on the package (See the human readable version string)
+
+        | pkg info -r puppet
+                  Name: system/management/puppet
+               Summary: Puppet, an automated configuration management tool
+           Description: Puppet, an automated configuration management tool
+              Category: System/Administration and Configuration
+                 State: Not installed
+             Publisher: puppetlabs.com
+               Version: 3.0.0 (3.0.0-rc6)
+         Build Release: 5.11
+                Branch: 6.170
+        Packaging Date: September 14, 2012 06:11:05 PM 
+                  Size: 2.43 MB
+                  FMRI: pkg://puppetlabs.com/system/management/puppet@3.0.0,5.11-6.170:20120914T181105Z
+
+- Check license
+
+        | pkg info -r --license puppet
+           Puppet - Automating Configuration Management.
+
+           Copyright (C) 2005-2012 Puppet Labs Inc
+
+
+- Reference
+
+http://docs.oracle.com/cd/E19963-01/html/820-6572/managepkgs.html

data/ext/packaging/README.md

@@ -0,0 +1,89 @@
+Packaging
+
+This is a repository for packaging artifacts for Puppet Labs software.
+The goal is to abstract and automate packaging processes beyond individual
+software projects to a level where this repo can be cloned inside any
+project and used to build Debian and Redhat packages.
+
+It expects the following directory structure in the project
+*   ext/{debian,redhat,osx}
+
+each of which contains templated erb files using the instance variables
+specified in the setupvars task. These include a debian changelog, a
+redhat spec file, and an osx preflight and plist.
+
+The top level Rakefile in the project should have the following added:
+```ruby
+Dir['ext/packaging/tasks/**/*'].sort.each { |t| load t }
+begin
+  @build_defaults ||= YAML.load_file('ext/build_defaults.yaml')
+  @packaging_url  = @build_defaults['packaging_url']
+  @packaging_repo = @build_defaults['packaging_repo']
+rescue
+  STDERR.puts "Unable to read the packaging repo from ext/build_defaults.yaml"
+end
+
+
+namespace :package do
+  desc "Bootstrap packaging automation, e.g. clone into packaging repo"
+  task :bootstrap do
+    cd 'ext' do
+      %x{git clone #{@packaging_url}}
+    end
+  end
+
+  desc "Remove all cloned packaging automation"
+  task :implode do
+    rm_rf "ext/#{@packaging_repo}"
+  end
+end
+```
+
+Also in ext should be two files, build_defaults.yaml and project_data.yaml.
+
+This is the sample build_defaults.yaml file from Hiera:
+```yaml
+---
+packaging_url: 'git@github.com:puppetlabs/packaging --branch=master'
+packaging_repo: 'packaging'
+default_cow: 'base-squeeze-i386.cow'
+cows: 'base-lucid-amd64.cow base-lucid-i386.cow base-natty-amd64.cow base-natty-i386.cow base-oneiric-amd64.cow base-oneiric-i386.cow base-precise-amd64.cow base-precise-i386.cow base-sid-amd64.cow base-sid-i386.cow base-squeeze-amd64.cow base-squeeze-i386.cow base-testing-amd64.cow base-testing-i386.cow base-wheezy-i386.cow'
+pbuild_conf: '/etc/pbuilderrc'
+packager: 'puppetlabs'
+gpg_name: 'info@puppetlabs.com'
+gpg_key: '4BD6EC30'
+sign_tar: FALSE
+# a space separated list of mock configs
+final_mocks: 'pl-5-i386 pl-5-x86_64 pl-6-i386 pl-6-x86_64 fedora-15-i386 fedora-15-x86_64 fedora-16-i386 fedora-16-x86_64 fedora-17-i386 fedora-17-x86_64'
+rc_mocks: 'pl-5-i386-dev pl-5-x86_64-dev pl-6-i386-dev pl-6-x86_64-dev fedora-15-i386-dev fedora-15-x86_64-dev fedora-16-i386-dev fedora-16-x86_64-dev fedora-17-i386-dev fedora-17-x86_64-dev'
+yum_host: 'burji.puppetlabs.com'
+yum_repo_path: '~/repo/'
+apt_host: 'burji.puppetlabs.com'
+apt_repo_url: 'http://apt.puppetlabs.com'
+apt_repo_path: '/opt/repository/incoming'
+# Whether to present the gem and apple tasks
+build_gem: TRUE
+build_dmg: TRUE
+```
+This is the sample project_data.yaml file:
+```yaml
+---
+project: 'hiera'
+author: 'Puppet Labs'
+email: 'info@puppetlabs.com'
+homepage: 'https://github.com/puppetlabs/hiera'
+summary: 'Light weight hierarchical data store'
+description: 'A pluggable data store for hierarcical data'
+version_file: '/lib/hiera.rb'
+# files and gem_files are space separated lists
+files: '[A-Z]* ext lib bin spec acceptance_tests'
+gem_files: '{bin,lib}/**/* CHANGELOG COPYING README.md LICENSE'
+gem_require_path: 'lib'
+gem_test_files: 'spec/**/*'
+gem_executables: 'hiera'
+gem_default_executables: 'hiera'
+# To add gem dependencies, indent.
+# This is an example only, hiera doesn't really depend on hiera-puppet
+gem_dependencies:
+  hiera-puppet: '1.0.0rc'
+```

data/ext/packaging/tasks/00_utils.rb

@@ -0,0 +1,236 @@
+# Utility methods used by the various rake tasks
+
+def check_tool(tool)
+  %x{which #{tool}}
+  unless $?.success?
+    STDERR.puts "#{tool} tool not found...exiting"
+    exit 1
+  end
+end
+
+def find_tool(tool)
+  location = %x{which #{tool}}.chomp
+  location if $?.success?
+end
+
+def check_file(file)
+  unless File.exist?(file)
+    STDERR.puts "#{file} file not found...exiting"
+    exit 2
+  end
+end
+
+def check_var(varname,var=nil)
+  if var.nil?
+    STDERR.puts "Requires #{varname} be set...exiting"
+    exit 3
+  end
+end
+
+def check_host(host)
+  unless host == %x{hostname}.chomp!
+    STDERR.puts "Requires host to be #{host}...exiting"
+    exit 5
+  end
+end
+
+def erb(erbfile,  outfile)
+  template = File.read(erbfile)
+  message = ERB.new(template, nil, "-")
+  output = message.result(binding)
+  File.open(outfile, 'w') { |f| f.write output }
+  puts "Generated: #{outfile}"
+end
+
+def cp_pr(src, dest, options={})
+  mandatory = {:preserve => true}
+  cp_r(src, dest, options.merge(mandatory))
+end
+
+def cp_p(src, dest, options={})
+  mandatory = {:preserve => true}
+  cp(src, dest, options.merge(mandatory))
+end
+
+def mv_f(src, dest, options={})
+  force = {:force => true}
+  mv(src, dest, options.merge(mandatory))
+end
+
+def git_co(dist)
+  %x{git reset --hard ; git checkout #{dist}}
+  unless $?.success?
+    STDERR.puts 'Could not checkout #{dist} git branch to build package from...exiting'
+    exit 1
+  end
+end
+
+def get_temp
+  temp = `mktemp -d -t tmpXXXXXX`.strip
+end
+
+def remote_ssh_cmd target, command
+  check_tool('ssh')
+  puts "Executing '#{command}' on #{target}"
+  %x{ssh #{target} '#{command}'}
+end
+
+def rsync_to *args
+  check_tool('rsync')
+  flags = "-Havxl -O --no-perms --no-owner --no-group"
+  source  = args[0]
+  target  = args[1]
+  dest    = args[2]
+  puts "rsyncing #{source} to #{target}"
+  %x{rsync #{flags} #{source} #{ENV['USER']}@#{target}:#{dest}}
+end
+
+def scp_file_from(host,path,file)
+  %x{scp #{ENV['USER']}@#{host}:#{path}/#{file} #{@tempdir}/#{file}}
+end
+
+def scp_file_to(host,path,file)
+  %x{scp #{@tempdir}/#{file} #{ENV['USER']}@#{host}:#{path}}
+end
+
+def timestamp
+  Time.now.strftime("%Y-%m-%d %H:%M:%S")
+end
+
+def get_dash_version
+  if File.exists?('.git')
+    %x{git describe}.chomp.split('-')[0..1].join('-').gsub('v','')
+  else
+    get_pwd_version
+  end
+end
+
+def get_ips_version
+  if File.exists?('.git')
+    desc = %x{git describe}.chomp.split(/[.-]/)
+    commits = %x{git log --oneline --no-merges | wc -l}.chomp.strip
+    osrelease = %x{uname -r}.chomp
+    "%s.%s.%s,#{osrelease}-%s" % [ desc[0],desc[1], desc[2], commits]
+  else
+    get_pwd_version
+  end
+end
+
+def get_dot_version
+  if File.exists?('.git')
+    %x{git describe}.chomp.gsub('-', '.').split('.')[0..3].join('.').gsub('v', '')
+  else
+    get_pwd_version
+  end
+end
+
+def get_pwd_version
+  %x{pwd}.strip.split('.')[-1]
+end
+
+def get_debversion
+  (@version.include?("rc") ? @version.sub(/rc[0-9]+/, '0.1\0') : "#{@version.gsub('-','.')}-1") + "#{@packager}#{get_debrelease}"
+end
+
+def get_origversion
+  @debversion.split('-')[0]
+end
+
+def get_rpmversion
+  @version.match(/^([0-9.]+)/)[1]
+end
+
+def get_version_file_version
+  # Match version files containing 'VERSION = "x.x.x"' and just x.x.x
+  contents = IO.read(@version_file)
+  if version_string = contents.match(/VERSION =.*/)
+    version_string.to_s.split()[-1]
+  else
+    contents
+  end
+end
+
+def get_debrelease
+  ENV['RELEASE'] || '1'
+end
+
+def get_rpmrelease
+  ENV['RELEASE'] ||
+    if @version.include?("rc")
+      "0.1" + @version.gsub('-', '_').match(/rc[0-9]+.*/)[0]
+    else
+      "1"
+    end
+end
+
+def restart_keychain
+  kill_keychain
+  start_keychain
+end
+
+def kill_keychain
+  %x{keychain -k mine}
+end
+
+def start_keychain
+  keychain = %x{/usr/bin/keychain -q --agents gpg --eval #{@gpg_key}}.chomp
+  new_env = keychain.match(/(GPG_AGENT_INFO)=([^;]*)/)
+  ENV[new_env[1]] = new_env[2]
+end
+
+def gpg_sign_file(file)
+  gpg ||= find_tool('gpg')
+
+  if gpg
+    sh "#{gpg} --armor --detach-sign -u #{@gpg_key} #{file}"
+  else
+    STDERR.puts "No gpg available. Cannot sign tarball. Exiting..."
+    exit 1
+  end
+end
+
+def mkdir_pr *args
+  args.each do |arg|
+    mkdir_p arg
+  end
+end
+
+def set_cow_envs(cow)
+  elements = cow.split('-')
+  if elements.size != 3
+    STDERR.puts "Expecting a cow name split on hyphens, e.g. 'base-squeeze-i386'"
+    exit 1
+  else
+    dist = elements[1]
+    arch = elements[2]
+    if dist.nil? or arch.nil?
+      STDERR.puts "Couldn't get the arg and dist from cow name. Expecting something like 'base-dist-arch'"
+      exit 1
+    end
+    arch = arch.split('.')[0] if arch.include?('.')
+  end
+
+  ENV['DIST'] = dist
+  ENV['ARCH'] = arch
+end
+
+def ln(target, name)
+  %x{ln -f #{target} #{name}}
+end
+
+def git_commit_file(file)
+  %x{which git &> /dev/null}
+  if $?.success? and File.exist?('.git')
+    %x{git commit #{file} -m "Commit changes to #{file}" &> /dev/null}
+  end
+end
+
+def ship_gem(file)
+  %x{gem push #{file}}
+end
+
+def x(v)
+  puts %[#{v}]
+  print %x[#{v}]
+end
+