From b1e202b2a782c191eb500699955da27440176d82 Mon Sep 17 00:00:00 2001 From: SJiB Date: Fri, 2 Aug 2024 09:14:33 +0200 Subject: [PATCH 1/7] Adapt minimal requirements --- docs/en/installation-guide/server.rst | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/en/installation-guide/server.rst b/docs/en/installation-guide/server.rst index b5d639d86..519cc18b3 100644 --- a/docs/en/installation-guide/server.rst +++ b/docs/en/installation-guide/server.rst @@ -11,14 +11,19 @@ Required Software Server installation ~~~~~~~~~~~~~~~~~~~ -* Install PostgreSQL (>=9.6) +* Install PostgreSQL (>=15.1) * `Download page `_ -* Install PostGIS (>=2.4) +* Install PostGIS (>=3.4.2) * E. g. by using the (Application) Stack Builder shipped with the EnterpriseDB version of posgreSQL on Windows and macOS +.. note:: + +Check the `TEKSI Roadmap `_ to see latest minimal requirements + + .. note:: The following instructions are **optional**: From 79d35d9f4ac42947513ee4902076d74954e2e138 Mon Sep 17 00:00:00 2001 From: SJiB Date: Fri, 2 Aug 2024 09:18:23 +0200 Subject: [PATCH 2/7] add warning as this part is outdated --- docs/en/vm/about.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/en/vm/about.rst b/docs/en/vm/about.rst index 0fab584a9..d36913e6d 100644 --- a/docs/en/vm/about.rst +++ b/docs/en/vm/about.rst @@ -1,5 +1,9 @@ About ===== +.. warning:: + +This part of the documentation is outdated and needs a review + This represents a guide on how to download and install a virtual machine (VM) that has a working TWW installation with a demo dataset. The VM also has a working demo of the `QWAT water project `_ . From 7cd62ef80fb971a81be6cbd01ab9c1a013d50cf9 Mon Sep 17 00:00:00 2001 From: SJiB Date: Fri, 2 Aug 2024 09:24:50 +0200 Subject: [PATCH 3/7] update database-inizialisatino --- .../database-initialization.rst | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/docs/en/installation-guide/database-initialization.rst b/docs/en/installation-guide/database-initialization.rst index a099c7776..1de6c1a71 100644 --- a/docs/en/installation-guide/database-initialization.rst +++ b/docs/en/installation-guide/database-initialization.rst @@ -61,14 +61,26 @@ Back in pgAdmin : * Propably you want to rename the database: Right click the database, click `Properties...` and rename the database. -There are now 7 schemas in the database (public, tww_import, tww_network, tww_swmm, tww_od, tww_sys, tww_vl) +There are now 7 `schemas `_ in the database + ++ public ++ tww_import ++ tww_network ++ tww_swmm ++ tww_od ++ tww_sys ++ tww_vl + Create minimal roles and access ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -.. note:: The TWW roles are defined in the https://github.com/TWW/datamodel/blob/master/12_0_roles.sql (per cluster) and https://github.com/TWW/datamodel/blob/master/12_1_roles.sql (per database) files. It is recommended to use these when using TWW in a production environment. +.. note:: The TWW roles are defined in the `12_0_roles.sql `_ (per cluster) +and `12_1_roles.sql `_ (per database) files. + +It is recommended to use these when using TWW in a production environment. -Copy paste and run the two .sql one after the other in the query editor of pgAdmin4 (Tools > Query Tool). +Copy paste and run the two .sql one after the other in the query editor of pgAdmin (Tools > Query Tool). Empty data model ^^^^^^^^^^^^^^^^ From c2741e47e1f7842acf5a44181b4c4649d72bc386 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 07:26:46 +0000 Subject: [PATCH 4/7] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/en/installation-guide/database-initialization.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/installation-guide/database-initialization.rst b/docs/en/installation-guide/database-initialization.rst index 1de6c1a71..545d87a02 100644 --- a/docs/en/installation-guide/database-initialization.rst +++ b/docs/en/installation-guide/database-initialization.rst @@ -75,8 +75,8 @@ There are now 7 `schemas `_ (per cluster) -and `12_1_roles.sql `_ (per database) files. +.. note:: The TWW roles are defined in the `12_0_roles.sql `_ (per cluster) +and `12_1_roles.sql `_ (per database) files. It is recommended to use these when using TWW in a production environment. From 6500f413b65d4fa4b65452260450e30c7991ee0a Mon Sep 17 00:00:00 2001 From: SJiB Date: Fri, 2 Aug 2024 09:27:18 +0200 Subject: [PATCH 5/7] create list --- docs/en/installation-guide/database-initialization.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/en/installation-guide/database-initialization.rst b/docs/en/installation-guide/database-initialization.rst index 1de6c1a71..e2f1ef39e 100644 --- a/docs/en/installation-guide/database-initialization.rst +++ b/docs/en/installation-guide/database-initialization.rst @@ -75,8 +75,9 @@ There are now 7 `schemas `_ (per cluster) -and `12_1_roles.sql `_ (per database) files. +.. note:: The TWW roles are defined in the ++ `12_0_roles.sql `_ (per cluster) and ++ `12_1_roles.sql `_ (per database) files. It is recommended to use these when using TWW in a production environment. From 5cfaea1ce12c7a5abc15150d44d2886624c2e547 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 07:29:12 +0000 Subject: [PATCH 6/7] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/en/installation-guide/database-initialization.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/installation-guide/database-initialization.rst b/docs/en/installation-guide/database-initialization.rst index d6a954467..d64d5d603 100644 --- a/docs/en/installation-guide/database-initialization.rst +++ b/docs/en/installation-guide/database-initialization.rst @@ -76,8 +76,8 @@ Create minimal roles and access ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. note:: The TWW roles are defined in the -+ `12_0_roles.sql `_ (per cluster) and -+ `12_1_roles.sql `_ (per database) files. ++ `12_0_roles.sql `_ (per cluster) and ++ `12_1_roles.sql `_ (per database) files. It is recommended to use these when using TWW in a production environment. From 0fbfaf7ae33b45e8049e0ecb2662fa90d566e8dc Mon Sep 17 00:00:00 2001 From: Arnaud Poncet-Montanges Date: Thu, 8 Aug 2024 15:15:31 +0200 Subject: [PATCH 7/7] tww_6_schemas --- docs/en/installation-guide/database-initialization.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/en/installation-guide/database-initialization.rst b/docs/en/installation-guide/database-initialization.rst index d64d5d603..b97b39b35 100644 --- a/docs/en/installation-guide/database-initialization.rst +++ b/docs/en/installation-guide/database-initialization.rst @@ -61,12 +61,11 @@ Back in pgAdmin : * Propably you want to rename the database: Right click the database, click `Properties...` and rename the database. -There are now 7 `schemas `_ in the database +There are now 6 `schemas `_ in the database + public -+ tww_import -+ tww_network -+ tww_swmm ++ tww_app ++ tww_cfg + tww_od + tww_sys + tww_vl