Skip to content

Commit 7c88c76

Browse files
authored
Merge pull request #2746 from reubenmiller/fix-tedge-config-ownership
feat(cli): set directory ownership using given user/group instead of root
2 parents b9f7d88 + 1174f3b commit 7c88c76

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

crates/core/tedge/src/cli/init.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,19 @@ impl TEdgeInitCmd {
148148
)?;
149149
create_directory(
150150
config_dir.join("sm-plugins"),
151-
PermissionEntry::new(Some("root".into()), Some("root".into()), Some(0o755)),
151+
PermissionEntry::new(
152+
Some(self.user.clone()),
153+
Some(self.group.clone()),
154+
Some(0o755),
155+
),
152156
)?;
153157
create_directory(
154158
config_dir.join("device-certs"),
155-
PermissionEntry::new(Some("root".into()), Some("root".into()), Some(0o775)),
159+
PermissionEntry::new(
160+
Some(self.user.clone()),
161+
Some(self.group.clone()),
162+
Some(0o775),
163+
),
156164
)?;
157165

158166
let config = self.context.config_repository.load()?;

tests/RobotFramework/tests/customizing/tedge_init.robot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Check ownership of the folders
3838
Check Owner of Directory /etc/tedge/mosquitto-conf tedge:tedge
3939
Check Owner of Directory /etc/tedge/operations tedge:tedge
4040
Check Owner of Directory /etc/tedge/plugins tedge:tedge
41-
Check Owner of Directory /etc/tedge/device-certs root:root
41+
Check Owner of Directory /etc/tedge/device-certs tedge:tedge
4242
Check Owner of Directory /var/tedge tedge:tedge
4343
Check Owner of Directory /var/log/tedge tedge:tedge
4444

@@ -50,7 +50,7 @@ Change user/group and check the change
5050
Check Owner of Directory /etc/tedge/mosquitto-conf petertest:petertest
5151
Check Owner of Directory /etc/tedge/operations petertest:petertest
5252
Check Owner of Directory /etc/tedge/plugins petertest:petertest
53-
Check Owner of Directory /etc/tedge/device-certs root:root
53+
Check Owner of Directory /etc/tedge/device-certs petertest:petertest
5454
Check Owner of Directory /var/tedge petertest:petertest
5555
Check Owner of Directory /var/log/tedge petertest:petertest
5656

@@ -62,7 +62,7 @@ Tedge init and check if default values are restored
6262
Check Owner of Directory /etc/tedge/mosquitto-conf tedge:tedge
6363
Check Owner of Directory /etc/tedge/operations tedge:tedge
6464
Check Owner of Directory /etc/tedge/plugins tedge:tedge
65-
Check Owner of Directory /etc/tedge/device-certs root:root
65+
Check Owner of Directory /etc/tedge/device-certs tedge:tedge
6666
Check Owner of Directory /var/tedge tedge:tedge
6767
Check Owner of Directory /var/log/tedge tedge:tedge
6868

0 commit comments

Comments
 (0)