opendev/gerrit
Code Issues Proposed changes

Move configuration files under $site_path/etc

Browse Source 
Most applications store their configuration files below some sort of
etc directory within the application's "home place".  We should do
the same thing given that we have quite a few top level items in our
$site_path directory (db, cache, logs, static, etc).

Change-Id: Ia38ddab0174433acb59f271e33f32b5061121ea1
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-11-17 15:43:18 -08:00
parent 2fe738b4ad
commit 3cf7fbdf16
9 changed files with 100 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java
View File

@@ -38,9 +38,10 @@ class HostKeyProvider implements Provider<KeyPairProvider> {
@Override
public KeyPairProvider get() {
final File anyKey = new File(sitePath, "ssh_host_key");
final File rsaKey = new File(sitePath, "ssh_host_rsa_key");
final File dsaKey = new File(sitePath, "ssh_host_dsa_key");
final File etc = new File(sitePath, "etc");
final File anyKey = new File(etc, "ssh_host_key");
final File rsaKey = new File(etc, "ssh_host_rsa_key");
final File dsaKey = new File(etc, "ssh_host_dsa_key");
final List<String> keys = new ArrayList<String>(2);
if (rsaKey.exists()) {
@@ -63,6 +64,9 @@ class HostKeyProvider implements Provider<KeyPairProvider> {
//
final SimpleGeneratorHostKeyProvider keyp;
if (!etc.exists() && !etc.mkdirs()) {
throw new ProvisionException("Cannot create directory " + etc);
}
keyp = new SimpleGeneratorHostKeyProvider();
keyp.setPath(anyKey.getAbsolutePath());
return keyp;