diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md index 0922b30..9979eb1 100644 --- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md +++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md @@ -1,18 +1,18 @@ ## Problem -- +- ## Solution -- +- ## PR Status -- +- ## Validation --- *Minor decision* -- **Upgrade previous version** : -- [ ] **Code review** : -- [ ] **Approval (LGTM)** : -- [ ] **Approval (LGTM)** : -- **CI succeeded** : [![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/garradin_ynh%20xxx%20(Official)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/nextcloud_ynh%20xxx%20(Official)/) +- **Upgrade previous version** : +- [ ] **Code review** : +- [ ] **Approval (LGTM)** : +- [ ] **Approval (LGTM)** : +- **CI succeeded** : [![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/garradin_ynh%20xxx%20(Official)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/nextcloud_ynh%20xxx%20(Official)/) When the PR is mark as ready to merge, you have to wait for 3 days before really merge it. diff --git a/conf/nginx.conf b/conf/nginx.conf index 50e50e6..eec0539 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,30 +1,31 @@ location __PATH__ { -# Path to source -alias __FINALPATH__/www/ ; + # Path to source + alias __FINALPATH__/www/ ; -if ($scheme = http) { + if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; -} + } - # Example PHP configuration (remove if not used) + # Example PHP configuration (remove if not used) index index.php /_route.php; try_files $uri $uri/ index.php /_route.php; -location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - 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 SCRIPT_FILENAME $request_filename; -} - # PHP configuration end + location ~ [^/]\.php(/|$) { + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + 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 SCRIPT_FILENAME $request_filename; + } # Increase size limit client_max_body_size 2M; + # PHP configuration end + # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } \ No newline at end of file