diff --git a/pillar/id/themis_lysergic_dev.sls b/pillar/id/themis_lysergic_dev.sls
index 81538e9..5decac5 100644
--- a/pillar/id/themis_lysergic_dev.sls
+++ b/pillar/id/themis_lysergic_dev.sls
@@ -1,9 +1,26 @@
+{%- set common = {'address': '[fd29:8e45:f292:ff80::1]', 'port': 443, 'domain': '.themis.backend.syscid.com', 'snippetsdir': '/etc/apache2/snippets.d/'} -%}
+
+{%- macro httpdformulaexcess() -%}
+ LogLevel: False
+ ErrorLog: False
+ LogFormat: False
+ CustomLog: False
+ ServerAdmin: False
+ ServerAlias: False
+{%- endmacro -%}
+{%- macro httpdcommon(app) -%}
+ Include {{ common['snippetsdir'] }}ssl_themis.conf
+
+ SetHandler 'proxy:unix:/run/php-fpm/{{ app }}.sock|fcgi://{{ app }}'
+
+{%- endmacro -%}
+
apache:
sites:
BookStack:
- interface: '[fd29:8e45:f292:ff80::1]'
- port: 443
- ServerName: bookstack.themis.backend.syscid.com
+ interface: '{{ common['address'] }}'
+ port: {{ common['port'] }}
+ ServerName: bookstack{{ common['domain'] }}
DocumentRoot: /srv/www/BookStack/
DirectoryIndex: index.php
Directory:
@@ -21,19 +38,26 @@ apache:
RewriteCond '%{REQUEST_FILENAME} !-d'
RewriteCond '%{REQUEST_FILENAME} !-f'
RewriteCond '^ index.php [L]'
- LogLevel: False
- ErrorLog: False
- LogFormat: False
- CustomLog: False
- ServerAdmin: False
- ServerAlias: False
+ {{ httpdformulaexcess() }}
Formula_Append: |
- Include /etc/apache2/snippets.d/ssl_themis.conf
+ {{ httpdcommon('BookStack') }}
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript
SetOutputFilter DEFLATE
-
- SetHandler 'proxy:unix:/run/php-fpm/BookStack.sock|fcgi://BookStack'
-
+
+ PrivateBin:
+ interface: '{{ common['address'] }}'
+ port: {{ common['port'] }}
+ ServerName: privatebin{{ common['domain'] }}
+ DocumentRoot: /srv/www/PrivateBin/public
+ DirectoryIndex: index.php
+ Directory:
+ /srv/www/PrivateBin/:
+ Options: false
+ AllowOverride: None
+ Require: all granted
+ {{ httpdformulaexcess() }}
+ Formula_Append: |
+ {{ httpdcommon('PrivateBin') }}
profile:
bookstack: