Summary: Path changes for new rpm packaging

spark404 · spark404 · commit cb6b96cda22d · 2013-02-05T20:49:02.000+01:00
The path to the keyfile was hardcoded, so added an alternative path for
compatibility with the packaging locations. Should ideally become a
setting in the config file.
diff --git a/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java b/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
@@ -45,7 +45,9 @@ public class EncryptionSecretKeyChecker extends AdapterBase implements SystemInt
 
     private static final Logger s_logger = Logger.getLogger(EncryptionSecretKeyChecker.class);
 
-    private static final String s_keyFile = "/etc/cloud/management/key";
+    // Two possible locations with the new packaging naming
+    private static final String s_altKeyFile = "/etc/cloud/management/key";
+    private static final String s_keyFile = "/etc/cloudstack/management/key";
     private static final String s_envKey = "CLOUD_SECRET_KEY";
     private static StandardPBEStringEncryptor s_encryptor = new StandardPBEStringEncryptor();
     private static boolean s_useEncryption = false;
@@ -76,8 +78,12 @@ public void check() {
             SimpleStringPBEConfig stringConfig = new SimpleStringPBEConfig(); 
 
             if(encryptionType.equals("file")){
+                File keyFile = new File(s_keyFile);
+                if (!keyFile.exists()) {
+                    keyFile = new File(s_altKeyFile);
+                }
                 try {
-                    BufferedReader in = new BufferedReader(new FileReader(s_keyFile));
+                    BufferedReader in = new BufferedReader(new FileReader(keyFile));
                     secretKey = in.readLine();
                     //Check for null or empty secret key
                 } catch (FileNotFoundException e) {
