YunoHost-Apps/wallabag2_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/wallabag2_ynh.git synced 2024-10-01 13:35:06 +02:00
Code Issues Activity Actions

Merge pull request #74 from ashemsay/testing

Browse source 
fix wrong user in hooks
This commit is contained in:
Kayou 2020-03-28 22:32:12 +01:00 • committed by GitHub
commit ae9078c956
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hooks/post_user_create
View file

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
app="wallabag2" app="__APP__"
user="__APP__"
# Retrieve arguments # Retrieve arguments
username=$1 username=$1
@ -14,5 +15,5 @@ user_pass=$(ynh_string_random)
# Create the new user in Wallabag # Create the new user in Wallabag
(cd "/var/www/$app" && \ (cd "/var/www/$app" && \
sudo sudo -u "www-data" php "bin/console" --no-interaction --env=prod \ sudo -u "$user" php "bin/console" --no-interaction --env=prod \
fos:user:create "$username" "$user_email" "$user_pass") fos:user:create "$username" "$user_email" "$user_pass")

5
hooks/post_user_delete
View file

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
app="wallabag2" app="__APP__"
user="__APP__"
# Retrieve arguments # Retrieve arguments
username=$1 username=$1
@ -8,5 +9,5 @@ purge=$2
# Deactivate the user from Wallabg # Deactivate the user from Wallabg
(cd "/var/www/$app" && \ (cd "/var/www/$app" && \
sudo sudo -u "www-data" php "bin/console" --no-interaction --env=prod \ sudo -u "$user" php "bin/console" --no-interaction --env=prod \
fos:user:deactivate "$username") fos:user:deactivate "$username")

7
scripts/install
View file

@ -167,6 +167,13 @@ chmod 600 $wb_conf
chown -R $app: $final_path chown -R $app: $final_path
chmod 755 $final_path chmod 755 $final_path
#=================================================
# SETUP HOOKS
#=================================================
ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="../hooks/post_user_create"
ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="../hooks/post_user_delete"
#================================================= #=================================================
# SETUP SSOWAT # SETUP SSOWAT
#================================================= #=================================================

7
scripts/upgrade
View file

@ -187,6 +187,13 @@ chmod 600 $wb_conf
chown -R $app: $final_path chown -R $app: $final_path
chmod 755 $final_path chmod 755 $final_path
#=================================================
# SETUP HOOKS
#=================================================
ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="../hooks/post_user_create"
ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="../hooks/post_user_delete"
#================================================= #=================================================
# SETUP SSOWAT # SETUP SSOWAT
#================================================= #=================================================