Changed all configuration files to be visible

Original commit: elastic/x-pack-elasticsearch@f1db8b43bb
This commit is contained in:
uboness 2014-10-15 15:08:06 -07:00
parent 97df195c02
commit ffeb0b4332
7 changed files with 7 additions and 7 deletions

View File

@ -76,7 +76,7 @@ public class FileUserPasswdStore extends AbstractComponent implements UserPasswd
public static Path resolveFile(Settings settings, Environment env) {
String location = settings.get("shield.authc.esusers.files.users");
if (location == null) {
return ShieldPlugin.resolveConfigFile(env, ".users");
return ShieldPlugin.resolveConfigFile(env, "users");
}
return Paths.get(location);
}

View File

@ -70,7 +70,7 @@ public class FileUserRolesStore extends AbstractComponent implements UserRolesSt
public static Path resolveFile(Settings settings, Environment env) {
String location = settings.get("shield.authc.esusers.files.users_roles");
if (location == null) {
return ShieldPlugin.resolveConfigFile(env, ".users_roles");
return ShieldPlugin.resolveConfigFile(env, "users_roles");
}
return Paths.get(location);
}

View File

@ -33,7 +33,7 @@ import java.util.*;
*/
public class LdapGroupToRoleMapper extends AbstractComponent {
public static final String DEFAULT_FILE_NAME = ".role_mapping";
public static final String DEFAULT_FILE_NAME = "role_mapping";
public static final String ROLE_MAPPING_FILE_SETTING = "files.role_mapping";
public static final String USE_UNMAPPED_GROUPS_AS_ROLES_SETTING = "unmapped_groups_as_roles";

View File

@ -75,7 +75,7 @@ public class FileRolesStore extends AbstractComponent implements RolesStore {
public static Path resolveFile(Settings settings, Environment env) {
String location = settings.get("files.roles");
if (location == null) {
return ShieldPlugin.resolveConfigFile(env, ".roles.yml");
return ShieldPlugin.resolveConfigFile(env, "roles.yml");
}
return Paths.get(location);

View File

@ -38,7 +38,7 @@ public class InternalKeyService extends AbstractComponent implements KeyService
public static final String KEY_ALGO = "HmacSHA512";
public static final int KEY_SIZE = 1024;
static final String FILE_NAME = ".system_key";
static final String FILE_NAME = "system_key";
static final String HMAC_ALGO = "HmacSHA1";
private static final Pattern SIG_PATTERN = Pattern.compile("\\$\\$[0-9]+\\$\\$.+");

View File

@ -40,7 +40,7 @@ import java.util.regex.Pattern;
public class IPFilteringN2NAuthenticator extends AbstractComponent implements N2NAuthenticator {
private static final Pattern COMMA_DELIM = Pattern.compile("\\s*,\\s*");
private static final String DEFAULT_FILE = ".ip_filter.yml";
private static final String DEFAULT_FILE = "ip_filter.yml";
private static final IpFilterRule[] NO_RULES = new IpFilterRule[0];
private final Path file;

View File

@ -90,7 +90,7 @@ public class SystemKeyToolTests extends CliToolTestCase {
File config = tempFolder.newFolder();
File shieldConfig = new File(config, ShieldPlugin.NAME);
shieldConfig.mkdirs();
Path path = new File(shieldConfig, ".system_key").toPath();
Path path = new File(shieldConfig, "system_key").toPath();
when(env.configFile()).thenReturn(config);
Generate generate = new Generate(terminal, null);
CliTool.ExitStatus status = generate.execute(ImmutableSettings.EMPTY, env);