From 6cbf59a73a38fb581ffbd395ff329b19d1d05a4e Mon Sep 17 00:00:00 2001 From: Paul Wise Date: Sat, 17 Jun 2017 14:35:12 +0800 Subject: [PATCH] Switch from /org to /srv in default configuration /org has been obsoleted by /srv for many years on debian.org hosts. --- debian/changelog | 6 ++++++ userdir-ldap.conf | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc5628f..eb4e0ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +userdir-ldap (0.3.90) UNRELEASED; urgency=medium + + * Switch from /org to /srv + + -- Paul Wise Sat, 17 Jun 2017 14:38:00 +0800 + userdir-ldap (0.3.89) unstable; urgency=medium [ Julien Cristau ] diff --git a/userdir-ldap.conf b/userdir-ldap.conf index e2242fb..dfdf1dc 100644 --- a/userdir-ldap.conf +++ b/userdir-ldap.conf @@ -41,8 +41,8 @@ fingerprintfile = "/etc/userdir-ldap/badfingerprints" haveprivatelist = True; # Echelon -ech_errorlog = "/org/db.debian.org/mail/Log/ech-errors.log" -ech_mainlog = "/org/db.debian.org/mail/Log/ech.log" +ech_errorlog = "/srv/db.debian.org/mail/Log/ech-errors.log" +ech_mainlog = "/srv/db.debian.org/mail/Log/ech.log" # For the output generator generatedir = "/var/cache/userdir-ldap/hosts/"; @@ -53,12 +53,12 @@ homeprefix = "/home/"; # GPG Things gpg = "/usr/bin/gpg"; # The whole set of all keyrings -keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg:/org/keyring.debian.org/keyrings/debian-maintainers.gpg" +keyrings = "/srv/keyring.debian.org/keyrings/debian-keyring.gpg:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg:/srv/keyring.debian.org/keyrings/debian-maintainers.gpg" # Keyrings synced to other machines, if they need them -sync_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-maintainers.gpg" +sync_keyrings = "/srv/keyring.debian.org/keyrings/debian-keyring.gpg:/srv/keyring.debian.org/keyrings/debian-maintainers.gpg" # Keyrings used to search in when new developers get added -add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg" -add_keyrings_guest = "/org/keyring.debian.org/keyrings/debian-maintainers.gpg:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg" +add_keyrings = "/srv/keyring.debian.org/keyrings/debian-keyring.gpg" +add_keyrings_guest = "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg" # For the WEB interface webloginhtml = "login.html"; -- 2.20.1