partitioning

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,
@@ -61,7 +65,7 @@ CREATE TABLE Server (
 CREATE TABLE Source (
   SourceId SERIAL PRIMARY KEY,
   SourceName VARCHAR(255) NOT NULL UNIQUE,
-  SourceURL TEXT
+  SourceDirectory TEXT
 );
 
 -- Release
@@ -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,
@@ -97,6 +113,9 @@ CREATE TABLE Applicationservice (
   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,
   OS JSON,
   UNIQUE (ApplicationserviceName, ApplicationserviceReleaseId)
 );

debian/changelog

@@ -1,5 +0,0 @@
-eole-risotto (0.1) unstable; urgency=medium
-
-  * Création du paquet
-
- -- Cadoles <contact@cadoles.com>  Thu, 02 Apr 2020 10:43:03 +0200

debian/control

@@ -10,9 +10,32 @@ Vcs-Browser: https://forge.cadoles.com/Infra/risotto
 
 Package: eole-risotto
 Architecture: any
-Depends: ${misc:Depends}, 
+Depends: ${misc:Depends},
+ eole-db,
+ eole-postgresql,
+ risotto-user-sql,
+ risotto-setting-sql,
+ risotto-provider-sql,
+ risotto-infra-sql,
+ risotto-message,
+ risotto
 Description: configuration pour l’intégration de risotto dans EOLE
  .
  Pour toute information complémentaire, veuillez vous rendre sur le
  site du projet.
 
+Package: eole-risotto-all
+Architecture: any
+Depends: ${misc:Depends},
+ eole-risotto,
+ python3-risotto-user,
+ python3-risotto-setting,
+ python3-risotto-provider,
+ python3-risotto-infra,
+ cadoles-risotto-seed,
+ cucchiaiata,
+ eole-risotto
+Description: configuration pour l’intégration de risotto dans EOLE
+ .
+ Pour toute information complémentaire, veuillez vous rendre sur le
+ site du projet.

dicos/20_partitioning_risotto.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<creole>
+    <variables>
+        <family name='système'>
+            <!-- We need to recalculate the variables -->
+            <variable name='eole_lv_names' redefine='True' remove_check='True' />
+            <variable name='eole_lv_standard_extends' redefine='True' remove_check='True' />
+        </family>
+    </variables>
+    <constraints>
+        <!-- Default AmonEcole* logical volumes -->
+        <auto name='calc_multi_val' target='eole_lv_names'>
+            <param>root</param>
+            <param>tmp</param>
+            <param>var</param>
+            <param>var+spool</param>
+            <param>var+log</param>
+            <param>home</param>
+        </auto>
+        <!-- Default AmonEcole* logical volumes extension: 100% /home -->
+        <auto name='calc_multi_val' target='eole_lv_standard_extends'>
+            <param type='number'>0</param>
+            <param type='number'>0</param>
+            <param type='number'>0</param>
+            <param type='number'>0</param>
+            <param type='number'>0</param>
+            <param type='number'>100</param>
+        </auto>
+    </constraints>
+    <help/>
+</creole>
+<!-- vim: ts=4 sw=4 expandtab
+-->
+

posttemplate/10-fix-postgresql-permissions

@@ -2,6 +2,8 @@
 
 set -e
 
+systemctl start postgresql.service
+
 psql -Upostgres -c "grant all on all tables in schema public to risotto" risotto
 psql -Upostgres -c "grant all on all sequences in schema public to risotto" risotto
 psql -Upostgres -c "grant all on all functions in schema public to risotto" risotto
@@ -9,4 +11,6 @@ psql -Upostgres -c "grant all on all tables in schema public to tiramisu" tirami
 psql -Upostgres -c "grant all on all sequences in schema public to tiramisu" tiramisu
 psql -Upostgres -c "grant all on all functions in schema public to tiramisu" tiramisu
 
+systemctl stop postgresql.service
+
 exit 0

tmpl/risotto.conf

@@ -12,3 +12,4 @@ DB_ADDRESS=%%getVar('risotto_db_address')
 MESSAGE_PATH=%%getVar('risotto_messages_dir')
 CACHE_ROOT_PATH=%%getVar('risotto_cache_dir')
 SRV_SEED_PATH=%%getVar('risotto_seed_dir')
+PYTHONPATH="/usr/lib/python3.6/dist-packages:$PYTHONPATH"

tmpl/risotto.yml

@@ -11,7 +11,7 @@ dbhost: %%getVar('risotto_db_address')
 dbport: 5432
 dbtype: postgres
 dbname: %%dbname
-template: 'postgres'
+template: 'template0'
 sqlscripts: ['/usr/share/eole/db/eole-risotto/gen/create_tables.sql']
 pwd_files:
         - {'file': '/etc/risotto/risotto.conf', 'pattern': 'RISOTTO_DB_PASSWORD='}

tmpl/tiramisu.yml

@@ -11,7 +11,7 @@ dbhost: %%getVar('risotto_db_address')
 dbport: 5432
 dbtype: postgres
 dbname: %%getVar('risotto_tiramisu_dbname')
-template: 'postgres'
+template: 'template0'
 pwd_files:
         - {'file': '/etc/risotto/risotto.conf', 'pattern': 'TIRAMISU_DB_PASSWORD='}