prepare release

CHANGELOG.md

@@ -5,22 +5,23 @@ Tous les changements notables de ce projet sont documentés dans ce fichier.
 Le format s'appuie sur [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 et le projet suit [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## 2.10.1_DEV     (unreleased)
+## [2.11.0](https://gitlab.adullact.net/Comptoir/Comptoir-srv/tags/v2.11.0)  - 2022-06-09
 
-+### Added
+### Added
 
-+### Changed
+- [#966](https://gitlab.adullact.net/Comptoir/Comptoir-srv/issues/966) Admin - Ajout d'un export JSON et CSV des utilisateurs
 
-+### Fixed
+### Fixed
 
-+### Security
+Pour le dev :
+- [!555](https://gitlab.adullact.net/Comptoir/Comptoir-srv/-/merge_requests/555) Vagrant - Correction des données ajoutées pour la cartographie
 
 
 ## [2.10.0](https://gitlab.adullact.net/Comptoir/Comptoir-srv/tags/v2.10.0)  - 2021-08-13
 
 ### Added
 
-- [!544](https://gitlab.adullact.net/Comptoir/Comptoir-srv/-/merge_requests/544) Ajout d'un export JSON
+- [!544](https://gitlab.adullact.net/Comptoir/Comptoir-srv/-/merge_requests/544) Ajout d'un export JSON des logiciels
 
 ### Fixed
 
@@ -360,4 +361,16 @@ Pour le dev :
 
 ## [2.3.2](https://gitlab.adullact.net/Comptoir/Comptoir-srv/tags/v2.3.2) - 2017-07-21
 
+## Template
+
+```markdown
+## <major>.<minor>.patch_DEV     (unreleased)
+
+### Added
 
+### Changed
+
+### Fixed
+
+### Security
+```

Documentation/For_ops/UPGRADE/UPGRADE_from_v2.10.0_to_v2.11.0.md

+# How to upgrade from v2.10.0 to v2.11.0
+
+## 1) First backup (DB + images files)
+
+```bash
+# (1) user comptoir
+sudo su comptoir
+
+# First backup (DB + images files)
+/home/comptoir/Comptoir-srv/bin/COMPTOIR_export_DB_data_AND_images.sh
+/home/comptoir/Comptoir-srv/bin/COMPTOIR_export_DB_structure_only.sh
+ls -lh /home/comptoir/Comptoir-EXPORT/
+```
+
+## 2) Preloading vendor directory
+
+```bash
+# (1) use the user "comptoir"
+sudo su comptoir
+
+# Preloading vendor
+mkdir /home/comptoir/tmp_migration
+cd /home/comptoir/tmp_migration
+git clone https://gitlab.adullact.net/Comptoir/Comptoir-srv.git
+mv Comptoir-srv/ Comptoir_tmp_update_vendor
+cd Comptoir_tmp_update_vendor/
+git checkout origin/master
+git log --decorate --oneline --graph --all
+composer check-platform-reqs
+composer validate
+composer install
+```
+
+## 3) Activate maintenance site
+
+see:
+[www-maintenance-comptoir](https://gitlab.adullact.net/Adullact-prive/comptoir-prive/www-maintenance-comptoir)
+(private repository)
+
+```bash
+# (1) use your user
+
+# Activate maintenance site
+sudo a2dissite 25-https_comptoir-du-libre.org.conf
+sudo a2ensite 30-503-MAINTENANCE_https_comptoir-du-libre.org.conf
+sudo service apache2 reload
+
+    # on your computer, the following command lines
+    # must retrun an HTTP 500 response
+    curl -v https://comptoir-du-libre.org/
+    curl -v https://comptoir-du-libre.org/notFoundPage
+```
+
+## 4) Backup before migration (DB + images files + main directory)
+
+```bash
+# (1) user comptoir
+sudo su comptoir
+
+# Second backup (DB + images files)
+/home/comptoir/Comptoir-srv/bin/COMPTOIR_export_DB_data_AND_images.sh
+/home/comptoir/Comptoir-srv/bin/COMPTOIR_export_DB_structure_only.sh
+ls -lh /home/comptoir/Comptoir-EXPORT/
+
+# Backup main directory
+cd  /home/comptoir/
+DATE=$(date +"%Y.%m.%d_%Hh%M")
+tar -czvf "Comptoir-srv_BACKUP_${DATE}.tar.gz" Comptoir-srv
+```
+
+## 5) Update source code
+
+```bash
+# (1) user comptoir
+sudo su comptoir
+
+# Update source code
+cd /home/comptoir/Comptoir-srv
+rm -rvf vendor/
+git remote -v
+git remote update -p
+git checkout origin/master
+git log --decorate --oneline --graph --all
+```
+
+## 6) Update vendor directory + clean cache
+
+```bash
+# (1) user comptoir
+sudo su comptoir
+
+# Update vendor directory (see step 2 "Preloading vendor directory")
+cd /home/comptoir/Comptoir-srv
+rm -rvf vendor/
+mv -v ../tmp_migration/Comptoir_tmp_update_vendor/vendor ./
+
+# Clean cache
+cd /home/comptoir/Comptoir-srv
+bin/cake cache clear_all
+```
+
+## 7) Apply migration of the database (new tables, adding fields, ...)
+
+The following changes must be recorded in the [production version tracking](https://gitlab.adullact.net/Adullact-prive/comptoir-prive/Exploitation-Comptoir/-/blob/master/Suivi-versions-PROD.md) file.
+
+```bash
+# (1) user comptoir
+sudo su comptoir
+
+# Apply migration of the database (new tables, adding fields, ...)
+cd /home/comptoir/Comptoir-srv
+bin/cake migrations migrate
+
+# Now you can apply additional changes in SQL with pgsl
+# ---> nothing to do here for this version
+```
+
+
+## 8) Update config files
+
+The following changes must be recorded in the [production version tracking](https://gitlab.adullact.net/Adullact-prive/comptoir-prive/Exploitation-Comptoir/-/blob/master/Suivi-versions-PROD.md) file.
+
+nothing to do here for this version
+
+```bash
+# (1) user comptoir
+sudo su comptoir
+
+# Apply additional changes in config files
+cd /home/comptoir/Comptoir-srv
+vim config/comptoir.php # ---> nothing to do here for this version
+vim config/app.php  # ---> nothing to do here for this version
+```
+
+## 9) Enable the main website
+
+see:
+[www-maintenance-comptoir](https://gitlab.adullact.net/Adullact-prive/comptoir-prive/www-maintenance-comptoir)
+(private repository)
+
+```bash
+# (1) use your user
+
+# Enable the main website
+sudo a2dissite 30-503-MAINTENANCE_https_comptoir-du-libre.org.conf
+sudo a2ensite 25-https_comptoir-du-libre.org.conf
+sudo service apache2 reload
+
+    # on your computer, the first following command line
+    # must return an HTTP 200 response code
+    # and the second return an HTTP 404 response code.
+    curl -v https://comptoir-du-libre.org/
+    curl -v https://comptoir-du-libre.org/notFoundPage
+```
+
+## 10) Backup after upgraded
+
+```bash
+# (1) user comptoir
+sudo su comptoir
+
+# Backup after upgraded (DB + images files)
+/home/comptoir/Comptoir-srv/bin/COMPTOIR_export_DB_data_AND_images.sh
+/home/comptoir/Comptoir-srv/bin/COMPTOIR_export_DB_structure_only.sh
+ls -lh /home/comptoir/Comptoir-EXPORT/
+```
+
+
+## 11) Clean up
+
+```bash
+# (1) user comptoir
+sudo su comptoir
+
+#  Clean up
+cd /home/comptoir/
+rm -rvf tmp_migration/
+rm -v Comptoir-srv_BACKUP_*.tar.gz
+```

config/bootstrap.php

@@ -293,7 +293,7 @@ Configure::write(
 Configure::write(
     'VERSION',
     [
-        "footer" => "v2.10.1_DEV"
+        "footer" => "v2.11.0"
     ]
 );