From 0d938a2389ec8fed81db3f1011c67bc2b267fa56 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Wed, 19 Aug 2020 11:37:15 +0200 Subject: [PATCH 1/6] add infraserver table --- db/gen/create_tables.sql | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/db/gen/create_tables.sql b/db/gen/create_tables.sql index d7e3dee..9844792 100644 --- a/db/gen/create_tables.sql +++ b/db/gen/create_tables.sql @@ -46,8 +46,12 @@ CREATE TABLE Zone ( SitesName VARCHAR(255) [] NOT NULL ); +------------------------------------- +-- Infra +------------------------------------- + -- Server -CREATE TABLE Server ( +CREATE TABLE InfraServer( ServerId SERIAL PRIMARY KEY, ServerName VARCHAR(255) NOT NULL UNIQUE, ServerDescription VARCHAR(255) NOT NULL, @@ -75,6 +79,18 @@ CREATE TABLE Release ( FOREIGN KEY (ReleaseSourceId) REFERENCES Source(SourceId) ); +------------------------------------- +-- Setting +------------------------------------- + +-- SettingServer +CREATE TABLE SettingServer( + ServerId SERIAL PRIMARY KEY, + ServerName VARCHAR(255) NOT NULL UNIQUE, + ServermodelName VARCHAR(255) NOT NULL, + ReleaseDistribution VARCHAR(255) NOT NULL +); + -- Servermodel CREATE TABLE Servermodel ( ServermodelId SERIAL PRIMARY KEY, From f371c96ff38f4f97d770c8cd15ceb5e20ded0729 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Wed, 26 Aug 2020 15:32:09 +0200 Subject: [PATCH 2/6] release_name and release_distribution --- db/gen/create_tables.sql | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/db/gen/create_tables.sql b/db/gen/create_tables.sql index 9844792..8d0c1d7 100644 --- a/db/gen/create_tables.sql +++ b/db/gen/create_tables.sql @@ -55,8 +55,9 @@ CREATE TABLE InfraServer( ServerId SERIAL PRIMARY KEY, ServerName VARCHAR(255) NOT NULL UNIQUE, ServerDescription VARCHAR(255) NOT NULL, - ServerServermodelName VARCHAR(255) NOT NULL, - ReleaseDistribution VARCHAR(255) NOT NULL, + ServermodelName VARCHAR(255) NOT NULL, + ServermodelSourceName VARCHAR(255) NOT NULL, + ServermodelReleaseDistribution VARCHAR(255) NOT NULL, SiteName VARCHAR(255) NOT NULL, ZonesName VARCHAR(255) [] NOT NULL, ZonesIP VARCHAR(255) [] NOT NULL @@ -72,11 +73,10 @@ CREATE TABLE Source ( CREATE TABLE Release ( ReleaseId SERIAL PRIMARY KEY, ReleaseName VARCHAR(255) NOT NULL, - ReleaseSourceId INTEGER NOT NULL, + ReleaseSourceName VARCHAR(255) NOT NULL, ReleaseDistribution VARCHAR(20) CONSTRAINT releasedistribution_choice CHECK (ReleaseDistribution IN ('last', 'n-1', 'n-2')), - UNIQUE (ReleaseName, ReleaseSourceId), - UNIQUE (ReleaseDistribution, ReleaseSourceId), - FOREIGN KEY (ReleaseSourceId) REFERENCES Source(SourceId) + UNIQUE (ReleaseName, ReleaseSourceName), + UNIQUE (ReleaseDistribution, ReleaseSourceName) ); ------------------------------------- @@ -88,7 +88,7 @@ CREATE TABLE SettingServer( ServerId SERIAL PRIMARY KEY, ServerName VARCHAR(255) NOT NULL UNIQUE, ServermodelName VARCHAR(255) NOT NULL, - ReleaseDistribution VARCHAR(255) NOT NULL + ReleaseName VARCHAR(255) NOT NULL ); -- Servermodel @@ -101,9 +101,10 @@ CREATE TABLE Servermodel ( ISO VARCHAR(255), ServermodelParents VARCHAR(255) [] DEFAULT '{}', SourceName VARCHAR(255) NOT NULL, + ReleaseName VARCHAR(255) NOT NULL, ReleaseDistribution VARCHAR(255) NOT NULL, ServermodelApplicationserviceId INTEGER NOT NULL, - UNIQUE (ServermodelName, SourceName, ReleaseDistribution) + UNIQUE (ServermodelName, SourceName, ReleaseName) ); CREATE INDEX ServermodelApplicationserviceId_index ON Servermodel (ServermodelApplicationserviceId); @@ -112,12 +113,10 @@ CREATE TABLE Applicationservice ( ApplicationserviceId SERIAL PRIMARY KEY, ApplicationserviceName VARCHAR(255) NOT NULL, ApplicationserviceDescription VARCHAR(255) NOT NULL, - ApplicationserviceReleaseId INTEGER NOT NULL, - --ApplicationserviceLVIS VARCHAR(255) NOT NULL, - --ApplicationserviceLVIP VARCHAR(255) NOT NULL, - --ApplicationserviceLVMP VARCHAR(255) NOT NULL, + ReleaseName VARCHAR(255) NOT NULL, + SourceName VARCHAR(255) NOT NULL, OS JSON, - UNIQUE (ApplicationserviceName, ApplicationserviceReleaseId) + UNIQUE (ApplicationserviceName, ReleaseName, SourceName) ); CREATE TABLE ApplicationserviceDependency ( From 54c895f82266e182abcf3a232dc9a1e488e58498 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Wed, 2 Sep 2020 09:04:49 +0200 Subject: [PATCH 3/6] =?UTF-8?q?les=20servermodels=20ne=20sont=20plus=20ass?= =?UTF-8?q?oci=C3=A9s=20=C3=A0=20une=20source?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/gen/create_tables.sql | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/db/gen/create_tables.sql b/db/gen/create_tables.sql index 8d0c1d7..af1a9f7 100644 --- a/db/gen/create_tables.sql +++ b/db/gen/create_tables.sql @@ -56,7 +56,6 @@ CREATE TABLE InfraServer( ServerName VARCHAR(255) NOT NULL UNIQUE, ServerDescription VARCHAR(255) NOT NULL, ServermodelName VARCHAR(255) NOT NULL, - ServermodelSourceName VARCHAR(255) NOT NULL, ServermodelReleaseDistribution VARCHAR(255) NOT NULL, SiteName VARCHAR(255) NOT NULL, ZonesName VARCHAR(255) [] NOT NULL, @@ -74,7 +73,7 @@ CREATE TABLE Release ( ReleaseId SERIAL PRIMARY KEY, ReleaseName VARCHAR(255) NOT NULL, ReleaseSourceName VARCHAR(255) NOT NULL, - ReleaseDistribution VARCHAR(20) CONSTRAINT releasedistribution_choice CHECK (ReleaseDistribution IN ('last', 'n-1', 'n-2')), + ReleaseDistribution VARCHAR(20) NOT NULL, UNIQUE (ReleaseName, ReleaseSourceName), UNIQUE (ReleaseDistribution, ReleaseSourceName) ); @@ -98,13 +97,11 @@ CREATE TABLE Servermodel ( ServermodelDescription VARCHAR(255) NOT NULL, Osname VARCHAR(255), Osversion VARCHAR(255), - ISO VARCHAR(255), ServermodelParents VARCHAR(255) [] DEFAULT '{}', - SourceName VARCHAR(255) NOT NULL, - ReleaseName VARCHAR(255) NOT NULL, ReleaseDistribution VARCHAR(255) NOT NULL, + ReleaseName VARCHAR(255) NOT NULL, ServermodelApplicationserviceId INTEGER NOT NULL, - UNIQUE (ServermodelName, SourceName, ReleaseName) + UNIQUE (ServermodelName, ReleaseDistribution) ); CREATE INDEX ServermodelApplicationserviceId_index ON Servermodel (ServermodelApplicationserviceId); @@ -113,10 +110,11 @@ CREATE TABLE Applicationservice ( ApplicationserviceId SERIAL PRIMARY KEY, ApplicationserviceName VARCHAR(255) NOT NULL, ApplicationserviceDescription VARCHAR(255) NOT NULL, + ReleaseDistribution VARCHAR(255) NOT NULL, ReleaseName VARCHAR(255) NOT NULL, SourceName VARCHAR(255) NOT NULL, OS JSON, - UNIQUE (ApplicationserviceName, ReleaseName, SourceName) + UNIQUE (ApplicationserviceName, ReleaseDistribution) ); CREATE TABLE ApplicationserviceDependency ( From 7becbca64ecf7dbf29c4934959c297a00b0185d6 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sat, 5 Sep 2020 16:36:59 +0200 Subject: [PATCH 4/6] Changement de nom de table SQL + ajout des colonnes OSName/OSVersion/Compatibilities pour les AS --- db/gen/create_tables.sql | 74 ++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 45 deletions(-) diff --git a/db/gen/create_tables.sql b/db/gen/create_tables.sql index af1a9f7..969d360 100644 --- a/db/gen/create_tables.sql +++ b/db/gen/create_tables.sql @@ -1,5 +1,4 @@ --- Deployment -CREATE TABLE Deployment ( +CREATE TABLE ProviderDeployment ( DeploymentId SERIAL PRIMARY KEY, ProviderType VARCHAR(255) NOT NULL, TargetType VARCHAR(255) NOT NULL, @@ -12,10 +11,9 @@ CREATE TABLE Deployment ( Labels VARCHAR(255) [] DEFAULT '{}', UNIQUE (TargetType, TargetName) ); -CREATE INDEX Deployment_FactoryNodeName_index ON Deployment(FactoryNodeName); +CREATE INDEX Deployment_FactoryNodeName_index ON ProviderDeployment(FactoryNodeName); --- Cluster -CREATE TABLE FactoryCluster ( +CREATE TABLE ProviderFactoryCluster ( ClusterId SERIAL PRIMARY KEY, ClusterName VARCHAR(255) NOT NULL UNIQUE, ClusterDescription VARCHAR(255) NOT NULL, @@ -23,34 +21,27 @@ CREATE TABLE FactoryCluster ( ZoneName VARCHAR(255) NOT NULL ); --- Node in Cluster -CREATE TABLE FactoryClusterNode ( +CREATE TABLE ProviderFactoryClusterNode ( ClusterNodeId SERIAL PRIMARY KEY, ClusterId INTEGER NOT NULL, ServerName VARCHAR(255) NOT NULL UNIQUE, - FOREIGN KEY (ClusterId) REFERENCES FactoryCluster(ClusterId) + FOREIGN KEY (ClusterId) REFERENCES ProviderFactoryCluster(ClusterId) ); -CREATE INDEX FactoryClusterNode_ServerName_index ON FactoryClusterNode(ServerName); --- Site -CREATE TABLE Site ( +CREATE INDEX ProviderFactoryClusterNode_ServerName_index ON ProviderFactoryClusterNode(ServerName); + +CREATE TABLE InfraSite ( SiteId SERIAL PRIMARY KEY, SiteName VARCHAR(255) NOT NULL UNIQUE, SiteDescription VARCHAR(255) NOT NULL ); --- Zone -CREATE TABLE Zone ( +CREATE TABLE InfraZone ( ZoneId SERIAL PRIMARY KEY, ZoneName VARCHAR(255) NOT NULL UNIQUE, ZoneDescription VARCHAR(255) NOT NULL, SitesName VARCHAR(255) [] NOT NULL ); -------------------------------------- --- Infra -------------------------------------- - --- Server CREATE TABLE InfraServer( ServerId SERIAL PRIMARY KEY, ServerName VARCHAR(255) NOT NULL UNIQUE, @@ -61,15 +52,14 @@ CREATE TABLE InfraServer( ZonesName VARCHAR(255) [] NOT NULL, ZonesIP VARCHAR(255) [] NOT NULL ); --- Source -CREATE TABLE Source ( + +CREATE TABLE SettingSource ( SourceId SERIAL PRIMARY KEY, SourceName VARCHAR(255) NOT NULL UNIQUE, SourceDirectory TEXT ); --- Release -CREATE TABLE Release ( +CREATE TABLE SettingRelease ( ReleaseId SERIAL PRIMARY KEY, ReleaseName VARCHAR(255) NOT NULL, ReleaseSourceName VARCHAR(255) NOT NULL, @@ -78,11 +68,6 @@ CREATE TABLE Release ( UNIQUE (ReleaseDistribution, ReleaseSourceName) ); -------------------------------------- --- Setting -------------------------------------- - --- SettingServer CREATE TABLE SettingServer( ServerId SERIAL PRIMARY KEY, ServerName VARCHAR(255) NOT NULL UNIQUE, @@ -90,42 +75,41 @@ CREATE TABLE SettingServer( ReleaseName VARCHAR(255) NOT NULL ); --- Servermodel -CREATE TABLE Servermodel ( +CREATE TABLE SettingServermodel ( ServermodelId SERIAL PRIMARY KEY, ServermodelName VARCHAR(255) NOT NULL, ServermodelDescription VARCHAR(255) NOT NULL, - Osname VARCHAR(255), - Osversion VARCHAR(255), ServermodelParents VARCHAR(255) [] DEFAULT '{}', ReleaseDistribution VARCHAR(255) NOT NULL, ReleaseName VARCHAR(255) NOT NULL, ServermodelApplicationserviceId INTEGER NOT NULL, + OSName VARCHAR(255), + OSVersion VARCHAR(255), UNIQUE (ServermodelName, ReleaseDistribution) ); -CREATE INDEX ServermodelApplicationserviceId_index ON Servermodel (ServermodelApplicationserviceId); +CREATE INDEX ServermodelApplicationserviceId_index ON SettingServermodel (ServermodelApplicationserviceId); --- Applicationservice -CREATE TABLE Applicationservice ( +CREATE TABLE SettingApplicationservice ( ApplicationserviceId SERIAL PRIMARY KEY, ApplicationserviceName VARCHAR(255) NOT NULL, ApplicationserviceDescription VARCHAR(255) NOT NULL, ReleaseDistribution VARCHAR(255) NOT NULL, ReleaseName VARCHAR(255) NOT NULL, SourceName VARCHAR(255) NOT NULL, - OS JSON, + Compatibilities JSON, + OSName VARCHAR(255), + OSVersion VARCHAR(255), UNIQUE (ApplicationserviceName, ReleaseDistribution) ); -CREATE TABLE ApplicationserviceDependency ( +CREATE TABLE SettingApplicationserviceDependency ( ApplicationserviceId INTEGER NOT NULL, ApplicationserviceDependencyId INTEGER NOT NULL, UNIQUE(ApplicationserviceId, ApplicationserviceDependencyId), - FOREIGN KEY (ApplicationserviceId) REFERENCES Applicationservice(ApplicationserviceId), - FOREIGN KEY (ApplicationserviceDependencyId) REFERENCES Applicationservice(ApplicationserviceId) + FOREIGN KEY (ApplicationserviceId) REFERENCES SettingApplicationservice(ApplicationserviceId), + FOREIGN KEY (ApplicationserviceDependencyId) REFERENCES SettingApplicationservice(ApplicationserviceId) ); --- Log CREATE TABLE log( Msg VARCHAR(255) NOT NULL, Level VARCHAR(10) NOT NULL, @@ -134,8 +118,8 @@ CREATE TABLE log( Data JSON, Date timestamp DEFAULT current_timestamp ); --- User, Role and ACL -CREATE TABLE RisottoUser ( + +CREATE TABLE UserUser ( UserId SERIAL PRIMARY KEY, UserLogin VARCHAR(100) NOT NULL UNIQUE, UserName VARCHAR(100) NOT NULL, @@ -148,17 +132,17 @@ CREATE TABLE UserRole ( RoleName VARCHAR(255) NOT NULL, RoleAttribute VARCHAR(255), RoleAttributeValue VARCHAR(255), - FOREIGN KEY (RoleUserId) REFERENCES RisottoUser(UserId) + FOREIGN KEY (RoleUserId) REFERENCES UserUser(UserId) ); -CREATE TABLE URI ( +CREATE TABLE UserURI ( URIId SERIAL PRIMARY KEY, URIName VARCHAR(255) NOT NULL UNIQUE ); -CREATE TABLE RoleURI ( +CREATE TABLE UserRoleURI ( RoleName VARCHAR(255) NOT NULL, URIId INTEGER NOT NULL, - FOREIGN KEY (URIId) REFERENCES URI(URIId), + FOREIGN KEY (URIId) REFERENCES UserURI(URIId), PRIMARY KEY (RoleName, URIId) ); From 9540ff6c8f07a1636f1d312866b32822d29a6c4c Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sun, 6 Sep 2020 09:48:32 +0200 Subject: [PATCH 5/6] remove sql file and dispatch it in risotto-*-sql packages --- db/gen/create_tables.sql | 148 --------------------------------------- tmpl/risotto.yml | 18 +++-- 2 files changed, 12 insertions(+), 154 deletions(-) delete mode 100644 db/gen/create_tables.sql diff --git a/db/gen/create_tables.sql b/db/gen/create_tables.sql deleted file mode 100644 index 969d360..0000000 --- a/db/gen/create_tables.sql +++ /dev/null @@ -1,148 +0,0 @@ -CREATE TABLE ProviderDeployment ( - DeploymentId SERIAL PRIMARY KEY, - ProviderType VARCHAR(255) NOT NULL, - TargetType VARCHAR(255) NOT NULL, - TargetName VARCHAR(255) NOT NULL, - FactoryCluster VARCHAR(255), - FactoryNodeName VARCHAR(255), - CPU INTEGER, - VCPU INTEGER, - Memory INTEGER, - Labels VARCHAR(255) [] DEFAULT '{}', - UNIQUE (TargetType, TargetName) -); -CREATE INDEX Deployment_FactoryNodeName_index ON ProviderDeployment(FactoryNodeName); - -CREATE TABLE ProviderFactoryCluster ( - ClusterId SERIAL PRIMARY KEY, - ClusterName VARCHAR(255) NOT NULL UNIQUE, - ClusterDescription VARCHAR(255) NOT NULL, - VirtualIp VARCHAR(15) NOT NULL, - ZoneName VARCHAR(255) NOT NULL -); - -CREATE TABLE ProviderFactoryClusterNode ( - ClusterNodeId SERIAL PRIMARY KEY, - ClusterId INTEGER NOT NULL, - ServerName VARCHAR(255) NOT NULL UNIQUE, - FOREIGN KEY (ClusterId) REFERENCES ProviderFactoryCluster(ClusterId) -); -CREATE INDEX ProviderFactoryClusterNode_ServerName_index ON ProviderFactoryClusterNode(ServerName); - -CREATE TABLE InfraSite ( - SiteId SERIAL PRIMARY KEY, - SiteName VARCHAR(255) NOT NULL UNIQUE, - SiteDescription VARCHAR(255) NOT NULL -); - -CREATE TABLE InfraZone ( - ZoneId SERIAL PRIMARY KEY, - ZoneName VARCHAR(255) NOT NULL UNIQUE, - ZoneDescription VARCHAR(255) NOT NULL, - SitesName VARCHAR(255) [] NOT NULL -); - -CREATE TABLE InfraServer( - ServerId SERIAL PRIMARY KEY, - ServerName VARCHAR(255) NOT NULL UNIQUE, - ServerDescription VARCHAR(255) NOT NULL, - ServermodelName VARCHAR(255) NOT NULL, - ServermodelReleaseDistribution VARCHAR(255) NOT NULL, - SiteName VARCHAR(255) NOT NULL, - ZonesName VARCHAR(255) [] NOT NULL, - ZonesIP VARCHAR(255) [] NOT NULL -); - -CREATE TABLE SettingSource ( - SourceId SERIAL PRIMARY KEY, - SourceName VARCHAR(255) NOT NULL UNIQUE, - SourceDirectory TEXT -); - -CREATE TABLE SettingRelease ( - ReleaseId SERIAL PRIMARY KEY, - ReleaseName VARCHAR(255) NOT NULL, - ReleaseSourceName VARCHAR(255) NOT NULL, - ReleaseDistribution VARCHAR(20) NOT NULL, - UNIQUE (ReleaseName, ReleaseSourceName), - UNIQUE (ReleaseDistribution, ReleaseSourceName) -); - -CREATE TABLE SettingServer( - ServerId SERIAL PRIMARY KEY, - ServerName VARCHAR(255) NOT NULL UNIQUE, - ServermodelName VARCHAR(255) NOT NULL, - ReleaseName VARCHAR(255) NOT NULL -); - -CREATE TABLE SettingServermodel ( - ServermodelId SERIAL PRIMARY KEY, - ServermodelName VARCHAR(255) NOT NULL, - ServermodelDescription VARCHAR(255) NOT NULL, - ServermodelParents VARCHAR(255) [] DEFAULT '{}', - ReleaseDistribution VARCHAR(255) NOT NULL, - ReleaseName VARCHAR(255) NOT NULL, - ServermodelApplicationserviceId INTEGER NOT NULL, - OSName VARCHAR(255), - OSVersion VARCHAR(255), - UNIQUE (ServermodelName, ReleaseDistribution) -); -CREATE INDEX ServermodelApplicationserviceId_index ON SettingServermodel (ServermodelApplicationserviceId); - -CREATE TABLE SettingApplicationservice ( - ApplicationserviceId SERIAL PRIMARY KEY, - ApplicationserviceName VARCHAR(255) NOT NULL, - ApplicationserviceDescription VARCHAR(255) NOT NULL, - ReleaseDistribution VARCHAR(255) NOT NULL, - ReleaseName VARCHAR(255) NOT NULL, - SourceName VARCHAR(255) NOT NULL, - Compatibilities JSON, - OSName VARCHAR(255), - OSVersion VARCHAR(255), - UNIQUE (ApplicationserviceName, ReleaseDistribution) -); - -CREATE TABLE SettingApplicationserviceDependency ( - ApplicationserviceId INTEGER NOT NULL, - ApplicationserviceDependencyId INTEGER NOT NULL, - UNIQUE(ApplicationserviceId, ApplicationserviceDependencyId), - FOREIGN KEY (ApplicationserviceId) REFERENCES SettingApplicationservice(ApplicationserviceId), - FOREIGN KEY (ApplicationserviceDependencyId) REFERENCES SettingApplicationservice(ApplicationserviceId) -); - -CREATE TABLE log( - Msg VARCHAR(255) NOT NULL, - Level VARCHAR(10) NOT NULL, - Path VARCHAR(255), - Username VARCHAR(100) NOT NULL, - Data JSON, - Date timestamp DEFAULT current_timestamp -); - -CREATE TABLE UserUser ( - UserId SERIAL PRIMARY KEY, - UserLogin VARCHAR(100) NOT NULL UNIQUE, - UserName VARCHAR(100) NOT NULL, - UserSurname VARCHAR(100) NOT NULL -); - -CREATE TABLE UserRole ( - RoleId SERIAL PRIMARY KEY, - RoleUserId INTEGER NOT NULL, - RoleName VARCHAR(255) NOT NULL, - RoleAttribute VARCHAR(255), - RoleAttributeValue VARCHAR(255), - FOREIGN KEY (RoleUserId) REFERENCES UserUser(UserId) -); - -CREATE TABLE UserURI ( - URIId SERIAL PRIMARY KEY, - URIName VARCHAR(255) NOT NULL UNIQUE -); - -CREATE TABLE UserRoleURI ( - RoleName VARCHAR(255) NOT NULL, - URIId INTEGER NOT NULL, - FOREIGN KEY (URIId) REFERENCES UserURI(URIId), - PRIMARY KEY (RoleName, URIId) -); diff --git a/tmpl/risotto.yml b/tmpl/risotto.yml index fa3fdbf..c822522 100644 --- a/tmpl/risotto.yml +++ b/tmpl/risotto.yml @@ -1,17 +1,23 @@ +%from os import listdir %set %%dbname = %%getVar('risotto_main_dbname') --- dbuser: %%getVar('risotto_db_user') dbuser_options: - - LOGIN + - LOGIN privileges: - %%{dbname}.public.*: 'ALL' - %%{dbname}.public: 'ALL' - %%{dbname}: 'ALL' + %%{dbname}.public.*: 'ALL' + %%{dbname}.public: 'ALL' + %%{dbname}: 'ALL' dbhost: %%getVar('risotto_db_address') dbport: 5432 dbtype: postgres dbname: %%dbname template: 'template0' -sqlscripts: ['/usr/share/eole/db/eole-risotto/gen/create_tables.sql'] +sqlscripts: +%for %%file in %%listdir('/usr/share/eole/db/eole-risotto/gen/') + %if %%file.endswith('.sql') + - /usr/share/eole/db/eole-risotto/gen/%%file + %end if +%end for pwd_files: - - {'file': '/etc/risotto/risotto.conf', 'pattern': 'RISOTTO_DB_PASSWORD='} + - {'file': '/etc/risotto/risotto.conf', 'pattern': 'RISOTTO_DB_PASSWORD='} From 408fdf22a29914a672c6759c88683d6c658e40bf Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Wed, 16 Sep 2020 08:04:25 +0200 Subject: [PATCH 6/6] partitioning --- dicos/20_partitioning_risotto.xml | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 dicos/20_partitioning_risotto.xml diff --git a/dicos/20_partitioning_risotto.xml b/dicos/20_partitioning_risotto.xml new file mode 100644 index 0000000..e15d636 --- /dev/null +++ b/dicos/20_partitioning_risotto.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + root + tmp + var + var+spool + var+log + home + + + + 0 + 0 + 0 + 0 + 0 + 100 + + + + + +