mirror of
https://github.com/YunoHost-Apps/noalyss_ynh.git
synced 2024-09-03 19:46:20 +02:00
Attempt to fix install, + small cleanup
This commit is contained in:
Alexandre Aubin
parent
f70f0cd016
commit
441369235f
6 changed files with 10 additions and 169 deletions
|
|
@ -6,7 +6,7 @@
|
|||
"en": "Accounting free software (Beligum and French accounting)",
|
||||
"fr": "Logiciel libre de comptabilité (comptabilité Belge et Française)"
|
||||
},
|
||||
"version": "7.2",
|
||||
"version": "7.2~ynh1",
|
||||
"url": "http://noalyss.eu",
|
||||
"license": "free",
|
||||
"maintainer": {
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
"url": "https://computhings.be"
|
||||
},
|
||||
"requirements": {
|
||||
"yunohost": ">= 3.0"
|
||||
"yunohost": ">= 3.8"
|
||||
},
|
||||
"multi_instance": false,
|
||||
"services": [
|
||||
|
|
|
|||
155
scripts/_psql.sh
155
scripts/_psql.sh
|
|
@ -1,155 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Create a master password and set up global settings
|
||||
# Please always call this script in install and restore scripts
|
||||
# usage: noalyss_psql_test_if_first_run
|
||||
|
||||
noalyss_psql_test_if_first_run() {
|
||||
if [ -f /etc/yunohost/psql ];
|
||||
then
|
||||
echo "PostgreSQL is already installed, no need to create master password"
|
||||
else
|
||||
local pgsql="$(ynh_string_random)"
|
||||
echo "$pgsql" > /etc/yunohost/psql
|
||||
|
||||
if [ -e /etc/postgresql/9.4/ ]
|
||||
then
|
||||
local pg_hba=/etc/postgresql/9.4/main/pg_hba.conf
|
||||
elif [ -e /etc/postgresql/9.6/ ]
|
||||
then
|
||||
local pg_hba=/etc/postgresql/9.6/main/pg_hba.conf
|
||||
else
|
||||
ynh_die "postgresql shoud be 9.4 or 9.6"
|
||||
fi
|
||||
|
||||
systemctl start postgresql
|
||||
sudo --login --user=postgres psql -c"ALTER user postgres WITH PASSWORD '$pgsql'" postgres
|
||||
|
||||
# force all user to connect to local database using passwords
|
||||
# https://www.postgresql.org/docs/current/static/auth-pg-hba-conf.html#EXAMPLE-PG-HBA.CONF
|
||||
# Note: we cant use peer since YunoHost create users with nologin
|
||||
# See: https://github.com/YunoHost/yunohost/blob/unstable/data/helpers.d/user
|
||||
sed -i '/local\s*all\s*all\s*peer/i \
|
||||
local all all password' "$pg_hba"
|
||||
systemctl enable postgresql
|
||||
systemctl reload postgresql
|
||||
fi
|
||||
}
|
||||
|
||||
# Open a connection as a user
|
||||
#
|
||||
# example: noalyss_psql_connect_as 'user' 'pass' <<< "UPDATE ...;"
|
||||
# example: noalyss_psql_connect_as 'user' 'pass' < /path/to/file.sql
|
||||
#
|
||||
# usage: noalyss_psql_connect_as user pwd [db]
|
||||
# | arg: user - the user name to connect as
|
||||
# | arg: pwd - the user password
|
||||
# | arg: db - the database to connect to
|
||||
noalyss_psql_connect_as() {
|
||||
local user="$1"
|
||||
local pwd="$2"
|
||||
local db="$3"
|
||||
sudo --login --user=postgres PGUSER="$user" PGPASSWORD="$pwd" psql "$db"
|
||||
}
|
||||
|
||||
# # Execute a command as root user
|
||||
#
|
||||
# usage: noalyss_psql_execute_as_root sql [db]
|
||||
# | arg: sql - the SQL command to execute
|
||||
noalyss_psql_execute_as_root () {
|
||||
local sql="$1"
|
||||
sudo --login --user=postgres psql <<< "$sql"
|
||||
}
|
||||
|
||||
# Execute a command from a file as root user
|
||||
#
|
||||
# usage: noalyss_psql_execute_file_as_root file [db]
|
||||
# | arg: file - the file containing SQL commands
|
||||
# | arg: db - the database to connect to
|
||||
noalyss_psql_execute_file_as_root() {
|
||||
local file="$1"
|
||||
local db="$2"
|
||||
sudo --login --user=postgres psql "$db" < "$file"
|
||||
}
|
||||
|
||||
# Create a database, an user and its password. Then store the password in the app s config
|
||||
#
|
||||
# After executing this helper, the password of the created database will be available in $db_pwd
|
||||
# It will also be stored as "psqlpwd" into the app settings.
|
||||
#
|
||||
# usage: noalyss_psql_setup_db user name [pwd]
|
||||
# | arg: user - Owner of the database
|
||||
# | arg: name - Name of the database
|
||||
# | arg: pwd - Password of the database. If not given, a password will be generated
|
||||
noalyss_psql_setup_db () {
|
||||
local db_user="$1"
|
||||
local db_name="$2"
|
||||
local new_db_pwd=$(ynh_string_random) # Generate a random password
|
||||
# If $3 is not given, use new_db_pwd instead for db_pwd.
|
||||
local db_pwd="${3:-$new_db_pwd}"
|
||||
noalyss_psql_create_db "$db_name" "$db_user" "$db_pwd" # Create the database
|
||||
|
||||
# sudo yunohost app setting "$app" "$key" --value="$value" --quiet
|
||||
# sudo yunohost app setting noalyss psqlpwd -v=RhWNxNe6KdrncQdhbBvWsur6 --quiet
|
||||
ynh_app_setting_set $app psqlpwd $db_pwd # Store the password in the app s config
|
||||
}
|
||||
|
||||
# Create a database and grant privilegies to a user
|
||||
#
|
||||
# usage: noalyss_psql_create_db db [user [pwd]]
|
||||
# | arg: db - the database name to create
|
||||
# | arg: user - the user to grant privilegies
|
||||
# | arg: pwd - the user password
|
||||
noalyss_psql_create_db() {
|
||||
local db="$1"
|
||||
local user="$2"
|
||||
local pwd="$3"
|
||||
noalyss_psql_create_user "$user" "$pwd"
|
||||
sudo --login --user=postgres createdb --owner="$user" "$db"
|
||||
}
|
||||
|
||||
# Drop a database
|
||||
#
|
||||
# usage: noalyss_psql_remove_db user
|
||||
# | arg: user - the user to drop
|
||||
noalyss_psql_remove_db() {
|
||||
local user="$1"
|
||||
# because the user may have multiple databases
|
||||
sudo su postgres --login -c "psql -l | grep \"\<$user\>\" | awk '{print \$1}' | xargs -l dropdb"
|
||||
noalyss_psql_drop_user "$user"
|
||||
}
|
||||
|
||||
# Dump a database
|
||||
#
|
||||
# example: noalyss_psql_dump_db 'roundcube' > ./dump.sql
|
||||
#
|
||||
# usage: noalyss_psql_dump_db user
|
||||
# | arg: db - the database name to dump
|
||||
# | ret: the psqldump output
|
||||
noalyss_psql_dump_db() {
|
||||
local user="$1"
|
||||
sudo su postgres --login -c "psql -l | grep \"\<$user\>\" | awk '{print \$1}' | xargs -l pg_dump -C"
|
||||
}
|
||||
|
||||
|
||||
# Create a user
|
||||
#
|
||||
# usage: noalyss_psql_create_user user pwd [host]
|
||||
# | arg: user - the user name to create
|
||||
# NOTICE : for Noalyss the user need to be able to createdb
|
||||
noalyss_psql_create_user() {
|
||||
local user="$1"
|
||||
local pwd="$2"
|
||||
sudo --login --user=postgres psql -c"CREATE USER $user createdb PASSWORD '$pwd'" postgres
|
||||
}
|
||||
|
||||
# Drop a user
|
||||
#
|
||||
# usage: noalyss_psql_drop_user user
|
||||
# | arg: user - the user name to drop
|
||||
noalyss_psql_drop_user() {
|
||||
local user="$1"
|
||||
sudo --login --user=postgres dropuser "$user"
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -9,7 +9,6 @@
|
|||
#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
|
||||
source ../settings/scripts/_common.sh
|
||||
source /usr/share/yunohost/helpers
|
||||
source ../settings/scripts/_psql.sh
|
||||
|
||||
#=================================================
|
||||
# MANAGE SCRIPT FAILURE
|
||||
|
|
@ -61,7 +60,7 @@ ynh_backup "/etc/php/7.0/fpm/pool.d/$app.conf"
|
|||
#=================================================
|
||||
ynh_print_info "Backing up the Postgres database..."
|
||||
|
||||
noalyss_psql_dump_db $app > db.sql
|
||||
ynh_psql_dump_db $app > db.sql
|
||||
|
||||
#=================================================
|
||||
# SPECIFIC BACKUP
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
source _common.sh
|
||||
source /usr/share/yunohost/helpers
|
||||
source _psql.sh
|
||||
|
||||
#=================================================
|
||||
# MANAGE SCRIPT FAILURE
|
||||
|
|
@ -111,12 +110,12 @@ ynh_install_app_dependencies $pkg_dependencies
|
|||
#=================================================
|
||||
|
||||
ynh_print_info "Testing if Postgress is installed..."
|
||||
noalyss_psql_test_if_first_run
|
||||
ynh_psql_test_if_first_run
|
||||
|
||||
ynh_print_info "Creating a Postgress database..."
|
||||
db_name=$(ynh_sanitize_dbid $app)
|
||||
ynh_app_setting_set $app db_name $db_name
|
||||
noalyss_psql_setup_db $db_name $db_name
|
||||
ynh_psql_setup_db $db_name $db_name
|
||||
|
||||
|
||||
#=================================================
|
||||
|
|
@ -318,4 +317,4 @@ systemctl reload nginx
|
|||
|
||||
ynh_print_info "Installation of $app completed"
|
||||
ynh_print_info "Default Noalyss admin / pass are phpcompta. Enjoy !"
|
||||
ynh_print_info "Go to https://$domain$path_url/install.php to continue !"
|
||||
ynh_print_info "Go to https://$domain$path_url/install.php to continue !"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
source _common.sh
|
||||
source /usr/share/yunohost/helpers
|
||||
source _psql.sh
|
||||
|
||||
#=================================================
|
||||
# LOAD SETTINGS
|
||||
|
|
@ -50,7 +49,7 @@ final_path=$(ynh_app_setting_get $app final_path)
|
|||
ynh_print_info "Removing the Postgres database"
|
||||
|
||||
# Remove a database if it exists, along with the associated user
|
||||
noalyss_psql_remove_db $db_user
|
||||
ynh_psql_remove_db $db_user
|
||||
|
||||
#=================================================
|
||||
# REMOVE DEPENDENCIES
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
|
||||
source ../settings/scripts/_common.sh
|
||||
source /usr/share/yunohost/helpers
|
||||
source ../settings/scripts/_psql.sh
|
||||
|
||||
#=================================================
|
||||
# MANAGE SCRIPT FAILURE
|
||||
|
|
@ -96,9 +95,9 @@ ynh_install_app_dependencies $pkg_dependencies
|
|||
ynh_print_info "Restoring the Postgres database..."
|
||||
|
||||
db_pwd=$(ynh_app_setting_get $app mysqlpwd)
|
||||
noalyss_psql_test_if_first_run
|
||||
noalyss_psql_setup_db $db_name $db_name $(ynh_app_setting_get $app psqlpwd)
|
||||
noalyss_psql_execute_file_as_root ./db.sql $db_name
|
||||
ynh_psql_test_if_first_run
|
||||
ynh_psql_setup_db $db_name $db_name $(ynh_app_setting_get $app psqlpwd)
|
||||
ynh_psql_execute_file_as_root ./db.sql $db_name
|
||||
|
||||
#=================================================
|
||||
# RESTORE SYSTEMD
|
||||
|
|
|
|||
Loading…
Reference in a new issue