diff --git a/README.md b/README.md index 5e3942f..494eeea 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Zwii is a database-less (flat-file) CMS that allows you to easily create and man - Flexible -**Shipped version:** 12.3.05~ynh1 +**Shipped version:** 12.3.05~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 7fd103f..f667aeb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ Zwii is a database-less (flat-file) CMS that allows you to easily create and man - Flexible -**Version incluse :** 12.3.05~ynh1 +**Version incluse :** 12.3.05~ynh2 ## Captures d’écran diff --git a/doc/POST_UPGRADE.md b/doc/POST_UPGRADE.md new file mode 100644 index 0000000..d242cf5 --- /dev/null +++ b/doc/POST_UPGRADE.md @@ -0,0 +1,19 @@ +## You need now to finalize the upgrade process of ZwiiCMS directly in the app. + +#### 1. Login with your admin account + +#### 2. Go to setup page + +![Setup menu](./upgrade_process_1.png) + +#### 3. Click on Reinstall + +![Reinstall](./upgrade_process_2.png) + +#### 4. If needed, deactivate the maintenance mode + +![Maintenance mode](./upgrade_process_3.png) + +#### 5. Save + +![Save](./upgrade_process_4.png) diff --git a/doc/PRE_UPGRADE.md b/doc/PRE_UPGRADE.md new file mode 100644 index 0000000..931aa61 --- /dev/null +++ b/doc/PRE_UPGRADE.md @@ -0,0 +1,6 @@ +## Disclaimers / important information +By continuing the app will stay in **maintenance mode** until a manual finalization. + +The manual finalization process is easy. You just need to be able to access the webapp and login with your admin account. + +This process will be explain at the end of the upgarde proccess. diff --git a/doc/upgrade_process_1.png b/doc/upgrade_process_1.png new file mode 100644 index 0000000..c2e1d52 Binary files /dev/null and b/doc/upgrade_process_1.png differ diff --git a/doc/upgrade_process_2.png b/doc/upgrade_process_2.png new file mode 100644 index 0000000..334382e Binary files /dev/null and b/doc/upgrade_process_2.png differ diff --git a/doc/upgrade_process_3.png b/doc/upgrade_process_3.png new file mode 100644 index 0000000..f119cfc Binary files /dev/null and b/doc/upgrade_process_3.png differ diff --git a/doc/upgrade_process_4.png b/doc/upgrade_process_4.png new file mode 100644 index 0000000..bb844c5 Binary files /dev/null and b/doc/upgrade_process_4.png differ diff --git a/manifest.toml b/manifest.toml index b26b135..dfb2787 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "ZwiiCMS" description.en = "Simple, lightweight, database-free, scalable and responsive CMS" description.fr = "CMS simple, léger, sans base de données, modulable et responsive" -version = "12.3.05~ynh1" +version = "12.3.05~ynh2" maintainers = ["ewilly"] @@ -55,13 +55,6 @@ ram.runtime = "50M" type = "password" [resources] - - [resources.sources] - - [resources.sources.main] - url = "https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS/archive/12.3.04.tar.gz" - sha256 = "2c0d58dbbf1f036a230dd7825c235a0a118975064290f2c8e306714afbd5d4bc" - [resources.system_user] [resources.install_dir] diff --git a/scripts/upgrade b/scripts/upgrade index db653a6..1f7ae2f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,6 +30,13 @@ find "$install_dir" -type f -exec chmod 640 {} \; find "$install_dir" -type d -exec chmod 750 {} \; find "$install_dir" -type d -exec chmod +s {} \; +#================================================= +# UPDATE A CONFIG FILE +#================================================= + +# Apply maintenance mode +sed -i 's/"maintenance":[^,]*/"maintenance":true/g' "$install_dir/site/data/config.json" + #================================================= # REAPPLY SYSTEM CONFIGURATIONS #=================================================