09ae0ab94a
This field was never user-configurable. We always overwrote the value with 120s from NonUserSource. However, we also never copied the value from RuntimeConfig to consul.Config, So the value in NonUserSource was always ignored, and we used the default value of 30s set by consul.DefaultConfig. All of this code is an unnecessary distraction because a user can not actually configure this value. This commit removes the fields and uses a constant value instad. Someone attempting to set acl.disabled_ttl in their config will now get an error about an unknown field, but previously the value was completely ignored, so the new behaviour seems more correct. We have to keep this field in the AutoConfig response for backwards compatibility, but the value will be ignored by the client, so it doesn't really matter what value we set.
72 lines
1.6 KiB
Protocol Buffer
72 lines
1.6 KiB
Protocol Buffer
syntax = "proto3";
|
|
|
|
package config;
|
|
|
|
option go_package = "github.com/hashicorp/consul/proto/pbconfig";
|
|
|
|
message Config {
|
|
string Datacenter = 1;
|
|
string PrimaryDatacenter = 2;
|
|
string NodeName = 3;
|
|
string SegmentName = 4;
|
|
ACL ACL = 5;
|
|
AutoEncrypt AutoEncrypt = 6;
|
|
Gossip Gossip = 7;
|
|
TLS TLS = 8;
|
|
}
|
|
|
|
message Gossip {
|
|
GossipEncryption Encryption = 1;
|
|
repeated string RetryJoinLAN = 2;
|
|
}
|
|
|
|
message GossipEncryption {
|
|
string Key = 1;
|
|
bool VerifyIncoming = 2;
|
|
bool VerifyOutgoing = 3;
|
|
}
|
|
|
|
message TLS {
|
|
bool VerifyOutgoing = 1;
|
|
bool VerifyServerHostname = 2;
|
|
string CipherSuites = 3;
|
|
string MinVersion = 4;
|
|
bool PreferServerCipherSuites = 5;
|
|
}
|
|
|
|
message ACL {
|
|
bool Enabled = 1;
|
|
string PolicyTTL = 2;
|
|
string RoleTTL = 3;
|
|
string TokenTTL = 4;
|
|
string DownPolicy = 5;
|
|
string DefaultPolicy = 6;
|
|
bool EnableKeyListPolicy = 7;
|
|
ACLTokens Tokens = 8;
|
|
// DisabledTTL is deprecated. It is no longer populated and should be ignored
|
|
// by clients.
|
|
string DisabledTTL = 9;
|
|
bool EnableTokenPersistence = 10;
|
|
bool MSPDisableBootstrap = 11;
|
|
}
|
|
|
|
message ACLTokens {
|
|
string Master = 1;
|
|
string Replication = 2;
|
|
string AgentMaster = 3;
|
|
string Default = 4;
|
|
string Agent = 5;
|
|
repeated ACLServiceProviderToken ManagedServiceProvider = 6;
|
|
}
|
|
|
|
message ACLServiceProviderToken {
|
|
string AccessorID = 1;
|
|
string SecretID = 2;
|
|
}
|
|
|
|
message AutoEncrypt {
|
|
bool TLS = 1;
|
|
repeated string DNSSAN = 2;
|
|
repeated string IPSAN = 3;
|
|
bool AllowTLS = 4;
|
|
} |