puppet 3.0.0.rc5 → 3.0.0.rc7

data/ext/packaging/tasks/mock.rake

@@ -0,0 +1,88 @@
+
+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 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

@@ -0,0 +1,20 @@
+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/packaging/tasks/rpm.rake

@@ -0,0 +1,39 @@
+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

@@ -0,0 +1,34 @@
+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
+
+  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
+
+  if @build_gem == TRUE or @build_gem == 'true' or @build_gem == 'TRUE'
+    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

@@ -0,0 +1,76 @@
+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
+    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
+
+  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
+
+  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
+    restart_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/tar.rake

@@ -0,0 +1,20 @@
+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/project_data.yaml

@@ -0,0 +1,25 @@
+---
+project: 'puppet'
+author: 'Puppet Labs'
+email: 'info@puppetlabs.com'
+homepage: 'https://github.com/puppetlabs/puppet'
+summary: 'Puppet, an automated configuration management tool'
+description: 'Puppet, an automated configuration management tool'
+version_file: 'lib/puppet/version.rb'
+# files and gem_files are space separated lists
+files: '[A-Z]* install.rb bin lib conf man examples ext tasks spec'
+# The gem specification bits only work on Puppet >= 3.0rc, NOT 2.7.x and earlier
+gem_files: '[A-Z]* install.rb bin lib conf man examples ext tasks spec'
+gem_test_files: 'spec/**/*'
+gem_executables: 'puppet'
+gem_default_executables: 'puppet'
+gem_forge_project: 'puppet'
+gem_runtime_dependencies:
+  facter: '>= 1.6.11'
+  hiera: '>= 1.0.0rc'
+gem_rdoc_options:
+  - --title
+  - "Puppet - Configuration Management"
+  - --main
+  - README.md
+  - --line-numbers

data/ext/rack/files/apache2.conf

@@ -24,7 +24,8 @@ Listen 8140
         SSLCARevocationFile     /etc/puppet/ssl/ca/ca_crl.pem
         SSLVerifyClient optional
         SSLVerifyDepth  1
-        SSLOptions +StdEnvVars
+        # The `ExportCertData` option is needed for agent certificate expiration warnings
+        SSLOptions +StdEnvVars +ExportCertData
 
         # This header needs to be set if using a loadbalancer or proxy
         RequestHeader unset X-Forwarded-For

data/{conf/redhat/puppet.spec → ext/redhat/puppet.spec.erb}

@@ -9,27 +9,34 @@
 %global puppet_libdir   %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]')
 %endif
 
-%global confdir conf/redhat
+%if 0%{?fedora} >= 17
+%global _with_systemd 1
+%else
+%global _with_systemd 0
+%endif
+
+# VERSION is subbed out during rake srpm process
+%global realversion <%= @version %>
+%global rpmversion <%= @rpmversion %>
+
+%global confdir ext/redhat
 
 Name:           puppet
-Version:        3.0.0
-Release:        0.1rc5%{?dist}
-#Release:        1%{?dist}
+Version:        %{rpmversion}
+Release:        <%= @rpmrelease -%>%{?dist}
 Vendor:         %{?_host_vendor}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
 URL:            http://puppetlabs.com
-#Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
-Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc5.tar.gz
-#Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.asc
-Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc5.tar.gz.asc
+Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{realversion}.tar.gz
 
 Group:          System Environment/Base
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  facter >= 1.6
-BuildRequires:  ruby >= 1.8.5
+BuildRequires:  facter < 1:2.0
+# Puppet 3.x drops ruby 1.8.5 support and adds ruby 1.9 support
+BuildRequires:  ruby >= 1.8.7
 
 BuildArch:      noarch
 Requires:       ruby(abi) >= 1.8
@@ -45,16 +52,26 @@ Requires:       ruby-shadow
 %endif
 
 Requires:       facter >= 1.6.11
-Requires:       ruby >= 1.8.5
+# Puppet 3.x drops ruby 1.8.5 support and adds ruby 1.9 support
+# Ruby 1.8.7 available for el5 at: yum.puppetlabs.com/el/5/devel/$ARCH
+Requires:       ruby >= 1.8.7
 Requires:       hiera >= 1.0.0
-Requires:       hiera-puppet >= 1.0.0
+Obsoletes:      hiera-puppet < 1.0.0
+Provides:       hiera-puppet >= 1.0.0
 %{!?_without_augeas:Requires: ruby-augeas}
 
-Requires(pre):  shadow-utils
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(preun): initscripts
-Requires(postun): initscripts
+# Required for %%pre
+Requires:       shadow-utils
+
+%if 0%{?_with_systemd}
+# Required for %%post, %%preun, %%postun
+Requires:       systemd
+%else
+# Required for %%post and %%preun
+Requires:       chkconfig
+# Required for %%preun and %%postun
+Requires:       initscripts
+%endif
 
 %description
 Puppet lets you centrally manage every important aspect of your system using a
@@ -66,19 +83,17 @@ along with obviously discrete elements like packages, services, and files.
 Group:          System Environment/Base
 Summary:        Server for the puppet system management tool
 Requires:       puppet = %{version}-%{release}
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(preun): initscripts
-Requires(postun): initscripts
+# chkconfig (%%post, %%preun) and initscripts (%%preun %%postun) are required for non systemd
+# and systemd (%%post, %%preun, and %%postun) are required for systems with systemd as default
+# They come along transitively with puppet-%{version}-%{release}.
 
 %description server
 Provides the central puppet server daemon which provides manifests to clients.
 The server can also function as a certificate authority and file server.
 
 %prep
-#%setup -q -n %{name}-%{version}
-%setup -q -n %{name}-%{version}rc5
-patch -s -p1 < conf/redhat/rundir-perms.patch
+%setup -q -n %{name}-%{realversion}
+patch -s -p1 < ext/redhat/rundir-perms.patch
 
 
 %build
@@ -107,12 +122,24 @@ install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
 install -d -m0755 %{buildroot}%{_datadir}/%{name}/modules
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
 install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
+
+# As per redhat bz #495096
 install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet
+
+%if 0%{?_with_systemd}
+# Systemd for fedora >= 17
+%{__install} -d -m0755  %{buildroot}%{_unitdir}
+install -Dp -m0644 ext/systemd/puppetagent.service %{buildroot}%{_unitdir}/puppetagent.service
+install -Dp -m0644 ext/systemd/puppetmaster.service %{buildroot}%{_unitdir}/puppetmaster.service
+%else
+# Otherwise init.d for fedora < 17 or el 5, 6
 install -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
 install -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
 install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
 install -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
 install -Dp -m0755 %{confdir}/queue.init %{buildroot}%{_initrddir}/puppetqueue
+%endif
+
 install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
 install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
 install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
@@ -122,6 +149,14 @@ install -d %{buildroot}%{_datadir}/%{name}
 cp -a ext/ %{buildroot}%{_datadir}/%{name}
 # emacs and vim bits are installed elsewhere
 rm -rf %{buildroot}%{_datadir}/%{name}/ext/{emacs,vim}
+# remove misc packaging artifacts not applicable to rpms
+rm -rf %{buildroot}%{_datadir}/%{name}/ext/{gentoo,freebsd,solaris,suse,windows,osx,ips,debian}
+rm -f %{buildroot}%{_datadir}/%{name}/ext/redhat/*.init
+rm -f %{buildroot}%{_datadir}/%{name}/ext/{build_defaults.yaml,project_data.yaml}
+
+# Rpmlint fixup
+chmod 755 %{buildroot}%{_datadir}/%{name}/ext/regexp_nodes/regexp_nodes.rb
+chmod 755 %{buildroot}%{_datadir}/%{name}/ext/puppet-load.rb
 
 # Install emacs mode files
 emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp
@@ -146,16 +181,21 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
 
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGELOG LICENSE README.md examples
+%doc LICENSE README.md examples
 %{_bindir}/puppet
+%{_bindir}/extlookup2hiera
 %{puppet_libdir}/*
+%if 0%{?_with_systemd}
+%{_unitdir}/puppetagent.service
+%else
 %{_initrddir}/puppet
+%config(noreplace) %{_sysconfdir}/sysconfig/puppet
+%endif
 %dir %{_sysconfdir}/puppet
 %dir %{_sysconfdir}/%{name}/modules
 %if 0%{?fedora} >= 15
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
 %endif
-%config(noreplace) %{_sysconfdir}/sysconfig/puppet
 %config(noreplace) %{_sysconfdir}/puppet/puppet.conf
 %config(noreplace) %{_sysconfdir}/puppet/auth.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
@@ -206,11 +246,15 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
 
 %files server
 %defattr(-, root, root, 0755)
+%if 0%{?_with_systemd}
+%{_unitdir}/puppetmaster.service
+%else
 %{_initrddir}/puppetmaster
 %{_initrddir}/puppetqueue
+%config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster
+%endif
 %config(noreplace) %{_sysconfdir}/puppet/fileserver.conf
 %dir %{_sysconfdir}/puppet/manifests
-%config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster
 %{_mandir}/man8/puppet-ca.8.gz
 %{_mandir}/man8/puppet-master.8.gz
 
@@ -228,6 +272,19 @@ fi
 exit 0
 
 %post
+%if 0%{?_with_systemd}
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ "$1" -ge 1 ]; then
+  # The pidfile changed from 0.25.x to 2.6.x, handle upgrades without leaving
+  # the old process running.
+  oldpid="%{_localstatedir}/run/puppet/puppetd.pid"
+  newpid="%{_localstatedir}/run/puppet/agent.pid"
+  if [ -s "$oldpid" -a ! -s "$newpid" ]; then
+    (kill $(< "$oldpid") && rm -f "$oldpid" && \
+      /bin/systemctl start puppetagent.service) >/dev/null 2>&1 || :
+  fi
+fi
+%else
 /sbin/chkconfig --add puppet || :
 if [ "$1" -ge 1 ]; then
   # The pidfile changed from 0.25.x to 2.6.x, handle upgrades without leaving
@@ -239,8 +296,22 @@ if [ "$1" -ge 1 ]; then
       /sbin/service puppet start) >/dev/null 2>&1 || :
   fi
 fi
+%endif
 
 %post server
+%if 0%{?_with_systemd}
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ "$1" -ge 1 ]; then
+  # The pidfile changed from 0.25.x to 2.6.x, handle upgrades without leaving
+  # the old process running.
+  oldpid="%{_localstatedir}/run/puppet/puppetmasterd.pid"
+  newpid="%{_localstatedir}/run/puppet/master.pid"
+  if [ -s "$oldpid" -a ! -s "$newpid" ]; then
+    (kill $(< "$oldpid") && rm -f "$oldpid" && \
+      /bin/systemctl start puppetmaster.service) > /dev/null 2>&1 || :
+  fi
+fi
+%else
 /sbin/chkconfig --add puppetmaster || :
 if [ "$1" -ge 1 ]; then
   # The pidfile changed from 0.25.x to 2.6.x, handle upgrades without leaving
@@ -252,33 +323,69 @@ if [ "$1" -ge 1 ]; then
       /sbin/service puppetmaster start) >/dev/null 2>&1 || :
   fi
 fi
+%endif
 
 %preun
+%if 0%{?_with_systemd}
+if [ "$1" -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable puppetagent.service > /dev/null 2>&1 || :
+    /bin/systemctl stop puppetagent.service > /dev/null 2>&1 || :
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+%else
 if [ "$1" = 0 ] ; then
-  /sbin/service puppet stop >/dev/null 2>&1
-  /sbin/chkconfig --del puppet || :
+    /sbin/service puppet stop > /dev/null 2>&1
+    /sbin/chkconfig --del puppet || :
 fi
+%endif
 
 %preun server
+%if 0%{?_with_systemd}
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable puppetmaster.service > /dev/null 2>&1 || :
+    /bin/systemctl stop puppetmaster.service > /dev/null 2>&1 || :
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+%else
 if [ "$1" = 0 ] ; then
-  /sbin/service puppetmaster stop >/dev/null 2>&1
-  /sbin/chkconfig --del puppetmaster || :
+    /sbin/service puppetmaster stop > /dev/null 2>&1
+    /sbin/chkconfig --del puppetmaster || :
 fi
+%endif
 
 %postun
+%if 0%{?_with_systemd}
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart puppetagent.service >/dev/null 2>&1 || :
+fi
+%else
 if [ "$1" -ge 1 ]; then
-  /sbin/service puppet condrestart >/dev/null 2>&1 || :
+    /sbin/service puppet condrestart >/dev/null 2>&1 || :
 fi
+%endif
 
 %postun server
+%if 0%{?_with_systemd}
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart puppetmaster.service >/dev/null 2>&1 || :
+fi
+%else
 if [ "$1" -ge 1 ]; then
-  /sbin/service puppetmaster condrestart >/dev/null 2>&1 || :
+    /sbin/service puppetmaster condrestart >/dev/null 2>&1 || :
 fi
+%endif
 
 %clean
 rm -rf %{buildroot}
 
 %changelog
+* <%= Time.now.strftime("%a %b %d %Y") %> Puppet Labs Release <info@puppetlabs.com> -  <%= @rpmversion %>-<%= @rpmrelease %>
+- Build for <%= @version %>
+
 * Wed Aug 29 2012 Moses Mendoza <moses@puppetlabs.com> - 3.0.0-0.1rc5
 - Update for 3.0.0 rc5