remove /etc/default/lsc (#50)

lsc-project · Jan 19, 2024 · 3231239 · 3231239
1 parent fbaf281
commit 3231239
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 38 deletions.
diff --git a/src/install/debian/lsc.install b/src/install/debian/lsc.install
@@ -9,7 +9,6 @@ lib/* usr/lib/lsc
 ## sample
 sample/* usr/share/doc/lsc
 ## systemd
-etc/default/lsc etc/default
 etc/default/lsc-sync etc/default
 etc/default/lsc-async etc/default
 ## nagios

diff --git a/src/install/debian/lsc.postinst b/src/install/debian/lsc.postinst
@@ -18,12 +18,6 @@ sed -i 's:^CFG_DIR.*:CFG_DIR="/etc/lsc":' /usr/bin/lsc /usr/bin/lsc-agent /usr/b
 sed -i 's:^LIB_DIR.*:LIB_DIR="/usr/lib/lsc":' /usr/bin/lsc /usr/bin/lsc-agent /usr/bin/hsqldb
 sed -i "s:^LOG_DIR.*:LOG_DIR=\"${lsc_logdir}\":" /usr/bin/lsc /usr/bin/lsc-agent /usr/bin/hsqldb
 sed -i 's:^VAR_DIR.*:VAR_DIR="/var/lsc":' /usr/bin/hsqldb
-## init
-sed -i 's:^LSC_BIN.*:LSC_BIN="/usr/bin/lsc":' /etc/default/lsc
-sed -i 's:^LSC_CFG_DIR.*:LSC_CFG_DIR="/etc/lsc":' /etc/default/lsc
-sed -i 's:^LSC_USER.*:LSC_USER="lsc":' /etc/default/lsc
-sed -i 's:^LSC_GROUP.*:LSC_GROUP="lsc":' /etc/default/lsc
-sed -i 's:^LSC_PID_FILE.*:LSC_PID_FILE="/var/run/lsc.pid":' /etc/default/lsc
 
 # Copy sample configuration for a fresh install
 [ -f /etc/lsc/lsc.xml ] || cp /usr/share/doc/lsc/lsc.xml-sample /etc/lsc/lsc.xml

diff --git a/src/install/etc/default/lsc b/src/install/etc/default/lsc
diff --git a/src/install/etc/default/lsc-async b/src/install/etc/default/lsc-async
@@ -10,7 +10,7 @@ LSC_JMXPORT="1099"
 #JAVA_HOME=/usr/java/jdk/jre
 
 LSC_CONFIG_DIR="/etc/lsc"
-LSC_SYNC_TASKS=""
-LSC_ASYNC_TASKS="-a exampletask"
-LSC_CLEAN_TASKS=""
+#LSC_SYNC_TASKS=""
+LSC_ASYNC_TASKS="-a all"
+#LSC_CLEAN_TASKS=""
 LSC_EXTRA_ARGS=""
diff --git a/src/install/etc/default/lsc-sync b/src/install/etc/default/lsc-sync
@@ -10,7 +10,7 @@ LSC_JMXPORT="1099"
 #JAVA_HOME=/usr/java/jdk/jre
 
 LSC_CONFIG_DIR="/etc/lsc"
-LSC_SYNC_TASKS="-s exampletask"
-LSC_ASYNC_TASKS=""
-LSC_CLEAN_TASKS="-c exampletask"
+LSC_SYNC_TASKS="-s all"
+#LSC_ASYNC_TASKS=""
+LSC_CLEAN_TASKS="-c all"
 LSC_EXTRA_ARGS=""
diff --git a/src/install/lib/systemd/system/lsc-async.service b/src/install/lib/systemd/system/lsc-async.service
@@ -11,7 +11,7 @@ Environment="LSC_CONFIG_DIR=/etc/lsc"
 Environment="LSC_ASYNC_TASKS=-a all"
 Environment="LSC_EXTRA_ARGS="
 Environment="LSC_JMXPORT="
-EnvironmentFile=-/etc/default/lsc
+EnvironmentFile=-/etc/default/lsc-async
 ExecStartPre=/usr/bin/lsc -v -f ${LSC_CONFIG_DIR}
 ExecStart=/usr/bin/lsc -f ${LSC_CONFIG_DIR} ${LSC_ASYNC_TASKS} ${LSC_EXTRA_ARGS}
 

diff --git a/src/install/lib/systemd/system/lsc-sync.service b/src/install/lib/systemd/system/lsc-sync.service
@@ -10,7 +10,7 @@ Environment="LSC_CONFIG_DIR=/etc/lsc"
 Environment="LSC_SYNC_TASKS=-s all"
 Environment="LSC_CLEAN_TASKS=-c all"
 Environment="LSC_EXTRA_ARGS="
-EnvironmentFile=-/etc/default/lsc
+EnvironmentFile=-/etc/default/lsc-sync
 ExecStartPre=/usr/bin/lsc -v -f ${LSC_CONFIG_DIR}
 ExecStart=/usr/bin/lsc -f ${LSC_CONFIG_DIR} ${LSC_SYNC_TASKS} ${LSC_CLEAN_TASKS} ${LSC_EXTRA_ARGS}
 

diff --git a/src/install/lsc-core.spec b/src/install/lsc-core.spec
@@ -96,7 +96,6 @@ cp -a sample/ %{buildroot}/usr/share/doc/lsc
 ## cron
 cp -a etc/cron.d/lsc.cron %{buildroot}/etc/cron.d/lsc
 ## systemd
-cp -a etc/default/lsc %{buildroot}/etc/default/lsc
 cp -a etc/default/lsc-async %{buildroot}%{_sysconfdir}/default/lsc-async
 cp -a etc/default/lsc-sync %{buildroot}%{_sysconfdir}/default/lsc-sync
 install -p -m 0644 lib/systemd/system/lsc-async.service %{buildroot}%{_unitdir}/
@@ -121,23 +120,18 @@ sed -i 's:^LOG_DIR.*:LOG_DIR="%{lsc_logdir}":' %{buildroot}/usr/bin/lsc %{buildr
 sed -i 's:^VAR_DIR.*:VAR_DIR="/var/lsc":' %{buildroot}/usr/bin/hsqldb
 ## init
 sed -i 's:^LSC_BIN.*:LSC_BIN="/usr/bin/lsc":' \
-  %{buildroot}%{_sysconfdir}/default/lsc \
   %{buildroot}%{_sysconfdir}/default/lsc-async \
   %{buildroot}%{_sysconfdir}/default/lsc-sync
 sed -i 's:^LSC_CFG_DIR.*:LSC_CFG_DIR="/etc/lsc":' \
-  %{buildroot}%{_sysconfdir}/default/lsc \
   %{buildroot}%{_sysconfdir}/default/lsc-async \
   %{buildroot}%{_sysconfdir}/default/lsc-sync
 sed -i 's:^LSC_USER.*:LSC_USER="lsc":' \
-  %{buildroot}%{_sysconfdir}/default/lsc \
   %{buildroot}%{_sysconfdir}/default/lsc-async \
   %{buildroot}%{_sysconfdir}/default/lsc-sync
 sed -i 's:^LSC_GROUP.*:LSC_GROUP="lsc":' \
-  %{buildroot}%{_sysconfdir}/default/lsc \
   %{buildroot}%{_sysconfdir}/default/lsc-async \
   %{buildroot}%{_sysconfdir}/default/lsc-sync
 sed -i 's:^LSC_PID_FILE.*:LSC_PID_FILE="/var/run/lsc.pid":' \
-  %{buildroot}%{_sysconfdir}/default/lsc \
   %{buildroot}%{_sysconfdir}/default/lsc-async \
   %{buildroot}%{_sysconfdir}/default/lsc-sync
 
@@ -193,7 +187,6 @@ rm -rf %{buildroot}
 %defattr(-, root, root, 0755)
 %config(noreplace) /etc/lsc/
 %config(noreplace) /etc/cron.d/lsc
-%config(noreplace) /etc/default/lsc
 %config(noreplace) /etc/default/lsc-sync
 %config(noreplace) /etc/default/lsc-async
 /usr/bin/lsc