[puppet/f16] Improve NetworkManager compatibility, thanks to Orion Poplawski (#532085)

[Todd Zullinger]

commit 78fc6fe163e45f315eb42f840ce775e6bb5d0160
Author: Todd Zullinger <tmz at pobox.com>
Date:   Wed Jul 11 10:03:42 2012 -0400

    Improve NetworkManager compatibility, thanks to Orion Poplawski (#532085)

 puppet-nm-dispatcher |    8 ++++++++
 puppet.spec          |   12 +++++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/puppet-nm-dispatcher b/puppet-nm-dispatcher
new file mode 100755
index 0000000..6e9e0b3
--- /dev/null
+++ b/puppet-nm-dispatcher
@@ -0,0 +1,8 @@
+#!/bin/bash
+#
+# Restart puppet on network changes to pickup changes to /etc/resolv.conf
+#
+# https://projects.puppetlabs.com/issues/2776
+# https://bugzilla.redhat.com/532085
+
+[[ $2 =~ ^(up|down)$ ]] && /sbin/service puppet condrestart || :
diff --git a/puppet.spec b/puppet.spec
index b85bdf2..6036f16 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -19,9 +19,10 @@ License:        GPLv2
 URL:            http://puppetlabs.com
 Source0:        http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz
 Source1:        http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz.asc
+Source2:        puppet-nm-dispatcher
 # https://projects.puppetlabs.com/issues/9167
 Patch0:         0001-9167-Do-not-sent-tagmail-reports-if-no-changes.patch
-# http://projects.puppetlabs.com/issues/11414
+# https://projects.puppetlabs.com/issues/11414
 # https://bugzilla.redhat.com/771097
 Patch1:         puppet-2.6.13-augeas-0.10.patch
 
@@ -132,6 +133,11 @@ touch %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
 touch %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
 touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 
+# Install a NetworkManager dispatcher script to pickup changes to
+# /etc/resolv.conf and such (https://bugzilla.redhat.com/532085).
+install -Dpv %{SOURCE2} \
+    %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/98-%{name}
+
 # Install the ext/ directory to %{_datadir}/%{name}
 install -d %{buildroot}%{_datadir}/%{name}
 cp -a ext/ %{buildroot}%{_datadir}/%{name}
@@ -178,6 +184,9 @@ echo "D /var/run/%{name} 0755 %{name} %{name} -" > \
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetca.conf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
+%dir %{_sysconfdir}/NetworkManager
+%dir %{_sysconfdir}/NetworkManager/dispatcher.d
+%{_sysconfdir}/NetworkManager/dispatcher.d/98-puppet
 # We don't want to require emacs or vim, so we need to own these dirs
 %{_datadir}/emacs
 %{_datadir}/vim
@@ -282,6 +291,7 @@ rm -rf %{buildroot}
 * Wed Jul 11 2012 Todd Zullinger <tmz at pobox.com> - 2.6.17-1
 - Update to 2.6.17, fixes CVE-2012-3864, CVE-2012-3865, CVE-2012-3866,
   CVE-2012-3867
+- Improve NetworkManager compatibility, thanks to Orion Poplawski (#532085)
 
 * Wed Apr 11 2012 Todd Zullinger <tmz at pobox.com> - 2.6.16-1
 - Update to 2.6.16, fixes CVE-2012-1986, CVE-2012-1987, and CVE-2012-1988