core156: Ship the entire web user interface and remove old themes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/156/filelists/files b/config/rootfiles/core/156/filelists/files
index 68a41b2cde8d1934314a9e63e52b7d20fb127a6e..a40d841cfaf9b09d47255888b98bab9a969313dc 100644 (file)
--- a/config/rootfiles/core/156/filelists/files
+++ b/config/rootfiles/core/156/filelists/files
@@ -1,15 +1,5 @@
 etc/rc.d/init.d/suricata
 etc/sysctl.conf
-srv/web/ipfire/cgi-bin/entropy.cgi
-srv/web/ipfire/cgi-bin/firewall.cgi
-srv/web/ipfire/cgi-bin/getrrdimage.cgi
-srv/web/ipfire/cgi-bin/logs.cgi/ids.dat
-srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
-srv/web/ipfire/cgi-bin/netovpnsrv.cgi
-srv/web/ipfire/cgi-bin/zoneconf.cgi
-srv/web/ipfire/html/include/rrdimage.js
-srv/web/ipfire/html/themes/ipfire/include/css/style.css
-srv/web/ipfire/html/themes/ipfire/include/functions.pl
 var/ipfire/graphs.pl
 var/ipfire/header.pl
 var/ipfire/network-functions.pl

diff --git a/config/rootfiles/core/156/filelists/web-user-interface b/config/rootfiles/core/156/filelists/web-user-interface
new file mode 120000 (symlink)
index 0000000..70c74b4
--- /dev/null
+++ b/config/rootfiles/core/156/filelists/web-user-interface
@@ -0,0 +1 @@
+../../../common/web-user-interface
\ No newline at end of file

diff --git a/config/rootfiles/core/156/update.sh b/config/rootfiles/core/156/update.sh
index d078c01cd1b3aee084997310e4892c133177b65c..3f3634335f29306871f303969b8fde2b36de8858 100644 (file)
--- a/config/rootfiles/core/156/update.sh
+++ b/config/rootfiles/core/156/update.sh
@@ -46,8 +46,12 @@ extract_files
 # update linker config
 ldconfig
 
-# Remove old perl modules
-rm -rfv /usr/lib/perl5/5.30.0
+# Remove old perl modules & webUI themes
+rm -rfv \
+       /usr/lib/perl5/5.30.0 \
+       /srv/web/ipfire/html/themes/darkdos \
+       /srv/web/ipfire/html/themes/ipfire-legacy \
+       /srv/web/ipfire/html/themes/maniac
 
 # Update Language cache
 /usr/local/bin/update-lang-cache