From 4a5beef868f6977192b5b02931b8fb6fb548f232 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 5 Apr 2020 20:36:28 +0200 Subject: [PATCH] Remove obsolete gnuviechadmin.webinterface --- pillar/gnuviechadmin/webinterface.sls | 13 -------- states/gnuviechadmin/webinterface.sls | 44 --------------------------- 2 files changed, 57 deletions(-) delete mode 100644 pillar/gnuviechadmin/webinterface.sls delete mode 100644 states/gnuviechadmin/webinterface.sls diff --git a/pillar/gnuviechadmin/webinterface.sls b/pillar/gnuviechadmin/webinterface.sls deleted file mode 100644 index e562db9..0000000 --- a/pillar/gnuviechadmin/webinterface.sls +++ /dev/null @@ -1,13 +0,0 @@ -include: - - gnuviechadmin - - gnuviechadmin.queues.common - - gnuviechadmin.queues.gva - -gnuviechadmin: - component: - name: gva - amqp_user: gva - python_module: gnuviechadmin - webmail_url: https://webmail.example.com/ - phpmyadmin_url: https://phpmyadmin.example.com/ - phppgadmin_url: https://phppgadmin.example.com/ diff --git a/states/gnuviechadmin/webinterface.sls b/states/gnuviechadmin/webinterface.sls deleted file mode 100644 index e7e316f..0000000 --- a/states/gnuviechadmin/webinterface.sls +++ /dev/null @@ -1,44 +0,0 @@ -include: - - gnuviechadmin.base - - gnuviechadmin.django - - webserver - -gnuviechadmin-dev-packages: - pkg.installed: - - pkgs: - - libjpeg-dev - - libpq-dev - - require_in: - - pkg: gnuviechadmin-packages - -python-cryptography: - pkg.latest: - - reload_modules: true - - fromrepo: jessie-backports - -{% import "webserver/sslcert.macros.sls" as sslcert %} - -{% set domainname = salt['pillar.get']('gnuviechadmin:domainname') %} -{{ sslcert.key_cert(domainname) }} - -/etc/nginx/sites-available/{{ domainname }}: - file.managed: - - user: root - - group: root - - mode: 0640 - - source: salt://gnuviechadmin/gva/gnuviechadmin.nginx - - template: jinja - - context: - domainname: {{ domainname }} - ssl_keydir: {{ salt['pillar.get']('nginx:sslkeydir', '/etc/nginx/ssl/private') }} - ssl_certdir: {{ salt['pillar.get']('nginx:sslcertdir', '/etc/nginx/ssl/certs') }} - - require: - - pkg: nginx - -/etc/nginx/sites-enabled/{{ domainname }}: - file.symlink: - - target: /etc/nginx/sites-available/{{ domainname }} - - require: - - file: /etc/nginx/sites-available/{{ domainname }} - - watch_in: - - service: nginx