fff-web: UPGRADE_PATH in header should be taken from hood file

Submitted by Adrian Schmutzler on Feb. 12, 2018, 6:05 p.m.

Details

Message ID 1518458709-58765-1-git-send-email-freifunk@adrianschmutzler.de
State Accepted
Headers show

Commit Message

Adrian Schmutzler Feb. 12, 2018, 6:05 p.m.
Signed-off-by: Tim Niemeyer <tim@tn-x.org>
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 src/packages/fff/fff-web/files/www/ssl/cgi-bin/header | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
index dbfb00a..d149c04 100755
--- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
+++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
@@ -1,8 +1,11 @@ 
 #!/usr/bin/haserl
 
 <%
-. /etc/community.cfg
+. /lib/functions/fff/keyxchange
 . /etc/firmware_release
+
+UPGRADE_PATH="$(getUpgradePath)"
+
 echo -en "Content-Type: text/html\r\n\r\n"
 nav_entry() {
 	script_file="/cgi-bin/$1"

Comments

Tim Niemeyer Feb. 12, 2018, 6:06 p.m.
Hi

Jupp

Christian review bitte.

Tim

Am 12. Februar 2018 19:05:09 MEZ schrieb Adrian Schmutzler <freifunk@adrianschmutzler.de>:
>Signed-off-by: Tim Niemeyer <tim@tn-x.org>
>Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
>---
> src/packages/fff/fff-web/files/www/ssl/cgi-bin/header | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
>b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
>index dbfb00a..d149c04 100755
>--- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
>+++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
>@@ -1,8 +1,11 @@
> #!/usr/bin/haserl
> 
> <%
>-. /etc/community.cfg
>+. /lib/functions/fff/keyxchange
> . /etc/firmware_release
>+
>+UPGRADE_PATH="$(getUpgradePath)"
>+
> echo -en "Content-Type: text/html\r\n\r\n"
> nav_entry() {
> 	script_file="/cgi-bin/$1"
Christian Dresel Feb. 12, 2018, 6:11 p.m.
Reviewed-by: Christian Dresel <fff@chrisi01.de>

mfg

Christian


On 12.02.2018 19:06, Tim Niemeyer wrote:
> Hi
>
> Jupp
>
> Christian review bitte.
>
> Tim
>
> Am 12. Februar 2018 19:05:09 MEZ schrieb Adrian Schmutzler <freifunk@adrianschmutzler.de>:
>> Signed-off-by: Tim Niemeyer <tim@tn-x.org>
>> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
>> ---
>> src/packages/fff/fff-web/files/www/ssl/cgi-bin/header | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
>> b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
>> index dbfb00a..d149c04 100755
>> --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
>> +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
>> @@ -1,8 +1,11 @@
>> #!/usr/bin/haserl
>>
>> <%
>> -. /etc/community.cfg
>> +. /lib/functions/fff/keyxchange
>> . /etc/firmware_release
>> +
>> +UPGRADE_PATH="$(getUpgradePath)"
>> +
>> echo -en "Content-Type: text/html\r\n\r\n"
>> nav_entry() {
>> 	script_file="/cgi-bin/$1"
Tim Niemeyer March 3, 2018, 5:42 p.m.
Hi

Applied.

Tim

Am Montag, den 12.02.2018, 19:05 +0100 schrieb Adrian Schmutzler:
> Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> ---
>  src/packages/fff/fff-web/files/www/ssl/cgi-bin/header | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
> b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
> index dbfb00a..d149c04 100755
> --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
> +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
> @@ -1,8 +1,11 @@
>  #!/usr/bin/haserl
>  
>  <%
> -. /etc/community.cfg
> +. /lib/functions/fff/keyxchange
>  . /etc/firmware_release
> +
> +UPGRADE_PATH="$(getUpgradePath)"
> +
>  echo -en "Content-Type: text/html\r\n\r\n"
>  nav_entry() {
>  	script_file="/cgi-bin/$1"