|
|
@@ -8,135 +8,18 @@ pkg_dependencies="php7.0-fpm sipcalc dnsutils openvpn curl fake-hwclock"
|
|
|
service_name="ynh-vpnclient"
|
|
|
service_checker_name=$service_name"-checker"
|
|
|
|
|
|
-to_logs() {
|
|
|
-
|
|
|
- # When yunohost --verbose or bash -x
|
|
|
- if $_ISVERBOSE; then
|
|
|
- cat
|
|
|
- else
|
|
|
- cat > /dev/null
|
|
|
- fi
|
|
|
-}
|
|
|
-
|
|
|
-# Experimental helpers
|
|
|
-# Cf. https://github.com/YunoHost-Apps/Experimental_helpers/blob/72b0bc77c68d4a4a2bf4e95663dbc05e4a762a0a/ynh_read_manifest/ynh_read_manifest
|
|
|
-read_json () {
|
|
|
- python3 -c "import sys, json;print(json.load(open('$1'))['$2'])"
|
|
|
-}
|
|
|
-
|
|
|
-# Experimental helper
|
|
|
-# Cf. https://github.com/YunoHost-Apps/Experimental_helpers/blob/72b0bc77c68d4a4a2bf4e95663dbc05e4a762a0a/ynh_read_manifest/ynh_read_manifest
|
|
|
-read_manifest () {
|
|
|
- if [ -f '../manifest.json' ] ; then
|
|
|
- read_json '../manifest.json' "$1"
|
|
|
- else
|
|
|
- read_json '../settings/manifest.json' "$1"
|
|
|
- fi
|
|
|
-}
|
|
|
-
|
|
|
-# Experimental helper
|
|
|
-# cf. https://github.com/YunoHost-Apps/Experimental_helpers/blob/master/ynh_abort_if_up_to_date/ynh_abort_if_up_to_date
|
|
|
-ynh_abort_if_up_to_date () {
|
|
|
- version=$(read_json "/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" 'version' 2> /dev/null || echo '20160501-7')
|
|
|
- last_version=$(read_manifest 'version')
|
|
|
- if [ "${version}" = "${last_version}" ]; then
|
|
|
- ynh_print_info "Up-to-date, nothing to do"
|
|
|
- ynh_die "" 0
|
|
|
- fi
|
|
|
-}
|
|
|
-
|
|
|
-# Read the value of a key in a ynh manifest file
|
|
|
-#
|
|
|
-# usage: ynh_read_manifest manifest key
|
|
|
-# | arg: manifest - Path of the manifest to read
|
|
|
-# | arg: key - Name of the key to find
|
|
|
-ynh_read_manifest () {
|
|
|
- manifest="$1"
|
|
|
- key="$2"
|
|
|
- python3 -c "import sys, json;print(json.load(open('$manifest', encoding='utf-8'))['$key'])"
|
|
|
-}
|
|
|
-
|
|
|
-# Read the upstream version from the manifest
|
|
|
-# The version number in the manifest is defined by <upstreamversion>~ynh<packageversion>
|
|
|
-# For example : 4.3-2~ynh3
|
|
|
-# This include the number before ~ynh
|
|
|
-# In the last example it return 4.3-2
|
|
|
-#
|
|
|
-# usage: ynh_app_upstream_version
|
|
|
-ynh_app_upstream_version () {
|
|
|
- manifest_path="../manifest.json"
|
|
|
- if [ ! -e "$manifest_path" ]; then
|
|
|
- manifest_path="../settings/manifest.json" # Into the restore script, the manifest is not at the same place
|
|
|
- fi
|
|
|
- version_key=$(ynh_read_manifest "$manifest_path" "version")
|
|
|
- echo "${version_key/~ynh*/}"
|
|
|
-}
|
|
|
-
|
|
|
-# Read package version from the manifest
|
|
|
-# The version number in the manifest is defined by <upstreamversion>~ynh<packageversion>
|
|
|
-# For example : 4.3-2~ynh3
|
|
|
-# This include the number after ~ynh
|
|
|
-# In the last example it return 3
|
|
|
-#
|
|
|
-# usage: ynh_app_package_version
|
|
|
-ynh_app_package_version () {
|
|
|
- manifest_path="../manifest.json"
|
|
|
- if [ ! -e "$manifest_path" ]; then
|
|
|
- manifest_path="../settings/manifest.json" # Into the restore script, the manifest is not at the same place
|
|
|
- fi
|
|
|
- version_key=$(ynh_read_manifest "$manifest_path" "version")
|
|
|
- echo "${version_key/*~ynh/}"
|
|
|
-}
|
|
|
-
|
|
|
-# Exit without error if the package is up to date
|
|
|
-#
|
|
|
-# This helper should be used to avoid an upgrade of a package
|
|
|
-# when it's not needed.
|
|
|
-#
|
|
|
-# To force an upgrade, even if the package is up to date,
|
|
|
-# you have to set the variable YNH_FORCE_UPGRADE before.
|
|
|
-# example: YNH_FORCE_UPGRADE=1 yunohost app upgrade MyApp
|
|
|
-#
|
|
|
-# usage: ynh_abort_if_up_to_date
|
|
|
-ynh_abort_if_up_to_date () {
|
|
|
- local force_upgrade=${YNH_FORCE_UPGRADE:-0}
|
|
|
- local package_check=${PACKAGE_CHECK_EXEC:-0}
|
|
|
-
|
|
|
- local version=$(ynh_read_manifest "/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" "version" || echo 1.0)
|
|
|
- local last_version=$(ynh_read_manifest "../manifest.json" "version" || echo 1.0)
|
|
|
- if [ "$version" = "$last_version" ]
|
|
|
- then
|
|
|
- if [ "$force_upgrade" != "0" ]
|
|
|
- then
|
|
|
- echo "Upgrade forced by YNH_FORCE_UPGRADE." >&2
|
|
|
- unset YNH_FORCE_UPGRADE
|
|
|
- elif [ "$package_check" != "0" ]
|
|
|
- then
|
|
|
- echo "Upgrade forced for package check." >&2
|
|
|
- else
|
|
|
- ynh_die "Up-to-date, nothing to do" 0
|
|
|
- fi
|
|
|
- fi
|
|
|
-}
|
|
|
-
|
|
|
# Operations needed by both 'install' and 'upgrade' scripts
|
|
|
function vpnclient_deploy_files_and_services()
|
|
|
{
|
|
|
- local domain=$1
|
|
|
- local app=$2
|
|
|
- local service_name=$3
|
|
|
- local sysuser="${app}"
|
|
|
- local service_checker_name="$service_name-checker"
|
|
|
-
|
|
|
# Ensure vpnclient_ynh has its own system user
|
|
|
- if ! ynh_system_user_exists ${sysuser}
|
|
|
+ if ! ynh_system_user_exists ${app}
|
|
|
then
|
|
|
- ynh_system_user_create ${sysuser}
|
|
|
+ ynh_system_user_create ${app}
|
|
|
fi
|
|
|
|
|
|
# Ensure the system user has enough permissions
|
|
|
install -b -o root -g root -m 0440 ../conf/sudoers.conf /etc/sudoers.d/${app}_ynh
|
|
|
- ynh_replace_string "__VPNCLIENT_SYSUSER__" "${sysuser}" /etc/sudoers.d/${app}_ynh
|
|
|
+ ynh_replace_string "__VPNCLIENT_SYSUSER__" "${app}" /etc/sudoers.d/${app}_ynh
|
|
|
|
|
|
# Install IPv6 scripts
|
|
|
install -o root -g root -m 0755 ../conf/ipv6_expanded /usr/local/bin/
|
|
|
@@ -147,11 +30,11 @@ function vpnclient_deploy_files_and_services()
|
|
|
|
|
|
# Copy confs
|
|
|
mkdir -pm 0755 /var/log/nginx/
|
|
|
- chown root:${sysuser} /etc/openvpn/
|
|
|
+ chown root:${app} /etc/openvpn/
|
|
|
chmod 775 /etc/openvpn/
|
|
|
mkdir -pm 0755 /etc/yunohost/hooks.d/post_iptable_rules/
|
|
|
|
|
|
- install -b -o root -g ${sysuser} -m 0664 ../conf/openvpn_client.conf.tpl /etc/openvpn/client.conf.tpl
|
|
|
+ install -b -o root -g ${app} -m 0664 ../conf/openvpn_client.conf.tpl /etc/openvpn/client.conf.tpl
|
|
|
install -o root -g root -m 0644 ../conf/openvpn_client.conf.tpl /etc/openvpn/client.conf.tpl.restore
|
|
|
install -b -o root -g root -m 0755 ../conf/hook_post-iptable-rules /etc/yunohost/hooks.d/90-vpnclient.tpl
|
|
|
install -b -o root -g root -m 0644 ../conf/openvpn@.service /etc/systemd/system/
|
|
|
@@ -166,7 +49,7 @@ function vpnclient_deploy_files_and_services()
|
|
|
|
|
|
# Create certificates directory
|
|
|
mkdir -pm 0770 /etc/openvpn/keys/
|
|
|
- chown root:${sysuser} /etc/openvpn/keys/
|
|
|
+ chown root:${app} /etc/openvpn/keys/
|
|
|
|
|
|
#=================================================
|
|
|
# NGINX CONFIGURATION
|
|
|
@@ -194,6 +77,8 @@ function vpnclient_deploy_files_and_services()
|
|
|
install -o root -g root -m 0755 ../conf/$service_checker_name.sh /usr/local/bin/
|
|
|
install -o root -g root -m 0644 ../conf/$service_checker_name.timer /etc/systemd/system/
|
|
|
|
|
|
+ systemctl daemon-reload
|
|
|
+
|
|
|
#=================================================
|
|
|
# SETUP SYSTEMD
|
|
|
#=================================================
|
