Merge pull request #3 from YunoHost-Apps/package_upgrade

Package Upgrade

README.md

@@ -1,2 +1,75 @@
-# prettynoemiecms_ynh
-PrettyNoemieCMS for yunohost
+# PrettyNoemieCMS for YunoHost
+
+[![Integration level](https://dash.yunohost.org/integration/prettynoemiecms.svg)](https://dash.yunohost.org/appci/app/prettynoemiecms)  
+[![Install prettynoemiecms with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=prettynoemiecms)
+
+*[Lire ce readme en français.](./README_fr.md)*
+
+> *This package allow you to install prettynoemiecms quickly and simply on a YunoHost server.  
+If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
+
+## Overview
+CMS offers its users an ergonomic solution, simple and elegant to build in no time responsive windows sites with modern design.
+The construction of your site will consist of arranging at your convenience various modules, edit their content, and customize your site by choosing fonts, formatting text, and display colors.
+
+**Shipped version:** 2019.05.23
+
+## Screenshots
+
+![](https://framablog.org/wp-content/uploads/2018/02/pages-framasite-theme-light.gif)
+
+## Demo
+
+* [Official demo](https://demo-pretty-noemie.frama.site)
+
+Login with:
+
+    login : pretty
+    mdp : 12345678
+
+
+## Configuration
+
+How to configure this app: by an admin panel at: `your.domain.tld/your_path/admin`
+
+## Documentation
+
+ * Official documentation: https://framagit.org/framasoft/PrettyNoemieCMS
+
+## YunoHost specific features
+
+#### Multi-users support
+
+Are LDAP and HTTP auth supported? **NO**  
+Can the app be used by multiple users? **NO**
+
+#### Supported architectures
+
+* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/prettynoemiecms%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/prettynoemiecms/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/prettynoemiecms%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/prettynoemiecms/)
+* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/prettynoemiecms%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/prettynoemiecms/)
+
+**More information on the documentation page:**  
+https://yunohost.org/packaging_apps
+
+## Links
+
+ * Report a bug: https://github.com/YunoHost-Apps/prettynoemiecms_ynh/issues
+ * App website: https://framagit.org/framasoft/PrettyNoemieCMS
+ * Upstream app repository: https://framagit.org/framasoft/PrettyNoemieCMS
+ * YunoHost website: https://yunohost.org/
+
+---
+
+Developers info
+----------------
+
+**Only if you want to use a testing branch for coding, instead of merging directly into master.**
+Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/prettynoemiecms_ynh/tree/testing).
+
+To try the testing branch, please proceed like that.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/prettynoemiecms_ynh/tree/testing --debug
+or
+sudo yunohost app upgrade prettynoemiecms -u https://github.com/YunoHost-Apps/prettynoemiecms_ynh/tree/testing --debug
+```

README_fr.md

@@ -0,0 +1,75 @@
+# PrettyNoemieCMS pour YunoHost
+
+[![Integration level](https://dash.yunohost.org/integration/prettynoemiecms.svg)](https://dash.yunohost.org/appci/app/prettynoemiecms)  
+[![Install prettynoemiecms with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=prettynoemiecms)
+
+*[Read this readme in english.](./README.md)* 
+
+> *Ce package vous permet d'installer prettynoemiecms 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.*
+
+## Vue d'ensemble
+CMS offrant à ses utilisateurs une solution ergonomique, simple et élégante pour construire en un rien de temps des sites vitrines responsives au design moderne.
+La construction de votre site consistera à agencer à votre convenance des modules variés, d'éditer leurs contenus, et de personnaliser votre site en choisissant les polices de caractère, la mise en forme du texte, ainsi que les couleurs d'affichage.
+
+**Version incluse:** 2019.05.23
+
+## Captures d'écran
+
+![](https://framablog.org/wp-content/uploads/2018/02/pages-framasite-theme-light.gif)
+
+## Démo
+
+* [Démo officielle](https://demo-pretty-noemie.frama.site)
+
+Connectez-vous avec :
+
+    login : pretty
+    mdp : 12345678
+
+
+## Configuration
+
+Comment configurer cette application: via le panneau d'administration à : `votre.domain.tld/votre_chemin/admin`
+
+## Documentation
+
+ * Documentation officielle: https://framagit.org/framasoft/PrettyNoemieCMS
+
+## Caractéristiques spécifiques YunoHost
+
+#### Support multi-utilisateurs
+
+L'authentification LDAP et HTTP est-elle prise en charge? **NON**  
+L'application peut-elle être utilisée par plusieurs utilisateurs? **NON**
+
+#### Supported architectures
+
+* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/prettynoemiecms%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/prettynoemiecms/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/prettynoemiecms%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/prettynoemiecms/)
+* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/prettynoemiecms%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/prettynoemiecms/)
+
+**Plus d'informations sur la page de documentation:**  
+https://yunohost.org/packaging_apps
+
+## Liens
+
+ * Signaler un bug: https://github.com/YunoHost-Apps/prettynoemiecms_ynh/issues
+ * Site de l'application: https://framagit.org/framasoft/PrettyNoemieCMS
+ * Dépôt de l'application principale: https://framagit.org/framasoft/PrettyNoemieCMS
+ * Site web YunoHost: https://yunohost.org/
+
+---
+
+Informations pour les développeurs
+----------------
+
+**Seulement si vous voulez utiliser une branche de test pour le codage, au lieu de fusionner directement dans la banche principale.**
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/prettynoemiecms_ynh/tree/testing).
+
+Pour essayer la branche testing, procédez comme suit.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/prettynoemiecms_ynh/tree/testing --debug
+ou
+sudo yunohost app upgrade prettynoemiecms -u https://github.com/YunoHost-Apps/prettynoemiecms_ynh/tree/testing --debug
+```

check_process.default → check_process

@@ -1,17 +1,11 @@
-# See here for more informations
-# https://github.com/YunoHost/package_check#syntax-check_process-file
-
-# Move this file from check_process.default to check_process when you have filled it.
-
 ;; Test complet
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
 		path="/path"	(PATH)
 		admin="john"	(USER)
-		language="fr"
+		language="fr_FR"
 		is_public=1	(PUBLIC|public=1|private=0)
 		password="pass"
-		port="666"	(PORT)
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@@ -24,20 +18,9 @@
 		multi_instance=1
 		incorrect_path=1
 		port_already_use=0
-		change_url=0
+		change_url=1
 ;;; Levels
-	Level 1=auto
-	Level 2=auto
-	Level 3=auto
-# Level 4: 
-	Level 4=0
-# Level 5: 
 	Level 5=auto
-	Level 6=auto
-	Level 7=auto
-	Level 8=0
-	Level 9=0
-	Level 10=0
 ;;; Options
 Email=
 Notification=none

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=url of app's source
-SOURCE_SUM=sha256 checksum
+SOURCE_URL=https://framagit.org/framasoft/PrettyNoemieCMS/-/archive/d600c5332aff591744e5159f0c80f1de188703f9/PrettyNoemieCMS-d600c5332aff591744e5159f0c80f1de188703f9.tar.gz
+SOURCE_SUM=f53ea70c3d7e9582ef67bb2ec8fe12b88b141b54a34bd651a3cce1a13ff8c585
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

conf/nginx.conf

@@ -1,37 +1,46 @@
-location __PATH__ {
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
+location __PATH__/ {
 
   # Path to source
   alias __FINALPATH__/ ;
 
+  # Force usage of https
   if ($scheme = http) {
     rewrite ^ https://$server_name$request_uri? permanent;
   }
 
-  # Example PHP configuration (remove if not used)
-  index index.php index.html index.htm;
+  index index.php;
 
-  # Common parameter to increase upload size limit in conjuction with dedicated php-fpm file
-  #client_max_body_size 50M;
+  # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
+  client_max_body_size 50M;
 
-  try_files $uri $uri/ /index.php;
+  try_files $uri $uri/ index.php;
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-    fastcgi_pass unix:/var/run/php5-fpm-__NAME__.sock;
-
-    # If you don't use a dedicated fpm config for your app,
-    # use a general fpm pool.
-    # This is to be used INSTEAD of line above
-    # Don't forget to adjust scripts install/upgrade/remove/backup accordingly
-    #
-    #fastcgi_pass unix:/var/run/php5-fpm.sock;
+    fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock;
 
     fastcgi_index index.php;
     include fastcgi_params;
     fastcgi_param REMOTE_USER $remote_user;
     fastcgi_param PATH_INFO $fastcgi_path_info;
+    fastcgi_param X-FRAMA-SITE $host;
     fastcgi_param SCRIPT_FILENAME $request_filename;
   }
-  # PHP configuration end
+
+  location ~ ^__PATH__/(.*)$ {
+    if ($request_filename !~ "-l"){
+            set $rule_1 1$rule_1;
+    }
+    if (!-f $request_filename){
+            set $rule_1 2$rule_1;
+    }
+    if (!-d $request_filename){
+            set $rule_1 3$rule_1;
+    }
+    if ($rule_1 = "321"){
+            rewrite __PATH__/(.*) __PATH__/index.php?$1 last;
+    }
+  }
 
   # Include SSOWAT user panel.
   include conf.d/yunohost_panel.conf.inc;