diff --git a/README.md b/README.md index 0c80e99..0dddc92 100755 --- a/README.md +++ b/README.md @@ -19,7 +19,6 @@ Federated blogging engine, based on ActivityPub. It uses the Rocket framework, a 1. **Plume** require a valid **certificate** installed on the domain. Yunohost can **install Letsencrypt certificate** on the domain from **admin web-interface** or through **command-line**. 1. This package is **multi-instance** that means you can run **multiple Plume instances** on a **single server**. 1. There is **No LDAP** support for Plume yet. -1. **Admin username** and **password** will be sent to the **email address** of the admin. ## Screenshots @@ -37,8 +36,7 @@ Federated blogging engine, based on ActivityPub. It uses the Rocket framework, a #### Multi-users support -There is **No LDAP** support for Plume yet -But the app can be used by multiple users +There is **No LDAP** support for Plume yet but the app can be used by multiple users #### Supported architectures diff --git a/check_process b/check_process index be31990..4da5afc 100755 --- a/check_process +++ b/check_process @@ -39,5 +39,5 @@ Level 9=0 Level 10=0 ;;; Options -Email=anmol@datamol.org +Email=anmol@datamol.org;yalh@yahoo.com Notification=yes diff --git a/conf/.env b/conf/.env index b567ad6..9574cd9 100755 --- a/conf/.env +++ b/conf/.env @@ -17,3 +17,9 @@ ROCKET_ADDRESS=127.0.0.1 # Secret key used for private cookies and CSRF protection # You can generate one with `openssl rand -base64 32` ROCKET_SECRET_KEY=__SECRET_KEY__ + +# Mail settings +MAIL_SERVER=localhost +#MAIL_USER=example +#MAIL_PASSWORD=123456 +MAIL_HELO_NAME=__DOMAIN__ \ No newline at end of file diff --git a/conf/nginx.conf b/conf/nginx.conf index 714cd7c..b04a44a 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,9 +1,3 @@ -location ~* \.(jpg|jpeg|png|gif|ico|js|pdf)$ { - root __FINALPATH__/__NAME__; - add_header Cache-Control "public"; - expires 7d; - } - location / { # Force usage of https if ($scheme = http) { @@ -16,4 +10,7 @@ location ~* \.(jpg|jpeg|png|gif|ico|js|pdf)$ { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; client_max_body_size 10m; + + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; } diff --git a/manifest.json b/manifest.json index 2b937fd..2233860 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Federated blogging application", "fr": "Une application de blogging fédérée." }, - "version": "0.2.0~ynh2", + "version": "0.2.0~ynh3", "url": "https://baptiste.gelez.xyz/", "license": "AGPL-3.0-only", "maintainer": { diff --git a/pull_request_template.md b/pull_request_template.md new file mode 100644 index 0000000..df09865 --- /dev/null +++ b/pull_request_template.md @@ -0,0 +1,23 @@ +## Problem +- *Description of why you made this PR* + +## Solution +- *And how do you fix that problem* + +## PR Status +- [ ] Code finished. +- [ ] Tested with Package_check. +- [ ] Fix or enhancement tested. +- [ ] Upgrade from last version tested. +- [ ] Can be reviewed and tested. + +## Validation +--- +- [ ] **Code review** +- [ ] **Approval (LGTM)** +*Code review and approval have to be from a member of @YunoHost/apps group* +- **CI succeeded** : +[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/plume_ynh%20-BRANCH-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/plume_ynh%20-BRANCH-/) +*Please replace '-BRANCH-' in this link by the name of the branch used.* +*If the PR is from a forked repository. Please provide public results from package_check.* +When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. diff --git a/scripts/_common.sh b/scripts/_common.sh index b905339..aa40270 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,5 +1,12 @@ #!/bin/bash +#================================================= +# COMMON VARIABLES +#================================================= + +# dependencies used by the app +pkg_dependencies="gettext postgresql postgresql-contrib libpq-dev git curl gcc make openssl libssl-dev pkg-config openssl" + #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index a6d1159..44c1dd3 100755 --- a/scripts/install +++ b/scripts/install @@ -105,10 +105,11 @@ ynh_print_info "Installing dependencies ..." ### Those deb packages will be installed as dependencies of this package. ### If you're not using this helper: ### - Remove the section "REMOVE DEPENDENCIES" in the remove script +### - Remove the variable "pkg_dependencies" in _common.sh ### - As well as the section "REINSTALL DEPENDENCIES" in the restore script ### - And the section "UPGRADE DEPENDENCIES" in the upgrade script -ynh_install_app_dependencies gettext postgresql postgresql-contrib libpq-dev git curl gcc make openssl libssl-dev pkg-config +ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE A POSTGRESQL DATABASE diff --git a/scripts/restore b/scripts/restore index ca7e4ae..a444990 100755 --- a/scripts/restore +++ b/scripts/restore @@ -88,8 +88,7 @@ chown -R "$app":"$app" $final_path ynh_print_info "Reinstalling dependencies..." # Define and install dependencies -ynh_install_app_dependencies gettext postgresql postgresql-contrib libpq-dev git curl gcc make openssl libssl-dev pkg-config - +ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE POSTGRESQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index d1df2c9..27c06da 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -122,7 +122,7 @@ ynh_add_nginx_config #================================================= ynh_print_info "Upgrading dependencies..." -ynh_install_app_dependencies gettext postgresql postgresql-contrib libpq-dev git curl gcc make openssl libssl-dev pkg-config +ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER