Switch from /org to /srv in default configuration

[mirror/userdir-ldap.git] / userdir-ldap.conf

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index e2242fb..dfdf1dc 100644 (file)
--- 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";