[RFC PATCH 0/5] Introduce fff-web-hood

Adrian Schmutzler freifunk at adrianschmutzler.de
Fr Jul 26 15:33:06 CEST 2019


Based on my work on supporting tiny devices yesterday, this provides
one of the requirements:

It splits the hood file-affecting part of the web server from the rest.

This will enable firmware builders to simply deselect the WebUI by
removing the single dependency line in fff/Makefile without side
effects.
This is obviously not limited to the tiny device use-case, but may
also just be used by people not wanting the WebUI.

This patch is meant as an early proposal.

It is not even build-tested and is based on my firmware, so won't
apply on official master (but should work equivalently).

Adrian Schmutzler (5):
  packages/fff: Add fff-web-hood package
  fff-web: Make fff-web depend on fff-web-hood
  fff-web: Rename to fff-web-ui
  fff-hoods: Add dependency to fff-web-hood
  fff-gateway: Add dependency to fff-web-hood

 src/packages/fff/fff-gateway/Makefile         |   5 ++-
 src/packages/fff/fff-hoods/Makefile           |   9 +++-
 src/packages/fff/fff-web-hood/Makefile        |  39 ++++++++++++++++++
 .../files/etc/uci-defaults/93-fff-web-hood    |  17 ++++++++
 .../files/www/hood/.keep                      |   0
 .../fff/{fff-web => fff-web-ui}/Makefile      |   8 ++--
 .../files/etc/httpd.conf                      |   0
 .../06-fff-reset-update-notification          |   0
 .../files/etc/uci-defaults/94-fff-web-ui}     |  10 -----
 .../usr/sbin/disable_update_notification.sh   |   0
 .../files/www/public/cgi-bin/status.html      |   0
 .../files/www/public/freifunk.svg             |   0
 .../files/www/public/index.html               |   0
 .../files/www/public/style.css                |   0
 .../files/www/ssl/cgi-bin/footer              |   0
 .../files/www/ssl/cgi-bin/header              |   0
 .../files/www/ssl/cgi-bin/helpers             |   0
 .../files/www/ssl/cgi-bin/home.html           |   0
 .../files/www/ssl/cgi-bin/leaflet.css         |   0
 .../files/www/ssl/cgi-bin/leaflet.js          |   0
 .../files/www/ssl/cgi-bin/logout.html         |   0
 .../files/www/ssl/cgi-bin/password.html       |   0
 .../files/www/ssl/cgi-bin/ports.html          |   0
 .../files/www/ssl/cgi-bin/reboot.html         |   0
 .../files/www/ssl/cgi-bin/settings.html       |   0
 .../files/www/ssl/cgi-bin/upgrade.html        |   0
 .../files/www/ssl/cgi-bin/wifiscan.html       |   0
 .../files/www/ssl/freifunk.svg                |   0
 .../files/www/ssl/index.html                  |   0
 .../files/www/ssl/leaflet.css.gz              | Bin
 .../files/www/ssl/leaflet.js.gz               | Bin
 .../files/www/ssl/map.html                    |   0
 .../files/www/ssl/port_down.png               | Bin
 .../files/www/ssl/port_up.png                 | Bin
 .../files/www/ssl/style.css                   |   0
 src/packages/fff/fff/Makefile                 |   2 +-
 36 files changed, 72 insertions(+), 18 deletions(-)
 create mode 100644 src/packages/fff/fff-web-hood/Makefile
 create mode 100644 src/packages/fff/fff-web-hood/files/etc/uci-defaults/93-fff-web-hood
 rename src/packages/fff/{fff-web => fff-web-hood}/files/www/hood/.keep (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/Makefile (81%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/etc/httpd.conf (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/etc/uci-defaults/06-fff-reset-update-notification (100%)
 rename src/packages/fff/{fff-web/files/etc/uci-defaults/93-fff-uhttpd => fff-web-ui/files/etc/uci-defaults/94-fff-web-ui} (77%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/usr/sbin/disable_update_notification.sh (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/public/cgi-bin/status.html (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/public/freifunk.svg (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/public/index.html (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/public/style.css (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/cgi-bin/footer (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/cgi-bin/header (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/cgi-bin/helpers (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/cgi-bin/home.html (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/cgi-bin/leaflet.css (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/cgi-bin/leaflet.js (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/cgi-bin/logout.html (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/cgi-bin/password.html (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/cgi-bin/ports.html (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/cgi-bin/reboot.html (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/cgi-bin/settings.html (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/cgi-bin/upgrade.html (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/cgi-bin/wifiscan.html (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/freifunk.svg (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/index.html (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/leaflet.css.gz (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/leaflet.js.gz (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/map.html (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/port_down.png (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/port_up.png (100%)
 rename src/packages/fff/{fff-web => fff-web-ui}/files/www/ssl/style.css (100%)

-- 
2.20.1



Mehr Informationen über die Mailingliste franken-dev