puppet 3.0.0 → 3.0.1.rc1

data/ext/packaging/tasks/mock.rake

@@ -1,88 +0,0 @@
-
-def mock(mock_config, srpm)
-  check_tool('mock')
-  sh "mock -r #{mock_config} #{srpm}"
-end
-
-def srpm_file
-  srpm = Dir["pkg/srpm/*.rpm"][0]
-  check_file(srpm)
-  srpm
-end
-
-def mock_el_family(mock_config)
-  family = mock_config.split('-')[0]
-  family = 'el' if family == 'pl'
-  family
-end
-
-def mock_el_ver(mock_config)
-  version = mock_config.split('-')[1]
-  version = "f#{version}" if mock_config.split('-')[0] == 'fedora'
-  version
-end
-
-def build_rpm_with_mock(is_rc, subdir)
-  if is_rc
-    mocks = @rc_mocks
-  else
-    mocks = @final_mocks
-  end
-
-  mocks.split(' ').each do |mock_config|
-    family  = mock_el_family(mock_config)
-    version = mock_el_ver(mock_config)
-    arch    = mock_config.split('-')[2]
-    result  = "/var/lib/mock/#{mock_config}/result/*.rpm"
-
-    mock(mock_config, srpm_file)
-
-    Dir[result].each do |rpm|
-      rpm.strip!
-      unless ENV['RC_OVERRIDE'] == '1'
-        if is_rc == FALSE and rpm =~ /[0-9]+rc[0-9]+\./
-          puts "It looks like you might be trying to ship an RC to the production repos. Leaving rpm in #{result}. Pass RC_OVERRIDE=1 to override."
-          next
-        elsif is_rc and rpm !~ /[0-9]+rc[0-9]+\./
-          puts "It looks like you might be trying to ship a production release to the development repos. Leaving rpm in #{result}. Pass RC_OVERRIDE=1 to override."
-          next
-        end
-      end
-
-      case File.basename(rpm)
-        when /debuginfo/
-          rm_rf(rpm)
-        when /src\.rpm/
-          cp_pr(rpm, "pkg/#{family}/#{version}/#{subdir}/SRPMS")
-        when /i.?86/
-          cp_pr(rpm, "pkg/#{family}/#{version}/#{subdir}/i386")
-        when /x86_64/
-          cp_pr(rpm, "pkg/#{family}/#{version}/#{subdir}/x86_64")
-        when /noarch/
-          cp_pr(rpm, "pkg/#{family}/#{version}/#{subdir}/i386")
-          ln("pkg/#{family}/#{version}/#{subdir}/i386/#{File.basename(rpm)}", "pkg/#{family}/#{version}/#{subdir}/x86_64/")
-      end
-    end
-  end
-end
-
-
-namespace :pl do
-  task :setup_el_dirs do
-    %x{mkdir -p pkg/el/{5,6}/{products,devel,dependencies}/{SRPMS,i386,x86_64}}
-    %x{mkdir -p pkg/fedora/{f15,f16,f17}/{products,devel,dependencies}/{SRPMS,i386,x86_64}}
-  end
-
-  desc "Use specified mocks to make final rpms, keyed to PL infrastructure, pass MOCK to specifiy config"
-  task :mock_final => [ "package:srpm", "pl:setup_el_dirs" ] do
-    subdir = ENV['subdir'] || 'products'
-    build_rpm_with_mock(FALSE, subdir)
-  end
-
-  desc "Use specified mocks to make RC rpms, keyed to PL infrastructure, pass MOCK to specify config"
-  task :mock_rc => [ "package:srpm", "pl:setup_el_dirs" ] do
-    subdir = 'devel'
-    build_rpm_with_mock(TRUE, subdir)
-  end
-end
-

data/ext/packaging/tasks/release.rake

@@ -1,56 +0,0 @@
-# These tasks are "release" chains that couple as much of the release process for a package as possible
-
-namespace :pl do
-  if @build_gem
-    desc "Build and ship a gem"
-    task :release_gem do
-      invoke_task("package:gem")
-      if confirm_ship(FileList["pkg/*.gem"])
-        invoke_task("pl:ship_gem")
-      end
-    end
-  end
-
-  desc "Release deb RCs, e.g. package:tar, pl:{deb_all_rc, sign_deb_changes, ship_debs}"
-  task :release_deb_rc do
-    load_keychain if has_tool('keychain')
-    invoke_task("pl:deb_all_rc")
-    invoke_task("pl:sign_deb_changes")
-    if confirm_ship(FileList["pkg/deb/**/*"])
-      invoke_task("pl:ship_debs")
-    end
-  end
-
-  desc "Release deb FINALs, e.g. package:tar, pl:{deb_all, sign_deb_changes, ship_debs}"
-  task :release_deb_final do
-    load_keychain if has_tool('keychain')
-    invoke_task("pl:deb_all")
-    invoke_task("pl:sign_deb_changes")
-    if confirm_ship(FileList["pkg/deb/**/*"])
-      invoke_task("pl:ship_debs")
-    end
-  end
-
-  desc "Release rpm RCs, e.g. package:tar, pl:{mock_rc, sign_rpms, ship_rpms, update_yum_repo}"
-  task :release_rpm_rc do
-    invoke_task("pl:mock_rc")
-    invoke_task("pl:sign_rpms")
-    if confirm_ship(FileList["pkg/el/**/*", "pkg/fedora/**/*"])
-      invoke_task("pl:ship_rpms")
-      invoke_task("pl:update_yum_repo")
-    end
-  end
-
-  desc "Release rpm FINALs, e.g. package:tar, pl:{mock_final, sign_rpms, ship_rpms, update_yum_repo}"
-  task :release_rpm_final do
-    invoke_task("pl:mock_final")
-    invoke_task("pl:sign_rpms")
-    if confirm_ship(FileList["pkg/el/**/*", "pkg/fedora/**/*"])
-      invoke_task("pl:ship_rpms")
-      invoke_task("pl:update_yum_repo")
-    end
-  end
-end
-
-
-

data/ext/packaging/tasks/rpm.rake

@@ -1,39 +0,0 @@
-def build_rpm(buildarg = "-bs")
-  check_tool('rpmbuild')
-  temp = get_temp
-  rpm_define = "--define \"%dist .el5\" --define \"%_topdir  #{temp}\" "
-  rpm_old_version = '--define "_source_filedigest_algorithm 1" --define "_binary_filedigest_algorithm 1" \
-     --define "_binary_payload w9.gzdio" --define "_source_payload w9.gzdio" \
-     --define "_default_patch_fuzz 2"'
-  args = rpm_define + ' ' + rpm_old_version
-  mkdir_pr temp, 'pkg/rpm', 'pkg/srpm', "#{temp}/SOURCES", "#{temp}/SPECS"
-  if @sign_tar
-    Rake::Task["pl:sign_tar"].invoke
-    cp_p "pkg/#{@name}-#{@version}.tar.gz.asc", "#{temp}/SOURCES"
-  end
-  cp_p "pkg/#{@name}-#{@version}.tar.gz", "#{temp}/SOURCES"
-  erb "ext/redhat/#{@name}.spec.erb", "#{temp}/SPECS/#{@name}.spec"
-  sh "rpmbuild #{args} #{buildarg} --nodeps #{temp}/SPECS/#{@name}.spec"
-  mv FileList["#{temp}/SRPMS/*.rpm"], "pkg/srpm"
-  mv FileList["#{temp}/RPMS/*/*.rpm"], "pkg/rpm"
-  rm_rf temp
-  puts
-  output = FileList['pkg/*/*.rpm']
-  puts "Wrote:"
-  output.each do | line |
-    puts line
-  end
-end
-
-namespace :package do
-  desc "Create srpm from this git repository (unsigned)"
-  task :srpm => :tar do
-    build_rpm("-bs")
-  end
-
-  desc "Create .rpm from this git repository (unsigned)"
-  task :rpm => :tar do
-    build_rpm("-ba")
-  end
-end
-

data/ext/packaging/tasks/ship.rake

@@ -1,36 +0,0 @@
-namespace :pl do
-  desc "Ship mocked rpms to #{@yum_host}"
-  task :ship_rpms do
-    rsync_to('pkg/el', @yum_host, @yum_repo_path)
-    rsync_to('pkg/fedora', @yum_host, @yum_repo_path)
-  end
-
-  desc "Update remote rpm repodata on #{@yum_host}"
-  task :update_yum_repo do
-    remote_ssh_cmd(@yum_host, '/var/lib/gems/1.8/gems/rake-0.9.2.2/bin/rake -f /opt/repository/Rakefile mk_repo')
-  end
-
-  desc "Ship cow-built debs to #{@apt_host}"
-  task :ship_debs do
-    rsync_to('pkg/deb/', @apt_host, @apt_repo_path)
-  end
-
-  if @build_ips
-    desc "Update remote ips repository on #{@ips_host}"
-    task :update_ips_repo do
-      rsync_to('pkg/ips/pkgs', @ips_host, @ips_store)
-      remote_ssh_cmd(@ips_host, "pkgrecv -s #{@ips_store}/pkgs/#{@name}@#{@ipsversion}.p5p -d #{@ips_repo} \\*")
-      remote_ssh_cmd(@ips_host, "pkgrepo refresh -s #{@ips_repo}")
-      remote_ssh_cmd(@ips_host, "/usr/sbin/svcadm restart svc:/application/pkg/server")
-    end
-  end
-
-  if @build_gem
-    desc "Ship built gem to rubygems"
-    task :ship_gem do
-      ship_gem("pkg/#{@name}-#{@gemversion}.gem")
-    end
-  end
-end
-
-

data/ext/packaging/tasks/sign.rake

@@ -1,79 +0,0 @@
-def sign_el5(rpm)
-  %x{rpm --define '%_gpg_name #{@gpg_name}' --define '%__gpg_sign_cmd %{__gpg} gpg --force-v3-sigs --digest-algo=sha1 --batch --no-verbose --no-armor --passphrase-fd 3 --no-secmem-warning -u %{_gpg_name} -sbo %{__signature_filename} %{__plaintext_filename}' --addsign #{rpm} > /dev/null}
-end
-
-def sign_modern(rpm)
-  %x{rpm --define '%_gpg_name #{@gpg_name}' --addsign #{rpm} > /dev/null}
-end
-
-def rpm_has_sig(rpm)
-  %x{rpm -Kv #{rpm} | grep "#{@gpg_key.downcase}" &> /dev/null}
-  $?.success?
-end
-
-def sign_deb_changes(file)
-  %x{debsign --re-sign -k#{@gpg_key} #{file}}
-end
-
-# requires atleast a self signed prvate key and certificate pair
-def sign_ips(pkg)
-  %x{pkgsign -s pkg/ips/repo/  -k #{@privatekey_pem} -c #{@certificate_pem} #{@name}@#{@ipsversion}}
-  %x{rm -f #{pkg}}
-  %x{pkgrecv -s pkg/ips/repo -a -d #{pkg} #{@name}@#{@ipsversion}}
-end
-
-namespace :pl do
-  desc "Sign the tarball, defaults to PL key, pass GPG_KEY to override or edit build_defaults"
-  task :sign_tar do
-    unless File.exist? "pkg/#{@name}-#{@version}.tar.gz"
-      STDERR.puts "No tarball exists. Try rake package:tar?"
-      exit 1
-    end
-    load_keychain if has_tool('keychain')
-    gpg_sign_file "pkg/#{@name}-#{@version}.tar.gz"
-  end
-
-  desc "Sign mocked rpms, Defaults to PL Key, pass KEY to override"
-  task :sign_rpms do
-    el5_rpms    = Dir["pkg/el/5/**/*.rpm"].join(' ')
-    modern_rpms = (Dir["pkg/el/6/**/*.rpm"] + Dir["pkg/fedora/**/*.rpm"]).join(' ')
-    puts "Signing el5 rpms..."
-    sign_el5 el5_rpms
-    puts "Signing el6 and fedora rpms..."
-    sign_modern modern_rpms
-  end
-
-  if @build_ips
-    desc "Sign ips package, Defaults to PL Key, pass KEY to override"
-    task :sign_ips do
-      ips_pkgs    = Dir["pkg/ips/pkgs/*.p5p"].join(' ')
-      puts "Signing ips packages..."
-      sign_ips ips_pkgs
-    end
-  end
-
-  desc "Check if all rpms are signed"
-  task :check_rpm_sigs do
-    signed = TRUE
-    rpms = Dir["pkg/el/5/**/*.rpm"] + Dir["pkg/el/6/**/*.rpm"] + Dir["pkg/fedora/**/*.rpm"]
-    print 'Checking rpm signatures'
-    rpms.each do |rpm|
-      if rpm_has_sig rpm
-        print '.'
-      else
-        puts "#{rpm} is unsigned."
-        signed = FALSE
-      end
-    end
-    exit 1 unless signed
-    puts "All rpms signed"
-  end
-
-  desc "Sign generated debian changes files. Defaults to PL Key, pass KEY to override"
-  task :sign_deb_changes do
-    load_keychain if has_tool('keychain')
-    sign_deb_changes("pkg/deb/*/*.changes") unless Dir["pkg/deb/*/*.changes"].empty?
-    sign_deb_changes("pkg/deb/*.changes") unless Dir["pkg/deb/*.changes"].empty?
-  end
-end
-

data/ext/packaging/tasks/tag.rake

@@ -1,8 +0,0 @@
-namespace 'pl' do
-  desc "Tag this repository, requires a TAG, e.g. TAG=1.1.1"
-  task "tag" do
-    check_var('TAG', ENV['TAG'])
-    git_tag(ENV['TAG'])
-  end
-end
-

data/ext/packaging/tasks/tar.rake

@@ -1,20 +0,0 @@
-namespace :package do
-  desc "Create a source tar archive"
-  task :tar => [ :clean ] do
-    tar = ENV['TAR'] || 'tar'
-    workdir = "pkg/#{@name}-#{@version}"
-    mkdir_p(workdir)
-    FileList[@files.split(' ')].each do |f|
-      cp_pr(f, workdir)
-    end
-    erb("#{workdir}/ext/redhat/#{@name}.spec.erb", "#{workdir}/ext/redhat/#{@name}.spec")
-    erb("#{workdir}/ext/debian/changelog.erb", "#{workdir}/ext/debian/changelog")
-    rm_rf(FileList["#{workdir}/ext/debian/*.erb", "#{workdir}/ext/redhat/*.erb"])
-    cd "pkg" do
-      sh "#{tar} --exclude=.gitignore --exclude=ext/#{@packaging_repo} -zcf #{@name}-#{@version}.tar.gz #{@name}-#{@version}"
-    end
-    rm_rf(workdir)
-    puts
-    puts "Wrote #{`pwd`.strip}/pkg/#{@name}-#{@version}.tar.gz"
-  end
-end

data/ext/packaging/tasks/version.rake

@@ -1,20 +0,0 @@
-namespace :package do
-  desc "Update the version in #{@version_file} to current and commit."
-  task :versionbump  do
-    old_version =  get_version_file_version
-    contents = IO.read(@version_file)
-    new_version = '"' + @version.to_s.strip + '"'
-    if contents.match("VERSION = #{old_version}")
-      contents.gsub!("VERSION = #{old_version}", "VERSION = #{new_version}")
-    elsif contents.match("#{@name.upcase}VERSION = #{old_version}")
-      contents.gsub!("#{@name.upcase}VERSION = #{old_version}", "#{@name.upcase}VERSION = #{new_version}")
-    else
-      contents.gsub!(old_version, @version)
-    end
-    file = File.open(@version_file, 'w')
-    file.write contents
-    file.close
-    git_commit_file(@version_file)
-  end
-end
-

data/ext/suse/fileserver.conf

@@ -1,12 +0,0 @@
-# This file consists of arbitrarily named sections/modules
-# defining where files are served from and to whom
-
-# Define a section 'files'
-# Adapt the allow/deny settings to your needs. Order
-# for allow/deny does not matter, allow always takes precedence
-# over deny
-# [files]
-#  path /var/lib/puppet/files
-#  allow *.example.com
-#  deny *.evil.example.com
-#  allow 192.168.0.0/24

data/ext/suse/logrotate

@@ -1,10 +0,0 @@
-/var/log/puppet/*log {
-  missingok
-  notifempty
-  create 0644 puppet puppet
-  sharedscripts
-  postrotate
-    [ -e /etc/init.d/puppetmaster ] && /etc/init.d/puppetmaster condrestart >/dev/null 2>&1 || true
-    [ -e /etc/init.d/puppet ] && /etc/init.d/puppet reload > /dev/null 2>&1 || true
-  endscript
-}

data/ext/suse/puppet.conf

@@ -1,25 +0,0 @@
-[main]
-    # The Puppet log directory.
-    # The default value is '$vardir/log'.
-    logdir = /var/log/puppet
-
-    # Where Puppet PID files are kept.
-    # The default value is '$vardir/run'.
-    rundir = /var/run/puppet
-
-    # Where SSL certificates are kept.
-    # The default value is '$confdir/ssl'.
-    ssldir = $vardir/ssl
-
-[agent]
-    # The file in which puppetd stores a list of the classes
-    # associated with the retrieved configuratiion.  Can be loaded in
-    # the separate ``puppet`` executable using the ``--loadclasses``
-    # option.
-    # The default value is '$confdir/classes.txt'.
-    classfile = $vardir/classes.txt
-
-    # Where puppetd caches the local configuration.  An
-    # extension indicating the cache format is added automatically.
-    # The default value is '$confdir/localconfig'.
-    localconfig = $vardir/localconfig

data/lib/puppet/network/http/mongrel/rest.rb

@@ -1,104 +0,0 @@
-require 'puppet/network/http/handler'
-
-class Puppet::Network::HTTP::MongrelREST < Mongrel::HttpHandler
-
-  include Puppet::Network::HTTP::Handler
-
-  ACCEPT_HEADER = "HTTP_ACCEPT".freeze # yay, zed's a crazy-man
-
-  def initialize(args={})
-    super()
-    initialize_for_puppet(args)
-  end
-
-  def accept_header(request)
-    request.params[ACCEPT_HEADER]
-  end
-
-  def content_type_header(request)
-    request.params["HTTP_CONTENT_TYPE"]
-  end
-
-  # which HTTP verb was used in this request
-  def http_method(request)
-    request.params[Mongrel::Const::REQUEST_METHOD]
-  end
-
-  # Return the query params for this request.  We had to expose this method for
-  # testing purposes.
-  def params(request)
-    params = Mongrel::HttpRequest.query_parse(request.params["QUERY_STRING"])
-    params.merge!(Mongrel::HttpRequest.query_parse(body(request))) if http_method(request).upcase == 'POST'
-
-    params = decode_params(params)
-    params.merge(client_info(request))
-  end
-
-  # what path was requested?
-  def path(request)
-    # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
-    #x = '/' + request.params[Mongrel::Const::REQUEST_PATH]
-    request.params[Mongrel::Const::REQUEST_PATH]
-  end
-
-  # return the request body
-  def body(request)
-    body = request.body.read
-    # We rewind the body, since read on a StringIO is destructive, and
-    # subsequent reads will return an empty string.
-    request.body.rewind
-
-    body
-  end
-
-  # There is no standard way of retrieving the client certificate since it is completely
-  # dictated by the web server environment; this is a stub to prevent a NotImplementedError
-  def client_cert(request)
-  end
-
-  def set_content_type(response, format)
-    response.header['Content-Type'] = format_to_mime(format)
-  end
-
-  # produce the body of the response
-  def set_response(response, result, status = 200)
-    # Set the 'reason' (or 'message', as it's called in Webrick), when
-    # we have a failure, unless we're on a version of mongrel that doesn't
-    # support this.
-    if status < 300
-      unless result.is_a?(File)
-        response.start(status) { |head, body| body.write(result) }
-      else
-        response.start(status) { |head, body| }
-        response.send_status(result.stat.size)
-        response.send_header
-        response.send_file(result.path)
-      end
-    else
-      begin
-        response.start(status,false,result) { |head, body| body.write(result) }
-      rescue ArgumentError
-        response.start(status)              { |head, body| body.write(result) }
-      end
-    end
-  end
-
-  def client_info(request)
-    result = {}
-    params = request.params
-    result[:ip] = params["HTTP_X_FORWARDED_FOR"] ? params["HTTP_X_FORWARDED_FOR"].split(',').last.strip : params["REMOTE_ADDR"]
-
-    # JJM #906 The following dn.match regular expression is forgiving
-    # enough to match the two Distinguished Name string contents
-    # coming from Apache, Pound or other reverse SSL proxies.
-    if dn = params[Puppet[:ssl_client_header]] and dn_matchdata = dn.match(/^.*?CN\s*=\s*(.*)/)
-      result[:node] = dn_matchdata[1].to_str
-      result[:authenticated] = (params[Puppet[:ssl_client_verify_header]] == 'SUCCESS')
-    else
-      result[:node] = resolve_node(result)
-      result[:authenticated] = false
-    end
-
-    result
-  end
-end