From 6861e5acfb5ecfde99f5ea3d749ebe27948afd84 Mon Sep 17 00:00:00 2001 From: Chris Pinnock Date: Sat, 16 Dec 2023 14:01:48 +0000 Subject: [PATCH] Packages: Use octez defaults for directories. --- scripts/pkg-common/baker.initd.in | 2 +- scripts/pkg-common/node.conf | 2 +- scripts/pkg-common/node.initd.in | 2 +- scripts/pkg-common/smartrollup.conf | 4 +--- scripts/pkg-common/smartrollup.initd.in | 6 +++--- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/pkg-common/baker.initd.in b/scripts/pkg-common/baker.initd.in index 86b7a8502207..d6f64f4f3bc8 100755 --- a/scripts/pkg-common/baker.initd.in +++ b/scripts/pkg-common/baker.initd.in @@ -31,7 +31,7 @@ fi # Defaults user=tezos group=tezos -nodedir=/var/tezos/node +nodedir=/var/tezos/.tezos-node logdir=/var/log/tezos rotateonstart=yes protocols="@PROTOCOLS@" diff --git a/scripts/pkg-common/node.conf b/scripts/pkg-common/node.conf index dfe0b1139a5c..5e4ce2375a85 100644 --- a/scripts/pkg-common/node.conf +++ b/scripts/pkg-common/node.conf @@ -6,7 +6,7 @@ group=tezos # Data Directory # An independent mount point of /var/tezos is recommended # -nodedir=/var/tezos/node +nodedir=/var/tezos/.tezos-node # Logfile # diff --git a/scripts/pkg-common/node.initd.in b/scripts/pkg-common/node.initd.in index 36805b0c5908..65506a59983e 100755 --- a/scripts/pkg-common/node.initd.in +++ b/scripts/pkg-common/node.initd.in @@ -35,7 +35,7 @@ fi # Defaults user=tezos group=tezos -nodedir=/var/tezos/node +nodedir=/var/tezos/.tezos-node logdir=/var/log/tezos rotateonstart=yes othercliopts_node="" diff --git a/scripts/pkg-common/smartrollup.conf b/scripts/pkg-common/smartrollup.conf index 6d447d81e101..32ec2a1bd1fa 100644 --- a/scripts/pkg-common/smartrollup.conf +++ b/scripts/pkg-common/smartrollup.conf @@ -3,9 +3,7 @@ #group=tezos # Data directories -#clientdir=/var/tezos/.tezos-client -#rollupdatadir=/var/tezos/.tezos-smart-rollup-node -rollupdatadir=/var/tezos/smartrollup +rollupdatadir=/var/tezos/.tezos-smart-rollup-node # Assume the node is on the local machine. Change if not. nodeaddr=127.0.0.1 diff --git a/scripts/pkg-common/smartrollup.initd.in b/scripts/pkg-common/smartrollup.initd.in index da795778ca3e..dc032655ea8a 100755 --- a/scripts/pkg-common/smartrollup.initd.in +++ b/scripts/pkg-common/smartrollup.initd.in @@ -29,9 +29,9 @@ fi # Defaults user=tezos group=tezos -nodedir=/var/tezos/node -clientdir=~tezos/.tezos-client -rollupdatadir=~tezos/.tezos-smart-rollup-node +nodedir=/var/tezos/.tezos-node +clientdir=/var/tezos/.tezos-client +rollupdatadir=/var/tezos/.tezos-smart-rollup-node logdir=/var/log/tezos rotateonstart=yes nodeaddr=127.0.0.1 -- GitLab