diff options
| author | Cullum Smith <cullum@sacredheartsc.com> | 2024-12-09 19:31:45 -0500 |
|---|---|---|
| committer | Cullum Smith <cullum@sacredheartsc.com> | 2024-12-09 19:31:45 -0500 |
| commit | 14ba57eee630891c47a63950621792bd8a26ec03 (patch) | |
| tree | ea28af5ba59598955d90334fbc26d0c6cd09bd61 | |
| parent | 32ca545175683af6c6468f0ce762c28af32d820c (diff) | |
| parent | 4655d1f53d07f3d1a07b2022913c0fd370faebd6 (diff) | |
| download | infrastructure-14ba57eee630891c47a63950621792bd8a26ec03.tar.gz | |
Merge branch 'master' of https://git.sacredheartsc.com/infrastructure
| -rw-r--r-- | files/etc/hosts.roadwarrior_laptop | 2 | ||||
| -rw-r--r-- | files/etc/krb5.conf.common | 6 | ||||
| -rw-r--r-- | files/etc/krb5.conf.idm_server | 6 | ||||
| -rw-r--r-- | files/usr/local/etc/poudriere.d/pkglist.pkg_repository | 1 | ||||
| l--------- | files/usr/local/etc/ssh/ssh_config.roadwarrior_laptop | 1 | ||||
| -rw-r--r-- | scripts/hostclass/roadwarrior_laptop/30-roadwarrior | 7 | ||||
| -rw-r--r-- | vars/hostclass/desktop | 1 |
7 files changed, 14 insertions, 10 deletions
diff --git a/files/etc/hosts.roadwarrior_laptop b/files/etc/hosts.roadwarrior_laptop new file mode 100644 index 0000000..f2940ed --- /dev/null +++ b/files/etc/hosts.roadwarrior_laptop @@ -0,0 +1,2 @@ +::1 localhost localhost.${domain} ${BOXCONF_HOSTNAME}.${domain} ${BOXCONF_HOSTNAME} +127.0.0.1 localhost localhost.${domain} ${BOXCONF_HOSTNAME}.${domain} ${BOXCONF_HOSTNAME} diff --git a/files/etc/krb5.conf.common b/files/etc/krb5.conf.common index 7eed6d2..7fa50c3 100644 --- a/files/etc/krb5.conf.common +++ b/files/etc/krb5.conf.common @@ -6,14 +6,14 @@ permitted_enctypes = aes256-cts-hmac-sha1-96 aes128-cts-hmac-sha1-96 default_keytab_name = FILE:/var/krb5/user/%{euid}/keytab default_client_keytab_name = FILE:/var/krb5/user/%{euid}/client.keytab + forwardable = true + ticket_lifetime = ${krb5_ticket_lifetime} + renew_lifetime = ${krb5_renew_lifetime} [appdefaults] pam = { minimum_uid = 1000 ccache = FILE:/tmp/krb5cc_%u_XXXXXX - forwardable = true - ticket_lifetime = ${krb5_ticket_lifetime} - renew_lifetime = ${krb5_renew_lifetime} } [realms] diff --git a/files/etc/krb5.conf.idm_server b/files/etc/krb5.conf.idm_server index 3f326ad..5d4d1a0 100644 --- a/files/etc/krb5.conf.idm_server +++ b/files/etc/krb5.conf.idm_server @@ -4,14 +4,14 @@ dns_lookup_realm = false allow_weak_crypto = false permitted_enctypes = aes256-cts-hmac-sha1-96 aes128-cts-hmac-sha1-96 + forwardable = true + ticket_lifetime = ${krb5_ticket_lifetime} + renew_lifetime = ${krb5_renew_lifetime} [appdefaults] pam = { minimum_uid = 1000 ccache = FILE:/tmp/krb5cc_%u_XXXXXX - forwardable = true - ticket_lifetime = ${krb5_ticket_lifetime} - renew_lifetime = ${krb5_renew_lifetime} } [realms] diff --git a/files/usr/local/etc/poudriere.d/pkglist.pkg_repository b/files/usr/local/etc/poudriere.d/pkglist.pkg_repository index a2027db..e3afb59 100644 --- a/files/usr/local/etc/poudriere.d/pkglist.pkg_repository +++ b/files/usr/local/etc/poudriere.d/pkglist.pkg_repository @@ -20,7 +20,6 @@ databases/php${php_version}-pgsql databases/postgresql${postgresql_version}-client databases/postgresql${postgresql_version}-server databases/redis -deskutils/merkuro deskutils/pim-sieve-editor deskutils/plasma5-sddm-kcm deskutils/py-vdirsyncer diff --git a/files/usr/local/etc/ssh/ssh_config.roadwarrior_laptop b/files/usr/local/etc/ssh/ssh_config.roadwarrior_laptop deleted file mode 120000 index 338cdba..0000000 --- a/files/usr/local/etc/ssh/ssh_config.roadwarrior_laptop +++ /dev/null @@ -1 +0,0 @@ -ssh_config.no_idm
\ No newline at end of file diff --git a/scripts/hostclass/roadwarrior_laptop/30-roadwarrior b/scripts/hostclass/roadwarrior_laptop/30-roadwarrior index cf3219d..6f3ea30 100644 --- a/scripts/hostclass/roadwarrior_laptop/30-roadwarrior +++ b/scripts/hostclass/roadwarrior_laptop/30-roadwarrior @@ -13,8 +13,13 @@ service devd restart pkg install -y \ krb5 \ cyrus-sasl-gssapi \ - openldap26-client + openldap26-client \ + perl5 \ + p5-perl-ldap \ + p5-Authen-SASL install_template -m 0644 \ /etc/krb5.conf \ /usr/local/etc/openldap/ldap.conf + +install_file -m 0555 /usr/local/libexec/idm-ssh-known-hosts diff --git a/vars/hostclass/desktop b/vars/hostclass/desktop index f56a5ae..f66a64b 100644 --- a/vars/hostclass/desktop +++ b/vars/hostclass/desktop @@ -72,7 +72,6 @@ krb5 libreoffice libva-utils libvdpau-va-gl -merkuro mpv neofetch noto-basic |