YunoHost-Apps/discourse_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/discourse_ynh.git synced 2024-09-03 18:26:18 +02:00
Code Issues Activity Actions

Update PostgreSQL helpers

Browse source
This commit is contained in:
Jimmy Monin 2018-05-02 19:30:56 +02:00
parent 4fdbfe333c
commit a7eed4e8a2
2 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -107,8 +107,8 @@ systemctl restart discourse-puma
--- ---
Developers infos Developers info
---------------- ---------------
Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/discourse_ynh/tree/testing). Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/discourse_ynh/tree/testing).

38
scripts/_common.sh
View file

@ -67,11 +67,15 @@ check_memory_requirements_upgrade() {
ynh_die "You must have a minimum of 400Mb available memory (RAM+swap) for the upgrade" ynh_die "You must have a minimum of 400Mb available memory (RAM+swap) for the upgrade"
fi fi
} }
#================================================= #=================================================
# POSTGRES HELPERS # POSTGRES HELPERS
#================================================= #=================================================
# Create a master password and set up global settings
# Please always call this script in install and restore scripts
#
# usage: ynh_psql_test_if_first_run
ynh_psql_test_if_first_run() { ynh_psql_test_if_first_run() {
if [ -f /etc/yunohost/psql ]; if [ -f /etc/yunohost/psql ];
then then
@ -92,8 +96,12 @@ ynh_psql_test_if_first_run() {
fi fi
systemctl start postgresql systemctl start postgresql
su --command="psql -c\"ALTER user postgres WITH PASSWORD '${pgsql}'\"" postgres sudo --login --user=postgres psql -c"ALTER user postgres WITH PASSWORD '$pgsql'" postgres
# we can't use peer since YunoHost create users with nologin
# 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 can't 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 \ sed -i '/local\s*all\s*all\s*peer/i \
local all all password' "$pg_hba" local all all password' "$pg_hba"
systemctl enable postgresql systemctl enable postgresql
@ -114,7 +122,7 @@ ynh_psql_connect_as() {
user="$1" user="$1"
pwd="$2" pwd="$2"
db="$3" db="$3"
su --command="PGUSER=\"${user}\" PGPASSWORD=\"${pwd}\" psql \"${db}\"" postgres sudo --login --user=postgres PGUSER="$user" PGPASSWORD="$pwd" psql "$db"
} }
# # Execute a command as root user # # Execute a command as root user
@ -124,7 +132,7 @@ ynh_psql_connect_as() {
# | arg: db - the database to connect to # | arg: db - the database to connect to
ynh_psql_execute_as_root () { ynh_psql_execute_as_root () {
sql="$1" sql="$1"
su --command="psql" postgres <<< "$sql" sudo --login --user=postgres psql <<< "$sql"
} }
# Execute a command from a file as root user # Execute a command from a file as root user
@ -135,7 +143,7 @@ ynh_psql_execute_as_root () {
ynh_psql_execute_file_as_root() { ynh_psql_execute_file_as_root() {
file="$1" file="$1"
db="$2" db="$2"
su -c "psql $db" postgres < "$file" sudo --login --user=postgres psql "$db" < "$file"
} }
# Create a database, an user and its password. Then store the password in the app's config # Create a database, an user and its password. Then store the password in the app's config
@ -158,7 +166,7 @@ ynh_psql_setup_db () {
ynh_app_setting_set "$app" psqlpwd "$db_pwd" # Store the password in the app's config ynh_app_setting_set "$app" psqlpwd "$db_pwd" # Store the password in the app's config
} }
# Create a database and grant optionnaly privilegies to a user # Create a database and grant privilegies to a user
# #
# usage: ynh_psql_create_db db [user [pwd]] # usage: ynh_psql_create_db db [user [pwd]]
# | arg: db - the database name to create # | arg: db - the database name to create
@ -169,7 +177,7 @@ ynh_psql_create_db() {
user="$2" user="$2"
pwd="$3" pwd="$3"
ynh_psql_create_user "$user" "$pwd" ynh_psql_create_user "$user" "$pwd"
su --command="createdb --owner=\"${user}\" \"${db}\"" postgres sudo --login --user=postgres createdb --owner="$user" "$db"
} }
# Drop a database # Drop a database
@ -180,12 +188,8 @@ ynh_psql_create_db() {
ynh_psql_remove_db() { ynh_psql_remove_db() {
db="$1" db="$1"
user="$2" user="$2"
# Force disconnections from the database (https://dba.stackexchange.com/a/11895) sudo --login --user=postgres dropdb "$db"
ynh_psql_execute_as_root "UPDATE pg_database SET datallowconn = 'false' WHERE datname = '${db}';" ynh_psql_drop_user "$user"
ynh_psql_execute_as_root "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = '${db}';"
su --command="dropdb \"${db}\"" postgres
ynh_psql_drop_user "${user}"
} }
# Dump a database # Dump a database
@ -197,7 +201,7 @@ ynh_psql_remove_db() {
# | ret: the psqldump output # | ret: the psqldump output
ynh_psql_dump_db() { ynh_psql_dump_db() {
db="$1" db="$1"
su --command="pg_dump \"${db}\"" postgres sudo --login --user=postgres pg_dump "$db"
} }
@ -208,7 +212,7 @@ ynh_psql_dump_db() {
ynh_psql_create_user() { ynh_psql_create_user() {
user="$1" user="$1"
pwd="$2" pwd="$2"
su --command="psql -c\"CREATE USER ${user} WITH PASSWORD '${pwd}'\"" postgres sudo --login --user=postgres psql -c"CREATE USER $user WITH PASSWORD '$pwd'" postgres
} }
# Drop a user # Drop a user
@ -217,7 +221,7 @@ ynh_psql_create_user() {
# | arg: user - the user name to drop # | arg: user - the user name to drop
ynh_psql_drop_user() { ynh_psql_drop_user() {
user="$1" user="$1"
su --command="dropuser \"${user}\"" postgres sudo --login --user=postgres dropuser "$user"
} }
# ============= MODIFIED EXISTING YUNOHOST HELPERS ============= # ============= MODIFIED EXISTING YUNOHOST HELPERS =============