From 2ce6931d519458e3d9616513df0fe365943b11e3 Mon Sep 17 00:00:00 2001 From: Julien VAUBOURG Date: Fri, 1 May 2015 23:20:22 +0200 Subject: [PATCH 1/6] Add the SCRIPT_FILENAME variable in the vhost --- conf/nginx_vpnadmin.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/nginx_vpnadmin.conf b/conf/nginx_vpnadmin.conf index 950bb4e..b3c1ef4 100644 --- a/conf/nginx_vpnadmin.conf +++ b/conf/nginx_vpnadmin.conf @@ -34,6 +34,7 @@ location { fastcgi_read_timeout 600; fastcgi_param REMOTE_USER $remote_user; fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME $request_filename; } include conf.d/yunohost_panel.conf.inc; From 3a3578a920585020de60aa19fa7c0ebc11ffe573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20Morel?= Date: Sat, 2 May 2015 20:03:51 +0200 Subject: [PATCH 2/6] typo in init script --- conf/init_ynh-vpnclient | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/init_ynh-vpnclient b/conf/init_ynh-vpnclient index 85bf6f1..6fc5b7c 100644 --- a/conf/init_ynh-vpnclient +++ b/conf/init_ynh-vpnclient @@ -1,7 +1,7 @@ #!/bin/bash ### BEGIN INIT INFO # Provides: ynh-vpnclient -# Required-Start: $network $remote_fs $syslog ynh-hostspot +# Required-Start: $network $remote_fs $syslog ynh-hotspot # Required-Stop: $network $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 From d30c9fed2d310cb76d8fcc75c0a7677e4c861edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20Morel?= Date: Sat, 2 May 2015 20:23:14 +0200 Subject: [PATCH 3/6] change required to should for init dependency with hotspot --- conf/init_ynh-vpnclient | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/init_ynh-vpnclient b/conf/init_ynh-vpnclient index 6fc5b7c..d97e21b 100644 --- a/conf/init_ynh-vpnclient +++ b/conf/init_ynh-vpnclient @@ -1,8 +1,9 @@ #!/bin/bash ### BEGIN INIT INFO # Provides: ynh-vpnclient -# Required-Start: $network $remote_fs $syslog ynh-hotspot +# Required-Start: $network $remote_fs $syslog # Required-Stop: $network $remote_fs $syslog +# Should-Start: ynh-hotspot # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Start VPN client. From 8d7b5df07d32db5f553220dfe41418b7b30e9e2d Mon Sep 17 00:00:00 2001 From: Julien VAUBOURG Date: Sat, 2 May 2015 20:29:45 +0200 Subject: [PATCH 4/6] Change required-start --- conf/init_ynh-vpnclient | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/init_ynh-vpnclient b/conf/init_ynh-vpnclient index d97e21b..e2506e0 100644 --- a/conf/init_ynh-vpnclient +++ b/conf/init_ynh-vpnclient @@ -1,9 +1,10 @@ #!/bin/bash ### BEGIN INIT INFO # Provides: ynh-vpnclient -# Required-Start: $network $remote_fs $syslog +# Required-Start: $network $remote_fs $syslog yunohost-api # Required-Stop: $network $remote_fs $syslog # Should-Start: ynh-hotspot +# Should-Stop: ynh-hotspot # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Start VPN client. From 0e48a3cf71c97e3e48203aeb23752d74ee71c381 Mon Sep 17 00:00:00 2001 From: Julien VAUBOURG Date: Tue, 5 May 2015 20:14:48 +0200 Subject: [PATCH 5/6] Update README --- README.md | 2 +- sources/views/settings.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 582ffa5..3f5b555 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ VPN Client app for [YunoHost](http://yunohost.org/). * Useful for hosting your server behind a filtered (and/or non-neutral) internet access. * Useful to have static IP addresses (IPv6 and IPv4). * Useful to easily move your server anywhere. -* With the [Hotspot app for YunoHost](https://github.com/jvaubourg/hotspot_ynh), you can broadcast your VPN access by Wifi for using a clean internet connection (depending on your VPN provider) on your laptop (or those of your friends) without have to configure it. +* With the [Hotspot app for YunoHost](https://github.com/jvaubourg/hotspot_ynh), you can broadcast your VPN access by wifi to use a clean internet connection (depending on your VPN provider) on your laptop (or those of your friends) without having to configure it. This YunoHost app is a part of the "[La Brique Internet](http://labriqueinter.net)" project but can be used independently. diff --git a/sources/views/settings.html.php b/sources/views/settings.html.php index eadaefd..c6cd3c2 100644 --- a/sources/views/settings.html.php +++ b/sources/views/settings.html.php @@ -45,7 +45,7 @@
- +
/> From 82747f3c1fffc57179325ea014f42953783124fc Mon Sep 17 00:00:00 2001 From: Julien VAUBOURG Date: Fri, 8 May 2015 20:52:49 +0200 Subject: [PATCH 6/6] Cleaning --- sources/views/layout.html.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sources/views/layout.html.php b/sources/views/layout.html.php index 56e9cc6..ba99543 100644 --- a/sources/views/layout.html.php +++ b/sources/views/layout.html.php @@ -24,7 +24,7 @@ - VPN Client <? echo (isset($title)) ? "| ".$title : "" ?> + <?= T_("VPN Client") ?><?= isset($title) ? " | $title" : '' ?> @@ -43,22 +43,22 @@
- + - + - + - +