From 08a6dfc92abe0fa8cea7ed3b69fa1db00049c202 Mon Sep 17 00:00:00 2001 From: polytan02 Date: Wed, 22 Feb 2017 14:56:18 +0000 Subject: [PATCH 1/5] Store composer in /opt No need to "hide" composer in /var/www/.composer ==> You can place it in /opt for example Easier to remember and to clean afterwards. Other adjustments may be required in your script ! --- scripts/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 837b0fd..94680c8 100644 --- a/scripts/install +++ b/scripts/install @@ -43,9 +43,9 @@ sudo chown -R www-data:www-data $tmp sudo chmod -R 755 $tmp # Prepare composer and cache directories -sudo mkdir -p /var/www/.composer/cache -sudo chown -R www-data:www-data /var/www/.composer -sudo chmod -R 755 /var/www/.composer +sudo mkdir -p /opt/flarum_composer/cache +sudo chown -R www-data:www-data /opt/flarum_composer +sudo chmod -R 755 /opt/flarum_composer ### composer ### if ! type "composer" > /dev/null; then @@ -55,7 +55,7 @@ if ! type "composer" > /dev/null; then ACTUAL_SIGNATURE=$(php -r "echo hash_file('SHA384', '$tmp/composer-setup.php');") if [ "$EXPECTED_SIGNATURE" = "$ACTUAL_SIGNATURE" ] then - sudo su - root -c "grep -q -F 'env[COMPOSER_HOME]= /var/www/.composer' /etc/php5/fpm/php-fpm.conf || sudo echo 'env[COMPOSER_HOME]= /var/www/.composer' >> /etc/php5/fpm/php-fpm.conf" + sudo su - root -c "grep -q -F 'env[COMPOSER_HOME]= /opt/flarum_composer' /etc/php5/fpm/php-fpm.conf || sudo echo 'env[COMPOSER_HOME]= /opt/flarum_composer' >> /etc/php5/fpm/php-fpm.conf" sudo service php5-fpm reload sudo su - www-data -s /bin/bash -c "php $tmp/composer-setup.php --install-dir=$tmp --filename=composer" sudo mv $tmp/composer /usr/local/bin From b093b2e1b5ce42da25713023af3e9ddd77143c93 Mon Sep 17 00:00:00 2001 From: polytan02 Date: Wed, 22 Feb 2017 14:57:58 +0000 Subject: [PATCH 2/5] Remove composer as well --- scripts/remove | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/remove b/scripts/remove index e073f51..aae75d6 100644 --- a/scripts/remove +++ b/scripts/remove @@ -12,6 +12,8 @@ domain=$(ynh_app_setting_get "$app" domain) # Remove sources sudo rm -rf /tmp/composerinstall sudo rm -rf /var/www/$app +sudo rm -rf /opt/flarum_composer +sudo rm -rf /usr/local/bin/composer # Remove nginx configuration file sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf From 676fac82f3c88754c948f407a06a86adfa9e15aa Mon Sep 17 00:00:00 2001 From: polytan02 Date: Wed, 22 Feb 2017 15:21:27 +0000 Subject: [PATCH 3/5] Update backup --- scripts/backup | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/backup b/scripts/backup index 575a599..f162882 100644 --- a/scripts/backup +++ b/scripts/backup @@ -13,6 +13,12 @@ source /usr/share/yunohost/helpers # Note: the last argument is where to save this path, see the restore script. ynh_backup "/var/www/${app}" "sources" +# Backup of composer +# +# TO BE VALIDATED AND TESTED +ynh_backup "/opt/flarum_composer" "flarum_composer" +ynh_backup "/usr/local/bin/composerr" "local_composer" + ### MySQL ### # If a MySQL database is used: # # Dump the database From f12a568a3179511ebf6244f8a5a49d474676c60f Mon Sep 17 00:00:00 2001 From: polytan02 Date: Wed, 22 Feb 2017 15:23:34 +0000 Subject: [PATCH 4/5] Update restore --- scripts/restore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/restore b/scripts/restore index 2f532ee..23c300f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -24,6 +24,13 @@ sudo yunohost app checkurl "${domain}${path}" -a "$app" \ src_path="/var/www/${app}" sudo cp -a ./sources "$src_path" +# Restore composer +# +# TO BE TESTED AND VALIDATED +# +cp -a ./flarum_composer /opt/flarum_composer +cp -a ./local_composer /usr/local/bin/composer + # Restore permissions to app files # you may need to make some file and/or directory writeable by www-data (nginx user) sudo chown -R root: "$src_path" From ee9bcedbe02869da07e97f9ce70bec8bfabf4c96 Mon Sep 17 00:00:00 2001 From: polytan02 Date: Wed, 22 Feb 2017 15:24:00 +0000 Subject: [PATCH 5/5] Typo --- scripts/backup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/backup b/scripts/backup index f162882..5c5bc81 100644 --- a/scripts/backup +++ b/scripts/backup @@ -17,7 +17,7 @@ ynh_backup "/var/www/${app}" "sources" # # TO BE VALIDATED AND TESTED ynh_backup "/opt/flarum_composer" "flarum_composer" -ynh_backup "/usr/local/bin/composerr" "local_composer" +ynh_backup "/usr/local/bin/composer" "local_composer" ### MySQL ### # If a MySQL database is used: