2009-06-16 12:09:03 +00:00
|
|
|
diff -up pegasus/env_var_Linux.status_old pegasus/env_var_Linux.status
|
|
|
|
|
--- pegasus/env_var_Linux.status_old 2009-01-23 00:39:36.000000000 +0100
|
|
|
|
|
+++ pegasus/env_var_Linux.status 2009-03-12 16:08:47.000000000 +0100
|
|
|
|
|
@@ -19,7 +19,8 @@ ifndef PEGASUS_STAGING_DIR
|
2006-04-07 02:56:48 +00:00
|
|
|
PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
|
|
|
|
|
endif
|
|
|
|
|
|
2009-06-16 12:09:03 +00:00
|
|
|
-PEGASUS_ENABLE_CQL=false
|
2006-04-07 02:56:48 +00:00
|
|
|
+PEGASUS_ENABLE_CQL=true
|
2008-11-07 07:32:29 +00:00
|
|
|
+PEGASUS_DEFAULT_ENABLE_OOP=true
|
2006-04-07 02:56:48 +00:00
|
|
|
PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
|
|
|
|
|
PEGASUS_DISABLE_PERFINST=yes
|
|
|
|
|
PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
|
2009-06-16 12:09:03 +00:00
|
|
|
@@ -28,7 +29,6 @@ PEGASUS_HAS_SSL=yes
|
2007-11-19 12:20:15 +00:00
|
|
|
PEGASUS_USE_SSL_RANDOMFILE=false
|
2006-04-07 02:56:48 +00:00
|
|
|
PEGASUS_NOASSERTS=yes
|
|
|
|
|
PEGASUS_PAM_AUTHENTICATION=true
|
|
|
|
|
-PEGASUS_USE_PAM_STANDALONE_PROC=true
|
|
|
|
|
PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
|
|
|
|
|
PEGASUS_USE_RELEASE_DIRS=true
|
|
|
|
|
PEGASUS_USE_SYSLOGS=true
|
2009-06-16 12:09:03 +00:00
|
|
|
@@ -72,23 +72,22 @@ PEGASUS_VARDATA_CACHE_DIR = $(PEGASUS_VA
|
2006-04-07 02:56:48 +00:00
|
|
|
PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
|
|
|
|
|
PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/trace
|
|
|
|
|
PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc
|
|
|
|
|
+PEGASUS_CONFIG_DIR = /etc/Pegasus
|
2009-06-16 12:09:03 +00:00
|
|
|
PEGASUS_CORE_DIR = $(PEGASUS_TRACE_DIR)
|
2006-04-07 02:56:48 +00:00
|
|
|
PEGASUS_PLANNED_CONFIG_FILE = cimserver_planned.conf
|
|
|
|
|
PEGASUS_PLANNED_CONFIG_FILE_PATH = \
|
|
|
|
|
- $(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
|
|
|
|
|
+ $(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
|
|
|
|
|
PEGASUS_CURRENT_CONFIG_FILE = cimserver_current.conf
|
|
|
|
|
PEGASUS_CURRENT_CONFIG_FILE_PATH = \
|
|
|
|
|
- $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
|
|
|
|
|
+ $(PEGASUS_CONFIG_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
|
|
|
|
|
|
|
|
|
|
PEGASUS_LOG_DIR = $(PEGASUS_VARDATA_DIR)/log
|
|
|
|
|
PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)/install.log
|
|
|
|
|
|
|
|
|
|
-PEGASUS_CONFIG_DIR = /etc/Pegasus
|
|
|
|
|
-
|
|
|
|
|
PEGASUS_VARRUN_DIR = /var/run/tog-pegasus
|
|
|
|
|
PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid
|
2007-11-19 12:20:15 +00:00
|
|
|
PEGASUS_CIMSERVER_START_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock
|
2006-04-11 02:31:28 +00:00
|
|
|
-PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)/socket
|
|
|
|
|
+PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)
|
|
|
|
|
PEGASUS_LOCAL_DOMAIN_SOCKET_PATH = \
|
|
|
|
|
$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket
|
|
|
|
|
|
