Commit e067118f authored by akrherz's avatar akrherz

More installer updates to note security.xml is a config-type file

One doubt remains about the solaris installer, will have to test it
http://issues.igniterealtime.org/browse/OF-714
parent 1e103cc3
/etc/openfire/openfire.xml /etc/openfire/openfire.xml
/etc/openfire/security.xml
/etc/openfire/security/keystore /etc/openfire/security/keystore
/etc/openfire/security/truststore /etc/openfire/security/truststore
/etc/openfire/security/client.truststore /etc/openfire/security/client.truststore
...@@ -22,5 +22,6 @@ install/openfire:: ...@@ -22,5 +22,6 @@ install/openfire::
cp $(TARGET)/lib/log4j.xml $(ETCDIR) cp $(TARGET)/lib/log4j.xml $(ETCDIR)
cp -r $(TARGET)/resources/database $(OPENFIRE)/resources/database cp -r $(TARGET)/resources/database $(OPENFIRE)/resources/database
cp $(TARGET)/conf/openfire.xml $(ETCDIR) cp $(TARGET)/conf/openfire.xml $(ETCDIR)
cp $(TARGET)/conf/security.xml $(ETCDIR)
cp -r $(TARGET)/resources/security $(ETCDIR)/security cp -r $(TARGET)/resources/security $(ETCDIR)/security
cp -r $(TARGET)/plugins $(VARDIR)/plugins cp -r $(TARGET)/plugins $(VARDIR)/plugins
...@@ -50,9 +50,11 @@ ...@@ -50,9 +50,11 @@
<fileEntry mountPoint="34" file="${compiler:RELEASE_FULL_PATH}/resources/security/truststore" overwrite="0" shared="false" mode="644" uninstallMode="1" /> <fileEntry mountPoint="34" file="${compiler:RELEASE_FULL_PATH}/resources/security/truststore" overwrite="0" shared="false" mode="644" uninstallMode="1" />
<fileEntry mountPoint="34" file="${compiler:RELEASE_FULL_PATH}/resources/security/keystore" overwrite="0" shared="false" mode="644" uninstallMode="1" /> <fileEntry mountPoint="34" file="${compiler:RELEASE_FULL_PATH}/resources/security/keystore" overwrite="0" shared="false" mode="644" uninstallMode="1" />
<fileEntry mountPoint="46" file="${compiler:RELEASE_FULL_PATH}/conf/openfire.xml" overwrite="0" shared="false" mode="644" uninstallMode="1" /> <fileEntry mountPoint="46" file="${compiler:RELEASE_FULL_PATH}/conf/openfire.xml" overwrite="0" shared="false" mode="644" uninstallMode="1" />
<fileEntry mountPoint="46" file="${compiler:RELEASE_FULL_PATH}/conf/security.xml" overwrite="0" shared="false" mode="644" uninstallMode="1" />
<dirEntry mountPoint="1" file="${compiler:RELEASE_FULL_PATH}" overwrite="4" shared="false" mode="644" uninstallMode="0" excludeSuffixes="" dirMode="755"> <dirEntry mountPoint="1" file="${compiler:RELEASE_FULL_PATH}" overwrite="4" shared="false" mode="644" uninstallMode="0" excludeSuffixes="" dirMode="755">
<exclude> <exclude>
<entry location="conf/openfire.xml" launcher="false" /> <entry location="conf/openfire.xml" launcher="false" />
<entry location="conf/security.xml" launcher="false" />
<entry location="resources/security/keystore" launcher="false" /> <entry location="resources/security/keystore" launcher="false" />
<entry location="resources/security/truststore" launcher="false" /> <entry location="resources/security/truststore" launcher="false" />
</exclude> </exclude>
......
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
if [ -f /tmp/openfireInstallBackup/openfire.xml ]; then if [ -f /tmp/openfireInstallBackup/openfire.xml ]; then
/bin/mv /tmp/openfireInstallBackup/openfire.xml /usr/local/openfire/conf/openfire.xml /bin/mv /tmp/openfireInstallBackup/openfire.xml /usr/local/openfire/conf/openfire.xml
fi fi
if [ -f /tmp/openfireInstallBackup/security.xml ]; then
/bin/mv /tmp/openfireInstallBackup/security.xml /usr/local/openfire/conf/security.xml
fi
if [ -f /tmp/openfireInstallBackup/keystore ]; then if [ -f /tmp/openfireInstallBackup/keystore ]; then
/bin/mv /tmp/openfireInstallBackup/keystore /usr/local/openfire/resources/security/keystore /bin/mv /tmp/openfireInstallBackup/keystore /usr/local/openfire/resources/security/keystore
......
...@@ -15,6 +15,9 @@ if [ -d /usr/local/openfire ]; then ...@@ -15,6 +15,9 @@ if [ -d /usr/local/openfire ]; then
if [ -f /usr/local/openfire/conf/openfire.xml ]; then if [ -f /usr/local/openfire/conf/openfire.xml ]; then
/bin/cp /usr/local/openfire/conf/openfire.xml /tmp/openfireInstallBackup/openfire.xml /bin/cp /usr/local/openfire/conf/openfire.xml /tmp/openfireInstallBackup/openfire.xml
fi fi
if [ -f /usr/local/openfire/conf/security.xml ]; then
/bin/cp /usr/local/openfire/conf/security.xml /tmp/openfireInstallBackup/security.xml
fi
if [ -f /usr/local/openfire/resources/security/keystore ]; then if [ -f /usr/local/openfire/resources/security/keystore ]; then
/bin/cp /usr/local/openfire/resources/security/keystore /tmp/openfireInstallBackup/keystore /bin/cp /usr/local/openfire/resources/security/keystore /tmp/openfireInstallBackup/keystore
fi fi
......
...@@ -5,6 +5,10 @@ if [ -f /tmp/openfireInstallBackup/openfire.xml ]; then ...@@ -5,6 +5,10 @@ if [ -f /tmp/openfireInstallBackup/openfire.xml ]; then
/bin/mv /tmp/openfireInstallBackup/openfire.xml /opt/openfire/conf/openfire.xml /bin/mv /tmp/openfireInstallBackup/openfire.xml /opt/openfire/conf/openfire.xml
/bin/chown daemon:daemon /opt/openfire/conf/openfire.xml /bin/chown daemon:daemon /opt/openfire/conf/openfire.xml
fi fi
if [ -f /tmp/openfireInstallBackup/security.xml ]; then
/bin/mv /tmp/openfireInstallBackup/security.xml /opt/openfire/conf/security.xml
/bin/chown daemon:daemon /opt/openfire/conf/security.xml
fi
if [ -f /tmp/openfireInstallBackup/keystore ]; then if [ -f /tmp/openfireInstallBackup/keystore ]; then
/bin/mv /tmp/openfireInstallBackup/keystore /opt/openfire/resources/security/keystore /bin/mv /tmp/openfireInstallBackup/keystore /opt/openfire/resources/security/keystore
......
...@@ -8,6 +8,9 @@ if [ -d "/opt/openfire" ]; then ...@@ -8,6 +8,9 @@ if [ -d "/opt/openfire" ]; then
if [ -f /opt/openfire/conf/openfire.xml ]; then if [ -f /opt/openfire/conf/openfire.xml ]; then
/bin/cp -f /opt/openfire/conf/openfire.xml /tmp/openfireInstallBackup/openfire.xml /bin/cp -f /opt/openfire/conf/openfire.xml /tmp/openfireInstallBackup/openfire.xml
fi fi
if [ -f /opt/openfire/conf/security.xml ]; then
/bin/cp -f /opt/openfire/conf/security.xml /tmp/openfireInstallBackup/security.xml
fi
if [ -f /opt/openfire/resources/security/keystore ]; then if [ -f /opt/openfire/resources/security/keystore ]; then
/bin/cp -f /opt/openfire/resources/security/keystore /tmp/openfireInstallBackup/keystore /bin/cp -f /opt/openfire/resources/security/keystore /tmp/openfireInstallBackup/keystore
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment