diff --git a/conf/admin.sql b/conf/admin.sql index 3a928e9..8a0cdb7 100644 --- a/conf/admin.sql +++ b/conf/admin.sql @@ -1,2 +1,2 @@ INSERT INTO `users` (`id`, `login`, `password`) VALUES (NULL, '__ADMIN__', '__ADMIN_PWD__'); - + \ No newline at end of file diff --git a/scripts/install b/scripts/install index 4e5f043..798d8a2 100644 --- a/scripts/install +++ b/scripts/install @@ -41,9 +41,7 @@ final_path=/var/www/$app test ! -e "$final_path" || ynh_die "This path already contains a folder" # Register (book) web path -ynh_webpath_register $app $domain $path_url - -admin_pwd=$(openssl passwd -1 -salt xyz $password) +ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= # STORE SETTINGS FROM MANIFEST @@ -119,9 +117,11 @@ ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_user" --ta ynh_replace_string "^\$enabled = false;" "\$enabled = true;" "$final_path/scripts/setup.php" +admin_pwd=$(openssl passwd -1 -salt xyz $password) + # Replace variables in SQL scripts -ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" ../conf/admin.sql -ynh_replace_string --match_string="__ADMIN_PWD__" --replace_string="$admin_pwd" ../conf/admin.sql +ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="../conf/admin.sql" +ynh_replace_string --match_string="__ADMIN_PWD__" --replace_string="$admin_pwd" --target_file="../conf/admin.sql" #================================================= # SETUP APPLICATION WITH CURL