summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2012-05-18 09:05:55 -0400
committerStephen Gallagher <sgallagh@redhat.com>2012-05-31 15:46:27 -0400
commitf1ce53a3b5656361557f80f61dfd42a371230c65 (patch)
tree9efa36f86a8c875aea7f122bd67926d7819ce22e /src
parent1467daed400d6c186bd0c99c057c42e764309ff3 (diff)
downloadsssd-f1ce53a3b5656361557f80f61dfd42a371230c65.tar.gz
sssd-f1ce53a3b5656361557f80f61dfd42a371230c65.tar.bz2
sssd-f1ce53a3b5656361557f80f61dfd42a371230c65.zip
SSSDConfig: Make default config and schema file locations configurable
https://fedorahosted.org/sssd/ticket/1008
Diffstat (limited to 'src')
-rw-r--r--src/config/SSSDConfig/__init__.py.in (renamed from src/config/SSSDConfig/__init__.py)12
-rw-r--r--src/config/setup.py.in (renamed from src/config/setup.py)2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/config/SSSDConfig/__init__.py b/src/config/SSSDConfig/__init__.py.in
index 11da7cf2..e594713b 100644
--- a/src/config/SSSDConfig/__init__.py
+++ b/src/config/SSSDConfig/__init__.py.in
@@ -338,9 +338,9 @@ class SSSDConfigSchema(SSSDChangeConf):
SSSDChangeConf.__init__(self)
#TODO: get these from a global setting
if not schemafile:
- schemafile = '/usr/share/sssd/sssd.api.conf'
+ schemafile = '@datadir@/sssd/sssd.api.conf'
if not schemaplugindir:
- schemaplugindir = '/usr/share/sssd/sssd.api.d'
+ schemaplugindir = '@datadir@/sssd/sssd.api.d'
try:
#Read the primary config file
@@ -1242,10 +1242,10 @@ class SSSDConfig(SSSDChangeConf):
schemafile:
The path to the api schema config file. Usually
- /usr/share/sssd/sssd.api.conf
+ @datadir@/sssd/sssd.api.conf
schemaplugindir:
The path the directory containing the provider schema config files.
- Usually /usr/share/sssd/sssd.api.d
+ Usually @datadir@/sssd/sssd.api.d
=== Returns ===
The newly-created SSSDConfig object.
@@ -1271,7 +1271,7 @@ class SSSDConfig(SSSDChangeConf):
configfile:
The path to the SSSD config file. If not specified, use the system
- default, usually /etc/sssd/sssd.conf
+ default, usually @sysconfdir@/sssd.conf
=== Returns ===
No return value
@@ -1290,7 +1290,7 @@ class SSSDConfig(SSSDChangeConf):
if not configfile:
#TODO: get this from a global setting
- configfile = '/etc/sssd/sssd.conf'
+ configfile = '@sysconfdir@/sssd.conf'
# open will raise an IOError if it fails
fd = open(configfile, 'r')
diff --git a/src/config/setup.py b/src/config/setup.py.in
index d3617e13..4d5f0e89 100644
--- a/src/config/setup.py
+++ b/src/config/setup.py.in
@@ -25,7 +25,7 @@ from distutils.core import setup
setup(
name='SSSDConfig',
- version='1',
+ version='@VERSION@',
license='GPLv3+',
url='http://fedorahosted.org/sssd',
packages=['SSSDConfig'],