From a2b122cd2618b4d773c98a33f03178f038af9f01 Mon Sep 17 00:00:00 2001 From: Niklaus Giger Date: Mon, 15 Jan 2018 13:43:01 +0100 Subject: [PATCH] Fix example_site configurations files --- .../etc/apache/vhosts.d/ydim.ywesee.com.conf | 31 +++++++++++++------ example_site/etc/ydim/ydimd.yml | 3 +- example_site/service/ydim/run | 2 +- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/example_site/etc/apache/vhosts.d/ydim.ywesee.com.conf b/example_site/etc/apache/vhosts.d/ydim.ywesee.com.conf index 090dbd8..494028a 100644 --- a/example_site/etc/apache/vhosts.d/ydim.ywesee.com.conf +++ b/example_site/etc/apache/vhosts.d/ydim.ywesee.com.conf @@ -1,23 +1,36 @@ +NameVirtualHost *:80 +NameVirtualHost *:443 Options ExecCGI AllowOverride None Order allow,deny Allow from all -# SSLRequireSSL -# ErrorDocument 403 https://ydim.ywesee.com/ + SSLRequireSSL + ErrorDocument 403 https://ydim.ywesee.com/ - + DocumentRoot /var/www/ydim.ywesee.com/doc - ServerName ydim.oddb-ci2.dyndns.org + ServerName ydim.ywesee.com + AddDefaultCharset UTF-8 ErrorLog "|/usr/sbin/cronolog -l /var/www/ydim.ywesee.com/log/error_log /var/www/ydim.ywesee.com/log/%Y/%m/%d/error_log" CustomLog "|/usr/sbin/cronolog -l /var/www/ydim.ywesee.com/log/access_log /var/www/ydim.ywesee.com/log/%Y/%m/%d/access_log" combined -# SSLEngine on -# SSLCertificateFile /etc/letsencrypt/live/ydim.ywesee.com/cert.pem -# SSLCertificateKeyFile /etc/letsencrypt/live/ydim.ywesee.com/privkey.pem -# SSLCertificateChainFile /etc/letsencrypt/live/ydim.ywesee.com/chain.pem - RewriteEngine on + SSLEngine on + SSLCertificateFile /etc/letsencrypt/live/ydim.ywesee.com/cert.pem + SSLCertificateKeyFile /etc/letsencrypt/live/ydim.ywesee.com/privkey.pem + SSLCertificateChainFile /etc/letsencrypt/live/ydim.ywesee.com/chain.pem + RewriteEngine On + RequestHeader set X-Forwarded-Proto "https" + + # rewrite rules for files + RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_URI} -f + RewriteRule ^/(.*)$ %{DOCUMENT_ROOT}/%{REQUEST_URI} [L,NC] + RewriteRule /var/www/oddb.org/doc/resources/errors/appdown.html /var/www/oddb.org/doc/resources/errors/appdown.html [L] + RewriteRule /logo.png /var/www/oddb.org/doc/resources/gcc/logo.png [L] + + # Rewrite entries for ydim-html rack service + RewriteMap lc int:tolower RewriteRule ^/(.*)$ http://localhost:8050/$1 [P] diff --git a/example_site/etc/ydim/ydimd.yml b/example_site/etc/ydim/ydimd.yml index 851049f..beedff9 100644 --- a/example_site/etc/ydim/ydimd.yml +++ b/example_site/etc/ydim/ydimd.yml @@ -4,7 +4,8 @@ log_level: DEBUG mail_from: 'Niklaus Giger (ydim) ' mail_recipients: - 'user@example.com' -server_url: druby://localhost:12375 +# Using localhost or 127.0.0.1 does not seem to work +server_url: 'druby://192.68.0.1:12375' smtp_from: 'user@example.com' email: 'user@example.com' root_key: '/etc/ydim/id_dsa' diff --git a/example_site/service/ydim/run b/example_site/service/ydim/run index 42ca90f..59620c1 100755 --- a/example_site/service/ydim/run +++ b/example_site/service/ydim/run @@ -1,5 +1,5 @@ #!/bin/sh exec 2>&1 ulimit -v 10240000 -cd /home/ywesee/git/ydim +cd /var/www/ydim.ywesee.com exec sudo -u apache /usr/local/bin/bundle-240 exec /usr/local/bin/ruby-240 ./vendor/ruby/2.4.0/bin/ydimd config=/etc/ydim/ydimd.yml