From e3d33d10fbdbf362b89476fbdab6c7a6ca0a45fb Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Wed, 13 Jun 2012 11:37:40 +0100 Subject: Make use of the new ensure_directory() function (#840) --- kolabd/__init__.py | 6 ++++++ saslauthd/__init__.py | 12 ++++++++++++ wallace/__init__.py | 6 ++++++ 3 files changed, 24 insertions(+) diff --git a/kolabd/__init__.py b/kolabd/__init__.py index bf4fc7b..5283c9f 100644 --- a/kolabd/__init__.py +++ b/kolabd/__init__.py @@ -91,6 +91,12 @@ class KolabDaemon(object): exitcode = 0 + utils.ensure_directory( + os.path.dirname(conf.pidfile), + conf.process_username, + conf.process_groupname + ) + try: try: (ruid, euid, suid) = os.getresuid() diff --git a/saslauthd/__init__.py b/saslauthd/__init__.py index 6daebf3..1497dda 100644 --- a/saslauthd/__init__.py +++ b/saslauthd/__init__.py @@ -60,6 +60,12 @@ class SASLAuthDaemon(object): conf.finalize_conf() + utils.ensure_directory( + os.path.dirname(conf.pidfile), + conf.process_username, + conf.process_groupname + ) + self.thread_count = 0 def run(self): @@ -116,6 +122,12 @@ class SASLAuthDaemon(object): s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + utils.ensure_directory( + '/var/run/saslauthd/', + conf.process_username, + conf.process_groupname + ) + # TODO: The saslauthd socket path could be a setting. try: os.remove('/var/run/saslauthd/mux') diff --git a/wallace/__init__.py b/wallace/__init__.py index 45ad211..5d056df 100644 --- a/wallace/__init__.py +++ b/wallace/__init__.py @@ -116,6 +116,12 @@ class WallaceDaemon(object): conf.finalize_conf() + utils.ensure_directory( + os.path.dirname(conf.pidfile), + conf.process_username, + conf.process_groupname + ) + import modules modules.__init__() -- cgit v1.1