From 03a84a0ecf62fbb9eaa881480a67b075357a4d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20BERSAC?= Date: Mon, 24 Oct 2022 09:49:24 +0200 Subject: [PATCH 1/2] docs: Fix server upgrade commands --- docs/server_upgrade.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/server_upgrade.md b/docs/server_upgrade.md index 94de32041..09b15d5fb 100644 --- a/docs/server_upgrade.md +++ b/docs/server_upgrade.md @@ -25,7 +25,7 @@ Update temboard package with your [preferred installation method]. Then apply `repository` database upgrade with the following command: ``` shell -sudo -u temboard migratedb upgrade +sudo -u temboard temboard migratedb upgrade ``` ### Flush tasks @@ -33,7 +33,7 @@ sudo -u temboard migratedb upgrade Flush background tasks with the following command: ``` shell -sudo -u temboard tasks flush +sudo -u temboard temboard tasks flush ``` @@ -42,7 +42,7 @@ sudo -u temboard tasks flush Generate signing key: ``` console -sudo -u temboard generate-key +sudo -u temboard temboard generate-key ``` ### Start service From e8449b2abe802ce50cefdacd33780e42991c6f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20BERSAC?= Date: Mon, 24 Oct 2022 09:49:33 +0200 Subject: [PATCH 2/2] ui: Fix alembic migration script --- ui/temboardui/model/versions/000_init.sql | 4 ++-- ui/temboardui/model/versions/007_drop-alembic.sql | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/temboardui/model/versions/000_init.sql b/ui/temboardui/model/versions/000_init.sql index a86c86577..8b72cb8a1 100644 --- a/ui/temboardui/model/versions/000_init.sql +++ b/ui/temboardui/model/versions/000_init.sql @@ -1,6 +1,6 @@ CREATE SCHEMA IF NOT EXISTS application; CREATE TABLE IF NOT EXISTS application.schema_migration_log ( version TEXT UNIQUE NOT NULL PRIMARY KEY, - cdate TIMESTAMP DEFAULT NOW(), - comment TEXT + comment TEXT, + cdate TIMESTAMP DEFAULT NOW() ); diff --git a/ui/temboardui/model/versions/007_drop-alembic.sql b/ui/temboardui/model/versions/007_drop-alembic.sql index e5aa242c0..f320300ed 100644 --- a/ui/temboardui/model/versions/007_drop-alembic.sql +++ b/ui/temboardui/model/versions/007_drop-alembic.sql @@ -1,5 +1,6 @@ DROP TABLE IF EXISTS "application"."alembic_version"; CREATE TABLE IF NOT EXISTS "application"."schema_migration_log" ( version TEXT UNIQUE NOT NULL PRIMARY KEY, + comment TEXT, cdate TIMESTAMP DEFAULT NOW() );