3 files changed, 28 insertions, 10 deletions
diff --git a/src/leap/bitmask/app.py b/src/leap/bitmask/app.py
index eda4073c..43dabad3 100644
--- a/src/leap/bitmask/app.py
+++ b/src/leap/bitmask/app.py
@@ -49,7 +49,7 @@ from leap.bitmask.backend.utils import generate_certificates
 from leap.bitmask import __version__ as VERSION
 from leap.bitmask.config import flags
 from leap.bitmask.frontend_app import run_frontend
-from leap.bitmask.backend.leapbackend import run_backend
+from leap.bitmask.backend_app import run_backend
 from leap.bitmask.logs.utils import create_logger
 from leap.bitmask.platform_init.locks import we_are_the_one_and_only
 from leap.bitmask.services.mail import plumber
diff --git a/src/leap/bitmask/backend/leapbackend.py b/src/leap/bitmask/backend/leapbackend.py
index d6b0954a..4794d988 100644
--- a/src/leap/bitmask/backend/leapbackend.py
+++ b/src/leap/bitmask/backend/leapbackend.py
@@ -18,7 +18,6 @@
 Backend for everything
 """
 import logging
-import signal
 
 import zope.interface
 import zope.proxy
@@ -503,11 +502,3 @@ class LeapBackend(Backend):
             imap_stopped
         """
         self._mail.stop_imap_service()
-
-
-def run_backend(bypass_checks=False):
-    # Ensure that the application quits using CTRL-C
-    signal.signal(signal.SIGINT, signal.SIG_DFL)
-
-    backend = LeapBackend(bypass_checks=bypass_checks)
-    backend.run()
diff --git a/src/leap/bitmask/backend_app.py b/src/leap/bitmask/backend_app.py
index e69de29b..bd3b8a1f 100644
--- a/src/leap/bitmask/backend_app.py
+++ b/src/leap/bitmask/backend_app.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# backend_app.py
+# Copyright (C) 2013, 2014 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+import signal
+
+from leap.bitmask.backend.leapbackend import LeapBackend
+
+
+def run_backend(bypass_checks=False):
+    # Ensure that the application quits using CTRL-C
+    signal.signal(signal.SIGINT, signal.SIG_DFL)
+
+    backend = LeapBackend(bypass_checks=bypass_checks)
+    backend.run()