From d071bc08bfdaf154f1691999e5f413c7a3b634af Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 3 Jun 2013 16:31:37 -0400
Subject: Core: don't unnecessarily set debug to False on server startup

---
 src/lib/Bcfg2/Server/Core.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/lib/Bcfg2/Server/Core.py')

diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index c246860c1..6e0d38418 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -785,7 +785,8 @@ class BaseCore(object):
             while self.fam.pending() != 0:
                 time.sleep(1)
 
-        self.set_debug(None, self.debug_flag)
+        if self.debug_flag:
+            self.set_debug(None, self.debug_flag)
         self._block()
 
     def _daemonize(self):
-- 
cgit v1.2.3-1-g7c22


From 7d53dd1afe826fc6537d3a747fb3737cd011dec6 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Wed, 19 Jun 2013 14:59:50 -0400
Subject: Core: rewrite $HOME after dropping privs

---
 src/lib/Bcfg2/Server/Core.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/lib/Bcfg2/Server/Core.py')

diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 6e0d38418..f44634d35 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -3,6 +3,7 @@ implementations inherit from. """
 
 import os
 import sys
+import pwd
 import time
 import atexit
 import select
@@ -758,6 +759,11 @@ class BaseCore(object):
                 os.chmod(piddir, 493)  # 0775
             if not self._daemonize():
                 return False
+
+            # rewrite $HOME. pulp stores its auth creds in ~/.pulp, so
+            # this is necessary to make that work when privileges are
+            # dropped
+            os.environ['HOME'] = pwd.getpwuid(self.setup['daemon_uid'])[5]
         else:
             os.umask(int(self.setup['umask'], 8))
 
-- 
cgit v1.2.3-1-g7c22


From 8b49d8b198564d0dae3e40b99b6f9d76188dcda7 Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Wed, 26 Jun 2013 09:15:40 -0500
Subject: Revert "Core: properly handle Ctrl-C"

This reverts commit 4568c44372c99ba809826e016680da9b881bd8e8.

Trying to handle ^c in the core is difficult and can break STDOUT for
interactive programs that invoke the core.

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

Conflicts:
	src/lib/Bcfg2/Server/Core.py
	src/sbin/bcfg2-test
	tools/bcfg2-profile-templates.py
---
 src/lib/Bcfg2/Server/Core.py | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'src/lib/Bcfg2/Server/Core.py')

diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index f44634d35..ecd68e1e4 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -2,15 +2,14 @@
 implementations inherit from. """
 
 import os
-import sys
 import pwd
-import time
 import atexit
-import select
-import signal
 import logging
-import inspect
+import select
+import sys
 import threading
+import time
+import inspect
 import lxml.etree
 import Bcfg2.settings
 import Bcfg2.Server
@@ -244,14 +243,6 @@ class BaseCore(object):
         #: The CA that signed the server cert
         self.ca = setup['ca']
 
-        def hdlr(sig, frame):  # pylint: disable=W0613
-            """ Handle SIGINT/Ctrl-C by shutting down the core and exiting
-            properly. """
-            self.shutdown()
-            os._exit(1)  # pylint: disable=W0212
-
-        signal.signal(signal.SIGINT, hdlr)
-
         #: The FAM :class:`threading.Thread`,
         #: :func:`_file_monitor_thread`
         self.fam_thread = \
-- 
cgit v1.2.3-1-g7c22