Sync docs from master to gh-pages

This commit is contained in:
buildmaster
2019-12-18 21:45:57 +00:00
parent 440d6c230b
commit 7d2b32ce4e
2 changed files with 220 additions and 116 deletions

View File

@@ -116,6 +116,8 @@ $(addBlockSwitches);
<li><a href="#_serving_alternative_formats">Serving Alternative Formats</a></li>
<li><a href="#_serving_plain_text">Serving Plain Text</a>
<ul class="sectlevel2">
<li><a href="#spring-cloud-config-serving-plain-text-git-svn-native-backends">Git, SVN, and Native Backends</a></li>
<li><a href="#spring-cloud-config-serving-plain-text-aws-s3">AWS S3</a></li>
<li><a href="#_decrypting_plain_text">Decrypting Plain Text</a></li>
</ul>
</li>
@@ -2279,63 +2281,7 @@ However, instead of aggregating all matching resources, only the first one to ma
</div>
<div class="paragraph">
<p>After a resource is located, placeholders in the normal format (<code>${&#8230;&#8203;}</code>) are resolved by using the effective <code>Environment</code> for the supplied application name, profile, and label.
In this way, the resource endpoint is tightly integrated with the environment endpoints.
Consider the following example for a GIT or SVN repository:</p>
</div>
<div class="listingblock">
<div class="content">
<pre>application.yml
nginx.conf</pre>
</div>
</div>
<div class="paragraph">
<p>where <code>nginx.conf</code> looks like this:</p>
</div>
<div class="listingblock">
<div class="content">
<pre>server {
listen 80;
server_name ${nginx.server.name};
}</pre>
</div>
</div>
<div class="paragraph">
<p>and <code>application.yml</code> like this:</p>
</div>
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code class="language-yaml hljs" data-lang="yaml">nginx:
server:
name: example.com
---
spring:
profiles: development
nginx:
server:
name: develop.com</code></pre>
</div>
</div>
<div class="paragraph">
<p>The <code>/foo/default/master/nginx.conf</code> resource might be as follows:</p>
</div>
<div class="listingblock">
<div class="content">
<pre>server {
listen 80;
server_name example.com;
}</pre>
</div>
</div>
<div class="paragraph">
<p>and <code>/foo/development/master/nginx.conf</code> like this:</p>
</div>
<div class="listingblock">
<div class="content">
<pre>server {
listen 80;
server_name develop.com;
}</pre>
</div>
In this way, the resource endpoint is tightly integrated with the environment endpoints.</p>
</div>
<div class="admonitionblock note">
<table>
@@ -2358,11 +2304,117 @@ So, if you want a profile-specific file, <code>/*/development/*/logback.xml</cod
</td>
<td class="content">
If you do not want to supply the <code>label</code> and let the server use the default label, you can supply a <code>useDefaultLabel</code> request parameter.
So, the preceding example for the <code>default</code> profile could be <code>/foo/default/nginx.conf?useDefaultLabel</code>.
Consequently, the preceding example for the <code>default</code> profile could be <code>/sample/default/nginx.conf?useDefaultLabel</code>.
</td>
</tr>
</table>
</div>
<div class="paragraph">
<p>At present, Spring Cloud Config can serve plaintext for git, SVN, native backends, and AWS S3.
The support for git, SVN, and native backends is identical. AWS S3 works a bit differently.
The following sections show how each one works:</p>
</div>
<div class="ulist">
<ul>
<li>
<p><a href="#spring-cloud-config-serving-plain-text-git-svn-native-backends">Git, SVN, and Native Backends</a></p>
</li>
<li>
<p><a href="#spring-cloud-config-serving-plain-text-aws-s3">AWS S3</a></p>
</li>
</ul>
</div>
<div class="sect2">
<h3 id="spring-cloud-config-serving-plain-text-git-svn-native-backends"><a class="link" href="#spring-cloud-config-serving-plain-text-git-svn-native-backends">Git, SVN, and Native Backends</a></h3>
<div class="paragraph">
<p>Consider the following example for a GIT or SVN repository or a native backend:</p>
</div>
<div class="exampleblock">
<div class="content">
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code>application.yml
nginx.conf</code></pre>
</div>
</div>
</div>
</div>
<div class="paragraph">
<p>The <code>nginx.conf</code> might resemble the following listing:</p>
</div>
<div class="exampleblock">
<div class="content">
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code>server {
listen 80;
server_name ${nginx.server.name};
}</code></pre>
</div>
</div>
</div>
</div>
<div class="paragraph">
<p><code>application.yml</code> might resemble the following listing:</p>
</div>
<div class="exampleblock">
<div class="content">
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code class="language-yaml hljs" data-lang="yaml">nginx:
server:
name: example.com
---
spring:
profiles: development
nginx:
server:
name: develop.com</code></pre>
</div>
</div>
</div>
</div>
<div class="paragraph">
<p>The <code>/sample/default/master/nginx.conf</code> resource might be as follows:</p>
</div>
<div class="exampleblock">
<div class="content">
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code>server {
listen 80;
server_name example.com;
}</code></pre>
</div>
</div>
</div>
</div>
<div class="paragraph">
<p><code>/sample/development/master/nginx.conf</code> might be as follows:</p>
</div>
<div class="exampleblock">
<div class="content">
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code>server {
listen 80;
server_name develop.com;
}</code></pre>
</div>
</div>
</div>
</div>
</div>
<div class="sect2">
<h3 id="spring-cloud-config-serving-plain-text-aws-s3"><a class="link" href="#spring-cloud-config-serving-plain-text-aws-s3">AWS S3</a></h3>
<div class="paragraph">
<p>To enable serving plain text for AWS s3, the Config Server application needs to include a dependency on Spring Cloud AWS.
For details on how to set up that dependency, see the
<a href="https://cloud.spring.io/spring-cloud-static/spring-cloud-aws/2.1.3.RELEASE/single/spring-cloud-aws.html#_spring_cloud_aws_maven_dependency_management">Spring Cloud AWS Reference Guide</a>.
Then you need to configure Spring Cloud AWS, as described in the
<a href="https://cloud.spring.io/spring-cloud-static/spring-cloud-aws/2.1.3.RELEASE/single/spring-cloud-aws.html#_configuring_credentials">Spring Cloud AWS Reference Guide</a>.</p>
</div>
</div>
<div class="sect2">
<h3 id="_decrypting_plain_text"><a class="link" href="#_decrypting_plain_text">Decrypting Plain Text</a></h3>
<div class="paragraph">

View File

@@ -116,6 +116,8 @@ $(addBlockSwitches);
<li><a href="#_serving_alternative_formats">Serving Alternative Formats</a></li>
<li><a href="#_serving_plain_text">Serving Plain Text</a>
<ul class="sectlevel2">
<li><a href="#spring-cloud-config-serving-plain-text-git-svn-native-backends">Git, SVN, and Native Backends</a></li>
<li><a href="#spring-cloud-config-serving-plain-text-aws-s3">AWS S3</a></li>
<li><a href="#_decrypting_plain_text">Decrypting Plain Text</a></li>
</ul>
</li>
@@ -2279,63 +2281,7 @@ However, instead of aggregating all matching resources, only the first one to ma
</div>
<div class="paragraph">
<p>After a resource is located, placeholders in the normal format (<code>${&#8230;&#8203;}</code>) are resolved by using the effective <code>Environment</code> for the supplied application name, profile, and label.
In this way, the resource endpoint is tightly integrated with the environment endpoints.
Consider the following example for a GIT or SVN repository:</p>
</div>
<div class="listingblock">
<div class="content">
<pre>application.yml
nginx.conf</pre>
</div>
</div>
<div class="paragraph">
<p>where <code>nginx.conf</code> looks like this:</p>
</div>
<div class="listingblock">
<div class="content">
<pre>server {
listen 80;
server_name ${nginx.server.name};
}</pre>
</div>
</div>
<div class="paragraph">
<p>and <code>application.yml</code> like this:</p>
</div>
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code class="language-yaml hljs" data-lang="yaml">nginx:
server:
name: example.com
---
spring:
profiles: development
nginx:
server:
name: develop.com</code></pre>
</div>
</div>
<div class="paragraph">
<p>The <code>/foo/default/master/nginx.conf</code> resource might be as follows:</p>
</div>
<div class="listingblock">
<div class="content">
<pre>server {
listen 80;
server_name example.com;
}</pre>
</div>
</div>
<div class="paragraph">
<p>and <code>/foo/development/master/nginx.conf</code> like this:</p>
</div>
<div class="listingblock">
<div class="content">
<pre>server {
listen 80;
server_name develop.com;
}</pre>
</div>
In this way, the resource endpoint is tightly integrated with the environment endpoints.</p>
</div>
<div class="admonitionblock note">
<table>
@@ -2358,11 +2304,117 @@ So, if you want a profile-specific file, <code>/*/development/*/logback.xml</cod
</td>
<td class="content">
If you do not want to supply the <code>label</code> and let the server use the default label, you can supply a <code>useDefaultLabel</code> request parameter.
So, the preceding example for the <code>default</code> profile could be <code>/foo/default/nginx.conf?useDefaultLabel</code>.
Consequently, the preceding example for the <code>default</code> profile could be <code>/sample/default/nginx.conf?useDefaultLabel</code>.
</td>
</tr>
</table>
</div>
<div class="paragraph">
<p>At present, Spring Cloud Config can serve plaintext for git, SVN, native backends, and AWS S3.
The support for git, SVN, and native backends is identical. AWS S3 works a bit differently.
The following sections show how each one works:</p>
</div>
<div class="ulist">
<ul>
<li>
<p><a href="#spring-cloud-config-serving-plain-text-git-svn-native-backends">Git, SVN, and Native Backends</a></p>
</li>
<li>
<p><a href="#spring-cloud-config-serving-plain-text-aws-s3">AWS S3</a></p>
</li>
</ul>
</div>
<div class="sect2">
<h3 id="spring-cloud-config-serving-plain-text-git-svn-native-backends"><a class="link" href="#spring-cloud-config-serving-plain-text-git-svn-native-backends">Git, SVN, and Native Backends</a></h3>
<div class="paragraph">
<p>Consider the following example for a GIT or SVN repository or a native backend:</p>
</div>
<div class="exampleblock">
<div class="content">
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code>application.yml
nginx.conf</code></pre>
</div>
</div>
</div>
</div>
<div class="paragraph">
<p>The <code>nginx.conf</code> might resemble the following listing:</p>
</div>
<div class="exampleblock">
<div class="content">
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code>server {
listen 80;
server_name ${nginx.server.name};
}</code></pre>
</div>
</div>
</div>
</div>
<div class="paragraph">
<p><code>application.yml</code> might resemble the following listing:</p>
</div>
<div class="exampleblock">
<div class="content">
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code class="language-yaml hljs" data-lang="yaml">nginx:
server:
name: example.com
---
spring:
profiles: development
nginx:
server:
name: develop.com</code></pre>
</div>
</div>
</div>
</div>
<div class="paragraph">
<p>The <code>/sample/default/master/nginx.conf</code> resource might be as follows:</p>
</div>
<div class="exampleblock">
<div class="content">
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code>server {
listen 80;
server_name example.com;
}</code></pre>
</div>
</div>
</div>
</div>
<div class="paragraph">
<p><code>/sample/development/master/nginx.conf</code> might be as follows:</p>
</div>
<div class="exampleblock">
<div class="content">
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight"><code>server {
listen 80;
server_name develop.com;
}</code></pre>
</div>
</div>
</div>
</div>
</div>
<div class="sect2">
<h3 id="spring-cloud-config-serving-plain-text-aws-s3"><a class="link" href="#spring-cloud-config-serving-plain-text-aws-s3">AWS S3</a></h3>
<div class="paragraph">
<p>To enable serving plain text for AWS s3, the Config Server application needs to include a dependency on Spring Cloud AWS.
For details on how to set up that dependency, see the
<a href="https://cloud.spring.io/spring-cloud-static/spring-cloud-aws/2.1.3.RELEASE/single/spring-cloud-aws.html#_spring_cloud_aws_maven_dependency_management">Spring Cloud AWS Reference Guide</a>.
Then you need to configure Spring Cloud AWS, as described in the
<a href="https://cloud.spring.io/spring-cloud-static/spring-cloud-aws/2.1.3.RELEASE/single/spring-cloud-aws.html#_configuring_credentials">Spring Cloud AWS Reference Guide</a>.</p>
</div>
</div>
<div class="sect2">
<h3 id="_decrypting_plain_text"><a class="link" href="#_decrypting_plain_text">Decrypting Plain Text</a></h3>
<div class="paragraph">