openvpn: update sysmocom config, bring back openvpn.service #13

Merged
hwelte merged 2 commits from osmith/nightly into laforge/nightly 2023-02-28 16:57:24 +00:00
4 changed files with 29 additions and 4 deletions

View File

@ -1,12 +1,12 @@
#OpenVPN client conf #OpenVPN client conf
tls-client tls-client
client client
ns-cert-type server remote-cert-tls server
dev tun dev tun
proto udp proto udp
tun-mtu 1500 tun-mtu 1500
remote admin.sysmocom.de remote vpn.sysmocom.de
comp-lzo comp-lzo
pkcs12 sysmocom-client-cert.p12 pkcs12 sysmocom-client-cert.p12
cipher BF-CBC cipher AES-256-CBC
nobind nobind

View File

@ -5,7 +5,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = "file://sysmocom-vpn.conf" SRC_URI = "file://sysmocom-vpn.conf"
PR = "r6" PR = "r7"
CONFFILES_${PN} = "${sysconfdir}/openvpn/sysmocom-vpn.conf" CONFFILES_${PN} = "${sysconfdir}/openvpn/sysmocom-vpn.conf"
PACKAGE_ARCH = "all" PACKAGE_ARCH = "all"

View File

@ -0,0 +1,18 @@
# This service is actually a systemd target,
# but we are using a service since targets cannot be reloaded.
[Unit]
Description=OpenVPN service
After=network.target
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/true
ExecReload=/bin/true
WorkingDirectory=/etc/openvpn
[Install]
WantedBy=multi-user.target

View File

@ -7,9 +7,12 @@ DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '
inherit autotools systemd update-rc.d pkgconfig inherit autotools systemd update-rc.d pkgconfig
PR = "r1"
SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \
file://0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch \ file://0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch \
file://openvpn \ file://openvpn \
file://openvpn.service \
" "
UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads"
@ -62,6 +65,9 @@ do_install_append() {
install -m 644 ${S}/sample/sample-scripts/* ${D}${sysconfdir}/openvpn/sample/sample-scripts install -m 644 ${S}/sample/sample-scripts/* ${D}${sysconfdir}/openvpn/sample/sample-scripts
install -d -m 710 ${D}/${localstatedir}/lib/openvpn install -d -m 710 ${D}/${localstatedir}/lib/openvpn
# Keep openvpn.service to match manuals (SYS#6303)
install -m 0644 ${WORKDIR}/openvpn.service ${D}${systemd_system_unitdir}
} }
PACKAGES =+ " ${PN}-sample " PACKAGES =+ " ${PN}-sample "
@ -71,6 +77,7 @@ RRECOMMENDS_${PN} = "kernel-module-tun"
FILES_${PN}-dbg += "${libdir}/openvpn/plugins/.debug" FILES_${PN}-dbg += "${libdir}/openvpn/plugins/.debug"
FILES_${PN} += "${systemd_system_unitdir}/openvpn-server@.service \ FILES_${PN} += "${systemd_system_unitdir}/openvpn-server@.service \
${systemd_system_unitdir}/openvpn-client@.service \ ${systemd_system_unitdir}/openvpn-client@.service \
${systemd_system_unitdir}/openvpn.service \
${nonarch_libdir}/tmpfiles.d \ ${nonarch_libdir}/tmpfiles.d \
" "
FILES_${PN}-sample = "${sysconfdir}/openvpn/sample/ \ FILES_${PN}-sample = "${sysconfdir}/openvpn/sample/ \