From da7bd50a090f2e0708e96d32a9db200a718c15f3 Mon Sep 17 00:00:00 2001 From: Nick Daly Date: Fri, 18 Oct 2013 16:49:50 -0500 Subject: [PATCH 1/4] Corrected "Old Browser" warning: point to FireFox. It's inappropriate for the FreedomBox project to recommend Non-Free Software. Therefore, we point users to the current version of FireFox if their browser is too old. --- templates/base.tmpl | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/templates/base.tmpl b/templates/base.tmpl index d3e320fba..3479c9f62 100644 --- a/templates/base.tmpl +++ b/templates/base.tmpl @@ -14,11 +14,11 @@ - + - - - + @@ -102,13 +102,11 @@ - - - +
@@ -172,7 +170,7 @@

Current page: $current_url

- +

#end block footer_block

From ee5609a2e3d9fdb61891ddbe6c2e5d8cace6d59f Mon Sep 17 00:00:00 2001 From: Nick Daly Date: Fri, 18 Oct 2013 16:52:40 -0500 Subject: [PATCH 2/4] Configure Apache correctly when installing Plinth. Apache configuration was missing a few modules, and the server needs to be restarted after those modules are enabled. Also, the server needs to be reloaded after the Plinth site is enabled. --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 81ad532b9..482b30074 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,11 @@ apache-install: install -D -m644 share/apache2/plinth.conf $(DESTDIR)/etc/apache2/sites-available/plinth.conf apache-config: apache-install apache-ssl a2ensite plinth + service apache2 reload apache-ssl: make-ssl-cert generate-default-snakeoil a2enmod ssl + a2enmod rewrite + a2enmod proxy + service apache2 restart From d84150b103ed786c0521108e154685564f4072ae Mon Sep 17 00:00:00 2001 From: Nick Daly Date: Fri, 18 Oct 2013 16:59:35 -0500 Subject: [PATCH 3/4] Fix DocumentRoot: Apache can serve Plinth's static files. Without this change, Apache tries to serve the static files from /dev/null/static, which never exists, so users will see all exciting manner of errors. I've assumed that the correct directory is the default directory that Freedom-Maker installs Plinth to, currently ``/home/fbx/plinth``. Other distributions will need to patch this out to their preferred location, like ``/usr/share/plinth/static``. --- share/apache2/plinth.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/apache2/plinth.conf b/share/apache2/plinth.conf index dff0f7d93..f3054aaaf 100644 --- a/share/apache2/plinth.conf +++ b/share/apache2/plinth.conf @@ -22,7 +22,7 @@ ## Use this rule to hang plinth off of plinth.(servername) ## The DocumentRoot is set by fabric - DocumentRoot /dev/null + DocumentRoot /home/fbx/plinth/static ServerName plinth ServerAlias plinth.* ProxyPreserveHost on From 025c2aebc1d1a065396fce87bcf9292404efad92 Mon Sep 17 00:00:00 2001 From: Nick Daly Date: Fri, 18 Oct 2013 17:03:27 -0500 Subject: [PATCH 4/4] Forgot an Apache module: proxy_http. Without this module, Apache doesn't know how to proxy HTTP requests. --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 482b30074..93b8da5e5 100644 --- a/Makefile +++ b/Makefile @@ -104,4 +104,5 @@ apache-ssl: a2enmod ssl a2enmod rewrite a2enmod proxy + a2enmod proxy_http service apache2 restart