Soft'N'Design Software
/
projects
/
debian6500.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4bee3a9
)
correct webconfig configuration files
author
Laurent Mazet
<laurent.mazet@thalesgroup.com>
Tue, 22 Sep 2015 07:52:52 +0000
(09:52 +0200)
committer
Laurent Mazet
<laurent.mazet@thalesgroup.com>
Tue, 22 Sep 2015 07:52:52 +0000
(09:52 +0200)
master/etc/default/webconfig
patch
|
blob
|
blame
|
history
master/etc/webconfig/alias.d/50-trc6500-master-file.csv
patch
|
blob
|
blame
|
history
trc6500-master-file/postinst
patch
|
blob
|
blame
|
history
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
# Should webconfig be enabled?
#ENABLED=1
-# ALIAS
ES
: filename containing form declaration
-#ALIAS
ES=/etc/webconfig/aliase
s.csv
+# ALIAS: filename containing form declaration
+#ALIAS
=/etc/webconfig/alia
s.csv
# PORT: server port
PORT=8080
# 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:
# -*- 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;;
;;;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..'
# 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
cp /etc/dhcp/dhcpd.conf.blank /etc/dhcp/dhcpd.conf
chsh -s /usr/bin/pdmenu trc6500