Merge pull request #6 from labriqueinternet/multissid

Multissid
This commit is contained in:
Julien Vaubourg
2015-05-09 00:29:01 +02:00
5 changed files with 11 additions and 8 deletions

View File

@@ -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 for hosting your server behind a filtered (and/or non-neutral) internet access.
* Useful to have static IP addresses (IPv6 and IPv4). * Useful to have static IP addresses (IPv6 and IPv4).
* Useful to easily move your server anywhere. * 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. This YunoHost app is a part of the "[La Brique Internet](http://labriqueinter.net)" project but can be used independently.

View File

@@ -1,8 +1,10 @@
#!/bin/bash #!/bin/bash
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: ynh-vpnclient # Provides: ynh-vpnclient
# Required-Start: $network $remote_fs $syslog ynh-hostspot # Required-Start: $network $remote_fs $syslog yunohost-api
# Required-Stop: $network $remote_fs $syslog # Required-Stop: $network $remote_fs $syslog
# Should-Start: ynh-hotspot
# Should-Stop: ynh-hotspot
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: Start VPN client. # Short-Description: Start VPN client.

View File

@@ -34,6 +34,7 @@ location <TPL:NGINX_LOCATION> {
fastcgi_read_timeout 600; fastcgi_read_timeout 600;
fastcgi_param REMOTE_USER $remote_user; fastcgi_param REMOTE_USER $remote_user;
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param SCRIPT_FILENAME $request_filename;
} }
include conf.d/yunohost_panel.conf.inc; include conf.d/yunohost_panel.conf.inc;

View File

@@ -24,7 +24,7 @@
<!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]--> <!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="<?= $locale ?>"> <!--<![endif]--> <!--[if gt IE 8]><!--> <html class="no-js" lang="<?= $locale ?>"> <!--<![endif]-->
<head> <head>
<title>VPN Client <? echo (isset($title)) ? "| ".$title : "" ?></title> <title><?= T_("VPN Client") ?><?= isset($title) ? " | $title" : '' ?></title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width"> <meta name="viewport" content="width=device-width">
@@ -43,22 +43,22 @@
<body> <body>
<div class="container"> <div class="container">
<? if(isset($flash['error'])): ?> <?php if(isset($flash['error'])): ?>
<div class="alert alert-dismissible alert-danger fade in" style="margin-top: 20px" role="alert"> <div class="alert alert-dismissible alert-danger fade in" style="margin-top: 20px" role="alert">
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button> <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<strong><?= T_('Error') ?>:</strong> <?= $flash['error'] ?> <strong><?= T_('Error') ?>:</strong> <?= $flash['error'] ?>
</div> </div>
<? elseif(isset($flash['notice'])): ?> <?php elseif(isset($flash['notice'])): ?>
<div class="alert alert-dismissible alert-info fade in" style="margin-top: 20px" role="alert"> <div class="alert alert-dismissible alert-info fade in" style="margin-top: 20px" role="alert">
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button> <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<strong><?= T_('Notice') ?>:</strong> <?= $flash['notice'] ?> <strong><?= T_('Notice') ?>:</strong> <?= $flash['notice'] ?>
</div> </div>
<? elseif(isset($flash['success'])): ?> <?php elseif(isset($flash['success'])): ?>
<div class="alert alert-dismissible alert-success fade in" style="margin-top: 20px" role="alert"> <div class="alert alert-dismissible alert-success fade in" style="margin-top: 20px" role="alert">
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button> <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<?= $flash['success'] ?> <?= $flash['success'] ?>
</div> </div>
<? endif; ?> <?php endif; ?>
<?= $content ?> <?= $content ?>

View File

@@ -45,7 +45,7 @@
<div style="padding: 14px 14px 0 10px"> <div style="padding: 14px 14px 0 10px">
<div class="form-group"> <div class="form-group">
<label for="wifi_secure" class="col-sm-3 control-label"><?= T_('VPN Enabled') ?></label> <label for="service_enabled" class="col-sm-3 control-label"><?= T_('VPN Enabled') ?></label>
<div class="col-sm-9 input-group-btn"> <div class="col-sm-9 input-group-btn">
<div class="input-group"> <div class="input-group">
<input type="checkbox" class="form-control switch" name="service_enabled" id="service_enabled" value="1" <?= $service_enabled == 1 ? 'checked="checked"' : '' ?> /> <input type="checkbox" class="form-control switch" name="service_enabled" id="service_enabled" value="1" <?= $service_enabled == 1 ? 'checked="checked"' : '' ?> />