diff --git a/manifest.json b/manifest.json index 52a2847..d3fdb45 100644 --- a/manifest.json +++ b/manifest.json @@ -26,7 +26,7 @@ "install" : [ { "name": "domain", - "type": "domain", + "type": "domain", "ask": { "en": "Choose a domain name for BicBucStriim", "fr": "Choisissez un nom de domaine pour BicBucStriim" @@ -35,7 +35,7 @@ }, { "name": "path", - "type": "path", + "type": "path", "ask": { "en": "Choose a path for BicBucStriim", "fr": "Choisissez un chemin pour BicBucStriim" @@ -45,13 +45,21 @@ }, { "name": "admin", - "type": "user", + "type": "user", "ask": { "en": "Choose an admin user", "fr": "Choisissez l’administrateur" }, "example": "johndoe" }, + { + "name": "admin_pwd", + "type": "password", + "ask": { + "en": "Choose a password for the admin user", + "fr": "Choisissez un mot de passe pour l’administrateur" + } + }, { "name": "login", "type": "boolean", diff --git a/scripts/install b/scripts/install index a174fa2..ed8eeb7 100644 --- a/scripts/install +++ b/scripts/install @@ -20,6 +20,7 @@ path=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC login=$YNH_APP_ARG_LOGIN +admin_pwd=$YNH_APP_ARG_ADMIN_PWD # Source YunoHost helpers source /usr/share/yunohost/helpers @@ -58,12 +59,20 @@ fi sudo chown -R root: $src_path sudo chmod -R ga+w $src_path/data +cp password.php $src_path/ynh_password.php +cd $src_path +hash=$(php ynh_password.php $admin_pwd) +rm ynh_password.php +cd - +mail=$(ynh_user_get_info $admin mail) if ! ynh_package_is_installed "sqlite3" ; then ynh_package_install sqlite3 echo "INSERT INTO config (name, val) VALUES ('calibre_dir', '/var/www/bicbucstriim_library');" | sqlite3 $src_path/data/data.db + echo "UPDATE user SET username = '$admin', password = '$hash', email='$mail' WHERE id = 1;" | sqlite3 $src_path/data/data.db ynh_package_remove sqlite3 else echo "INSERT INTO config (name, val) VALUES ('calibre_dir', '/var/www/bicbucstriim_library');" | sqlite3 $src_path/data/data.db + echo "UPDATE user SET username = '$admin', password = '$hash', email='$mail' WHERE id = 1;" | sqlite3 $src_path/data/data.db fi # Modify Nginx configuration file and copy it to Nginx conf directory @@ -81,4 +90,3 @@ fi # Reload services sudo service nginx reload echo "Open $domain$path/installcheck.php for troubleshooting guide." -echo "Default login and password are admin/admin. Change it!" diff --git a/scripts/password.php b/scripts/password.php new file mode 100644 index 0000000..4769f90 --- /dev/null +++ b/scripts/password.php @@ -0,0 +1,6 @@ +