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

Merge branch 'testing' into master

This commit is contained in:
Josué Tille 2020-12-03 21:54:16 +01:00
commit 62d6cb6b5e
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
9 changed files with 28 additions and 41 deletions

View file

@ -25,19 +25,6 @@
incorrect_path=1 incorrect_path=1
port_already_use=1 (8448) port_already_use=1 (8448)
change_url=0 change_url=0
;;; Levels
Level 1=auto
Level 2=auto
Level 3=auto
# https://github.com/YunoHost-Apps/sogo_ynh/blob/master/conf/sogo.conf#L25-L40
Level 4=1
Level 5=auto
Level 5=auto
Level 6=auto
Level 7=auto
Level 8=0
Level 9=0
Level 10=0
;;; Upgrade options ;;; Upgrade options
; commit=b2595379b2e4f3f0d7ad1ae7da4f90a8184a90ff ; commit=b2595379b2e4f3f0d7ad1ae7da4f90a8184a90ff
name=Branch_Old_package_For_CI1 name=Branch_Old_package_For_CI1

View file

@ -8,8 +8,8 @@ Environment="PREFORK=3"
Environment="LD_LIBRARY_PATH=/lib:/usr/lib:/opt/yunohost/__APP__/Library/Libraries/sogo:/opt/yunohost/__APP__/Local/Library/Libraries/sogo" Environment="LD_LIBRARY_PATH=/lib:/usr/lib:/opt/yunohost/__APP__/Library/Libraries/sogo:/opt/yunohost/__APP__/Local/Library/Libraries/sogo"
EnvironmentFile=-/etc/default/__APP__ EnvironmentFile=-/etc/default/__APP__
Type=forking Type=forking
ExecStart=/opt/yunohost/__APP__/sbin/sogod -WOWorkersCount ${PREFORK} -WOPidFile /var/run/__APP__/sogo.pid -WOLogFile /var/log/__APP__/sogo.log ExecStart=/opt/yunohost/__APP__/sbin/sogod -WOWorkersCount ${PREFORK} -WOPidFile /run/__APP__/sogo.pid -WOLogFile /var/log/__APP__/sogo.log
PIDFile=/var/run/__APP__/sogo.pid PIDFile=/run/__APP__/sogo.pid
User=__APP__ User=__APP__
[Install] [Install]

View file

@ -6,8 +6,8 @@
"url": "https://sogo.nu/", "url": "https://sogo.nu/",
"version": "4.0.7-1~ynh1", "version": "4.0.7-1~ynh1",
"description": { "description": {
"en": "Sogo is an opensource groupware for E-Mail, Contacts and Calender.", "en": "An opensource groupware for E-Mail, Contacts and Calender.",
"fr": "Sogo est un groupware opensource pour les e-mail, contacts et calendrier" "fr": "Un groupware opensource pour les e-mail, contacts et calendrier"
}, },
"maintainer": { "maintainer": {
"name": "Josué Tille", "name": "Josué Tille",

View file

@ -4,16 +4,16 @@
# GENERIC START # GENERIC START
#================================================= #=================================================
# Import common cmd
source ../settings/scripts/experimental_helper.sh
source ../settings/scripts/_common.sh
# Source YunoHost helpers # Source YunoHost helpers
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
# Stop script if errors # Stop script if errors
ynh_abort_if_errors ynh_abort_if_errors
# Import common cmd
source ../settings/scripts/experimental_helper.sh
source ../settings/scripts/_common.sh
ynh_script_progression --message="Loading installation settings..." ynh_script_progression --message="Loading installation settings..."
# retrieve useful param # retrieve useful param

View file

@ -4,16 +4,16 @@
# GENERIC START # GENERIC START
#================================================= #=================================================
# Import common cmd
source ./experimental_helper.sh
source ./_common.sh
# IMPORT GENERIC HELPERS # IMPORT GENERIC HELPERS
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
# Exit if an error occurs during the execution of the script # Exit if an error occurs during the execution of the script
ynh_abort_if_errors ynh_abort_if_errors
# Import common cmd
source ./experimental_helper.sh
source ./_common.sh
ynh_script_progression --message="Loading installation settings..." ynh_script_progression --message="Loading installation settings..."
# RETRIEVE ARGUMENTS # RETRIEVE ARGUMENTS

View file

@ -4,16 +4,16 @@
# GENERIC START # GENERIC START
#================================================= #=================================================
# Import common cmd
source ./experimental_helper.sh
source ./_common.sh
# Source YunoHost helpers # Source YunoHost helpers
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
# Stop script if errors # Stop script if errors
ynh_abort_if_errors ynh_abort_if_errors
# Import common cmd
source ./experimental_helper.sh
source ./_common.sh
ynh_script_progression --message="Validating installation parameters..." ynh_script_progression --message="Validating installation parameters..."
# RETRIEVE ARGUMENTS FROM THE MANIFEST # RETRIEVE ARGUMENTS FROM THE MANIFEST

View file

@ -4,9 +4,6 @@
# GENERIC START # GENERIC START
#================================================= #=================================================
# Source YunoHost helpers
source /usr/share/yunohost/helpers
# Stop script if errors # Stop script if errors
set -u set -u
@ -14,6 +11,9 @@ set -u
source ./experimental_helper.sh source ./experimental_helper.sh
source ./_common.sh source ./_common.sh
# Source YunoHost helpers
source /usr/share/yunohost/helpers
ynh_script_progression --message="Loading installation settings..." ynh_script_progression --message="Loading installation settings..."
# Retrieve app settings # Retrieve app settings

View file

@ -4,16 +4,16 @@
# GENERIC START # GENERIC START
#================================================= #=================================================
# Import common cmd
source ../settings/scripts/experimental_helper.sh
source ../settings/scripts/_common.sh
# Source YunoHost helpers # Source YunoHost helpers
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
# Stop script if errors # Stop script if errors
ynh_abort_if_errors ynh_abort_if_errors
# Import common cmd
source ../settings/scripts/experimental_helper.sh
source ../settings/scripts/_common.sh
ynh_script_progression --message="Loading settings..." ynh_script_progression --message="Loading settings..."
domain=$(ynh_app_setting_get --app $app --key domain) domain=$(ynh_app_setting_get --app $app --key domain)

View file

@ -4,16 +4,16 @@
# GENERIC START # GENERIC START
#================================================= #=================================================
# Import common cmd
source ./experimental_helper.sh
source ./_common.sh
# IMPORT GENERIC HELPERS # IMPORT GENERIC HELPERS
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
# Exit if an error occurs during the execution of the script # Exit if an error occurs during the execution of the script
ynh_abort_if_errors ynh_abort_if_errors
# Import common cmd
source ./experimental_helper.sh
source ./_common.sh
ynh_script_progression --message="Loading installation settings..." ynh_script_progression --message="Loading installation settings..."
# LOAD SETTINGS # LOAD SETTINGS