From b4146e5c67e8ff1a7fb92db5959f5f51ed5be82d Mon Sep 17 00:00:00 2001 From: plopoyop Date: Sat, 20 Sep 2014 10:47:18 +0200 Subject: [PATCH] Fix hooks --- hooks/post_app_removeaccess | 33 ++++++--------------------------- hooks/post_user_create | 34 ---------------------------------- 2 files changed, 6 insertions(+), 61 deletions(-) delete mode 100755 hooks/post_user_create diff --git a/hooks/post_app_removeaccess b/hooks/post_app_removeaccess index dffa8b9..4837460 100755 --- a/hooks/post_app_removeaccess +++ b/hooks/post_app_removeaccess @@ -1,7 +1,7 @@ #!/bin/bash app=$1 -new_users=$2 +deleted_users=$2 if [[ "freshrss" = "$app" ]]; @@ -10,31 +10,10 @@ then db_name=freshrss db_pwd=$(sudo yunohost app setting freshrss mysqlpwd) - #check wallabag - if [[ $(sudo yunohost app list -f wallabag | /bin/grep -q "installed: True") -eq 0 ]]; then - echo "Detected wallabag" - wallabagPath=$(sudo yunohost app setting wallabag path) - wallabagUrl=$domain$wallabagPath - sharingWallabag="array('type' => 'wallabag','name' => 'Wallabag','url' => 'https://$wallabagUrl',)," - fi - - for myuser in $(echo "$new_users" | sed "s/,/ /g") + #for each deleted users + for myuser in $(echo "$deleted_users" | sed "s/,/ /g") do - #copy sql - sudo cp /var/www/freshrss/app/SQL/install_ynh.sql /tmp/$myuser-install.sql - - #change username in sql - sudo sed -i "s/YnoUser/$myuser/g" /tmp/$myuser-install.sql - #create tables - mysql -u $db_user -p$db_pwd $db_user < /tmp/$myuser-install.sql - #remove temp sql - sudo rm /tmp/$myuser-install.sql - #copy default conf - sudo cp /var/www/freshrss/data/user.php.dist /var/www/freshrss/data/$myuser\_user.php - #change username - sudo sed -i "s/YnoUser/$myuser/g" $final_path/data/$myuser\_user.php - #add wallabag sharing - sudo sed -i "s@sharingArrayYnh@$sharingWallabag@g" $final_path/data/$myuser\_user.php - + #drop all 3 tables + mysql -u root -p$root_pwd -e "DROP TABLE $myuser\_entry; DROP TABLE $myuser\_feed; DROP TABLE $myuser\_catefory;" $db_name done -fi \ No newline at end of file +fi \ No newline at end of file diff --git a/hooks/post_user_create b/hooks/post_user_create deleted file mode 100755 index aa13e7d..0000000 --- a/hooks/post_user_create +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -db_user=freshrss -db_name=freshrss -db_pwd=$(sudo yunohost app setting freshrss mysqlpwd) - -myuser=$1 - -#check wallabag -if [[ $(sudo yunohost app list -f wallabag | /bin/grep -q "installed: True") -eq 0 ]]; then - echo "Detected wallabag" - $wallabagPath=$(sudo yunohost app setting wallabag path) - $wallabagUrl=$domain$wallabagPath - $sharingWallabag="array('type' => 'wallabag','name' => 'Wallabag','url' => 'https://$wallabagUrl',)," -fi - - -#copy sql -sudo cp /var/www/freshrss/app/SQL/install_ynh.sql /tmp/$myuser-install.sql -#change username in sql -sudo sed -i "s/YnoUser/$myuser/g" /tmp/$myuser-install.sql -#create tables -mysql -u $db_user -p$db_pwd $db_user < /tmp/$myuser-install.sql -#remove temp sql -sudo rm /tmp/$myuser-install.sql -#copy default conf -sudo cp /var/www/freshrss/data/user.php.dist /var/www/freshrss/data/$myuser\_user.php -#change email -#user_email=$(ldapsearch -h localhost -b uid=$myuser,ou=users,dc=yunohost,dc=org -x objectClass=mailAccount mail | grep mail: | head -n 1| sed 's/mail: //') -sudo sed -i "s/ynoUserEmail/$user_email/g" /var/www/freshrss//data/$myuser\_user.php -#change username -sudo sed -i "s/YnoUser/$myuser/g" /var/www/freshrss/data/$myuser\_user.php - -sudo sed -i "s/sharingArrayYnh/$sharingWallabag/g" $final_path/data/$myuser\_user.php