summaryrefslogtreecommitdiff
path: root/salt
diff options
context:
space:
mode:
authorCarlos Konstanski <ckonstanski@pippiandcarlos.com>2018-01-16 15:04:23 -0700
committerCarlos Konstanski <ckonstanski@pippiandcarlos.com>2018-01-16 15:04:23 -0700
commit3cc35ce178da5ca1e99840f18c2e6b7fb9f1cbb2 (patch)
treec41a2198844a035f2c9051f22f680274170c2e4f /salt
parent0f028e9ea256041cb25ddf6d40c2de360039444d (diff)
typos
Diffstat (limited to 'salt')
-rw-r--r--salt/openbook/ansible/files/registry.conf10
-rw-r--r--salt/openbook/ansible/files/ssl.yaml2
2 files changed, 6 insertions, 6 deletions
diff --git a/salt/openbook/ansible/files/registry.conf b/salt/openbook/ansible/files/registry.conf
index 04edb64..4f231db 100644
--- a/salt/openbook/ansible/files/registry.conf
+++ b/salt/openbook/ansible/files/registry.conf
@@ -1,15 +1,15 @@
-upstream {% raw %}{{ inventory_hostsname }}{% endraw %} {
+upstream {% raw %}{{ inventory_hostname }}{% endraw %} {
server registry:5000;
}
server {
listen 443;
- server_name {% raw %}{{ inventory_hostsname }}{% endraw %};
+ server_name {% raw %}{{ inventory_hostname }}{% endraw %};
# SSL
ssl on;
- ssl_certificate /etc/nginx/conf.d/{% raw %}{{ inventory_hostsname }}{% endraw %}.crt;
- ssl_certificate_key /etc/nginx/conf.d/{% raw %}{{ inventory_hostsname }}{% endraw %}.key;
+ ssl_certificate /etc/nginx/conf.d/{% raw %}{{ inventory_hostname }}{% endraw %}.crt;
+ ssl_certificate_key /etc/nginx/conf.d/{% raw %}{{ inventory_hostname }}{% endraw %}.key;
# disable any limits to avoid HTTP 413 for large image uploads
client_max_body_size 0;
@@ -29,7 +29,7 @@ server {
auth_basic_user_file /etc/nginx/conf.d/registry.password;
add_header 'Docker-Distribution-Api-Version' 'registry/2.0' always;
- proxy_pass http://{% raw %}{{ inventory_hostsname }}{% endraw %};
+ proxy_pass http://{% raw %}{{ inventory_hostname }}{% endraw %};
proxy_set_header Host $http_host; # required for docker client's sake
proxy_set_header X-Real-IP $remote_addr; # pass on real client's IP
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/salt/openbook/ansible/files/ssl.yaml b/salt/openbook/ansible/files/ssl.yaml
index bc72779..0f662ac 100644
--- a/salt/openbook/ansible/files/ssl.yaml
+++ b/salt/openbook/ansible/files/ssl.yaml
@@ -1,5 +1,5 @@
---
-- name: "SSl cert"
+- name: "SSL cert"
hosts: target
tasks:
- name: "Create self-signed SSL cert"