From adbcd1b7e58a91686def3e223e8991aa14a1bda5 Mon Sep 17 00:00:00 2001 From: frju365 Date: Mon, 20 Aug 2018 20:49:22 +0200 Subject: [PATCH 1/4] [fix] No need of php7.0 dependency on Stretch --- scripts/_common.sh | 56 ---------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 07c27b7..24bd7ba 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -11,59 +11,3 @@ ynh_delete_file_checksum () { local checksum_setting_name=checksum_${1//[\/ ]/_} # Replace all '/' and ' ' by '_' ynh_app_setting_delete $app $checksum_setting_name } - -ynh_install_php7 () { - - ynh_package_update - ynh_package_install apt-transport-https --no-install-recommends - - wget -q -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg - echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/php7.list - - ynh_package_update - ynh_install_app_dependencies php7.1 php7.1-zip php7.1-fpm php7.1-mysql php7.1-xml php7.1-intl php7.1-mbstring php7.1-gd php7.1-curl php7.1-soap php7.1-pgsql php7.1-xmlrpc postgresql-9.4 - sudo update-alternatives --install /usr/bin/php php /usr/bin/php5 70 -} - -ynh_remove_php7 () { - sudo rm -f /etc/apt/sources.list.d/php7.list - sudo apt-key del 4096R/89DF5277 - sudo apt-key del 2048R/11A06851 - ynh_remove_app_dependencies php7.1 php7.1-zip php7.1-fpm php7.1-mysql php7.1-xml php7.1-intl php7.1-mbstring php7.1-gd php7.1-curl php7.1-soap php7.1-pgsql php7.1-xmlrpc postgresql-9.4 -} - - -# Create a dedicated php-fpm config for php7.1 -# -# usage: ynh_add_fpm_config -ynh_add_php7.1-fpm_config () { - finalphpconf="/etc/php/7.1/fpm/pool.d/$app.conf" - ynh_backup_if_checksum_is_different "$finalphpconf" - sudo cp ../conf/php-fpm.conf "$finalphpconf" - ynh_replace_string "__NAMETOCHANGE__" "$app" "$finalphpconf" - ynh_replace_string "__FINALPATH__" "$final_path" "$finalphpconf" - ynh_replace_string "__USER__" "$app" "$finalphpconf" - sudo chown root: "$finalphpconf" - ynh_store_file_checksum "$finalphpconf" - - if [ -e "../conf/php-fpm.ini" ] - then - finalphpini="/etc/php/7.1/fpm/conf.d/20-$app.ini" - ynh_backup_if_checksum_is_different "$finalphpini" - sudo cp ../conf/php-fpm.ini "$finalphpini" - sudo chown root: "$finalphpini" - ynh_store_file_checksum "$finalphpini" - fi - - sudo systemctl reload php7.1-fpm -} - - -# Remove the dedicated php-fpm config for php7.1 -# -# usage: ynh_remove_fpm_config -ynh_remove_php7.1-fpm_config () { - ynh_secure_remove "/etc/php/7.1/fpm/pool.d/$app.conf" - ynh_secure_remove "/etc/php/7.1/fpm/conf.d/20-$app.ini" 2>&1 - sudo systemctl reload php7.1-fpm -} From ff5a78beac16d2c4194db92aba5354a38a6969e8 Mon Sep 17 00:00:00 2001 From: frju365 Date: Mon, 20 Aug 2018 20:53:13 +0200 Subject: [PATCH 2/4] [fix] app.src --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 143ee99..7c17c2d 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/moodle/moodle/archive/v3.4.0.tar.gz -SOURCE_SUM=50913fe0e149adf56cfe34f29aec9e79fef17c3ff00590db4f5a643642fa67c7 +SOURCE_URL=https://github.com/moodle/moodle/archive/v3.5.1.tar.gz +SOURCE_SUM=ccabd372fcdb253a404428196c1cf0a16529797717b443572250103a29ce1799 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR= From 69d8b4cbc2b7f7122b640541fbf00b74be2f9d5f Mon Sep 17 00:00:00 2001 From: frju365 Date: Mon, 20 Aug 2018 20:54:56 +0200 Subject: [PATCH 3/4] [fix] dependencies --- scripts/install | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/install b/scripts/install index 51a8e79..93ec761 100644 --- a/scripts/install +++ b/scripts/install @@ -80,6 +80,13 @@ ynh_psql_test_if_first_run ynh_psql_create_user $app $db_pwd ynh_psql_execute_as_root \ "CREATE DATABASE $db_name ENCODING 'UTF8' LC_COLLATE='C' LC_CTYPE='C' template=template0 OWNER $app;" + +#================================================= +# Install dependencies +#================================================= + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= From 8daee0201213405451e59dd4ce49715ffe5c1095 Mon Sep 17 00:00:00 2001 From: frju365 Date: Mon, 20 Aug 2018 20:56:51 +0200 Subject: [PATCH 4/4] [fix] dependencies --- scripts/_common.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index 24bd7ba..c973b87 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -11,3 +11,5 @@ ynh_delete_file_checksum () { local checksum_setting_name=checksum_${1//[\/ ]/_} # Replace all '/' and ' ' by '_' ynh_app_setting_delete $app $checksum_setting_name } + +pkg_dependencies="php-zip php-mysql php-xml php-intl php-mbstring php-gd php-curl php-soap php-pgsql php-xmlrpc postgresql"