about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaweł Dybiec <pdybiec@stud.cs.uni.wroc.pl>2019-12-05 19:31:58 +0100
committerPaweł Dybiec <pdybiec@stud.cs.uni.wroc.pl>2019-12-05 19:31:58 +0100
commitd979a2c1eee03daee6ab6eeb52487b9ece4ad04e (patch)
treef96faf3e5b72e5484efb3f3b93119d280a619c60
parentRemove blockIps from nginx conf (diff)
Refactor domains
-rw-r--r--docker.yml2
-rw-r--r--domains.yml3
2 files changed, 2 insertions, 3 deletions
diff --git a/docker.yml b/docker.yml
index 72878db..be74464 100644
--- a/docker.yml
+++ b/docker.yml
@@ -19,7 +19,7 @@
   - name: Generate nginx conf
     template:
       src: templates/nginx.conf.j2
-      dest: "{{docker_compose_dir}}/nginx/conf.d/{{item.key}}.conf"
+      dest: "{{docker_compose_dir}}/nginx/conf.d/{{short_name}}.conf"
     vars:
       server: "{{item.value}}"
       short_name: "{{item.key}}"
diff --git a/domains.yml b/domains.yml
index a1c1cf2..e696bd0 100644
--- a/domains.yml
+++ b/domains.yml
@@ -1,7 +1,7 @@
 ---
 domains:
   main:
-    name: ".dybiec.info"
+    name: "dybiec.info"
     http_redirect: true
     dir: "/usr/share/nginx/html"
   git:
@@ -38,7 +38,6 @@ domains:
       cache: true
   balmora:
     name: "balmora.dybiec.info"
-    http_redirect: true
     proxy:
       host: "10.0.27.2"
       port: 8000