From 10758cce5f7103a8bfaa7840a056c226ea456931 Mon Sep 17 00:00:00 2001 From: Daniel M <daniel.q.mueller@stud.h-da.de> Date: Mon, 8 Nov 2021 13:26:54 +0100 Subject: [PATCH] Make user configurable --- local.yml | 3 +++ roles/jupyter-lab/files/jupyter.service | 7 ++++--- roles/jupyter-lab/tasks/main.yml | 8 ++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/local.yml b/local.yml index 1197008..7e7673c 100644 --- a/local.yml +++ b/local.yml @@ -1,5 +1,8 @@ --- - hosts: localhost + vars: + target_user: pi + pre_tasks: # - name: Upgrade packages # become: true diff --git a/roles/jupyter-lab/files/jupyter.service b/roles/jupyter-lab/files/jupyter.service index 5b44a74..cd84905 100644 --- a/roles/jupyter-lab/files/jupyter.service +++ b/roles/jupyter-lab/files/jupyter.service @@ -5,9 +5,10 @@ Description=Jupyter Lab Type=simple PIDFile=/run/jupyter.pid # Password: [empty string] -ExecStart=/usr/bin/python3 -m jupyterlab --ip="0.0.0.0" --notebook-dir=/home/pi/notebooks --no-browser --NotebookApp.password='sha1:9a2d316959ac:843b251c27024afb46174ce40ce0ebebcf29217b' -User=pi -Group=pi +ExecStart=/usr/bin/python3 -m jupyterlab --ip="0.0.0.0" +--notebook-dir=/home/{{ target_user }}/notebooks --no-browser --NotebookApp.password='sha1:9a2d316959ac:843b251c27024afb46174ce40ce0ebebcf29217b' +User={{ target_user }} +Group={{ target_user }} Restart=always RestartSec=10 diff --git a/roles/jupyter-lab/tasks/main.yml b/roles/jupyter-lab/tasks/main.yml index 6ae98f2..adb63c1 100644 --- a/roles/jupyter-lab/tasks/main.yml +++ b/roles/jupyter-lab/tasks/main.yml @@ -3,10 +3,10 @@ - name: Notebooks dir file: - path: /home/pi/notebooks + path: "/home/{{ target_user }}/notebooks" state: directory - owner: pi - group: pi + owner: "{{ target_user }}" + group: "{{ target_user }}" # This should be optimized so that only one check / install is needed # Still we should make sure that pip3 is actually installed before trying to use it @@ -27,7 +27,7 @@ - name: Install systemd service become: true - copy: + template: src: files/jupyter.service dest: /etc/systemd/system/jupyter.service mode: '0644' -- GitLab