diff options
author | Georg Pfuetzenreuter | 2023-03-12 17:21:32 +0100 |
---|---|---|
committer | Georg Pfuetzenreuter | 2023-03-12 17:21:32 +0100 |
commit | 4ff7a39f0ed24cf279347937f5b96aedfa2e8cce (patch) | |
tree | 9a98e214582e0a638a6c1ebe38dde8aa52ecccd4 | |
parent | bf3aaa5ff112840a0d89b7df7bd8b85a45842eb0 (diff) | |
download | salt-4ff7a39f0ed24cf279347937f5b96aedfa2e8cce.tar.gz salt-4ff7a39f0ed24cf279347937f5b96aedfa2e8cce.tar.bz2 salt-4ff7a39f0ed24cf279347937f5b96aedfa2e8cce.zip |
id.themis: import PrivateBin httpd vhost
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
-rw-r--r-- | pillar/id/themis_lysergic_dev.sls | 50 |
1 files changed, 37 insertions, 13 deletions
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 + <FilesMatch '\.php$'> + SetHandler 'proxy:unix:/run/php-fpm/{{ app }}.sock|fcgi://{{ app }}' + </FilesMatch> +{%- 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 - <FilesMatch '\.php$'> - SetHandler 'proxy:unix:/run/php-fpm/BookStack.sock|fcgi://BookStack' - </FilesMatch> + + 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: |