correct webconfig configuration files

diff --git a/master/etc/default/webconfig b/master/etc/default/webconfig
index 117fe7d591f08bacc093d6fbd1a7882956c529f6..195207f1c2ba97d254e306a683382abd86ad4636 100644 (file)
--- 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 aea0590d63d7c0518629848b23b11db5d022329f..ee5f10c3859a49ce725f898a072a81797b5561f2 100644 (file)
--- 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 8ca6a169a696cd2ab598f7f45367d48e902c03e9..a4e4749943cf23647a740b79139e8b8530f09655 100755 (executable)
--- 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