revert changes to consul config files and ignore in checkstyle
This commit is contained in:
Spencer Gibb
@@ -14,4 +14,7 @@
|
||||
checks="LineLengthCheck"/>
|
||||
<suppress files=".*ConsulConfigAutoConfiguration.*"
|
||||
checks="HideUtilityClassConstructorCheck"/>
|
||||
<suppress files="[\\/]src[\\/]test[\\/]resources[\\/]consul_*[\\/]" checks="[a-zA-Z0-9]*"/>
|
||||
<suppress files="[\\/]src[\\/]test[\\/]resources[\\/]etc" checks="[a-zA-Z0-9]*"/>
|
||||
|
||||
</suppressions>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
CONSUL_VER="0.7.5"
|
||||
CONSUL_VER="1.3.1"
|
||||
CONSUL_ZIP="consul_${CONSUL_VER}_linux_amd64.zip"
|
||||
IGNORE_CERTS="${IGNORE_CERTS:-no}"
|
||||
|
||||
|
||||
@@ -1,31 +1,28 @@
|
||||
{
|
||||
"ID": "anonymous",
|
||||
"Name": "anonymous",
|
||||
"Type": "client",
|
||||
"Rules": "{
|
||||
\
|
||||
"key\": {
|
||||
\
|
||||
"\": {
|
||||
\
|
||||
"policy\": \"write\"
|
||||
}
|
||||
},
|
||||
\"event\": {
|
||||
\"\": {
|
||||
\"policy\": \"write\"
|
||||
}
|
||||
},
|
||||
\"service\": {
|
||||
\"\": {
|
||||
\"policy\": \"write\"
|
||||
},
|
||||
\"testConsulDiscoveryAcl\": {
|
||||
\"policy\": \"deny\"
|
||||
},
|
||||
\"testConsulDiscoveryAcl\": {
|
||||
\"policy\": \"deny\"
|
||||
}
|
||||
}
|
||||
}"
|
||||
"ID": "anonymous",
|
||||
"Name": "anonymous",
|
||||
"Type": "client",
|
||||
"Rules": "{
|
||||
\"key\": {
|
||||
\"\": {
|
||||
\"policy\": \"write\"
|
||||
}
|
||||
},
|
||||
\"event\": {
|
||||
\"\": {
|
||||
\"policy\": \"write\"
|
||||
}
|
||||
},
|
||||
\"service\": {
|
||||
\"\": {
|
||||
\"policy\": \"write\"
|
||||
},
|
||||
\"testConsulDiscoveryAcl\": {
|
||||
\"policy\": \"deny\"
|
||||
},
|
||||
\"testConsulDiscoveryAcl\": {
|
||||
\"policy\": \"deny\"
|
||||
}
|
||||
}
|
||||
}"
|
||||
}
|
||||
|
||||
@@ -1,21 +1,18 @@
|
||||
{
|
||||
"ID": "2d2e6b3b-1c82-40ab-8171-54609d8ad304",
|
||||
"Name": "discover_client_test_acl",
|
||||
"Type": "client",
|
||||
"Rules": "{
|
||||
\
|
||||
"service\": {
|
||||
\
|
||||
"\": {
|
||||
\
|
||||
"policy\": \"write\"
|
||||
},
|
||||
\"testConsulDiscoveryAcl\": {
|
||||
\"policy\": \"write\"
|
||||
},
|
||||
\"testSecondServiceAcl\": {
|
||||
\"policy\": \"write\"
|
||||
}
|
||||
}
|
||||
}"
|
||||
"ID": "2d2e6b3b-1c82-40ab-8171-54609d8ad304",
|
||||
"Name": "discover_client_test_acl",
|
||||
"Type": "client",
|
||||
"Rules": "{
|
||||
\"service\": {
|
||||
\"\": {
|
||||
\"policy\": \"write\"
|
||||
},
|
||||
\"testConsulDiscoveryAcl\": {
|
||||
\"policy\": \"write\"
|
||||
},
|
||||
\"testSecondServiceAcl\": {
|
||||
\"policy\": \"write\"
|
||||
}
|
||||
}
|
||||
}"
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"datacenter": "local",
|
||||
"acl_datacenter": "local",
|
||||
"acl_master_token": "2ee647bd-bd69-4118-9f34-b9a6e9e60746",
|
||||
"acl_default_policy": "deny"
|
||||
"datacenter": "local",
|
||||
"acl_datacenter": "local",
|
||||
"acl_master_token": "2ee647bd-bd69-4118-9f34-b9a6e9e60746",
|
||||
"acl_default_policy": "deny"
|
||||
}
|
||||
|
||||
@@ -1,43 +1,40 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta content="IE=edge" http-equiv="X-UA-Compatible">
|
||||
<meta content="width=device-width, initial-scale=0.7, user-scalable=no"
|
||||
name="viewport">
|
||||
<title>Consul by HashiCorp</title>
|
||||
<link href="static/bootstrap.min.css" rel="stylesheet">
|
||||
<link href="static/base.css" rel="stylesheet">
|
||||
<link href="static/favicon.png" rel="shortcut icon">
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=0.7, user-scalable=no">
|
||||
<title>Consul by HashiCorp</title>
|
||||
<link rel="stylesheet" href="static/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="static/base.css">
|
||||
<link rel="shortcut icon" href="static/favicon.png">
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div class="wrapper">
|
||||
<div class="container">
|
||||
<div class="col-md-12">
|
||||
<div id="app">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wrapper">
|
||||
<div class="container">
|
||||
<div class="col-md-12">
|
||||
<div id="app">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="push"></div>
|
||||
</div>
|
||||
<div class="push"></div>
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
<div class="container">
|
||||
<div class="col-md-12">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="footer">
|
||||
<div class="container">
|
||||
<div class="col-md-12">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script type="text/x-handlebars">
|
||||
<script type="text/x-handlebars">
|
||||
{{outlet}}
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script data-template-name="error" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" data-template-name="error">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12">
|
||||
<div class="text-center vertical-center">
|
||||
@@ -51,11 +48,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script data-template-name="dc/unauthorized" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" data-template-name="dc/unauthorized">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12">
|
||||
<div class="text-center vertical-center">
|
||||
@@ -71,11 +66,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script data-template-name="dc/aclsdisabled" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" data-template-name="dc/aclsdisabled">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12">
|
||||
<div class="text-center vertical-center">
|
||||
@@ -85,11 +78,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script data-template-name="loading" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" data-template-name="loading">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12">
|
||||
<div class="text-center vertical-center">
|
||||
@@ -98,11 +89,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script id="actionbar" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" id="actionbar">
|
||||
<div class="row">
|
||||
<div class="action-bar">
|
||||
<div {{ bind-attr class="searchBar:col-md-10:col-md-5" }} >
|
||||
@@ -133,11 +122,9 @@
|
||||
{{/if}}
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script data-template-name="dc" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" data-template-name="dc">
|
||||
<div class="row">
|
||||
<div {{ bind-attr class=":col-md-12 :col-sm-12 :col-xs-12 :topbar" }}>
|
||||
|
||||
@@ -184,11 +171,9 @@
|
||||
</div>
|
||||
|
||||
{{outlet}}
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script data-template-name="kv/show" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" data-template-name="kv/show">
|
||||
<div class="row">
|
||||
<div class="col-md-6 col-lg-5 padded-right-middle">
|
||||
<h4 class="breadcrumbs"><a href="" {{action 'linkToKey' grandParentKey }}>{{parentKey}}</a> <a href="" {{action 'linkToKey' parentKey }}>+</a></h4>
|
||||
@@ -258,11 +243,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script data-template-name="kv/edit" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" data-template-name="kv/edit">
|
||||
<div class="row">
|
||||
<div class="col-md-6 col-lg-5 padded-right-middle">
|
||||
<h4 class="breadcrumbs"><a href="" {{action 'linkToKey' grandParentKey }}>{{parentKey}}</a> <a href="" {{action 'linkToKey' parentKey }}>+</a></h4>
|
||||
@@ -337,11 +320,9 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script data-template-name="item/loading" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" data-template-name="item/loading">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12">
|
||||
<div class="text-center vertical-center">
|
||||
@@ -350,11 +331,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script id="services" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" id="services">
|
||||
<div class="row">
|
||||
<div {{ bind-attr class=":col-md-6 :col-lg-5 :padded-right-middle isShowingItem:hidden-xs isShowingItem:hidden-sm" }}>
|
||||
{{view App.ActionBarView }}
|
||||
@@ -415,11 +394,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script id="service" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" id="service">
|
||||
<div class="col-xs-12 col-sm-12 visible-xs visible-sm">
|
||||
{{#link-to "services" class="btn btn-default btn-block" }}Back to all services{{/link-to}}
|
||||
<hr>
|
||||
@@ -468,11 +445,9 @@
|
||||
{{/link-to}}
|
||||
|
||||
{{/each}}
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script id="nodes" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" id="nodes">
|
||||
<div class="row">
|
||||
<div {{ bind-attr class=":col-md-6 :col-lg-5 :padded-right-middle isShowingItem:hidden-xs isShowingItem:hidden-sm" }}>
|
||||
{{view App.ActionBarView }}
|
||||
@@ -528,11 +503,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script id="node" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" id="node">
|
||||
<div class="col-xs-12 col-sm-12 visible-xs visible-sm">
|
||||
{{#link-to "nodes" class="btn btn-default btn-block" }}Back to all nodes{{/link-to}}
|
||||
<hr>
|
||||
@@ -614,11 +587,9 @@
|
||||
{{else}}
|
||||
<p class="light small">No sessions</p>
|
||||
{{/if}}
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script id="acls" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" id="acls">
|
||||
<div class="row">
|
||||
<div {{ bind-attr class=":col-md-6 :col-lg-5 :padded-right-middle isShowingItem:hidden-xs isShowingItem:hidden-sm" }}>
|
||||
{{view App.ActionBarView }}
|
||||
@@ -685,11 +656,9 @@
|
||||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script id="acl" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" id="acl">
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-12 visible-xs visible-sm">
|
||||
{{#link-to "acls" class="btn btn-default btn-block" }}Back to all ACLs{{/link-to}}
|
||||
@@ -736,11 +705,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script id="index" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" id="index">
|
||||
<div class="col-md-8 col-md-offset-2 col-xs-offset-0 col-sm-offset-0 col-xs-12 col-sm-12 vertical-center">
|
||||
<h5>Select a datacenter</h5>
|
||||
{{#each item in model}}
|
||||
@@ -757,11 +724,9 @@
|
||||
{{/link-to}}
|
||||
{{/each}}
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script id="settings" type="text/x-handlebars">
|
||||
<script type="text/x-handlebars" id="settings">
|
||||
<div class="col-md-8 col-md-offset-2 col-xs-offset-0 col-sm-offset-0 col-xs-12 col-sm-12">
|
||||
<h3>Settings</h3>
|
||||
<p>These settings allow you to configure your browser for the Consul Web UI. Everything is saved to localstorage,
|
||||
@@ -777,17 +742,14 @@
|
||||
<button {{ action "reset" }} {{ bind-attr class=":btn :btn-danger" }}>Reset Defaults</button>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
||||
</script>
|
||||
<script>
|
||||
// Enable query params, must be loaded before ember is
|
||||
EmberENV = {FEATURES: {'query-params-new': true}};
|
||||
</script>
|
||||
|
||||
|
||||
<script>
|
||||
// Enable query params, must be loaded before ember is
|
||||
EmberENV = {FEATURES: {'query-params-new': true}};
|
||||
</script>
|
||||
|
||||
|
||||
<script src="static/application.min.js"></script>
|
||||
</body>
|
||||
<script src="static/application.min.js"></script></body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
@@ -1,21 +1,11 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 14 32 18" width="32" height="4"
|
||||
fill="#9e84c5" preserveAspectRatio="none">
|
||||
<path opacity="0.8" transform="translate(0 0)" d="M2 14 V18 H6 V14z">
|
||||
<animateTransform attributeName="transform" type="translate"
|
||||
values="0 0; 24 0; 0 0" dur="2s" begin="0"
|
||||
repeatCount="indefinite"
|
||||
keySplines="0.2 0.2 0.4 0.8;0.2 0.2 0.4 0.8" calcMode="spline"/>
|
||||
</path>
|
||||
<path opacity="0.5" transform="translate(0 0)" d="M0 14 V18 H8 V14z">
|
||||
<animateTransform attributeName="transform" type="translate"
|
||||
values="0 0; 24 0; 0 0" dur="2s" begin="0.1s"
|
||||
repeatCount="indefinite"
|
||||
keySplines="0.2 0.2 0.4 0.8;0.2 0.2 0.4 0.8" calcMode="spline"/>
|
||||
</path>
|
||||
<path opacity="0.25" transform="translate(0 0)" d="M0 14 V18 H8 V14z">
|
||||
<animateTransform attributeName="transform" type="translate"
|
||||
values="0 0; 24 0; 0 0" dur="2s" begin="0.2s"
|
||||
repeatCount="indefinite"
|
||||
keySplines="0.2 0.2 0.4 0.8;0.2 0.2 0.4 0.8" calcMode="spline"/>
|
||||
</path>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 14 32 18" width="32" height="4" fill="#9e84c5" preserveAspectRatio="none">
|
||||
<path opacity="0.8" transform="translate(0 0)" d="M2 14 V18 H6 V14z">
|
||||
<animateTransform attributeName="transform" type="translate" values="0 0; 24 0; 0 0" dur="2s" begin="0" repeatCount="indefinite" keySplines="0.2 0.2 0.4 0.8;0.2 0.2 0.4 0.8" calcMode="spline" />
|
||||
</path>
|
||||
<path opacity="0.5" transform="translate(0 0)" d="M0 14 V18 H8 V14z">
|
||||
<animateTransform attributeName="transform" type="translate" values="0 0; 24 0; 0 0" dur="2s" begin="0.1s" repeatCount="indefinite" keySplines="0.2 0.2 0.4 0.8;0.2 0.2 0.4 0.8" calcMode="spline" />
|
||||
</path>
|
||||
<path opacity="0.25" transform="translate(0 0)" d="M0 14 V18 H8 V14z">
|
||||
<animateTransform attributeName="transform" type="translate" values="0 0; 24 0; 0 0" dur="2s" begin="0.2s" repeatCount="indefinite" keySplines="0.2 0.2 0.4 0.8;0.2 0.2 0.4 0.8" calcMode="spline" />
|
||||
</path>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 983 B |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"service": {
|
||||
"name": "configserver",
|
||||
"address": "127.0.0.1",
|
||||
"port": 8888
|
||||
}
|
||||
"service": {
|
||||
"name": "configserver",
|
||||
"address": "127.0.0.1",
|
||||
"port": 8888
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user