diff --git a/scripts/install b/scripts/install index a6832b2..b210bfa 100755 --- a/scripts/install +++ b/scripts/install @@ -32,9 +32,9 @@ if [[ ! $? -eq 0 ]]; then fi # Generate random DES key & password -deskey=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p') -db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p') -app_salt=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{40\}\).*/\1/p') +deskey=$(ynh_string_random) +db_pwd=$(ynh_string_random) +app_salt=$(ynh_string_random) # Use 'freshrss' as database name and user db_user=freshrss db_name=freshrss @@ -45,20 +45,23 @@ sudo yunohost app setting freshrss mysqlpwd -v $db_pwd # Copy files to the right place TMPDIR=$(ynh_mkdir_tmp) extract_freshrss "$TMPDIR" -sudo cp -a ../conf/config.php $TMPDIR/data -sudo cp ../sources/install_ynh.sql $TMPDIR/app/SQL/install_ynh.sql +cd $TMPDIR +./cli/do-install.php --default_user $admin_user --auth_type http --environment production --base_url $domain/$path --title FreshRSS --api_enabled --db-type mysql --db-host localhost:3306 --db-user $db_user --db-password $db_pwd --db-base $db_name + +# sudo cp -a ../conf/config.php $TMPDIR/data +# sudo cp ../sources/install_ynh.sql $TMPDIR/app/SQL/install_ynh.sql # Change variables in freshrss configuration -sudo sed -i "s/yunouser/$db_user/g" $TMPDIR/data/config.php -sudo sed -i "s/yunopass/$db_pwd/g" $TMPDIR/data/config.php -sudo sed -i "s/yunobase/$db_user/g" $TMPDIR/data/config.php -sudo sed -i "s/yunosalt/$app_salt/g" $TMPDIR/data/config.php -sudo sed -i "s@yunopath@$path@g" $TMPDIR/data/config.php -if [[ $admin_user != '' ]]; then - sudo sed -i "s/yunoadminuser/$admin_user/g" $TMPDIR/data/config.php -else - sudo sed -i '/yunoadminuser/d' $TMPDIR/data/config.php -fi +# sudo sed -i "s/yunouser/$db_user/g" $TMPDIR/data/config.php +# sudo sed -i "s/yunopass/$db_pwd/g" $TMPDIR/data/config.php +# sudo sed -i "s/yunobase/$db_user/g" $TMPDIR/data/config.php +# sudo sed -i "s/yunosalt/$app_salt/g" $TMPDIR/data/config.php +# sudo sed -i "s@yunopath@$path@g" $TMPDIR/data/config.php +# if [[ $admin_user != '' ]]; then +# sudo sed -i "s/yunoadminuser/$admin_user/g" $TMPDIR/data/config.php +# else +# sudo sed -i '/yunoadminuser/d' $TMPDIR/data/config.php +# fi # Add users @@ -81,13 +84,15 @@ fi freshrss_users=$(ldapsearch -h localhost -b ou=users,dc=yunohost,dc=org -x objectClass=mailAccount uid | grep uid: | sed 's/uid: //' | xargs) for myuser in $freshrss_users do + user_token=$(ynh_string_random) + ./cli/create-user.php --user $myuser --language en --token $user_token --no-default-feeds #copy sql - sudo cp ../sources/install_ynh.sql /tmp/$myuser-install.sql + # sudo cp ../sources/install_ynh.sql /tmp/$myuser-install.sql #change username in sql - sudo sed -i "s/YnoUser/$myuser/g" /tmp/$myuser-install.sql + # sudo sed -i "s/YnoUser/$myuser/g" /tmp/$myuser-install.sql #create tables - ynh_mysql_connect_as "$db_user" "$db_pwd" "$db_name" \ - < "/tmp/$myuser-install.sql" + # ynh_mysql_connect_as "$db_user" "$db_pwd" "$db_name" \ + # < "/tmp/$myuser-install.sql" #remove temp sql sudo rm /tmp/$myuser-install.sql