diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-09-14 18:23:45 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-09-14 18:23:45 +0200 |
| commit | 862691edf02b1da5721d88ef38167d86095c7900 (patch) | |
| tree | 31a9525b279e682a8eb6f47a9c4fbf74f49f7ef2 /data | |
| parent | 29dc679dd04deb5f37fb6e94bde5295cfeb8e220 (diff) | |
| parent | 1e53198432b8723b6c4f06c224c9373300edc51d (diff) | |
| download | vyos-build-862691edf02b1da5721d88ef38167d86095c7900.tar.gz vyos-build-862691edf02b1da5721d88ef38167d86095c7900.zip | |
Merge branch 'current' of github.com:vyos/vyos-build into equuleus
* 'current' of github.com:vyos/vyos-build:
Jenkins: adjust description
Jenkins: add build trigger
Jenkins: deploy ISO to dev.packages.vyos.net
Jenkins: remove individual package build and only build the ISO
T1640: update Linux Kernel to v4.19.70
openvpn: T1630: add sudo configuration for openvpn user
Docker: add graphviz to container
T1598: enable vyos-hostsd by on startup.
Diffstat (limited to 'data')
| -rwxr-xr-x | data/live-build-config/hooks/live/18-enable-disable_services.chroot | 2 | ||||
| -rw-r--r-- | data/live-build-config/includes.chroot/etc/sudoers.d/openvpn | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 787510e0..0caed88a 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -39,3 +39,5 @@ systemctl disable strongswan.service systemctl disable frr.service systemctl disable salt-minion.service systemctl disable nginx.service + +systemctl enable vyos-hostsd.service diff --git a/data/live-build-config/includes.chroot/etc/sudoers.d/openvpn b/data/live-build-config/includes.chroot/etc/sudoers.d/openvpn new file mode 100644 index 00000000..7c5454a0 --- /dev/null +++ b/data/live-build-config/includes.chroot/etc/sudoers.d/openvpn @@ -0,0 +1,2 @@ +openvpn ALL=(ALL) NOPASSWD: /sbin/ip +Defaults:openvpn !requiretty |