vpnmain.cgi: Disable compression by default

[ipfire-2.x.git] / lfs / web-user-interface

diff --git a/lfs/web-user-interface b/lfs/web-user-interface
index a8e3e39607bb7dc97f5f24cc8deb0eac7794ae4c..0c568825234a315a8abb72f0952228d24caa65ef 100644 (file)
--- a/lfs/web-user-interface
+++ b/lfs/web-user-interface
@@ -64,10 +64,28 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chown -R root:root /srv/web/ipfire
        chmod -R 755 /srv/web/ipfire/cgi-bin
        chmod -R 644 /srv/web/ipfire/html
-       chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,dial.cgi,images,include,themes,themes/*,themes/*/*}
-       chmod -R 777 /srv/web/ipfire/html/captive/logo
+       chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,images,include,themes,themes/*,themes/*/*}
        ln -svf ipfire /srv/web/ipfire/html/themes/ipfire-rounded
 
        # Reset permissions of redirect templates and theme directories
-       find /srv/web/ipfire/html/{redirect-templates,themes} -type d | xargs chmod -v 755
+       find /srv/web/ipfire/html/{captive,redirect-templates,themes} -type d | xargs chmod -v 755
+
+       # Captive Portal CSS
+       ln -svf --relative /usr/share/bootstrap/css/bootstrap-grid.min.css \
+               /srv/web/ipfire/html/captive/assets/bootstrap-grid.min.css
+       ln -svf --relative /usr/share/bootstrap/css/bootstrap-grid.min.css.map \
+               /srv/web/ipfire/html/captive/assets/bootstrap-grid.min.css.map
+       ln -svf --relative /usr/share/bootstrap/css/bootstrap-reboot.min.css \
+               /srv/web/ipfire/html/captive/assets/bootstrap-reboot.min.css
+       ln -svf --relative /usr/share/bootstrap/css/bootstrap-reboot.min.css.map \
+               /srv/web/ipfire/html/captive/assets/bootstrap-reboot.min.css.map
+
+       # Captive Portal Fonts
+       ln -svf --relative /usr/share/fonts/Ubuntu-L.ttf \
+               /srv/web/ipfire/html/captive/assets/Ubuntu-L.ttf
+       ln -svf --relative /usr/share/fonts/Ubuntu-M.ttf \
+               /srv/web/ipfire/html/captive/assets/Ubuntu-M.ttf
+       ln -svf --relative /usr/share/fonts/Ubuntu-R.ttf \
+               /srv/web/ipfire/html/captive/assets/Ubuntu-R.ttf
+
        @$(POSTBUILD)