diff --git a/README.md b/README.md index ed3d3ae..57f9973 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ mumble_yunohost =============== A yunohost compatible version of Mumble server (Murmur). -This download it via the repository of debian and configures it with given settings. +This downloads it via the repository of debian and configures it with given settings. SETUP ====== diff --git a/manifest.json b/manifest.json index 71f21c3..bf55b66 100644 --- a/manifest.json +++ b/manifest.json @@ -6,12 +6,12 @@ "fr": "Mumble est un logiciel libre de voix sur IP (VoIP), son principal usage étant la communication pendant les parties de jeux en réseau." }, "developer": { - "name": "Thorvald Natvig", - "email": "BSD", + "name": "Matlink", + "email": "matlink@matlink.fr", "url": "http://www.mumble.info" }, "multi_instance": "false", - "license": "Beerware", + "license": "BSD", "arguments": { "install" : [ { @@ -25,8 +25,17 @@ { "name": "password", "ask": { - "en": "Choose a password for your mumble server. Type nothing if you don't want to set a password", - "fr": "Choisissez un mot de passe pour votre serveur Mumble. Ne rien rentrer si vous ne souhaitez pas mettre de mot de passe" + "en": "Choose a password for your mumble server. This password is given to persons who want to join", + "fr": "Choisissez un mot de passe pour votre serveur Mumble. Ce mot de passe sera donné aux personnes qui veulent rejoindre le serveur" + }, + "example": "super_secret_password", + "default": "" + }, + { + "name": "su_password", + "ask": { + "en": "Choose a password for the SuperUser. This is different from the server password and allows you to create the first admin.", + "fr": "Choisissez un mot de passe pour le SuperUser. Il est différent du mot de passe du serveur est permet de créer le premier Administrateur." }, "example": "super_secret_password" }, diff --git a/scripts/install b/scripts/install index 8c2739f..d34733e 100644 --- a/scripts/install +++ b/scripts/install @@ -6,9 +6,10 @@ app=mumbleserver # Retrieve arguments admin=$1 server_password=$2 -welcometext=$3 -port=$4 -registerName=$5 +su_passwd=$3 +welcometext=$4 +port=$5 +registerName=$6 mumble_conf=/etc/mumble-server.ini # Check user @@ -38,11 +39,6 @@ sudo sed -i "s/port=.*/port=$port/g" $mumble_conf sudo sed -i "s/serverpassword=.*/serverpassword=$server_password/g" $mumble_conf sudo sed -i "s/*serverpassword=.*/registerName=$registerName/g" $mumble_conf -#generating random password for super-user -su_passwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p') - -#save superuser password -sudo yunohost app setting $app superuser_password -v "$su_passwd" #open port in firewall sudo yunohost firewall allow Both $port > /dev/null 2>&1