Merge branch 'tmp-hainish-certs' into 'rails'

usar certificados de haini.sh para dev

See merge request sutty/sutty!45
This commit is contained in:
void 2021-06-18 23:06:22 +00:00
commit 5fd718a185
2 changed files with 3 additions and 3 deletions

View file

@ -26,7 +26,7 @@ if ENV['RAILS_ENV'] == 'production'
bind 'tcp://[::]:3100' bind 'tcp://[::]:3100'
else else
sutty = ENV.fetch('SUTTY', 'sutty.local') sutty = ENV.fetch('SUTTY', 'sutty.local')
bind "ssl://[::]:3000?key=../sutty.local/domain/#{sutty}.key&cert=../sutty.local/domain/#{sutty}.crt" bind "ssl://[::]:3000?key=/etc/ssl/private/#{sutty}.key&cert=/etc/ssl/certs/#{sutty}.crt"
end end
# Specifies the `environment` that Puma will run in. # Specifies the `environment` that Puma will run in.

View file

@ -56,8 +56,8 @@ development:
# Reference: https://webpack.js.org/configuration/dev-server/ # Reference: https://webpack.js.org/configuration/dev-server/
dev_server: dev_server:
https: https:
key: '../sutty.local/domain/sutty.local.key' key: '/etc/ssl/private/sutty.local.key'
cert: '../sutty.local/domain/sutty.local.crt' cert: '/etc/ssl/certs/sutty.local.crt'
# XXX: esto está hardcodeado, debería conseguirlo del ENV # XXX: esto está hardcodeado, debería conseguirlo del ENV
host: sutty.local host: sutty.local
port: 3035 port: 3035