Skip to content

Commit

Permalink
[Kim] vyos#2554 customise vyos-1x
Browse files Browse the repository at this point in the history
* update sshd_config template with parameters required for freeipa/sssd
* symlink config to /config/freeipa so it can be updated and retained
  * /etc/krb5.conf
  * /etc/krb5.conf.d
  * /etc/nslcd.conf
  * /etc/nsswitch.conf
  * /etc/pam.d/common-account
  * /etc/pam.d/common-account-ldaps
  * /etc/pam.d/common-auth
  * /etc/pam.d/common-auth-ldaps
  * /etc/pam.d/common-session
  * /etc/pam.d/common-session-ldaps
  * /etc/pam.d/common-session-noninteractive
  * /etc/pam.d/common-session-noninteractive-ldaps
  * /etc/sssd/conf.d
  * /etc/sssd/pki
  * /etc/sssd/sssd.conf
  * /etc/telegraf/telegraf.conf
  * /etc/telegraf/telegraf.d
  * /root/.k5login
  * /usr/local/share/ca-certificates
  * /var/lib/ipa-client
* override service definitions to start in mgmt vrf
  * nslcd
  * pdns-recursor
  * telegraf
  • Loading branch information
arnoxit committed Dec 6, 2023
1 parent 983e36f commit a603679
Show file tree
Hide file tree
Showing 24 changed files with 51 additions and 1 deletion.
8 changes: 8 additions & 0 deletions data/templates/ssh/sshd_config.j2
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ AddressFamily any
DebianBanner no
KbdInteractiveAuthentication no

# Added freeipa config

UsePAM yes
GSSAPIAuthentication yes
ChallengeResponseAuthentication yes
AuthorizedKeysCommandUser nobody
AuthorizedKeysCommand /usr/bin/sss_ssh_authorizedkeys

#
# User configurable section
#
Expand Down
1 change: 1 addition & 0 deletions src/etc/krb5.conf
1 change: 1 addition & 0 deletions src/etc/krb5.conf.d
1 change: 1 addition & 0 deletions src/etc/nslcd.conf
1 change: 1 addition & 0 deletions src/etc/nsswitch.conf
1 change: 1 addition & 0 deletions src/etc/pam.d/common-account
1 change: 1 addition & 0 deletions src/etc/pam.d/common-account-ldaps
1 change: 1 addition & 0 deletions src/etc/pam.d/common-auth
1 change: 1 addition & 0 deletions src/etc/pam.d/common-auth-ldaps
1 change: 1 addition & 0 deletions src/etc/pam.d/common-session
1 change: 1 addition & 0 deletions src/etc/pam.d/common-session-ldaps
1 change: 1 addition & 0 deletions src/etc/pam.d/common-session-noninteractive
1 change: 1 addition & 0 deletions src/etc/pam.d/common-session-noninteractive-ldaps
1 change: 1 addition & 0 deletions src/etc/sssd/conf.d
1 change: 1 addition & 0 deletions src/etc/sssd/pki
1 change: 1 addition & 0 deletions src/etc/sssd/sssd.conf
3 changes: 3 additions & 0 deletions src/etc/systemd/system/nslcd.service.d/override.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[Service]
ExecStart=
ExecStart=/usr/bin/ip vrf exec mgmt /etc/init.d/nslcd start
9 changes: 8 additions & 1 deletion src/etc/systemd/system/pdns-recursor.service.d/override.conf
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
[Service]
User=root
WorkingDirectory=
WorkingDirectory=/run/powerdns
RuntimeDirectory=
RuntimeDirectory=powerdns
RuntimeDirectoryPreserve=yes
ExecStart=
ExecStart=/usr/sbin/pdns_recursor --daemon=no --write-pid=no --disable-syslog --log-timestamp=no --config-dir=/run/powerdns --socket-dir=/run/powerdns
ExecStart=/bin/ip vrf exec mgmt /usr/sbin/pdns_recursor --daemon=no --write-pid=no --disable-syslog --log-timestamp=no --config-dir=/run/powerdns --socket-dir=/run/powerdns --setuid=pdns

LimitMEMLOCK=8388608
CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_CHOWN CAP_SYS_ADMIN CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_SETUID
AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_CHOWN CAP_SYS_ADMIN CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_SETUID
ProtectControlGroups=false
RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 AF_NETLINK
12 changes: 12 additions & 0 deletions src/etc/systemd/system/telegraf.service.d/override.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[Unit]
After=vyos-router.service

[Service]
User=root
ExecStart=
ExecStart=/usr/sbin/ip vrf exec mgmt /sbin/runuser -u telegraf -- /usr/bin/telegraf -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d $TELEGRAF_OPTS
RestartSec=10s

[Install]
WantedBy=
WantedBy=vyos.target
1 change: 1 addition & 0 deletions src/etc/telegraf/telegraf.conf
1 change: 1 addition & 0 deletions src/etc/telegraf/telegraf.d
1 change: 1 addition & 0 deletions src/root/.k5login
1 change: 1 addition & 0 deletions src/usr/local/share/ca-certificates
1 change: 1 addition & 0 deletions src/var/lib/ipa-client

0 comments on commit a603679

Please sign in to comment.