Remove db-enc.properties

wido · wido · commit d80d8d8a6751 · 2013-04-04T08:51:38.000+02:00
This seemed to be used with Ant, but there is no other reference to this file.

It shouldn't be here and isn't used. It only confuses people.
diff --git a/client/tomcatconf/db-enc.properties.in b/client/tomcatconf/db-enc.properties.in
diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst
@@ -38,7 +38,7 @@ if [ "$1" = configure ]; then
 
     OLDCONFDIR="/etc/cloud/management"
     NEWCONFDIR="/etc/cloudstack/management"
-    CONFFILES="db.properties db-enc.properties cloud.keystore key"
+    CONFFILES="db.properties cloud.keystore key"
 
     # Copy old configuration so the admin doesn't have to do that
     # Only do so when we are installing for the first time
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
@@ -236,7 +236,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/cl
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
 
 for name in db.properties log4j-cloud.xml tomcat6-nonssl.conf tomcat6-ssl.conf server-ssl.xml server-nonssl.xml \
-            catalina.policy catalina.properties db-enc.properties classpath.conf tomcat-users.xml web.xml environment.properties ; do
+            catalina.policy catalina.properties classpath.conf tomcat-users.xml web.xml environment.properties ; do
   mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name \
     ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
