diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2018-01-09 10:41:42 +0100 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2018-01-09 10:41:42 +0100 |
| commit | 01f55d2fd3ea0e9620bb631dd91e475444393099 (patch) | |
| tree | 8ba7d5048778d8335c4444584d68ca96e352266a /lava-master | |
| parent | c856c35e30f4465f8d14834d672a0dcbf06567fb (diff) | |
Permit to create staff/superuser users
This patch add two user options staff and superuser.
This will permit to create users with thoses flag in LAVA.
In the process remove the hardcoded admin user from Dockerfile and move
it in tokens.yaml
Diffstat (limited to 'lava-master')
| -rw-r--r-- | lava-master/Dockerfile | 5 | ||||
| -rwxr-xr-x | lava-master/scripts/setup.sh | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index be8a3b7..1e396d4 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -45,11 +45,6 @@ RUN service postgresql start \ && a2ensite lava-server \ && /stop.sh -# Create a admin user (Insecure note, this creates a default user, username: admin/admin) -RUN /start.sh \ - && lava-server manage users add --passwd admin --staff --superuser --email admin@example.com admin \ - && /stop.sh - # Install latest #RUN /start.sh \ # && git clone https://github.com/kernelci/lava-dispatcher.git -b master /root/lava-dispatcher \ diff --git a/lava-master/scripts/setup.sh b/lava-master/scripts/setup.sh index b60c93b..5b62c45 100755 --- a/lava-master/scripts/setup.sh +++ b/lava-master/scripts/setup.sh @@ -5,14 +5,23 @@ if [ -e /root/lava-users ];then do # User is the filename USER=$ut + USER_OPTION="" + STAFF=0 + SUPERUSER=0 . /root/lava-users/$ut if [ -z "$PASSWORD" -o "$PASSWORD" = "$TOKEN" ];then echo "Generating password..." #Could be very long, should be avoided PASSWORD=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) fi - echo "Adding username $USER DEBUG(with $TOKEN / $PASSWORD)" - lava-server manage users add --passwd $PASSWORD $USER || exit 1 + if [ $STAFF -eq 1 ];then + USER_OPTION="$USER_OPTION --staff" + fi + if [ $SUPERUSER -eq 1 ];then + USER_OPTION="$USER_OPTION --superuser" + fi + echo "Adding username $USER DEBUG(with $TOKEN / $PASSWORD / $USER_OPTION)" + lava-server manage users add --passwd $PASSWORD $USER_OPTION $USER || exit 1 if [ ! -z "$TOKEN" ];then lava-server manage tokens add --user $USER --secret $TOKEN || exit 1 fi |