From 41a66e36f2ca14cf6befabf2f6ee1c7d3fa29c92 Mon Sep 17 00:00:00 2001
From: ericgaspar
-Shipped Version: **4.7.6**
+
+## Overview
+Replace phpMyAdmin with Adminer and you will get a tidier user interface, better support for MySQL features, higher performance and more security. See detailed comparison https://www.adminer.org/en/phpmyadmin/.
+Adminer development priorities are: 1. Security, 2. User experience, 3. Performance, 4. Feature set, 5. Size.
+
+**Shipped version:** 4.7.6
+
+## Screenshots
+
+![](Link to a screenshot of this app.)
+
Adminer (formerly phpMinAdmin better alternate to phpmyadmin) is a full-featured database management tool written in PHP.
+
http://www.adminer.org
Replace phpMyAdmin with Adminer and you will get a tidier user interface, better support for MySQL features, higher performance and more security. See detailed comparison https://www.adminer.org/en/phpmyadmin/
-Adminer development priorities are: 1. Security, 2. User experience, 3. Performance, 4. Feature set, 5. Size.
- diff --git a/conf/nginx.conf b/conf/nginx.conf index 6ab1f8c..11b8f68 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -18,7 +18,7 @@ location __PATH__/ { try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock; + fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; fastcgi_index index.php; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index ab5dca9..ab1a471 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -33,7 +33,7 @@ group = __USER__ ; (IPv6 and IPv4-mapped) on a specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. -listen = /var/run/php/php7.0-fpm-__NAMETOCHANGE__.sock +listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock ; Set listen(2) backlog. ; Default Value: 511 (-1 on FreeBSD and OpenBSD) diff --git a/manifest.json b/manifest.json index cce2e6e..842ebcb 100644 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,7 @@ "url": "https://github.com/jesuisfol/adminer_ynh" }, "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 3.8.1" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 9ea8430..78111e4 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,8 +4,10 @@ # COMMON VARIABLES #================================================= +YNH_PHP_VERSION="7.3" + # dependencies used by the app -pkg_dependencies="php7.0-mysql php7.0-sqlite3 php7.0-pgsql" +extra_php_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-pgsql" #================================================= # PERSONAL HELPERS diff --git a/scripts/backup b/scripts/backup index 69abc4f..aee48a7 100644 --- a/scripts/backup +++ b/scripts/backup @@ -29,6 +29,7 @@ app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP @@ -53,7 +54,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" # BACKUP THE PHP-FPM CONFIGURATION #================================================= -ynh_backup --src_path="/etc/php/7.0/fpm/pool.d/$app.conf" +ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # END OF SCRIPT diff --git a/scripts/change_url b/scripts/change_url index 3e2ec41..9a3179d 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -32,7 +32,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its url (may take a while)..." --weight=4 +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=4 # Backup the current version of the app ynh_backup_before_upgrade diff --git a/scripts/install b/scripts/install index 99b24d1..404ee7b 100644 --- a/scripts/install +++ b/scripts/install @@ -49,13 +49,6 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=is_public --value=$is_public -#================================================= -# INSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Installing dependencies..." --weight=3 - -ynh_install_app_dependencies $pkg_dependencies - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -100,18 +93,18 @@ ynh_add_nginx_config ynh_script_progression --message="Configuring PHP-fpm..." --weight=1 # Create a dedicated php-fpm config -ynh_add_fpm_config +ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # SETUP SSOWAT #================================================= ynh_script_progression --message="Configuring SSOwat..." --weight=1 -# Make app public if necessary +# Make app public if necessary or protect it if [ $is_public -eq 1 ] then - # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" + ynh_permission_update --permission "main" --add "visitors" fi #================================================= diff --git a/scripts/remove b/scripts/remove index 4eff709..54e719a 100644 --- a/scripts/remove +++ b/scripts/remove @@ -19,14 +19,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." --weight=5 - -# Remove metapackage and its dependencies -ynh_remove_app_dependencies - #================================================= # REMOVE APP MAIN DIR #================================================= diff --git a/scripts/restore b/scripts/restore index 5b13ef3..b9a7914 100644 --- a/scripts/restore +++ b/scripts/restore @@ -27,6 +27,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CHECK IF THE APP CAN BE RESTORED @@ -53,14 +54,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$final_path" -#================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=10 - -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -80,8 +73,9 @@ chmod 755 -R $final_path/adminer.php #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= +ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=5 -ynh_restore_file --origin_path="/etc/php/7.0/fpm/pool.d/$app.conf" +ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # GENERIC FINALIZATION @@ -90,7 +84,7 @@ ynh_restore_file --origin_path="/etc/php/7.0/fpm/pool.d/$app.conf" #================================================= ynh_script_progression --message="Reloading NGINX web server and PHP-fpm..." --weight=1 -ynh_systemd_action --service_name=php7.0-fpm --action=reload +ynh_systemd_action --service_name=php${phpversion}-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 8adf174..264686c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,6 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) is_public=$(ynh_app_setting_get --app=$app --key=is_public) root_access=$(ynh_app_setting_get --app=$app --key=root_access) +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -90,15 +91,15 @@ ynh_add_nginx_config #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading PHP-fpm configuration..." --weight=1 +ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated php-fpm config -ynh_add_fpm_config +ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload From 3cf43042ea218680222ea3671ea994d98fa63e30 Mon Sep 17 00:00:00 2001 From: ericgaspar%*2Ղs!%C1N%\nl7\"*R k<4L5@FPd;DBJ:4dpӱ9AH\n YaRH@(!z⺖!#I/۹0@+üzx5LsߥAQ,h@:VDrA-kQt'z[Wa!\naԍA052tA\$, )ZFÌ0?؍&S>==:?A5\n<)@[Lcԃb\rp*)+²?ZIPh\0 e+{==L3~8 \nnj &;\0F\n-G{V~ٔK҉. S:-AHܘo 8PT@-I˨NlL)\\Y_̪2dp!mm: >a [uߓ\"EH+6ԼvL ړU,\"tq=ŵw:&Dr;VL^#\rV pL4ZM)tR\rڄе+O)@@^\n~Ao.9hтфzwa\nppaSjAe=G[ID(ۛC 3Aľ)jvy-j/gT8(L%\$IV*@B8GI-9xNk5b.
!܋6Gpy!\$ddVJjH0b\0H∫tk>a碐4~KxP%LJIl,@kѿS2n5)%\$a\r|;*u1ϙ|OA-29+/ f.;Nd\rb/r~5߲#سU2)iў}tvV>!4\$tR)7dkʗֿ(\nC~'VFzO}HtihېQ\"QFKA:nGjXL'ą3\0j? X %8rd/|1\n04\rC\"3\"v٢@7˪[,Z\\}R%=ch1>\"-0QN|w2c,HcPсC]ηNf--!P+ъMpUbS15!LxOg\"`ƨ\"kJ0l.VPX3eKo p!j͖l'Zc%b.'k \$J#2>d\$\\#Q)\0%ɢe1\r\nrbNRi'\0&L(=,u'2f\r#'tRhBA^%vdy\r-&XP-\rERx0Rܲ-0f&-xIi#F5ҩ dlܒ0]ЌT# R\0U!l7nP<1u\$e\$.Q;%\$d\"Ob0Dmd;5gLOP`q~7:Vĺ\rV6ȀB:0'tΎbGdoplCg#L/PT(3)r(\"69Bn\\HH0e1]?08'de@,0D@\"5]:D?BJ-Ⱥ\$\$/,fdiLq(zf\"-CltH{bxDlEϪZK |O/}&kF_ Ge7ѩb%H/ pp8\"pTp,eBM 1̞Hb\$Lx6Vt7 ӥ6>\0Y356G6G% \r\0b}(/r@I*#";break;case"fr":$g="E1iu9fSi7\n\0%(m8g3IeIcIiDi6Lİ22@sY2:JeS\ntLM&Ӄ PsLeCf4(iƓaJ*;g]mWH&SkZE=4ih.H7U? *жFa7J]r )LNB51jpJۆzfp0PH p,xVgo9#\nz~΄K\"I/А|ulf7zt] ,O\rUPGwOg`bF0*c]o `@a\nV.5NPDNwʰαm\$+/\nPDCQ!-ɞ\\~/-Ih,2h8]bo%(iE%+j_I|{Pj\rʂf I\$/Z3_6`z>++٧G<}u!၍/PS {BC\n݀7?k \"qA{ȈZ#B8p*@\$\nNB0QiDD^MLDP<\0L\n\0BH7d \"z͌K(nFcTB\$V0@ \0?\$Ȃ\$l\$0#8 \"\rcXJD0U(PO Mq b@'4m \$MN7 dt0Bb(0\noC?.6(ϧV߃`t4i %*2Ղs!%C1N%\nl7\"*R k<4L5@FPd;DBJ:4dpӱ9AH\n YaRH@(!z⺖!#I/۹0@+üzx5LsߥAQ,h@:VDrA-kQt'z[Wa!\naԍA052tA\$, )ZFÌ0?؍&S>==:?A5\n<)@[Lcԃb\rp*)+²?ZIPh\0 e+{==L3~8 \nnj &;\0F\n-G{V~ٔK҉. S:-AHܘo 8PT@-I˨NlL)\\Y_̪2dp!mm: >a [uߓ\"EH+6ԼvL ړU,\"tq=ŵw:&Dr;VL^#\rV pL4ZM)tR\rڄе+O)@@^\n~Ao.9hтфzwa\nppaSjAe=G[ID(ۛC 3Aľ)jvy-j/gT8(L%\$IV*@B8GI-9xNk5b. !܋6Gpy!\$ddVJjH0b\0H∫tk>a碐4~KxP%LJIl,@kѿS2n5)%\$a\r|;*u1ϙ|OA-29+/ f.;Nd\rb/r~5߲#سU2)iў}tvV>!4\$tR)7dkʗֿ(\nC~'VFzO}HtihېQ\"QFKA:nGjXL'ą3\0j? )LNB51jpJۆzfp0PH p,xVgo9#\nz~΄K\"I/А|ulf7zt] ,O\rUPGwOg`bF0*c]o `@a\nV.5NPDNwʰαm\$+/\nPDCQ!-ɞ\\~/-Ih,2h8]bo%(iE%+j_I|{Pj\rʂf I\$/Z3_6`z>++٧G<}u!၍/PS {BC\n݀7?k \"qA{ȈZ#B8p*@\$\nNB0QiDD^MLDP<\0L\n\0BH7d \"z͌K(nFcTB\$V0@ \0?\$Ȃ\$l\$0#8 \"\rcXJD0U(PO Mq b@'4m \$MN7 dt0Bb(0\noC?.6(ϧV߃`t4i
\nPˈ\r|\rF7Z}p3#p`ȪZ5KL\00*^P:`+@3k2dWKSy\$r>`\$2C\$f^0\"k,M0Hwy]4\n5C+\" ,p09^Ϙw/+[\0\$~o=.} U }ǂHF2 5\"6ƪ;{QxO*t͕#Uwl0*WaJR*ؿR)ߩh@5.L#!0CyL\$bHA%!P45sDuRBZ 0@:V[+tX+\rb^}Kj׆C%#La;9;P܂XN80)%eD9Ր\nl1*,\\!RV]uzKc%TasBAE\r)K-\"F 6#dtjܙ*X&fT:SV/`3%UC\rd< l3\$InCFFu.359\nNĚ@\$\0[3ѱ?(&PSQ2([\0C\naH#Aê\\j/;f@S<keA0[*sѧDm9օ0YCؚddžp@*ntA2!tպ^]v%'xzzcP}hVzoT7UMO|h ^͈U5Gqlt~Oxtdu;oSdit-Ѻ[&cvwlrnLS,x\$~Ck1<5\n5Yճ\n}VY_fv0%b=7X+fJ8ׅK\r2 sCa 1ݻbr:ǜ5Xl/kZ2BU%NWH\n\0RPVC'(pep\\#}mCS;XcJw0\nɹ\$3*+xN~\rt70ib,n{->B\0e|rV\rX1\$8q嵬b%q6,I\$U\$\nH@LK!aX!\n]֪I8K=\$A V\\-\nb>Ai-dl2aDwr 9@`,.Gt~o9sSy_fLЕ\"/Lː\n+\rcIf=z*|n)E=(- {Fȗ\$MI9!tVN3s˳9i%Uj%tG}UPbډ\rV<\"ji\0:c%THՎ^ps\$|Io҉*7ZNE\".\$2%\\3VJ̓5P!*lhBT\n!D
\nPˈ\r|\rF7Z}p3#p`ȪZ5KL\00*^P:`+@3k2dWKSy\$r>`\$2C\$f^0\"k,M0Hwy]4\n5C+\" ,p09^Ϙw/+[\0\$~o=.} U }ǂHF2 5\"6ƪ;{QxO*t͕#Uwl0*WaJR*ؿR)ߩh@5.L#!0CyL\$bHA%!P45sDuRBZ 0@:V[+tX+\rb^}Kj׆C%#La;9;P܂XN80)%eD9Ր\nl1*,\\!RV]uzKc%TasBAE\r)K-\"F 6#dtjܙ*X&fT:SV/`3%UC\rd< l3\$InCFFu.359\nNĚ@\$\0[3ѱ?(&PSQ2(