diff --git a/README.md b/README.md index 288724b..a347871 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to [Piwigo](http://piwigo.org) is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable. -**Shipped version:** 11.3.0 +**Shipped version:** 11.5.0 ## Screenshots diff --git a/check_process b/check_process index 050f061..3fac6e1 100644 --- a/check_process +++ b/check_process @@ -1,10 +1,10 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - admin="john" (USER) + domain="domain.tld" + path="/path" + admin="john" language="fr" - is_public=1 (PUBLIC|public=1|private=0) + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/conf/app.src b/conf/app.src index e0244d4..6d61b68 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://piwigo.org/download/dlcounter.php?code=11.3.0 -SOURCE_SUM=07b0a364484c85acecf9abd6ac2b87e9c8793795b760134b4fab96be99228943 +SOURCE_URL=https://piwigo.org/download/dlcounter.php?code=11.5.0 +SOURCE_SUM=bfecdd743c62cdb4e1936662178d019af264ea763d26c8c832da836fbe09652d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 27bd2fd..4b4334a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source photo gallery for the web", "fr": "Galerie de photos open source pour le web" }, - "version": "11.3.0~ynh2", + "version": "11.5.0~ynh1", "url": "http://piwigo.org", "license": "GPL-2.0", "maintainer": { @@ -15,7 +15,7 @@ "url": "" }, "requirements": { - "yunohost": ">= 4.1.0" + "yunohost": ">= 4.1.7" }, "multi_instance": true, "services": [ @@ -28,38 +28,22 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain for Piwigo", - "fr": "Choisissez un nom de domaine pour Piwigo" - }, "example": "domain.org" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for Piwigo", - "fr": "Choisissez un chemin pour Piwigo" - }, "example": "/piwigo", "default": "/piwigo" }, { "name": "admin", "type": "user", - "ask": { - "en": "Choose an admin user", - "fr": "Choisissez l'administrateur" - }, "example": "homer" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public application?", - "fr": "Est-ce une application publique ?" - }, "default": true }, { diff --git a/scripts/install b/scripts/install index 63de718..3a00252 100644 --- a/scripts/install +++ b/scripts/install @@ -174,18 +174,9 @@ ynh_local_curl "/install.php?language=$applanguage" "install=true" "dbuser=$db_n #================================================= ynh_script_progression --message="Configuring Piwigo..." -# Change local config -cp ../conf/config.inc.php $final_path/local/config/ - -# Calculate and store the config file checksum -ynh_store_file_checksum --file="$final_path/local/config/config.inc.php" - -# Setup database in local/config/database.inc.php +ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/local/config/config.inc.php" ynh_add_config --template="../conf/database.inc.php" --destination="$final_path/local/config/database.inc.php" -# Calculate and store the database config file checksum -ynh_store_file_checksum --file="$final_path/local/config/database.inc.php" - #================================================= # ADD LDAP PLUGIN #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d840c9a..f797b59 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -214,23 +214,9 @@ ynh_local_curl "/upgrade.php?language=$applanguage&now=true" "language=$applangu #================================================= ynh_script_progression --message="Configuring Piwigo..." -# Make a backup of the original config file if modified -ynh_backup_if_checksum_is_different --file="$final_path/local/config/config.inc.php" - -# Change local config -cp ../conf/config.inc.php $final_path/local/config/ - -# Calculate and store the config file checksum -ynh_store_file_checksum --file="$final_path/local/config/config.inc.php" - -# Make a backup of the original database config file if modified -ynh_backup_if_checksum_is_different --file="$final_path/local/config/database.inc.php" - +ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/local/config/config.inc.php" ynh_add_config --template="../conf/database.inc.php" --destination="$final_path/local/config/database.inc.php" -# Calculate and store the database config file checksum -ynh_store_file_checksum --file="$final_path/local/config/database.inc.php" - #================================================= # CONFIGURE LDAP PLUGIN #=================================================