diff --git a/docs/source/server_howto.rst b/docs/source/server_howto.rst index 4b026958..a371fd60 100644 --- a/docs/source/server_howto.rst +++ b/docs/source/server_howto.rst @@ -1313,11 +1313,19 @@ Authentication Configuration :: - ; For Kerberos authentication - ; the principal to connect with - principal=koji/kojira@EXAMPLE.COM - ; The location of the keytab for the principal above - keytab=/etc/kojira.keytab + ;configuration for Kerberos authentication + + ;the kerberos principal to use + ;principal = kojira@EXAMPLE.COM + + ;location of the keytab + ;keytab = /etc/kojira/kojira.keytab + + ;the service name of the principal being used by the hub + ;krbservice = host + + ;The realm of server principal. Using client's realm if not set + ;krb_server_realm = EXAMPLE.COM ``/etc/sysconfig/kojira`` The local user kojira runs as needs to be able to read and write to diff --git a/util/kojira.conf b/util/kojira.conf index 4d70695c..e5cb8e7f 100644 --- a/util/kojira.conf +++ b/util/kojira.conf @@ -3,12 +3,6 @@ ; user=kojira ; password=kojira -; For Kerberos authentication -; the principal to connect with -principal=koji/repo@EXAMPLE.COM -; The location of the keytab for the principal above -keytab=/etc/kojira.keytab - ; The URL for the koji hub server server=http://hub.example.com/kojihub