From 8ce962b31296b80f7c7d6a1a6821dacc784963ae Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Tue, 4 Jun 2024 02:16:37 +0300 Subject: [PATCH] Move scripts --- debian/vitastor-mon.install | 5 +++-- debian/vitastor-osd.install | 6 +++--- mon/{ => scripts}/90-vitastor.rules | 0 mon/{ => scripts}/afr.js | 0 mon/{ => scripts}/afr_test.js | 0 mon/{ => scripts}/make-etcd | 0 mon/{ => scripts}/simple-offsets.js | 0 mon/{ => scripts}/vitastor-mon.service | 0 mon/{ => scripts}/vitastor-osd@.service | 0 mon/{ => scripts}/vitastor.target | 0 rpm/vitastor-el7.spec | 5 +++-- rpm/vitastor-el8.spec | 5 +++-- rpm/vitastor-el9.spec | 5 +++-- 13 files changed, 15 insertions(+), 11 deletions(-) rename mon/{ => scripts}/90-vitastor.rules (100%) rename mon/{ => scripts}/afr.js (100%) rename mon/{ => scripts}/afr_test.js (100%) rename mon/{ => scripts}/make-etcd (100%) rename mon/{ => scripts}/simple-offsets.js (100%) rename mon/{ => scripts}/vitastor-mon.service (100%) rename mon/{ => scripts}/vitastor-osd@.service (100%) rename mon/{ => scripts}/vitastor.target (100%) diff --git a/debian/vitastor-mon.install b/debian/vitastor-mon.install index b5f61f6d..094ce288 100644 --- a/debian/vitastor-mon.install +++ b/debian/vitastor-mon.install @@ -1,2 +1,3 @@ -mon usr/lib/vitastor -mon/vitastor-mon.service /lib/systemd/system +mon usr/lib/vitastor/mon +mon/scripts/make-etcd usr/lib/vitastor/mon +mon/scripts/vitastor-mon.service /lib/systemd/system diff --git a/debian/vitastor-osd.install b/debian/vitastor-osd.install index 07e37a51..91377f90 100644 --- a/debian/vitastor-osd.install +++ b/debian/vitastor-osd.install @@ -1,6 +1,6 @@ usr/bin/vitastor-osd usr/bin/vitastor-disk usr/bin/vitastor-dump-journal -mon/vitastor-osd@.service /lib/systemd/system -mon/vitastor.target /lib/systemd/system -mon/90-vitastor.rules /lib/udev/rules.d +mon/scripts/vitastor-osd@.service /lib/systemd/system +mon/scripts/vitastor.target /lib/systemd/system +mon/scripts/90-vitastor.rules /lib/udev/rules.d diff --git a/mon/90-vitastor.rules b/mon/scripts/90-vitastor.rules similarity index 100% rename from mon/90-vitastor.rules rename to mon/scripts/90-vitastor.rules diff --git a/mon/afr.js b/mon/scripts/afr.js similarity index 100% rename from mon/afr.js rename to mon/scripts/afr.js diff --git a/mon/afr_test.js b/mon/scripts/afr_test.js similarity index 100% rename from mon/afr_test.js rename to mon/scripts/afr_test.js diff --git a/mon/make-etcd b/mon/scripts/make-etcd similarity index 100% rename from mon/make-etcd rename to mon/scripts/make-etcd diff --git a/mon/simple-offsets.js b/mon/scripts/simple-offsets.js similarity index 100% rename from mon/simple-offsets.js rename to mon/scripts/simple-offsets.js diff --git a/mon/vitastor-mon.service b/mon/scripts/vitastor-mon.service similarity index 100% rename from mon/vitastor-mon.service rename to mon/scripts/vitastor-mon.service diff --git a/mon/vitastor-osd@.service b/mon/scripts/vitastor-osd@.service similarity index 100% rename from mon/vitastor-osd@.service rename to mon/scripts/vitastor-osd@.service diff --git a/mon/vitastor.target b/mon/scripts/vitastor.target similarity index 100% rename from mon/vitastor.target rename to mon/scripts/vitastor.target diff --git a/rpm/vitastor-el7.spec b/rpm/vitastor-el7.spec index 5f333693..0780f4db 100644 --- a/rpm/vitastor-el7.spec +++ b/rpm/vitastor-el7.spec @@ -108,10 +108,11 @@ npm install --production cd .. mkdir -p %buildroot/usr/lib/vitastor cp -r mon %buildroot/usr/lib/vitastor +mv %buildroot/usr/lib/vitastor/mon/scripts/make-etcd %buildroot/usr/lib/vitastor/mon/ mkdir -p %buildroot/lib/systemd/system -cp mon/vitastor.target mon/vitastor-mon.service mon/vitastor-osd@.service %buildroot/lib/systemd/system +cp mon/scripts/vitastor.target mon/scripts/vitastor-mon.service mon/scripts/vitastor-osd@.service %buildroot/lib/systemd/system mkdir -p %buildroot/lib/udev/rules.d -cp mon/90-vitastor.rules %buildroot/lib/udev/rules.d +cp mon/scripts/90-vitastor.rules %buildroot/lib/udev/rules.d %files diff --git a/rpm/vitastor-el8.spec b/rpm/vitastor-el8.spec index dc3b012f..abada6e0 100644 --- a/rpm/vitastor-el8.spec +++ b/rpm/vitastor-el8.spec @@ -105,10 +105,11 @@ npm install --production cd .. mkdir -p %buildroot/usr/lib/vitastor cp -r mon %buildroot/usr/lib/vitastor +mv %buildroot/usr/lib/vitastor/mon/scripts/make-etcd %buildroot/usr/lib/vitastor/mon/ mkdir -p %buildroot/lib/systemd/system -cp mon/vitastor.target mon/vitastor-mon.service mon/vitastor-osd@.service %buildroot/lib/systemd/system +cp mon/scripts/vitastor.target mon/scripts/vitastor-mon.service mon/scripts/vitastor-osd@.service %buildroot/lib/systemd/system mkdir -p %buildroot/lib/udev/rules.d -cp mon/90-vitastor.rules %buildroot/lib/udev/rules.d +cp mon/scripts/90-vitastor.rules %buildroot/lib/udev/rules.d %files diff --git a/rpm/vitastor-el9.spec b/rpm/vitastor-el9.spec index 57b99b58..75920e42 100644 --- a/rpm/vitastor-el9.spec +++ b/rpm/vitastor-el9.spec @@ -98,10 +98,11 @@ npm install --production cd .. mkdir -p %buildroot/usr/lib/vitastor cp -r mon %buildroot/usr/lib/vitastor +mv %buildroot/usr/lib/vitastor/mon/scripts/make-etcd %buildroot/usr/lib/vitastor/mon/ mkdir -p %buildroot/lib/systemd/system -cp mon/vitastor.target mon/vitastor-mon.service mon/vitastor-osd@.service %buildroot/lib/systemd/system +cp mon/scripts/vitastor.target mon/scripts/vitastor-mon.service mon/scripts/vitastor-osd@.service %buildroot/lib/systemd/system mkdir -p %buildroot/lib/udev/rules.d -cp mon/90-vitastor.rules %buildroot/lib/udev/rules.d +cp mon/scripts/90-vitastor.rules %buildroot/lib/udev/rules.d %files