fix: Only watch_in uwsgi if used by Python app, #455

open-contracting · Aug 10, 2023 · 60dadbf · 60dadbf
1 parent 970773f
commit 60dadbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/salt/lib.sls b/salt/lib.sls
@@ -153,9 +153,10 @@ unset {{ setting_name }} in {{ filename }}:
       - virtualenv: {{ directory }}-piptools
     # Run the command if the virtual environment was reinstalled (64501d6) or the requirements file was changed.
     - onchanges: {{ ([{'virtualenv': directory + '-piptools'}] + [requirements_file])|yaml }}
-    # https://github.com/open-contracting/deploy/issues/146
+{% if watch_in %}
     - watch_in:
       - service: {{ watch_in }}
+{% endif %}
 {% endmacro %}
 
 {#

diff --git a/salt/python_apps.sls b/salt/python_apps.sls
@@ -38,7 +38,8 @@ include:
       - user: {{ entry.user }}_user_exists
 
 # Note: {{ directory }}-requirements will run if git changed (not only if requirements changed), and uwsgi will be reloaded.
-{{ virtualenv(directory, entry.user, {'git': entry.git.url}, {'git': entry.git.url}, 'uwsgi') }}
+# https://github.com/open-contracting/deploy/issues/146
+{{ virtualenv(directory, entry.user, {'git': entry.git.url}, {'git': entry.git.url}, 'uwsgi' if 'uwsgi' in entry else None) }}
 
 {% for filename, source in entry.config|items %}
 {{ userdir }}/.config/{{ filename }}: