mirrors/postgsail
1
0
Fork 0
mirror of https://github.com/xbgmsharp/postgsail.git synced 2025-09-17 11:17:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add new parameter PGSAIL_APP_UR

Browse Source
This commit is contained in:
xbgmsharp
2022-10-18 21:39:58 +02:00
parent 07c7628973
commit 7fb24d8cae
3 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.env.example
View File

@@ -10,6 +10,7 @@ PGSAIL_EMAIL_SERVER=localhost
#PGSAIL_EMAIL_PASS= Comment if not use #PGSAIL_EMAIL_PASS= Comment if not use
#PGSAIL_PUSHOVER_TOKEN= Comment if not use #PGSAIL_PUSHOVER_TOKEN= Comment if not use
#PGSAIL_PUSHOVER_APP= Comment if not use #PGSAIL_PUSHOVER_APP= Comment if not use
PGSAIL_APP_URL=http://localhost
# POSTGREST ENV Settings # POSTGREST ENV Settings
PGRST_DB_URI=postgres://authenticator:${PGSAIL_AUTHENTICATOR_PASSWORD}@127.0.0.1:5432/signalk PGRST_DB_URI=postgres://authenticator:${PGSAIL_AUTHENTICATOR_PASSWORD}@127.0.0.1:5432/signalk
PGRST_JWT_SECRET=_at_least_32__char__long__random PGRST_JWT_SECRET=_at_least_32__char__long__random

59
initdb/02_3_signalk_public.sql
View File

@@ -82,12 +82,13 @@ COMMENT ON TABLE
-- with escape value, eg: E'A\nB\r\nC' -- with escape value, eg: E'A\nB\r\nC'
-- https://stackoverflow.com/questions/26638615/insert-line-break-in-postgresql-when-updating-text-field -- https://stackoverflow.com/questions/26638615/insert-line-break-in-postgresql-when-updating-text-field
-- TODO Update notification subject for log entry to 'logbook #NB ...'
INSERT INTO email_templates VALUES INSERT INTO email_templates VALUES
('logbook', ('logbook',
'New Logbook Entry', 'New Logbook Entry',
E'Hello __RECIPIENT__,\n\nWe just wanted to let you know that you have a new entry on openplotter.cloud: "__LOGBOOK_NAME__"\r\n\r\nSee more details at https://beta.openplotter.cloud/log/__LOGBOOK_LINK__\n\nHappy sailing!\nThe PostgSail Team', E'Hello __RECIPIENT__,\n\nWe just wanted to let you know that you have a new entry on openplotter.cloud: "__LOGBOOK_NAME__"\r\n\r\nSee more details at __APP_URL__/log/__LOGBOOK_LINK__\n\nHappy sailing!\nThe PostgSail Team',
'New Logbook Entry', 'New Logbook Entry',
E'We just wanted to let you know that you have a new entry on openplotter.cloud: "__LOGBOOK_NAME__"\r\n\r\nSee more details at https://beta.openplotter.cloud/log/__LOGBOOK_LINK__\n\nHappy sailing!\nThe PostgSail Team'), E'We just wanted to let you know that you have a new entry on openplotter.cloud: "__LOGBOOK_NAME__"\r\n\r\nSee more details at __APP_URL__/log/__LOGBOOK_LINK__\n\nHappy sailing!\nThe PostgSail Team'),
('user', ('user',
'Welcome', 'Welcome',
E'Hello __RECIPIENT__,\nCongratulations!\nYou successfully created an account.\nKeep in mind to register your vessel.\nHappy sailing!', E'Hello __RECIPIENT__,\nCongratulations!\nYou successfully created an account.\nKeep in mind to register your vessel.\nHappy sailing!',
@@ -100,19 +101,19 @@ INSERT INTO email_templates VALUES
E'Hi!\nHow are you?\n__BOAT__ is now linked to your account.'), E'Hi!\nHow are you?\n__BOAT__ is now linked to your account.'),
('monitor_offline', ('monitor_offline',
'Offline', 'Offline',
E'__BOAT__ has been offline for more than an hour\r\nFind more details at https://beta.openplotter.cloud/boats/\n', E'__BOAT__ has been offline for more than an hour\r\nFind more details at __APP_URL__/boats/\n',
'Offline', 'Offline',
E'__BOAT__ has been offline for more than an hour\r\nFind more details at https://beta.openplotter.cloud/boats/\n'), E'__BOAT__ has been offline for more than an hour\r\nFind more details at __APP_URL__/boats/\n'),
('monitor_online', ('monitor_online',
'Online', 'Online',
E'__BOAT__ just came online\nFind more details at https://beta.openplotter.cloud/boats/\n', E'__BOAT__ just came online\nFind more details at __APP_URL__/boats/\n',
'Online', 'Online',
E'__BOAT__ just came online\nFind more details at https://beta.openplotter.cloud/boats/\n'), E'__BOAT__ just came online\nFind more details at __APP_URL__/boats/\n'),
('badge', ('badge',
'New Badge!', 'New Badge!',
E'Hello __RECIPIENT__,\nCongratulations! You have just unlocked a new badge: __BADGE_NAME__\nSee more details at https://beta.openplotter.cloud/badges\nHappy sailing!\nThe PostgSail Team', E'Hello __RECIPIENT__,\nCongratulations! You have just unlocked a new badge: __BADGE_NAME__\nSee more details at __APP_URL__/badges\nHappy sailing!\nThe PostgSail Team',
'New Badge!', 'New Badge!',
E'Congratulations!\nYou have just unlocked a new badge: __BADGE_NAME__\nSee more details at https://beta.openplotter.cloud/badges\nHappy sailing!\nThe PostgSail Team'); E'Congratulations!\nYou have just unlocked a new badge: __BADGE_NAME__\nSee more details at __APP_URL__/badges\nHappy sailing!\nThe PostgSail Team');
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- python send email -- python send email
@@ -159,6 +160,9 @@ AS $send_email_py$
if 'badge' in _user and _user['badge']: if 'badge' in _user and _user['badge']:
email_content = email_content.replace('__BADGE_NAME__', _user['badge']) email_content = email_content.replace('__BADGE_NAME__', _user['badge'])
if 'app.url' in app and app['app.url']:
email_content = email_content.replace('__APP_URL__', app['app.url'])
email_from = 'root@localhost' email_from = 'root@localhost'
if 'app.email_from' in app and app['app.email_from']: if 'app.email_from' in app and app['app.email_from']:
email_from = app['app.email_from'] email_from = app['app.email_from']
@@ -246,6 +250,9 @@ AS $send_pushover_py$
if 'badge' in _user and _user['badge']: if 'badge' in _user and _user['badge']:
pushover_message = pushover_message.replace('__BADGE_NAME__', _user['badge']) pushover_message = pushover_message.replace('__BADGE_NAME__', _user['badge'])
if 'app.url' in app and app['app.url']:
pushover_message = pushover_message.replace('__APP_URL__', app['app.url'])
pushover_token = None pushover_token = None
if 'app.pushover_token' in app and app['app.pushover_token']: if 'app.pushover_token' in app and app['app.pushover_token']:
pushover_token = app['app.pushover_token'] pushover_token = app['app.pushover_token']
@@ -648,23 +655,33 @@ COMMENT ON FUNCTION
-- Get user settings details from a log entry -- Get user settings details from a log entry
DROP FUNCTION IF EXISTS get_app_settings_fn; DROP FUNCTION IF EXISTS get_app_settings_fn;
CREATE OR REPLACE FUNCTION get_app_settings_fn(OUT app_settings JSONB) RETURNS JSONB CREATE OR REPLACE FUNCTION get_app_settings_fn (OUT app_settings jsonb)
AS $get_app_settings$ RETURNS jsonb
DECLARE AS $get_app_settings$
BEGIN DECLARE
SELECT jsonb_object_agg(name,value) INTO app_settings BEGIN
FROM public.app_settings SELECT
WHERE name LIKE '%app.email%' OR name LIKE '%app.pushover%'; jsonb_object_agg(name, value) INTO app_settings
END; FROM
$get_app_settings$ LANGUAGE plpgsql; public.app_settings
WHERE
name LIKE '%app.email%'
OR name LIKE '%app.pushover%'
OR name LIKE '%app.url';
END;
$get_app_settings$
LANGUAGE plpgsql;
-- Description -- Description
COMMENT ON FUNCTION COMMENT ON FUNCTION
public.get_app_settings_fn public.get_app_settings_fn
IS 'get app settings details, email, pushover'; IS 'get app settings details, email, pushover';
-- Get user settings details from a metadata entry -- Send notifications
DROP FUNCTION IF EXISTS send_notification_fn; DROP FUNCTION IF EXISTS send_notification_fn;
CREATE OR REPLACE FUNCTION send_notification_fn(IN email_type TEXT, IN notification_rec RECORD) RETURNS JSON CREATE OR REPLACE FUNCTION send_notification_fn(
IN email_type TEXT,
IN user_settings JSONB) RETURNS VOID
AS $send_notification$ AS $send_notification$
DECLARE DECLARE
app_settings JSONB; app_settings JSONB;
@@ -687,7 +704,7 @@ $send_notification$ LANGUAGE plpgsql;
-- Description -- Description
COMMENT ON FUNCTION COMMENT ON FUNCTION
public.send_notification_fn public.send_notification_fn
IS 'TODO'; IS 'TODO Send notifications';
DROP FUNCTION IF EXISTS get_user_settings_from_clientid_fn; DROP FUNCTION IF EXISTS get_user_settings_from_clientid_fn;
CREATE OR REPLACE FUNCTION get_user_settings_from_clientid_fn( CREATE OR REPLACE FUNCTION get_user_settings_from_clientid_fn(
@@ -698,7 +715,7 @@ AS $get_user_settings_from_clientid$
DECLARE DECLARE
BEGIN BEGIN
-- If client_id is not NULL -- If client_id is not NULL
IF clientid IS NULL OR clientid <> '' THEN IF clientid IS NULL OR clientid = '' THEN
RAISE WARNING '-> get_user_settings_from_clientid_fn invalid input %', clientid; RAISE WARNING '-> get_user_settings_from_clientid_fn invalid input %', clientid;
END IF; END IF;
SELECT SELECT

1
initdb/99env.sh
View File

@@ -16,6 +16,7 @@ INSERT INTO app_settings (name, value) VALUES
('app.email_from', '${PGSAIL_EMAIL_FROM}'), ('app.email_from', '${PGSAIL_EMAIL_FROM}'),
('app.pushover_token', '${PGSAIL_PUSHOVER_TOKEN}'), ('app.pushover_token', '${PGSAIL_PUSHOVER_TOKEN}'),
('app.pushover_app', '_todo_'), ('app.pushover_app', '_todo_'),
('app.url', '${PGSAIL_APP_URL}'),
('app.version', '${PGSAIL_VERSION}'); ('app.version', '${PGSAIL_VERSION}');
-- Update comment with version -- Update comment with version
COMMENT ON DATABASE signalk IS 'version ${PGSAIL_VERSION}'; COMMENT ON DATABASE signalk IS 'version ${PGSAIL_VERSION}';