Hello community, here is the log from the commit of package puppet for openSUSE:Factory checked in at 2014-04-09 13:15:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/puppet (Old) and /work/SRC/openSUSE:Factory/.puppet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "puppet" Changes: -------- --- /work/SRC/openSUSE:Factory/puppet/puppet.changes 2014-01-03 14:59:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.puppet.new/puppet.changes 2014-04-09 13:15:26.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Apr 7 10:57:44 CEST 2014 - [email protected] + +- finish migration to systemd +- drop puppet-3.0.2-client-init-masterport.patch as there is no init + script anymore +- drop useless sysconfig files and provide compatibility %post scripts +- puppet user is needed only for server +- use upstream service names (and warn users) +- little bit polished upstream unit files + * added puppet-3.3.1-systemd-units.patch + * https://github.com/puppetlabs/puppet/pull/2510 + +------------------------------------------------------------------- Old: ---- puppet-3.0.2-client-init-masterport.patch puppet.sysconfig puppetagent.service New: ---- puppet-3.3.1-systemd-units.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ puppet.spec ++++++ --- /var/tmp/diff_new_pack.BCOu0j/_old 2014-04-09 13:15:27.000000000 +0200 +++ /var/tmp/diff_new_pack.BCOu0j/_new 2014-04-09 13:15:27.000000000 +0200 @@ -31,16 +31,10 @@ Source: http://downloads.puppetlabs.com/puppet/%{name}-%{version}.tar.gz Source1: puppetmaster.fw Source2: puppet.fw -Source3: puppet.sysconfig -Source4: puppetmasterd.sysconfig -Source5: puppetagent.service -Source6: puppet.changelog -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines +Source7: puppet.changelog Patch0: puppet-2.6.6-yumconf.diff -# PATCH-FIX-OPENSUSE puppet-3.0.2-init.diff [email protected] -- 2013-11-02 refactored [email protected] fix masterport -# PATCH-OBSOLETE -- Obsolete previous puppet-3.0.2-init.diff which causes a stop of the puppet client to -# to shutdown the puppetmaster. Kept the original fix for masterport -Patch1: puppet-3.0.2-client-init-masterport.patch +# PATCH-FIX_UPSTREAM puppet-3.3.1-systemd-units.patch https://github.com/puppetlabs/puppet/pull/2510 +Patch1: puppet-3.3.1-systemd-units.patch Obsoletes: hiera-puppet < 1.0.0 Provides: hiera-puppet >= 1.0.0 Requires: facter >= 1.6.4 @@ -56,19 +50,12 @@ BuildRequires: emacs-nox BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires(pre): %fillup_prereq -Requires(pre): %insserv_prereq Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd -%if 0%{?suse_version} >= 1210 BuildRequires: systemd -%endif +%{?systemd_requires} -%if %suse_version > 1220 %define _unitdir /usr/lib/systemd -%else -%define _unitdir /lib/systemd -%endif %description Puppet lets you centrally manage every important aspect of your system @@ -80,9 +67,7 @@ %package server Summary: A network tool for managing many disparate systems Group: Productivity/Networking/System -Requires(pre): %fillup_prereq -Requires(pre): %insserv_prereq -Requires(pre): puppet = %{version} +%{?systemd_requires} %description server Puppet lets you centrally manage every important aspect of your system @@ -95,36 +80,27 @@ %setup -q %patch0 %patch1 -cp %{S:6} ChangeLog +cp %{S:7} ChangeLog %build %install ruby install.rb install --destdir=%{buildroot} --sitelibdir=%{_libdir}/ruby/vendor_ruby/%{rb_ver} mkdir -p %{buildroot}%{_sysconfdir}/puppet -mkdir -p %{buildroot}%{_sysconfdir}/init.d mkdir -p %{buildroot}/%{_sbindir} mkdir -p %{buildroot}%{_localstatedir}/lib/puppet mkdir -p %{buildroot}%{_localstatedir}/log/puppet mkdir -p %{buildroot}/%{_fwdefdir} -%if 0%{?suse_version} >= 1210 mkdir -p %{buildroot}%{_unitdir}/system -%endif install -m0644 ext/redhat/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf install -m0644 conf/auth.conf %{buildroot}%{_sysconfdir}/puppet/auth.conf -install -m0755 ext/suse/client.init %{buildroot}%{_initddir}/puppet -install -m0755 ext/suse/server.init %{buildroot}%{_initddir}/puppetmasterd -ln -sf ../../etc/init.d/puppet %{buildroot}/%{_sbindir}/rcpuppet -ln -sf ../../etc/init.d/puppetmasterd %{buildroot}/%{_sbindir}/rcpuppetmasterd +ln -sf service %{buildroot}/%{_sbindir}/rcpuppet +ln -sf service %{buildroot}/%{_sbindir}/rcpuppetmaster install -m 644 %{SOURCE1} %{buildroot}/%{_fwdefdir}/puppetmasterd install -m 644 %{SOURCE2} %{buildroot}/%{_fwdefdir}/puppet -%if 0%{?suse_version} >= 1210 -install -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/system/puppetagent.service +# Latest git calls the service for agent puppet again +install -m 644 ext/systemd/puppetagent.service %{buildroot}%{_unitdir}/system/puppet.service install -m 644 ext/systemd/puppetmaster.service %{buildroot}%{_unitdir}/system/puppetmaster.service -%endif -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates -cp %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.puppet -cp %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.puppetmasterd %fdupes -s %{buildroot}/%{_mandir} # puppet ext/ data @@ -163,29 +139,44 @@ install -Dp -m0644 ext/emacs/puppet-mode-init.el \ $emacsdir/site-start.d/puppet-mode-init.el -%pre +%pre server getent group puppet >/dev/null || /usr/sbin/groupadd -r puppet getent passwd puppet >/dev/null || /usr/sbin/useradd -r -g puppet -d /var/lib/puppet -s /bin/false -c "Puppet daemon" puppet +%service_add_pre puppetmaster.service + +%pre +%service_add_pre puppet.service %preun -%stop_on_removal puppet +%service_del_preun puppet.service %postun -%restart_on_update puppet -%insserv_cleanup +%service_del_postun puppet.service %post -%fillup_and_insserv +# Compatibility with old setups +if [ -f /etc/sysconfig/puppet ] && [ -z "`grep 'PUPPET_EXTRA_OPTS="' /etc/sysconfig/puppet | grep ' --server=${PUPPET_SERVER} --port=${PUPPET_PORT} --logdest=${PUPPET_LOG}"'`" ]; then + echo 'PUPPET_EXTRA_OPTS=" --server=${PUPPET_SERVER} --port=${PUPPET_PORT} --logdest=${PUPPET_LOG} ${PUPPET_EXTRA_OPTS}"' >> /etc/sysconfig/puppet +fi +%service_add_post puppet.service %preun server -%stop_on_removal puppetmasterd - -%post server -%fillup_and_insserv -f +%service_del_preun puppetmaster.service %postun server -%restart_on_update puppetmasterd -%insserv_cleanup +%service_del_postun puppetmaster.service + +%post server +# Compatibility with old setups +if [ -f /etc/sysconfig/puppetmasterd ] && [ -z "`grep 'PUPPETMASTER_EXTRA_OPTS="' /etc/sysconfig/puppetmasterd | grep ' --manifest=${PUPPETMASTER_MANIFEST} --masterport=${PUPPETMASTER_PORTS[0]} --logdest ${PUPPETMASTER_LOG}'`" ]; then + echo 'PUPPETMASTER_EXTRA_OPTS=" --manifest=${PUPPETMASTER_MANIFEST} --masterport=${PUPPETMASTER_PORTS[0]} --logdest ${PUPPETMASTER_LOG} ${PUPPETMASTER_EXTRA_OPTS}' >> /etc/sysconfig/puppet +fi +%service_add_post puppetmaster.service +cat > %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} << EOF +Warning: If you used puppet on openSUSE/SLE before be aware, that service is now +Warning: called puppemaster instead of puppetmasterd. This was done to comply +Warning: with upstream naming of the service and hopefully with everybody else +EOF %files %defattr(-,root,root,-) @@ -232,23 +223,15 @@ %config %{_sysconfdir}/puppet/puppet.conf %config %{_sysconfdir}/puppet/auth.conf %{_mandir}/man?/* -%{_sysconfdir}/init.d/puppet %{_sbindir}/rcpuppet %config %{_fwdefdir}/puppet -%{_localstatedir}/adm/fillup-templates/sysconfig.puppet -%if 0%{?suse_version} >= 1210 -%{_unitdir}/system/puppetagent.service -%endif +%{_unitdir}/system/puppet.service %files server %defattr(-, root, root, 0755) %dir %attr(755,root,root) -%{_sbindir}/rcpuppetmasterd -%{_sysconfdir}/init.d/puppetmasterd +%{_sbindir}/rcpuppetmaster %config %{_fwdefdir}/puppetmasterd -%{_localstatedir}/adm/fillup-templates/sysconfig.puppetmasterd -%if 0%{?suse_version} >= 1210 %{_unitdir}/system/puppetmaster.service -%endif %changelog ++++++ puppet-3.3.1-systemd-units.patch ++++++ Index: ext/systemd/puppetagent.service =================================================================== --- ext/systemd/puppetagent.service.orig +++ ext/systemd/puppetagent.service @@ -1,13 +1,11 @@ [Unit] Description=Puppet agent Wants=basic.target -After=basic.target network.target +After=basic.target network.target puppetmaster.service [Service] -Type=forking -EnvironmentFile=-/etc/sysconfig/puppetagent -PIDFile=/run/puppet/agent.pid -ExecStart=/usr/bin/puppet agent $PUPPET_EXTRA_OPTS +EnvironmentFile=-/etc/sysconfig/puppet +ExecStart=/usr/bin/puppet agent ${PUPPET_EXTRA_OPTS} --no-daemonize [Install] WantedBy=multi-user.target Index: ext/systemd/puppetmaster.service =================================================================== --- ext/systemd/puppetmaster.service.orig +++ ext/systemd/puppetmaster.service @@ -4,10 +4,8 @@ Wants=basic.target After=basic.target network.target [Service] -Type=forking EnvironmentFile=-/etc/sysconfig/puppetmaster -PIDFile=/run/puppet/master.pid -ExecStart=/usr/bin/puppet master $PUPPETMASTER_EXTRA_OPTS +ExecStart=/usr/bin/puppet master ${PUPPETMASTER_EXTRA_OPTS} --no-daemonize [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
