From b83c53c65996a78c9413203da31242c2280fbbb2 Mon Sep 17 00:00:00 2001
From: Manuel Montecelo <mmontecelo@sipwise.com>
Date: Wed, 2 Jun 2021 09:48:44 +0200
Subject: [PATCH] TT#104381 Fixes for previous commit about missing tests of
dirs in /ngcp-data/*
Fixes commit cf9a6c94b8f8eca2bd8dcd08987e1dfbc0fc70fb
The dir for redis was added with wrong expected permissions, while other
dirs are only Pro/Carrier, add them to the config file for tests that
it's meant to run only in those systems and not in CE.
Change-Id: Ia8e02eba1b657ef0094a8643000d876ed452e555
---
templates/130_filesys-ngcp.yaml.tt2 | 30 +------------------------
templates/131_filesys-ngcp-pro.yaml.tt2 | 29 ++++++++++++++++++++++++
2 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/templates/130_filesys-ngcp.yaml.tt2 b/templates/130_filesys-ngcp.yaml.tt2
index 41d2f61..650b8ea 100644
--- a/templates/130_filesys-ngcp.yaml.tt2
+++ b/templates/130_filesys-ngcp.yaml.tt2
@@ -287,7 +287,7 @@ file:
/ngcp-data/redis:
exists: true
- mode: "0755"
+ mode: "0750"
owner: redis
group: redis
filetype: directory
@@ -300,13 +300,6 @@ file:
linked-to: /ngcp-data/redis
filetype: symlink
- /ngcp-data/logfs:
- exists: true
- mode: "0700"
- owner: root
- group: root
- filetype: directory
-
/ngcp-data/logs:
exists: true
mode: "0755"
@@ -321,24 +314,3 @@ file:
group: root
linked-to: /ngcp-data/logs
filetype: symlink
-
- /ngcp-data/spool:
- exists: true
- mode: "0755"
- owner: root
- group: root
- filetype: directory
-
- /ngcp-data/spool/faxserver:
- exists: true
- mode: "2770"
- owner: faxserver
- group: faxserver
- filetype: directory
-
- /ngcp-data/spool/websocket:
- exists: true
- mode: "2770"
- owner: websocket
- group: websocket
- filetype: directory
diff --git a/templates/131_filesys-ngcp-pro.yaml.tt2 b/templates/131_filesys-ngcp-pro.yaml.tt2
index 404b82a..a6eb636 100644
--- a/templates/131_filesys-ngcp-pro.yaml.tt2
+++ b/templates/131_filesys-ngcp-pro.yaml.tt2
@@ -166,3 +166,32 @@ file:
[% IF general.ngcp_type == 'sppro' -%]
size: 0
[% END -%]
+
+
+ /ngcp-data/logfs:
+ exists: true
+ mode: "0700"
+ owner: root
+ group: root
+ filetype: directory
+
+ /ngcp-data/spool:
+ exists: true
+ mode: "0755"
+ owner: root
+ group: root
+ filetype: directory
+
+ /ngcp-data/spool/faxserver:
+ exists: true
+ mode: "2770"
+ owner: faxserver
+ group: faxserver
+ filetype: directory
+
+ /ngcp-data/spool/websocket:
+ exists: true
+ mode: "2770"
+ owner: websocket
+ group: websocket
+ filetype: directory