Modified: add 80 port and 443 port at same time; Wayde

sunwei · Sep 1, 2019 · c410152 · c410152
1 parent 5732f27
commit c410152
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.1.0
+-----
+
+- Provide all in one configure file
+
 0.0.8
 -----
 

diff --git a/ddd_nginx/__version__.py b/ddd_nginx/__version__.py
@@ -1 +1 @@
-__version__ = '0.0.8'
+__version__ = '0.1.0'
diff --git a/ddd_nginx/nginx.py b/ddd_nginx/nginx.py
@@ -101,6 +101,7 @@ def dumps(self, directory):
             os.path.join(directory, "error_page.conf"))
 
         all_in_one = self.dump("all-in-one.conf.jinja2", {
+            "namespace": self.namespace,
             "maps": maps,
             "upstreams": upstreams,
             "servers": servers,

diff --git a/ddd_nginx/template/apigw/server-location.conf.jinja2 b/ddd_nginx/template/apigw/server-location.conf.jinja2
@@ -4,6 +4,7 @@ server {
 {% endfor %}
     access_log /var/log/nginx/api_access.log {{ name }};
 
+    listen 80;
     listen 443 ssl;
     server_name {{ name }};
 

diff --git a/ddd_nginx/template/apigw/server.conf.jinja2 b/ddd_nginx/template/apigw/server.conf.jinja2
@@ -4,6 +4,7 @@ server {
 {% endfor %}
     access_log /var/log/nginx/api_access.log {{ name }};
 
+    listen 80;
     listen 443 ssl;
     server_name {{ name }};
 

diff --git a/tests/test_data/server-location.conf b/tests/test_data/server-location.conf
@@ -2,6 +2,7 @@ server {
     set $api_name -;
     access_log /var/log/nginx/api_access.log api.example.com;
 
+    listen 80;
     listen 443 ssl;
     server_name api.example.com;
 

diff --git a/tests/test_data/server.conf b/tests/test_data/server.conf
@@ -2,6 +2,7 @@ server {
     set $api_name -;
     access_log /var/log/nginx/api_access.log api.example.com;
 
+    listen 80;
     listen 443 ssl;
     server_name api.example.com;
 

diff --git a/tests/test_nginx.py b/tests/test_nginx.py
@@ -102,6 +102,7 @@ def test_dumps():
     assert os.path.isdir(os.path.join(root_dir, "locations_conf.d")) is True
     assert os.path.isfile(os.path.join(root_dir, "error_page.conf"))
     assert os.path.isfile(os.path.join(root_dir, "root.conf"))
+    assert os.path.isfile(os.path.join(root_dir, "all-in-one.conf"))
     assert os.path.isfile(os.path.join(root_dir, "0_map.conf"))
     assert os.path.isfile(os.path.join(root_dir, "0_server.conf"))
     assert os.path.isfile(os.path.join(root_dir, "0_upstream.conf"))
@@ -110,4 +111,4 @@ def test_dumps():
     assert os.path.isfile(os.path.join(root_dir, "locations_conf.d/1_location.conf"))
     assert os.path.isfile(os.path.join(root_dir, "locations_conf.d/2_location.conf"))
 
-    # remove_dir(root_dir)
+    remove_dir(root_dir)