diff --git a/conf/app.src b/conf/app.src index 44afba3..f477cfe 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/flarum/flarum/archive/v0.1.0-beta.16.zip -SOURCE_SUM=CB4B892AA0C59C1DAF48812EC0EC842E5D9B1C99ED7D90F30D0A1DB3B411993A +SOURCE_URL=https://github.com/flarum/flarum/archive/v1.0.0.zip +SOURCE_SUM=32cd6f0cc71f61299b3849f483b96dcea0d3d987b17c6617ae2ff9cf4bf41dec SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/ldap.sql.template b/conf/ldap.sql.template index 3aaca50..8558904 100644 --- a/conf/ldap.sql.template +++ b/conf/ldap.sql.template @@ -6,7 +6,7 @@ INSERT INTO `settings` (`key`, `value`) VALUES ('tituspijean-auth-ldap.follow_referrals', '0'), ('tituspijean-auth-ldap.hosts', 'localhost'), ('tituspijean-auth-ldap.method_name', 'YunoHost'), -('tituspijean-auth-ldap.onlyUse', '1'), +('tituspijean-auth-ldap.onlyUse', '0'), ('tituspijean-auth-ldap.port', '389'), ('tituspijean-auth-ldap.search_user_fields', 'uid,mail'), ('tituspijean-auth-ldap.use_ssl', ''), diff --git a/manifest.json b/manifest.json index 71daed1..7e8f20a 100644 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,7 @@ "fr": "Un forum de nouvelle génération, simplement.", "de": "Forum der nächsten Generation leicht gemacht." }, - "version": "0.1.0.16~ynh5", + "version": "1.0.0~ynh5", "url": "http://flarum.org/", "upstream": { "license": "MIT", diff --git a/scripts/_common.sh b/scripts/_common.sh index 264bb9b..ed6c97c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -13,9 +13,9 @@ YNH_COMPOSER_VERSION="2.0.13" extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo-mysql php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-zip" # Version numbers -project_version="~0.1.0-beta.16" -core_version="~0.1.0-beta.16" -ldap_version="~0.1.0-beta.16-1" +project_version="~1.0.0" +core_version="~1.0.0" +ldap_version="~1.0.0-p1" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 8bfc12c..7eb09f4 100644 --- a/scripts/install +++ b/scripts/install @@ -172,14 +172,14 @@ ynh_mysql_connect_as --user=$app --password="$db_pwd" --database=$db_name < ../c case $language in fr) ynh_script_progression --message="Installing French extension..." --weight=2 - ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require qiaeru/lang-french:1.10\" + ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require qiaeru/lang-french:^2.0.0\" activate_flarum_extension $db_name "qiaeru-lang-french" sql_command="UPDATE \`settings\` SET \`value\` = 'fr' WHERE \`settings\`.\`key\` = 'default_locale'" ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name ;; de) ynh_script_progression --message="Installing German extension..." --weight=2 - ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require kakifrucht/flarum-de:0.14.3\" + ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require kakifrucht/flarum-de:^1.0.0\" activate_flarum_extension $db_name "kakifrucht-de" sql_command="UPDATE \`settings\` SET \`value\` = 'de' WHERE \`settings\`.\`key\` = 'default_locale'" ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name diff --git a/scripts/upgrade b/scripts/upgrade index b9b2bdf..b74b3a9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -210,14 +210,14 @@ fi case $language in fr) ynh_script_progression --message="Installing French extension..." --weight=2 - ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require qiaeru/lang-french:1.10\" + ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require qiaeru/lang-french:^2.0.0\" activate_flarum_extension $db_name "qiaeru-lang-french" sql_command="UPDATE \`settings\` SET \`value\` = 'fr' WHERE \`settings\`.\`key\` = 'default_locale'" ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name ;; de) ynh_script_progression --message="Installing German extension..." --weight=2 - ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require kakifrucht/flarum-de:0.14.3\" + ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require kakifrucht/flarum-de:^1.0.0\" activate_flarum_extension $db_name "kakifrucht-de" sql_command="UPDATE \`settings\` SET \`value\` = 'de' WHERE \`settings\`.\`key\` = 'default_locale'" ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name