Merge pull request #66 from labriqueinternet/testing

Testing

README.md

@@ -30,3 +30,11 @@ VPN Client app for [YunoHost](http://yunohost.org/).
 
 ![Screenshot of the web interface](https://raw.githubusercontent.com/labriqueinternet/vpnclient_ynh/master/screenshot.png)
 
+
+## Running vpnclient inside lxc
+If you want to run openvpn inside lxc, you should add this to your container:
+```
+lxc.hook.autodev = sh -c "modprobe tun"
+lxc.mount.entry=/dev/net/tun dev/net/tun none bind,create=file
+lxc.hook.autodev = sh -c "chmod 0666 dev/net/tun"
+```

manifest.json

@@ -2,7 +2,7 @@
   "name": "VPN Client",
   "id": "vpnclient",
   "packaging_format": 1,
-  "version": "1.4.1",
+  "version": "1.4.1~ynh1",
   "description": {
     "en": "Tunnel the internet traffic through a VPN",
     "fr": "Fais passer le traffic internet à travers un VPN"

scripts/_common.sh

@@ -185,7 +185,7 @@ function vpnclient_deploy_files_and_services()
   #=================================================
 
   # Fix sources
-  ynh_replace_string "__PATH__" "${path_url}" "/var/www/${app}/config.php"
+  ynh_replace_string "__PATH__" "${path_url%%/}" "/var/www/${app}/config.php"
 
   # Copy init script
   install -o root -g root -m 0755 ../conf/$service_name /usr/local/bin/