1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/SitemagicCMS_ynh.git synced 2024-09-03 20:26:13 +02:00

Merge pull request #5 from YunoHost-Apps/testing

Testing
This commit is contained in:
Éric Gaspar 2022-08-27 09:27:50 +02:00 committed by GitHub
commit a6c4932794
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 57 additions and 53 deletions

View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# Sitemagic CMS for YunoHost # Sitemagic CMS for YunoHost
[![Integration level](https://dash.yunohost.org/integration/sitemagiccms.svg)](https://dash.yunohost.org/appci/app/sitemagiccms) ![](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.maintain.svg) [![Integration level](https://dash.yunohost.org/integration/sitemagiccms.svg)](https://dash.yunohost.org/appci/app/sitemagiccms) ![Working status](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.maintain.svg)
[![Install Sitemagic CMS with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=sitemagiccms) [![Install Sitemagic CMS with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=sitemagiccms)
*[Lire ce readme en français.](./README_fr.md)* *[Lire ce readme en français.](./README_fr.md)*
@ -17,32 +17,32 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Sitemagic is a Content Management System. It's very unique in its approach to design. Sitemagic CMS is a comprehensive Content Management System that allows anyone to easily manage pages, files, menu, forms, and external modules such as maps, social media plugins, videos, and more. But there's also a ton of hidden features that helps you save time such as automatic mobile and search engine optimizations (SEO). Sitemagic is a Content Management System. It's very unique in its approach to design. Sitemagic CMS is a comprehensive Content Management System that allows anyone to easily manage pages, files, menu, forms, and external modules such as maps, social media plugins, videos, and more. But there's also a ton of hidden features that helps you save time such as automatic mobile and search engine optimizations (SEO).
**Shipped version:** 4.4.2~ynh3 **Shipped version:** 4.4.2~ynh4
## Screenshots ## Screenshots
![](./doc/screenshots/.DS_Store) ![Screenshot of Sitemagic CMS](./doc/screenshots/.DS_Store)
![](./doc/screenshots/Designer.jpeg) ![Screenshot of Sitemagic CMS](./doc/screenshots/Designer.jpeg)
## Documentation and resources ## Documentation and resources
* Official app website: https://sitemagic.org/ * Official app website: <https://sitemagic.org/>
* Official admin documentation: https://sitemagic.org/sites/cms-guide/ * Official admin documentation: <https://sitemagic.org/sites/cms-guide/>
* Upstream app code repository: https://github.com/Jemt/SitemagicCMS * Upstream app code repository: <https://github.com/Jemt/SitemagicCMS>
* YunoHost documentation for this app: https://yunohost.org/app_sitemagiccms * YunoHost documentation for this app: <https://yunohost.org/app_sitemagiccms>
* Report a bug: https://github.com/YunoHost-Apps/sitemagiccms_ynh/issues * Report a bug: <https://github.com/YunoHost-Apps/sitemagiccms_ynh/issues>
## Developer info ## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing). Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing).
To try the testing branch, please proceed like that. To try the testing branch, please proceed like that.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing --debug
or or
sudo yunohost app upgrade sitemagiccms -u https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing --debug sudo yunohost app upgrade sitemagiccms -u https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing --debug
``` ```
**More info regarding app packaging:** https://yunohost.org/packaging_apps **More info regarding app packaging:** <https://yunohost.org/packaging_apps>

View file

@ -1,10 +1,14 @@
<!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
It shall NOT be edited by hand.
-->
# Sitemagic CMS pour YunoHost # Sitemagic CMS pour YunoHost
[![Niveau d'intégration](https://dash.yunohost.org/integration/sitemagiccms.svg)](https://dash.yunohost.org/appci/app/sitemagiccms) ![](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.maintain.svg) [![Niveau d'intégration](https://dash.yunohost.org/integration/sitemagiccms.svg)](https://dash.yunohost.org/appci/app/sitemagiccms) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.maintain.svg)
[![Installer Sitemagic CMS avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=sitemagiccms) [![Installer Sitemagic CMS avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=sitemagiccms)
*[Read this readme in english.](./README.md)* *[Read this readme in english.](./README.md)*
*[Lire ce readme en français.](./README_fr.md)*
> *Ce package vous permet d'installer Sitemagic CMS rapidement et simplement sur un serveur YunoHost. > *Ce package vous permet d'installer Sitemagic CMS rapidement et simplement sur un serveur YunoHost.
Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@ -13,32 +17,32 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Sitemagic is a Content Management System. It's very unique in its approach to design. Sitemagic CMS is a comprehensive Content Management System that allows anyone to easily manage pages, files, menu, forms, and external modules such as maps, social media plugins, videos, and more. But there's also a ton of hidden features that helps you save time such as automatic mobile and search engine optimizations (SEO). Sitemagic is a Content Management System. It's very unique in its approach to design. Sitemagic CMS is a comprehensive Content Management System that allows anyone to easily manage pages, files, menu, forms, and external modules such as maps, social media plugins, videos, and more. But there's also a ton of hidden features that helps you save time such as automatic mobile and search engine optimizations (SEO).
**Version incluse :** 4.4.2~ynh3 **Version incluse :** 4.4.2~ynh4
## Captures d'écran ## Captures d'écran
![](./doc/screenshots/.DS_Store) ![Capture d'écran de Sitemagic CMS](./doc/screenshots/.DS_Store)
![](./doc/screenshots/Designer.jpeg) ![Capture d'écran de Sitemagic CMS](./doc/screenshots/Designer.jpeg)
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : https://sitemagic.org/ * Site officiel de l'app : <https://sitemagic.org/>
* Documentation officielle de l'admin : https://sitemagic.org/sites/cms-guide/ * Documentation officielle de l'admin : <https://sitemagic.org/sites/cms-guide/>
* Dépôt de code officiel de l'app : https://github.com/Jemt/SitemagicCMS * Dépôt de code officiel de l'app : <https://github.com/Jemt/SitemagicCMS>
* Documentation YunoHost pour cette app : https://yunohost.org/app_sitemagiccms * Documentation YunoHost pour cette app : <https://yunohost.org/app_sitemagiccms>
* Signaler un bug : https://github.com/YunoHost-Apps/sitemagiccms_ynh/issues * Signaler un bug : <https://github.com/YunoHost-Apps/sitemagiccms_ynh/issues>
## Informations pour les développeurs ## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing). Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit. Pour essayer la branche testing, procédez comme suit.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing --debug
ou ou
sudo yunohost app upgrade sitemagiccms -u https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing --debug sudo yunohost app upgrade sitemagiccms -u https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing --debug
``` ```
**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps **Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>

View file

@ -6,7 +6,7 @@
"en": "Content Management System", "en": "Content Management System",
"fr": "Système de gestion de contenu" "fr": "Système de gestion de contenu"
}, },
"version": "4.4.2~ynh3", "version": "4.4.2~ynh4",
"url": "https://sitemagic.org/", "url": "https://sitemagic.org/",
"upstream": { "upstream": {
"license": "FSFULLR", "license": "FSFULLR",
@ -20,12 +20,12 @@
"email": "" "email": ""
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.3.0" "yunohost": ">= 11.0.9"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
"nginx", "nginx",
"php7.3-fpm" "php7.4-fpm"
], ],
"arguments": { "arguments": {
"install" : [ "install" : [

View file

@ -4,7 +4,7 @@
# COMMON VARIABLES # COMMON VARIABLES
#================================================= #=================================================
YNH_PHP_VERSION="7.3" YNH_PHP_VERSION="7.4"
#================================================= #=================================================
# PERSONAL HELPERS # PERSONAL HELPERS

View file

@ -81,14 +81,6 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path" chown -R $app:www-data "$final_path"
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Configuring NGINX web server..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# PHP-FPM CONFIGURATION # PHP-FPM CONFIGURATION
#================================================= #=================================================
@ -97,6 +89,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
# Create a dedicated PHP-FPM config # Create a dedicated PHP-FPM config
ynh_add_fpm_config ynh_add_fpm_config
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Configuring NGINX web server..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# ADD A CONFIGURATION # ADD A CONFIGURATION
#================================================= #=================================================

View file

@ -40,13 +40,6 @@ test ! -d $final_path || ynh_die --message="There is already a directory: $final
#================================================= #=================================================
# STANDARD RESTORATION STEPS # STANDARD RESTORATION STEPS
#=================================================
# RESTORE THE NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================
# RECREATE THE DEDICATED USER # RECREATE THE DEDICATED USER
#================================================= #=================================================
@ -76,6 +69,13 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
#=================================================
# RESTORE THE NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================
# RESTORE THE MYSQL DATABASE # RESTORE THE MYSQL DATABASE
#================================================= #=================================================

View file

@ -79,7 +79,7 @@ then
ynh_script_progression --message="Upgrading source files..." --weight=1 ynh_script_progression --message="Upgrading source files..." --weight=1
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path" --keep="config.xml.php $final_path/data $final_path/files $final_path/templates/*" ynh_setup_source --dest_dir="$final_path" --keep="config.xml.php data files templates/*"
fi fi
chmod 750 "$final_path" chmod 750 "$final_path"
@ -89,14 +89,6 @@ chown -R $app:www-data "$final_path"
chmod 660 "$final_path/config.xml.php" chmod 660 "$final_path/config.xml.php"
chown $app:$app "$final_path/config.xml.php" chown $app:$app "$final_path/config.xml.php"
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# PHP-FPM CONFIGURATION # PHP-FPM CONFIGURATION
#================================================= #=================================================
@ -105,6 +97,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
# Create a dedicated PHP-FPM config # Create a dedicated PHP-FPM config
ynh_add_fpm_config ynh_add_fpm_config
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX
#================================================= #=================================================