dot

packages and services management
Log | Files | Refs | README

commit 8b415f461ee230dd0105e7f4f5a3f0eb9ee5f8cf
parent 83bcf5a123c9d6c049ec701c34722a59ab48727e
Author: Josuah Demangeon <mail@josuah.net>
Date:   Tue, 25 Dec 2018 20:45:47 +0100

cleanup party

Diffstat:
Mbin/s6-mk-build | 10++++++----
Detc/s6/acme-client/x/group | 1-
Detc/s6/axfrdns/x/group | 1-
Detc/s6/bird/x/group | 1-
Retc/s6/collectd/josuah.net/plug/df/Device -> etc/s6/collectd/josuah.net/conf/plug/df/Device | 0
Retc/s6/collectd/josuah.net/plug/df/MountPoint -> etc/s6/collectd/josuah.net/conf/plug/df/MountPoint | 0
Retc/s6/collectd/josuah.net/plug/disk/Disk -> etc/s6/collectd/josuah.net/conf/plug/disk/Disk | 0
Retc/s6/collectd/josuah.net/plug/interface/Interface -> etc/s6/collectd/josuah.net/conf/plug/interface/Interface | 0
Retc/s6/collectd/josuah.net/conf/Hostname -> etc/s6/collectd/josuah.net/conf/variable/Hostname | 0
Detc/s6/collectd/x/group | 1-
Detc/s6/curvevpn/x/group | 1-
Detc/s6/dnscache/x/group | 1-
Detc/s6/fossil/x/group | 1-
Detc/s6/geomyidae/x/group | 1-
Detc/s6/git-daemon/x/group | 1-
Detc/s6/git-mirror/x/group | 1-
Detc/s6/httpfile/x/group | 1-
Detc/s6/kamailio/.s6-svscan/lock | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/carrierroute-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/carrierroute-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/cpl-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/cpl-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/domainpolicy-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/domainpolicy-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/drouting-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/drouting-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/htable-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/htable-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/imc-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/imc-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/matrix-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/matrix-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/mohqueue-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/mohqueue-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/mtree-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/mtree-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/pipelimit-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/pipelimit-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/purple-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/purple-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/rls-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/rls-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/rtpengine-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/rtpengine-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/rtpproxy-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/rtpproxy-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/sca-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/sca-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/siptrace-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/siptrace-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/topos-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/topos-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/uac-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/uac-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/uid_auth_db-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/uid_auth_db-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/uid_avp_db-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/uid_avp_db-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/uid_domain-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/uid_domain-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/uid_gflags-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/uid_gflags-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/uid_uri_db-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/uid_uri_db-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite-extra/userblacklist-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite-extra/userblacklist-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/acc-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/acc-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/alias_db-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/alias_db-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/auth_db-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/auth_db-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/avpops-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/avpops-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/dialog-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/dialog-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/dialplan-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/dialplan-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/dispatcher-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/dispatcher-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/domain-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/domain-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/group-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/group-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/lcr-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/lcr-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/msilo-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/msilo-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/pdt-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/pdt-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/permissions-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/permissions-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/registrar-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/registrar-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/speeddial-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/speeddial-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/standard-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/standard-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/uri_db-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/uri_db-create.sql | 0
Retc/s6/kamailio/sqlite/db/sqlite/usrloc-create.sql -> etc/s6/kamailio/sqlite/conf/sqlite/usrloc-create.sql | 0
Detc/s6/kamailio/x/group | 1-
Detc/s6/ntpclient/x/group | 1-
Detc/s6/pjsua/x/group | 1-
Detc/s6/qemu/x/group | 1-
Detc/s6/qmail-pop3d/x/group | 1-
Retc/s6/qmail-send/josuah.net/alias/.qmail-mail -> etc/s6/qmail-send/josuah.net/conf/alias/.qmail-mail | 0
Retc/s6/qmail-send/josuah.net/alias/.qmail-postmaster -> etc/s6/qmail-send/josuah.net/conf/alias/.qmail-postmaster | 0
Retc/s6/qmail-send/josuah.net/alias/.qmail-root -> etc/s6/qmail-send/josuah.net/conf/alias/.qmail-root | 0
Retc/s6/qmail-send/josuah.net/alias/.qmail-services -> etc/s6/qmail-send/josuah.net/conf/alias/.qmail-services | 0
Detc/s6/qmail-send/x/group | 1-
Detc/s6/qmail-smtpd/x/group | 1-
Detc/s6/tapio/x/group | 1-
Detc/s6/tinc/x/group | 1-
Detc/s6/tinydns/x/group | 1-
Detc/s6/transmission/x/group | 1-
Detc/s6/u9fs-mount/x/group | 1-
Detc/s6/u9fs-ssh/x/group | 1-
Detc/s6/venti/x/group | 1-
Detc/s6/vsftpd/x/group | 1-
Detc/s6/vtund/x/group | 1-
Detc/s6/walldns/x/group | 1-
Detc/s6/warp-vpn/x/group | 1-
82 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/bin/s6-mk-build b/bin/s6-mk-build @@ -37,14 +37,16 @@ if { } # setup the logger for longruns -if { - if -t { test ${type} = longrun } +ifthenelse { test ${type} = longrun } { ifthenelse { test -d /etc/s6/${sv}/log } { s6-hiercopy /etc/s6/${sv}/log ${sv},log } { s6-hiercopy /etc/s6/.s6-log ${sv},log } if { redirfd -a 1 ${sv},x/producer-for echo ${sv},log } if { redirfd -w 1 ${sv},log/env/SERVICE echo ${sv} } if { redirfd -w 1 ${sv},log/consumer-for echo ${sv},x } -} +} { } -if { cd ${sv},x if -t { test -x setup } ./setup } +cd ${sv},x +forx -o 0 x { x ${mod} } importas x x +if -t { test -x setup/${x} } +./setup/${x} diff --git a/etc/s6/acme-client/x/group b/etc/s6/acme-client/x/group @@ -1 +0,0 @@ -ssl diff --git a/etc/s6/axfrdns/x/group b/etc/s6/axfrdns/x/group @@ -1 +0,0 @@ -dns diff --git a/etc/s6/bird/x/group b/etc/s6/bird/x/group @@ -1 +0,0 @@ -bgp diff --git a/etc/s6/collectd/josuah.net/plug/df/Device b/etc/s6/collectd/josuah.net/conf/plug/df/Device diff --git a/etc/s6/collectd/josuah.net/plug/df/MountPoint b/etc/s6/collectd/josuah.net/conf/plug/df/MountPoint diff --git a/etc/s6/collectd/josuah.net/plug/disk/Disk b/etc/s6/collectd/josuah.net/conf/plug/disk/Disk diff --git a/etc/s6/collectd/josuah.net/plug/interface/Interface b/etc/s6/collectd/josuah.net/conf/plug/interface/Interface diff --git a/etc/s6/collectd/josuah.net/conf/Hostname b/etc/s6/collectd/josuah.net/conf/variable/Hostname diff --git a/etc/s6/collectd/x/group b/etc/s6/collectd/x/group @@ -1 +0,0 @@ -monit diff --git a/etc/s6/curvevpn/x/group b/etc/s6/curvevpn/x/group @@ -1 +0,0 @@ -vpn diff --git a/etc/s6/dnscache/x/group b/etc/s6/dnscache/x/group @@ -1 +0,0 @@ -dns diff --git a/etc/s6/fossil/x/group b/etc/s6/fossil/x/group @@ -1 +0,0 @@ -disk diff --git a/etc/s6/geomyidae/x/group b/etc/s6/geomyidae/x/group @@ -1 +0,0 @@ -gopher diff --git a/etc/s6/git-daemon/x/group b/etc/s6/git-daemon/x/group @@ -1 +0,0 @@ -git diff --git a/etc/s6/git-mirror/x/group b/etc/s6/git-mirror/x/group @@ -1 +0,0 @@ -git diff --git a/etc/s6/httpfile/x/group b/etc/s6/httpfile/x/group @@ -1 +0,0 @@ -www diff --git a/etc/s6/kamailio/.s6-svscan/lock b/etc/s6/kamailio/.s6-svscan/lock diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/carrierroute-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/carrierroute-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/cpl-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/cpl-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/domainpolicy-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/domainpolicy-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/drouting-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/drouting-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/htable-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/htable-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/imc-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/imc-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/matrix-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/matrix-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/mohqueue-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/mohqueue-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/mtree-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/mtree-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/pipelimit-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/pipelimit-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/purple-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/purple-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/rls-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/rls-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/rtpengine-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/rtpengine-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/rtpproxy-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/rtpproxy-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/sca-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/sca-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/siptrace-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/siptrace-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/topos-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/topos-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/uac-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/uac-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/uid_auth_db-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/uid_auth_db-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/uid_avp_db-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/uid_avp_db-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/uid_domain-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/uid_domain-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/uid_gflags-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/uid_gflags-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/uid_uri_db-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/uid_uri_db-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite-extra/userblacklist-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite-extra/userblacklist-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/acc-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/acc-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/alias_db-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/alias_db-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/auth_db-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/auth_db-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/avpops-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/avpops-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/dialog-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/dialog-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/dialplan-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/dialplan-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/dispatcher-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/dispatcher-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/domain-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/domain-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/group-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/group-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/lcr-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/lcr-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/msilo-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/msilo-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/pdt-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/pdt-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/permissions-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/permissions-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/registrar-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/registrar-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/speeddial-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/speeddial-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/standard-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/standard-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/uri_db-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/uri_db-create.sql diff --git a/etc/s6/kamailio/sqlite/db/sqlite/usrloc-create.sql b/etc/s6/kamailio/sqlite/conf/sqlite/usrloc-create.sql diff --git a/etc/s6/kamailio/x/group b/etc/s6/kamailio/x/group @@ -1 +0,0 @@ -sip diff --git a/etc/s6/ntpclient/x/group b/etc/s6/ntpclient/x/group @@ -1 +0,0 @@ -ntp diff --git a/etc/s6/pjsua/x/group b/etc/s6/pjsua/x/group @@ -1 +0,0 @@ -sip diff --git a/etc/s6/qemu/x/group b/etc/s6/qemu/x/group @@ -1 +0,0 @@ -vm diff --git a/etc/s6/qmail-pop3d/x/group b/etc/s6/qmail-pop3d/x/group @@ -1 +0,0 @@ -qmail diff --git a/etc/s6/qmail-send/josuah.net/alias/.qmail-mail b/etc/s6/qmail-send/josuah.net/conf/alias/.qmail-mail diff --git a/etc/s6/qmail-send/josuah.net/alias/.qmail-postmaster b/etc/s6/qmail-send/josuah.net/conf/alias/.qmail-postmaster diff --git a/etc/s6/qmail-send/josuah.net/alias/.qmail-root b/etc/s6/qmail-send/josuah.net/conf/alias/.qmail-root diff --git a/etc/s6/qmail-send/josuah.net/alias/.qmail-services b/etc/s6/qmail-send/josuah.net/conf/alias/.qmail-services diff --git a/etc/s6/qmail-send/x/group b/etc/s6/qmail-send/x/group @@ -1 +0,0 @@ -qmail diff --git a/etc/s6/qmail-smtpd/x/group b/etc/s6/qmail-smtpd/x/group @@ -1 +0,0 @@ -qmail diff --git a/etc/s6/tapio/x/group b/etc/s6/tapio/x/group @@ -1 +0,0 @@ -vpn diff --git a/etc/s6/tinc/x/group b/etc/s6/tinc/x/group @@ -1 +0,0 @@ -vpn diff --git a/etc/s6/tinydns/x/group b/etc/s6/tinydns/x/group @@ -1 +0,0 @@ -dns diff --git a/etc/s6/transmission/x/group b/etc/s6/transmission/x/group @@ -1 +0,0 @@ -torrent diff --git a/etc/s6/u9fs-mount/x/group b/etc/s6/u9fs-mount/x/group @@ -1 +0,0 @@ -9p diff --git a/etc/s6/u9fs-ssh/x/group b/etc/s6/u9fs-ssh/x/group @@ -1 +0,0 @@ -9p diff --git a/etc/s6/venti/x/group b/etc/s6/venti/x/group @@ -1 +0,0 @@ -9p diff --git a/etc/s6/vsftpd/x/group b/etc/s6/vsftpd/x/group @@ -1 +0,0 @@ -ftp diff --git a/etc/s6/vtund/x/group b/etc/s6/vtund/x/group @@ -1 +0,0 @@ -vpn diff --git a/etc/s6/walldns/x/group b/etc/s6/walldns/x/group @@ -1 +0,0 @@ -dns diff --git a/etc/s6/warp-vpn/x/group b/etc/s6/warp-vpn/x/group @@ -1 +0,0 @@ -vpn