Update README.md

add integration from jenkins

.gitignore

@@ -1,3 +0,0 @@
-# Created from https://github.com/YunoHost/example_ynh/blob/master/.gitignore
-*~
-*.sw[op]

.travis.yml

@@ -1,13 +0,0 @@
-language: php
-before_script:
-    - git clone --depth 1 git://github.com/YunoHost/package_linter ../package_linter && cd ../package_linter
-    - mv ../vpnclient_ynh vpnclient_ynh
-script:
-    - ./package_linter.py vpnclient_ynh
-notifications:
-  email: false
-  irc:
-    on_success: always
-    on_failure: always
-    channels:
-      - "irc.geeknode.org#labriqueinter.net-dev"

README.md

@@ -1,5 +1,6 @@
-# VPN Client
-[![Build Status](https://travis-ci.org/labriqueinternet/vpnclient_ynh.svg?branch=master)](https://travis-ci.org/labriqueinternet/vpnclient_ynh)
+# VPN Client [![Build Status](https://travis-ci.org/labriqueinternet/vpnclient_ynh.svg?branch=master)](https://travis-ci.org/labriqueinternet/vpnclient_ynh) [![Integration level](https://dash.yunohost.org/integration/vpnclient.svg)](https://ci-apps.yunohost.org/jenkins/job/vpnclient%20%28Community%29/lastBuild/consoleFull)  
+[![Install LaBriqueInterNet VPNclient with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=vpnclient)
+
 ## Overview
 
 VPN Client app for [YunoHost](http://yunohost.org/).

conf/ynh-vpnclient

@@ -132,7 +132,7 @@ start_openvpn() {
   # Unset firewall to let DNS and NTP resolution works
   # Firewall is reset after vpn is mounted (more details on #1016)
   unset_firewall
-  
+
   sync_time
 
   cp /etc/openvpn/client.conf{.tpl,}
@@ -204,6 +204,20 @@ stop_openvpn() {
 sync_time() {
   systemctl stop ntp
   timeout 20 ntpd -qg &> /dev/null
+  
+  # Some networks drop ntp port (udp 123). 
+  # Try to get the date with an http request on the internetcube web site
+  if [ $? -ne 0 ]; then
+    http_date=`curl -sD - labriqueinter.net | grep '^Date:' | cut -d' ' -f3-6`
+    http_date_seconds=`date -d "${http_date}" +%s`
+    curr_date_seconds=`date +%s`
+
+    # Set the new date if it's greater than the current date
+    # So it does if 1970 year or if old fake-hwclock date is used
+    if [ $http_date_seconds -ge $curr_date_seconds ]; then
+      date -s "${http_date}"
+    fi
+  fi 
   systemctl start ntp
 }
 

manifest.json

@@ -1,46 +1,34 @@
 {
   "name": "VPN Client",
   "id": "vpnclient",
-  "packaging_format": 1,
   "description": {
     "en": "VPN Client",
     "fr": "Client VPN"
   },
+  "license": "AGPL-3",
   "url": "https://github.com/labriqueinternet/vpnclient_ynh",
-  "version": "1.1.0",
-  "license": "AGPL-3.0",
+  "version": "1.1.1",
   "maintainer": {
     "name": "Julien Vaubourg",
     "email": "julien@vaubourg.com",
     "url": "http://julien.vaubourg.com"
   },
-  "requirements": {
-    "yunohost": ">= 2.2.0",
-    "moulinette": ">= 2.4.0"
-  },
-  "multi_instance": false,
-  "services": [
-    "nginx",
-    "php5-fpm",
-    "ynh-vpnclient"
-  ],
+  "multi_instance": "false",
   "arguments": {
-    "install": [
+    "install" : [
       {
         "name": "domain",
-        "type": "domain",
         "ask": {
-          "en": "Choose a domain for the web administration",
-          "fr": "Choisissez un domaine pour l'administration web"
+            "en": "Choose a domain for the web administration",
+            "fr": "Choisissez un domaine pour l'administration web"
         },
         "example": "domain.org"
       },
       {
         "name": "path",
-        "type": "path",
         "ask": {
-          "en": "Choose a path for the web administration",
-          "fr": "Choisissez un chemin pour l'administration web"
+            "en": "Choose a path for the web administration",
+            "fr": "Choisissez un chemin pour l'administration web"
         },
         "example": "/vpnadmin",
         "default": "/vpnadmin"

scripts/backup

@@ -1,16 +1,9 @@
 #!/bin/bash
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_abort_if_errors # Stop script if an error is detected
-
-#=================================================
-
 backup_dir="${1}/apps/vpnclient"
 mkdir -p "${backup_dir}/"
 
 sudo cp -a /etc/openvpn/keys/ "${backup_dir}/"
 sudo cp -a /etc/openvpn/client.conf.tpl "${backup_dir}/"
 
+exit 0

scripts/helpers

@@ -1,15 +1,12 @@
 #!/bin/bash
+
+source /usr/share/yunohost/helpers
+
 #
-# Common variables
-#
-
-pkg_dependencies="php5-fpm sipcalc dnsutils openvpn curl fake-hwclock"
-
-
 # Helper to start/stop/.. a systemd service from a yunohost context,
 # *and* the systemd service itself needs to be able to run yunohost
 # commands.
-#
+# 
 # Hence the need to release the lock during the operation
 #
 # usage : ynh_systemctl yolo restart
@@ -27,7 +24,7 @@ function ynh_systemctl()
   # Save and release the lock...
   cp $LOCKFILE $LOCKFILE.bkp.$$
   rm $LOCKFILE
-
+  
   # Wait for the end of the action
   wait $SYSCTLACTION
 
@@ -40,4 +37,3 @@ function ynh_systemctl()
   # Restore the old lock
   mv $LOCKFILE.bkp.$$ $LOCKFILE
 }
-

scripts/install

@@ -1,99 +1,61 @@
 #!/bin/bash
 
-# VPN Client app for YunoHost
+# VPN Client app for YunoHost 
 # Copyright (C) 2015 Julien Vaubourg <julien@vaubourg.com>
 # Contribute at https://github.com/labriqueinternet/vpnclient_ynh
-#
+# 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-#
+# 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Affero General Public License for more details.
-#
+# 
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-source _common.sh
-source /usr/share/yunohost/helpers
-
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# RETRIEVE ARGUMENTS FROM THE MANIFEST
-#=================================================
+# This is an upgrade?
+upgrade=$([ "${VPNCLIENT_UPGRADE}" == 1 ] && echo true || echo false)
 
 # Retrieve arguments
-domain=$YNH_APP_ARG_DOMAIN
-path_url=$YNH_APP_ARG_PATH
+domain=${1}
+url_path=${2}
 
-app=$YNH_APP_INSTANCE_NAME
+if ! $upgrade; then
+  source ./helpers
+  source ./prerequisites
+fi
 
-#=================================================
-# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
-#=================================================
+# Check domain/path availability
+ynh_webpath_register vpnclient $domain $url_path || exit 1
 
-# Check destination directory
-final_path="/var/www/$app"
-test ! -e "$final_path" || ynh_die "This path already contains a folder"
+# Install packages
+packages='php5-fpm sipcalc dnsutils openvpn curl fake-hwclock'
+export DEBIAN_FRONTEND=noninteractive
 
-# Normalize the url path syntax
-path_url=$(ynh_normalize_url_path "$path_url")
+sudo apt-get --assume-yes --force-yes install ${packages}
 
-# Check web path availability
-ynh_webpath_available "$domain" "$path_url"
-# Register (book) web path
-ynh_webpath_register "$app" "$domain" "$path_url"
-
-#=================================================
-# STORE SETTINGS FROM MANIFEST
-#=================================================
-
-ynh_app_setting_set "$app" domain "$domain"
-ynh_app_setting_set "$app" final_path "$final_path"
-
-#=================================================
-# STANDARD MODIFICATIONS
-#=================================================
-# INSTALL DEPENDENCIES
-#=================================================
-
-ynh_install_app_dependencies "$pkg_dependencies"
-
-#=================================================
-# SPECIFIC SETUP
-#=================================================
-
-# This is an upgrade?
-upgrade=$([ -z ${VPNCLIENT_UPGRADE+x} ] && echo true || echo false)
+if [ $? -ne 0 ]; then
+  sudo apt-get update
+  sudo apt-get --assume-yes --force-yes install ${packages}
+fi
 
 if ! $upgrade; then
 
   # Save arguments
-  ynh_app_setting_set $app service_enabled 0
-  ynh_app_setting_set $app server_name none
-  ynh_app_setting_set $app server_port 1194
-  ynh_app_setting_set $app server_proto udp
-  ynh_app_setting_set $app ip6_addr none
-  ynh_app_setting_set $app ip6_net none
-  ynh_app_setting_set $app login_user "${login_user}"
-  ynh_app_setting_set $app login_passphrase "${login_passphrase}"
-  ynh_app_setting_set $app dns0 89.234.141.66
-  ynh_app_setting_set $app dns1 2001:913::8
+  sudo yunohost app setting vpnclient service_enabled -v 0
+  sudo yunohost app setting vpnclient server_name -v none
+  sudo yunohost app setting vpnclient server_port -v 1194
+  sudo yunohost app setting vpnclient server_proto -v udp
+  sudo yunohost app setting vpnclient ip6_addr -v none
+  sudo yunohost app setting vpnclient ip6_net -v none
+  sudo yunohost app setting vpnclient login_user -v "${login_user}"
+  sudo yunohost app setting vpnclient login_passphrase -v "${login_passphrase}"
+  sudo yunohost app setting vpnclient dns0 -v 89.234.141.66
+  sudo yunohost app setting vpnclient dns1 -v 2001:913::8
 
 fi
 
@@ -129,25 +91,20 @@ sudo find /var/www/vpnadmin/ -type d -exec chmod +x {} \;
 sudo mkdir -pm 0770 /etc/openvpn/keys/
 sudo chown root:admins /etc/openvpn/keys/
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-
-sudo sed "s|<TPL:NGINX_LOCATION>|${path_url}|g" -i "/etc/nginx/conf.d/${domain}.d/vpnadmin.conf"
+# Fix confs
+## nginx
+sudo sed "s|<TPL:NGINX_LOCATION>|${url_path}|g" -i "/etc/nginx/conf.d/${domain}.d/vpnadmin.conf"
 sudo sed 's|<TPL:NGINX_REALPATH>|/var/www/vpnadmin/|g' -i "/etc/nginx/conf.d/${domain}.d/vpnadmin.conf"
 sudo sed 's|<TPL:PHP_NAME>|vpnadmin|g' -i "/etc/nginx/conf.d/${domain}.d/vpnadmin.conf"
 
-#=================================================
-# PHP-FPM CONFIGURATION
-#=================================================
-
+## php-fpm
 sudo sed 's|<TPL:PHP_NAME>|vpnadmin|g' -i /etc/php5/fpm/pool.d/vpnadmin.conf
 sudo sed 's|<TPL:PHP_USER>|admin|g' -i /etc/php5/fpm/pool.d/vpnadmin.conf
 sudo sed 's|<TPL:PHP_GROUP>|admins|g' -i /etc/php5/fpm/pool.d/vpnadmin.conf
 sudo sed 's|<TPL:NGINX_REALPATH>|/var/www/vpnadmin/|g' -i /etc/php5/fpm/pool.d/vpnadmin.conf
 
 # Fix sources
-sudo sed "s|<TPL:NGINX_LOCATION>|${path_url}|g" -i /var/www/vpnadmin/config.php
+sudo sed "s|<TPL:NGINX_LOCATION>|${url_path}|g" -i /var/www/vpnadmin/config.php
 
 # Copy init script
 sudo install -o root -g root -m 0755 ../conf/ynh-vpnclient /usr/local/bin/
@@ -181,11 +138,11 @@ if ! $upgrade; then
   ynh_systemctl start ynh-vpnclient
 
   # Check configuration consistency
-
+  
   if [ -z "${crt_server_ca_path}" ]; then
     echo "WARNING: VPN Client is not started because you need to define a server CA through the web admin" >&2
   fi
-
+  
   if [ -z "${crt_client_key_path}" -a -z "${login_user}" ]; then
     echo "WARNING: VPN Client is not started because you need either a client certificate, either a username (or both)" >&2
   fi
@@ -193,3 +150,4 @@ fi
 
 sudo yunohost app ssowatconf
 
+exit 0

scripts/prerequisites

@@ -0,0 +1,8 @@
+# Source me
+
+# Check YunoHost version (firewall hook in Moulinette)
+ynh_version=$(sudo dpkg -l yunohost | grep ii | awk '{ print $3 }' | sed 's/\.//g')
+
+if [ "${ynh_version}" -lt 240 ]; then
+  echo "WARN: You need a YunoHost's version equals or greater than 2.4.0 for activating the firewalling" >&2
+fi

scripts/remove

@@ -1,40 +1,27 @@
 #!/bin/bash
 
-# VPN Client app for YunoHost
+# VPN Client app for YunoHost 
 # Copyright (C) 2015 Julien Vaubourg <julien@vaubourg.com>
 # Contribute at https://github.com/labriqueinternet/vpnclient_ynh
-#
+# 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-#
+# 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Affero General Public License for more details.
-#
+# 
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#=================================================
-# GENERIC STARTING
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
+source ./helpers
 
-source _common.sh
-source /usr/share/yunohost/helpers
+# Retrieve arguments
+domain=$(sudo yunohost app setting vpnclient domain)
 
-#=================================================
-# LOAD SETTINGS
-#=================================================
-
-app=$YNH_APP_INSTANCE_NAME
-
-domain=$(ynh_app_setting_get $app domain)
-
-#=================================================
 # The End
 ynh_systemctl stop ynh-vpnclient-checker.service
 sudo systemctl disable ynh-vpnclient-checker.service
@@ -63,3 +50,4 @@ sudo systemctl reload nginx
 # Remove sources
 sudo rm -rf /var/www/vpnadmin/
 
+exit 0

scripts/restore

@@ -1,24 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-if [ ! -e _common.sh ]; then
-    # Fetch helpers file if not in current directory
-    cp ../settings/scripts/_common.sh ./_common.sh
-    chmod a+rx _common.sh
-fi
-source _common.sh
-source /usr/share/yunohost/helpers
-
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 backup_dir="${1}/apps/vpnclient"
 
 sudo mkdir -p /etc/openvpn/
@@ -37,3 +18,4 @@ bash ./upgrade
 
 sudo rm -r "${tmpdir}/"
 
+exit 0

scripts/upgrade

@@ -1,41 +1,18 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC STARTING
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
+ynh_setting() {
+  app=${1}
+  setting=${2}
 
-source _common.sh
-source /usr/share/yunohost/helpers
+  sudo grep "^${setting}:" "/etc/yunohost/apps/${app}/settings.yml" | sed s/^[^:]\\+:\\s*[\"\']\\?// | sed s/\\s*[\"\']\$//
+}
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-
-app=$YNH_APP_INSTANCE_NAME
-
-domain=$(ynh_app_setting_get $app domain)
-path_url=$(ynh_app_setting_get $app path)
-is_public=$(ynh_app_setting_get $app is_public)
-final_path=$(ynh_app_setting_get $app final_path)
-server_name=$(ynh_app_setting_get $app server_name)
-
-#=================================================
-# CHECK VERSION
-#=================================================
-
-ynh_abort_if_up_to_date
-
-#=================================================
+source ./helpers
+source ./prerequisites
 
+domain=$(ynh_setting vpnclient domain)
+path=$(ynh_setting vpnclient path)
+server_name=$(ynh_setting vpnclient server_name)
 
 sudo mkdir -m 0700 -p /var/cache/labriqueinternet/vpnclient/
 sudo tar czf "/var/cache/labriqueinternet/vpnclient/rollback_$(date +%Y-%m-%d-%H%M%S).tgz" /etc/openvpn/ /etc/yunohost/apps/vpnclient/ &> /dev/null
@@ -67,3 +44,4 @@ fi
 
 ynh_systemctl start ynh-vpnclient
 
+exit 0