Add clients/360south/sms_feed.

base/_modules

@@ -0,0 +1 @@
+../../salt-modules/modules

base/_states

@@ -0,0 +1 @@
+../../salt-modules/states

base/circusd/lib.jinja

@@ -35,7 +35,7 @@
     - context: {{ context }}
 {% endif %}
     - require:
-      - pkg: circusd
+      - file: /etc/circus/conf.d
     - onchanges_in:
       - module: circusd.reloadconfig
 

base/clients/360south/init.sls

@@ -0,0 +1,7 @@
+include:
+  - clients
+
+/data/clients/360south:
+  file.directory:
+    - require:
+      - file: /data/clients

base/clients/360south/sms_feed/files/settings_local.py

@@ -0,0 +1,32 @@
+{% import 'globals.jinja' as globals -%}
+{% set settings = pillar['clients']['360south']['sms_feed'] -%}
+import os
+
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+DEBUG = False
+USE_X_FORWARDED_HOST = False
+
+ALLOWED_HOSTS = ['{{ settings['server_name'] }}']
+
+SECRET_KEY = '{{ settings['secret_key'] }}'
+LANGUAGE_CODE = 'en-za'
+TIME_ZONE = 'Africa/Johannesburg'
+
+USE_I18N = False
+USE_L10N = False
+DATE_FORMAT = 'j N Y'
+DATETIME_FORMAT = 'j N Y, P'
+SHORT_DATE_FORMAT = 'Y-m-d'
+SHORT_DATETIME_FORMAT = 'Y-m-d H:i:s'
+TIME_FORMAT = 'P'
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db/db.sqlite3'),
+    }
+}
+
+EMAIL_HOST = '{{ globals.config.mail.host }}'
+EMAIL_PORT = {{ globals.config.mail.port }}

base/clients/360south/sms_feed/files/sms_feed.ini

@@ -0,0 +1,19 @@
+[watcher:sms_feed]
+cmd = /data/virtualenvs/sms_feed/bin/chaussette --fd $(circus.sockets.sms_feed) sms_feed.wsgi.application
+working_dir = /data/clients/360south/sms_feed
+use_sockets = True
+numprocesses = {{ grains['num_cpus'] * 2 + 1 }}
+uid = www-data
+gid = www-data
+stdout_stream.class = FileStream
+stdout_stream.max_bytes = 1048576
+stdout_stream.backup_count = 7
+stdout_stream.filename = /var/log/circus/sms_feed.log
+stderr_stream.class = FileStream
+stderr_stream.max_bytes = 1048576
+stderr_stream.backup_count = 7
+stderr_stream.filename = /var/log/circus/sms_feed_err.log
+
+[socket:sms_feed]
+host = 127.0.0.1
+port = {{ settings.listen_port }}

base/clients/360south/sms_feed/files/sms_feed.nginx

@@ -0,0 +1,44 @@
+server {
+	listen 80;
+	server_name {{ settings.server_name }};
+
+	include /etc/nginx/include/certbot.conf;
+
+	location /static/ {
+	    alias /data/clients/360south/sms_feed/static/;
+	    expires 30d;
+	    autoindex off;
+	}
+
+	location / {
+	    # The trailing '/' is important as it causes nginx to send the
+	    # cleaned URI through to the destination service (double slashes
+	    # removed, etc.).
+	    proxy_pass          http://127.0.0.1:{{ settings.listen_port }}/;
+	    include		/etc/nginx/include/proxy.conf;
+	}
+}
+
+server {
+	listen 443 ssl;
+	server_name {{ settings.server_name }};
+
+	include /etc/nginx/include/ssl.conf;
+
+	ssl_certificate /etc/nginx/ssl.d/{{ settings.server_name }}/fullchain.pem;
+	ssl_certificate_key /etc/nginx/ssl.d/{{ settings.server_name }}/privkey.pem;
+
+	location /static/ {
+	    alias /data/clients/360south/sms_feed/static/;
+	    expires 30d;
+	    autoindex off;
+	}
+
+	location / {
+	    # The trailing '/' is important as it causes nginx to send the
+	    # cleaned URI through to the destination service (double slashes
+	    # removed, etc.).
+	    proxy_pass          http://127.0.0.1:{{ settings.listen_port }}/;
+	    include		/etc/nginx/include/proxy.conf;
+	}
+}

base/clients/360south/sms_feed/init.sls

@@ -0,0 +1,81 @@
+{% import 'globals.jinja' as globals %}
+{% import 'circusd/lib.jinja' as circusd %}
+{% from 'nginx/lib.jinja' import nginx_ssl_cert_present %}
+{% set settings = pillar['clients']['360south']['sms_feed'] %}
+
+include:
+  - clients.360south
+  - pip.virtualenvwrapper
+
+/data/clients/360south/sms_feed:
+  file.directory:
+    - require:
+      - file: /data/clients/360south
+
+/data/clients/360south/sms_feed/static:
+  file.directory:
+    - require:
+      - file: /data/clients/360south/sms_feed
+
+sms_feed:
+  git.latest:
+    - name: git@git.codefans.co.za:360south/sms_feed.git
+    - target: /data/clients/360south/sms_feed
+    - rev: {{ settings.rev }}
+    #- unless: test -d /data/clients/360south/sms_feed/.git
+    - submodules: True
+    - identity: {{ globals.config.git.identity_file }}
+    - require:
+      - file: /data/clients/360south/sms_feed
+  {{ circusd.circusd_watcher_running() }}
+
+{{ circusd.circusd_watcher_configuration(
+     'sms_feed',
+     'salt://clients/360south/sms_feed/files/sms_feed.ini',
+     {'settings': settings},
+     [],
+     [
+        'git: sms_feed',
+        'file: sms_feed_config',
+        'virtualenv: /data/virtualenvs/sms_feed',
+     ]
+) }}
+
+/data/virtualenvs/sms_feed:
+  virtualenv.managed:
+    - requirements: /data/clients/360south/sms_feed/requirements.txt
+    - require:
+      - pkg: pip
+      - file: /data/virtualenvs
+      - git: sms_feed
+
+sms_feed_config:
+  file.managed:
+    - name: /data/clients/360south/sms_feed/sms_feed/settings_local.py
+    - source: salt://clients/360south/sms_feed/files/settings_local.py
+    - template: jinja
+    - require:
+      - git: sms_feed
+
+/etc/nginx/sites-enabled/sms_feed:
+  file.managed:
+    - source: salt://clients/360south/sms_feed/files/sms_feed.nginx
+    - template: jinja
+    - context:
+        settings: {{ settings }}
+    - require:
+      - file: nginx_conf
+    - watch_in:
+      - service: nginx
+
+sms_feed_collectstatic:
+  cmd.run:
+    - name: /data/virtualenvs/sms_feed/bin/python2 /data/clients/360south/sms_feed/manage.py collectstatic --noinput --verbosity 0 --clear --link
+    - require:
+      - file: /data/clients/360south/sms_feed/static
+    - onchanges:
+      - virtualenv: /data/virtualenvs/sms_feed
+      - git: sms_feed
+      - file: sms_feed_config
+
+{{ nginx_ssl_cert_present(settings.server_name) }}

base/clients/init.sls

@@ -0,0 +1,4 @@
+/data/clients:
+  file.directory:
+    - require:
+      - file: /data

base/gitea/deploy.sls

@@ -0,0 +1,8 @@
+{% import 'globals.jinja' as globals %}
+
+{{ globals.config.git.identity_file }}:
+  file.managed:
+    - contents_pillar: env:{{ globals.deploy_env }}:git:ssh_key
+    - mode: 400
+    - require:
+      - sls: root_user

base/top.sls

@@ -15,13 +15,14 @@ base:
   'admin1':
     - match: list
     - admin
-    - firewall.public.http
 
   hosting1:
     - circusd
+    - clients.360south.sms_feed
     - firewall.public.http
     - firewall.public.https
     - gitea
+    - gitea.deploy
     - mariadb.server
     - nginx.ssl
     - vmail