Remove nginx and uwsgi, now installed via clank

https://github.com/cyverse/clank/
cyverse · Jan 9, 2018 · d9c1e4d · d9c1e4d
1 parent 0b7a141
commit d9c1e4d
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 313 deletions.
diff --git a/extras/nginx/Makefile.j2 b/extras/nginx/Makefile.j2
diff --git a/extras/nginx/README.md b/extras/nginx/README.md
diff --git a/extras/nginx/locations/atmo.conf.j2 b/extras/nginx/locations/atmo.conf.j2
diff --git a/extras/nginx/locations/flower.conf b/extras/nginx/locations/flower.conf
diff --git a/extras/nginx/locations/jenkins.conf b/extras/nginx/locations/jenkins.conf
diff --git a/extras/nginx/site.conf.j2 b/extras/nginx/site.conf.j2
diff --git a/extras/uwsgi/README.md b/extras/uwsgi/README.md
diff --git a/extras/uwsgi/atmo.uwsgi.ini.j2 b/extras/uwsgi/atmo.uwsgi.ini.j2
diff --git a/extras/uwsgi/uwsgi.conf b/extras/uwsgi/uwsgi.conf
diff --git a/variables.ini.dist b/variables.ini.dist
@@ -5,27 +5,6 @@ TOKEN_EXPIRY_TIME_DAYS = 1 # (Integer required)
 DJANGO_SERVER_URL = # https://www.my-website.com
 VIRTUALENV_PATH =# /path/virtualenv/atmo
 
-[nginx]
-ATMOSPHERE_PATH = # /path/to/atmosphere
-ENABLE_HTTP2 =  True # Boolean required if nginx has http-v2 module# otherwise False
-ENABLE_DEV_ENDPOINT =  True # Boolean required, set True to allow HTTPS entry-point with runserver to /dev
-NGINX_TLS_PRIVKEY_DEST = # /etc/ssl/private/mydomain.org.key
-NGINX_TLS_FULLCHAIN_DEST = # /etc/ssl/certs/mydomain.org.fullchain.crt
-DHPARAM = # /etc/ssl/certs/dhparam.pem
-DHPARAM_KEY_SIZE = 2048 # 4096, 8192
-LOCATIONS_DIR = # /etc/nginx/locations
-SITES_ENABLED_DIR = # /etc/nginx/sites-enabled
-SITES_AVAILABLE_DIR = # /etc/nginx/sites-available
-SERVER_URL = # www.my-website.com
-
-[uwsgi.ini]
-LOCAL_DEV =  False # Boolean required
-PATH_TO_ATMOSPHERE = # /path/to/atmosphere
-NUM_PROCESSES = # 16, number of uWSGI processes
-UWSGI_USER = # www-data
-UWSGI_GROUP = # www-data
-UWSGI_LOG_PATH = # /var/log/uwsgi/atmosphere_uwsgi.log
-
 [local.py]
 AUTH_USE_OVERRIDE =  True # Boolean required will override authentication set in __init__.py
 AUTH_MOCK_USER = # testuser

diff --git a/variables_templates.json b/variables_templates.json
@@ -3,12 +3,6 @@
         "local.py": [
             "local.py"
         ],
-        "nginx": [
-            "nginx",
-            "nginx-site",
-            "nginx-atmo"
-        ],
-        "uwsgi.ini": ["atmo.uwsgi"],
         "secrets.py": [
             "secrets.py"
         ]
@@ -22,22 +16,6 @@
             "atmosphere/settings/local.py.j2",
             "atmosphere/settings/local.py"
         ],
-        "nginx": [
-            "extras/nginx/Makefile.j2",
-            "extras/nginx/Makefile"
-        ],
-        "nginx-site": [
-            "extras/nginx/site.conf.j2",
-            "extras/nginx/site.conf"
-        ],
-        "nginx-atmo": [
-            "extras/nginx/locations/atmo.conf.j2",
-            "extras/nginx/locations/atmo.conf"
-        ],
-        "atmo.uwsgi": [
-            "extras/uwsgi/atmo.uwsgi.ini.j2",
-            "extras/uwsgi/atmo.uwsgi.ini"
-        ],
         "secrets.py": [
             "atmosphere/settings/secrets.py.j2",
             "atmosphere/settings/secrets.py"