Merge: create dedicated user, put logs in right place

4 files changed, 12 insertions, 5 deletions

diff --git a/debian/ick2.postinst b/debian/ick2.postinst
index c8192a7..13595a9 100644
--- a/debian/ick2.postinst
+++ b/debian/ick2.postinst
@@ -16,7 +16,14 @@
 
 set -eu
 
+# Create a group and user for ick
+addgroup --system --force _ick
+adduser --system --disabled-login --disabled-password \
+        --gecos "Ick CI" --home /var/lib/ick \
+        --shell /bin/true --force \
+        _ick
+
 # Create the log directory with the right ownership and permissions.
-install -d -m 0755 -o www-data -g www-data /var/log/ick2
+install -d -m 0755 -o _ick -g _ick /var/log/ick
 
 #DEBHELPER#
diff --git a/ick2.service b/ick2.service
index 9e2f4c1..57fd209 100644
--- a/ick2.service
+++ b/ick2.service
@@ -18,8 +18,8 @@ After=network.target
 
 [Service]
 Type=simple
-User=www-data
-Group=www-data
+User=_ick
+Group=_ick
 WorkingDirectory=/var/lib/ick
 ExecStart=/usr/bin/start_ick
 KillSignal=QUIT
diff --git a/ick_controller.py b/ick_controller.py
index 59ac86a..a7a1c51 100644
--- a/ick_controller.py
+++ b/ick_controller.py
@@ -59,7 +59,7 @@ def load_config(filename, defconf):
 def main():
     logger = logging.getLogger()
     logger.setLevel(logging.DEBUG)
-    handler = logging.FileHandler('/tmp/ick.log')
+    handler = logging.StreamHandler(sys.stderr)
     logger.addHandler(handler)
     logging.info('Starting ick controller main program')
 
diff --git a/start_ick b/start_ick
index 2878f95..add1f61 100644
--- a/start_ick
+++ b/start_ick
@@ -19,6 +19,6 @@ set -eux
 export ICK_CONTROLLER_CONFIG=/etc/ick/controller.conf
 gunicorn3 \
     --bind 127.0.0.1:12765 \
-    --log-file /tmp/gunicorn3.log \
+    --log-file /var/log/ick/gunicorn3.log \
     --log-level debug \
     ick_controller:app