aboutsummaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
Diffstat (limited to 'files')
-rw-r--r--files/etc/hosts.roadwarrior_laptop2
-rw-r--r--files/etc/krb5.conf.common6
-rw-r--r--files/etc/krb5.conf.idm_server6
-rw-r--r--files/usr/local/etc/poudriere.d/pkglist.pkg_repository1
l---------files/usr/local/etc/ssh/ssh_config.roadwarrior_laptop1
5 files changed, 8 insertions, 8 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