From 82f94593227dae6305b95cbfb4db43ac33f2ab64 Mon Sep 17 00:00:00 2001 From: ewilly Date: Sun, 17 Apr 2016 17:19:47 +0200 Subject: [PATCH] allowed users #6 --- manifest.json | 9 --------- scripts/install | 18 +++--------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/manifest.json b/manifest.json index 902bf0e..b92ad6f 100644 --- a/manifest.json +++ b/manifest.json @@ -37,15 +37,6 @@ "example": "/bozon", "default": "/bozon" }, - { - "name": "admin", - "type": "user", - "ask": { - "en": "Choose an admin user for BoZoN", - "fr": "Choisissez un administrateur pour BoZoN" - }, - "example": "homer" - }, { "name": "public_site", "ask": { diff --git a/scripts/install b/scripts/install index 5d39b26..ebd4076 100644 --- a/scripts/install +++ b/scripts/install @@ -6,10 +6,9 @@ set -e # retrieve arguments domain=$1 path=$2 -admin=$3 -is_public=$4 -default_lang=$5 -filesize=$6 +is_public=$3 +default_lang=$4 +filesize=$5 # definie useful vars app=bozon @@ -26,15 +25,7 @@ if [[ ! $? -eq 0 ]]; then exit 1 fi -# check user -sudo yunohost user list --json | grep -q "\"username\": \"$admin\"" -if [[ ! $? -eq 0 ]]; then - echo "Wrong user" - exit 1 -fi - # save app settings -sudo yunohost app setting $app admin -v "$admin" sudo yunohost app setting $app is_public -v "$is_public" sudo yunohost app setting $app domain -v "$domain" sudo yunohost app setting $app path -v "$path" @@ -92,9 +83,6 @@ else sudo yunohost app setting $app unprotected_uris -v "/" fi -# adding admin to the allowed users -sudo yunohost app addaccess $app -u $admin - # restart services sudo service nginx reload sudo yunohost app ssowatconf