BUG#: 8804

TITLE: needs to be move all pegasus config files to /etc dir.

diff --git a/Makefile.Release b/Makefile.Release
index 763d016ab60dff89c95b9185e3ec41968bb47a87..99d1b38c01d6892ba966f5e59bce7e607adc7f04 100644 (file)
--- a/Makefile.Release
+++ b/Makefile.Release
@@ -418,11 +418,11 @@ setpermissions_PegasusMOFDirectoryFiles: FORCE
        $(foreach i, $(INTEROP_MOF_FILES), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
        $(foreach i, $(MANAGEDSYSTEM_MOF_FILES), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
 
-stage_PegasusVarDataDirectoryFiles: FORCE
-       $(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+stage_PegasusConfFiles: FORCE
+       $(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
 
-setpermissions_PegasusVarDataDirectoryFiles: FORCE
-       $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+setpermissions_PegasusConfFiles: FORCE
+       $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
 
 stage_genOpenPegasusSSLCertsFile: FORCE
        @$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
@@ -461,7 +461,7 @@ stage_PegasusFiles: FORCE
        $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusProviderManagerLibraryDirectoryFiles
        $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusAdminCmdsDirectoryFiles
        $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusUserCmdsDirectoryFiles
-       $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusVarDataDirectoryFiles
+       $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusConfFiles
        $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusRepository
        $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusUnixManPageDirectoryFiles
        $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusDocFiles
@@ -475,7 +475,7 @@ setpermissions_PegasusFiles: FORCE
        $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusProviderManagerLibraryDirectoryFiles
        $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusAdminCmdsDirectoryFiles
        $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusUserCmdsDirectoryFiles
-       $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusVarDataDirectoryFiles
+       $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusConfFiles
        $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusRepository
        $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusUnixManPageDirectoryFiles
        $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusDocFiles
@@ -1139,7 +1139,7 @@ _append_filesSectionToSpecFile: FORCE
             "/etc/init.d/$(PEGASUS_FLAVOR)-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "%config(noreplace)" \
             "%attr($(Prw_r__r__),$(CIMSERVER_USR),$(CIMSERVER_GRP))" \
-            "$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
+            "$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)

diff --git a/env_var_Linux.status b/env_var_Linux.status
index c20a056089e5d694c6ac5ad304f15017705d46c7..24213ba0871008dbce723d7d2fa13e8b6dede428 100644 (file)
--- a/env_var_Linux.status
+++ b/env_var_Linux.status
@@ -110,10 +110,10 @@ PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc
 PEGASUS_CORE_DIR = $(PEGASUS_TRACE_DIR)
 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

diff --git a/rpm/tog-pegasus.spec b/rpm/tog-pegasus.spec
index c5f489282a02037aa41e2ec0894e41db9eba1372..27daa0b689722ddad19bab410f0c1f9d40597949 100644 (file)
--- a/rpm/tog-pegasus.spec
+++ b/rpm/tog-pegasus.spec
@@ -420,7 +420,7 @@ if [ $1 -eq 0 ]; then
       %PEGASUS_SBIN_DIR/cimserver -s
    fi
    /sbin/chkconfig --del %{Flavor}-pegasus;
-   rm -f %PEGASUS_VARDATA_DIR/cimserver_current.conf;
+   rm -f %PEGASUS_CONFIG_DIR/cimserver_current.conf;
    [ -d %PEGASUS_REPOSITORY_DIR ]  && rm -rf %PEGASUS_REPOSITORY_DIR;
    [ -d %PEGASUS_VARDATA_CACHE_DIR ]  && rm -rf %PEGASUS_VARDATA_CACHE_DIR;
    rm -f %PEGASUS_LOCAL_DOMAIN_SOCKET_PATH;
@@ -500,7 +500,7 @@ fi
 %dir %attr(1777,root,pegasus) /var/lib/Pegasus/cache/trace
 
 %config %attr(750,root,pegasus) /etc/init.d/tog-pegasus
-%config(noreplace) %attr(644,root,root) /var/lib/Pegasus/cimserver_planned.conf
+%config(noreplace) %attr(644,root,root) /etc/Pegasus/cimserver_planned.conf
 %config(noreplace) /etc/Pegasus/access.conf
 %config(noreplace) /etc/pam.d/wbem
 

diff --git a/rpm/tog-specfiles/tog-pegasus-preun.spec b/rpm/tog-specfiles/tog-pegasus-preun.spec
index 5eb59c479ea6e2ab4687bd353c3dfba8923bdbdb..ed2f173d8b29136388d950ccdadf0c32184b14b3 100644 (file)
--- a/rpm/tog-specfiles/tog-pegasus-preun.spec
+++ b/rpm/tog-specfiles/tog-pegasus-preun.spec
@@ -8,7 +8,7 @@ if [ $1 -eq 0 ]; then
       %PEGASUS_SBIN_DIR/cimserver -s
    fi
    /sbin/chkconfig --del %{Flavor}-pegasus;
-   rm -f %PEGASUS_VARDATA_DIR/cimserver_current.conf;
+   rm -f %PEGASUS_CONFIG_DIR/cimserver_current.conf;
    [ -d %PEGASUS_REPOSITORY_DIR ]  && rm -rf %PEGASUS_REPOSITORY_DIR;
    [ -d %PEGASUS_VARDATA_CACHE_DIR ]  && rm -rf %PEGASUS_VARDATA_CACHE_DIR;
    rm -f %PEGASUS_LOCAL_DOMAIN_SOCKET_PATH;