From a5773812a9f237b0596fa338f620a5c1730ea518 Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Tue, 22 Sep 2015 09:52:52 +0200 Subject: [PATCH] correct webconfig configuration files --- master/etc/default/webconfig | 7 +++++-- master/etc/webconfig/alias.d/50-trc6500-master-file.csv | 2 +- trc6500-master-file/postinst | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/master/etc/default/webconfig b/master/etc/default/webconfig index 117fe7d..195207f 100644 --- a/master/etc/default/webconfig +++ b/master/etc/default/webconfig @@ -3,8 +3,11 @@ # Should webconfig be enabled? #ENABLED=1 -# ALIASES: filename containing form declaration -#ALIASES=/etc/webconfig/aliases.csv +# ALIAS: filename containing form declaration +#ALIAS=/etc/webconfig/alias.csv # PORT: server port PORT=8080 + +# RESOURCE: directory containing alias files +#RESOURCE=/etc/webconfig/alias.d diff --git a/master/etc/webconfig/alias.d/50-trc6500-master-file.csv b/master/etc/webconfig/alias.d/50-trc6500-master-file.csv index aea0590..ee5f10c 100644 --- a/master/etc/webconfig/alias.d/50-trc6500-master-file.csv +++ b/master/etc/webconfig/alias.d/50-trc6500-master-file.csv @@ -1,6 +1,6 @@ # -*- CSV -*- ;;;TRC6500 Configuration Manager;:title: -/;/usr/share/webconfig;/etc/webconfig/alias.csv;;:refresh: +/;/usr/share/webconfig;/etc/webconfig/alias.d/50-trc6500-master-file.csv;;:refresh: ;;;List of configuration forms; /trace_ce;/usr/share/xcfe;/opt/trc6500/etc/common/libtrace.xml;Debuger Configuration Editor;sudo service trc6500 restart /trace_ce/cfg;/usr/share/xcfe/cfg;/etc/webconfig/trace.csv;; diff --git a/trc6500-master-file/postinst b/trc6500-master-file/postinst index 8ca6a16..a4e4749 100755 --- a/trc6500-master-file/postinst +++ b/trc6500-master-file/postinst @@ -37,7 +37,7 @@ echo 'Scripts enabled.' # and these other things too echo 'Finalizing configuration..' -chown webconfig /etc/webconfig/alias.csv /etc/dhcp/dhcpd.conf* +chown webconfig /etc/webconfig/alias.d/50-trc6500-master-file.csv /etc/dhcp/dhcpd.conf* cp /etc/dhcp/dhcpd.conf.blank /etc/dhcp/dhcpd.conf chsh -s /usr/bin/pdmenu trc6500 -- 2.30.2