diff --git a/manifest.json b/manifest.json index 5fdec8e..a8886c4 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "id": "mumbleserver", "description": { "en": "Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming.", - "fr": "Mumbleest un logiciel libre de voix sur IP (VoIP), son principal usage étant la communication pendant les parties de jeux en réseau." + "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", @@ -53,13 +53,13 @@ "fr": "Entrez un port pour votre serveur. Laissez par défaut si vous ne voulez pas en changer" }, "example": "64738", - "default": "64738'" + "default": "64738" }, { "name": "registername", "ask": { "en": "Choose a name for the root channel", - "fr": "Entrez un nom pour le channel racines" + "fr": "Entrez un nom pour le channel racine" }, "example": "Root", "default": "Root'" diff --git a/scripts/install b/scripts/install index 1c31cf3..a6968ae 100644 --- a/scripts/install +++ b/scripts/install @@ -12,9 +12,24 @@ port=$5 registerName=$6 mumble_conf=/etc/mumble-server.ini +# Check user +sudo yunohost user list --json | grep -q "\"username\": \"$user\"" +if [[ ! $? -eq 0 ]]; then +echo "Wrong user" + exit 1 +fi +# Check port availability +sudo yunohost app checkport $port +if [[ ! $? -eq 0 ]]; then + exit 1 +fi + +#open port in firewall +sudo yunohost firewall allow Both $port > /dev/null 2>&1 # Save app settings sudo yunohost app setting $app admin -v "$admin" +sudo yunohost app setting $app port -v "$port" # install via apt-get sudo apt-get update diff --git a/scripts/remove b/scripts/remove index ea74462..173508a 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,20 +1,6 @@ #!/bin/bash -db_user=emailPoubelle -db_name=$db_user -root_pwd=$(sudo cat /etc/yunohost/mysql) -domain=$(sudo yunohost app setting emailpoubelle domain) - -#removing emailpoubelle database -sudo mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;" -#removing emailpoubelle directory -sudo rm -rf /var/www/emailpoubelle -#removing nginx conf -sudo rm -f /etc/nginx/conf.d/$domain.d/emailpoubelle.conf -#removing aliases -sudo sed -i "s@devnull:/dev/null@@g" /etc/aliases -sudo newaliases -sudo sed -i "s@virtual_alias_maps = hash:/var/www/emailpoubelle/var/virtual@@g" /etc/postfix/main.cf -sudo service postfix reload -sudo nginx reload -sudo yunohost app ssowatconf \ No newline at end of file +app=mumbleserver +$port=$(sudo yunohost app setting $app port) +sudo apt-get autoremove -y mumble-server +sudo yunohost firewall disallow Both $port > /dev/null 2>&1 \ No newline at end of file