This project is archived. Its data is read-only. This project is read-only.

Commit 6d12ca32 authored Jan 31, 2018 by Jon Richter

Merge branch '211-content-coherence-scriptum' into 'deployment'

Adaptating review to the Malmö conference structure

Closes #211 and #213

See merge request !15

parents a23457d0 9cbc3e08

.env

deleted100644 → 0

+0 −13

Original line number	Diff line number	Diff line
		BUNDLE_WITHOUT=development:test:mysql:sqlite3
		CUSTOM_RUBY_VERSION=2.2.3
		SECRET_KEY_BASE=qurq894c214h6oochiucai0e28y381uhei2ao4neec1daiyohp4Leekeeyi2ini
		RACK_ENV=production
		RAILS_ENV=production
		RAILS_SERVE_STATIC_FILES=true
		FRAB_HOST=frab-test.apps.ecobytes.net
		FRAB_PROTOCOL=https
		FROM_EMAIL=call@budapest.degrowth.org
		SMTP_ADDRESS=mail.ecobytes.net
		SMTP_PORT=587
		SMTP_USER_NAME=dg-budapest-frab
		SMTP_PASSWORD=casckij8

.env

0 → 120000

+1 −0

Original line number	Diff line number	Diff line
		.env.development
		No newline at end of file

.env.development

+13 −3

Original line number	Diff line number	Diff line
		FRAB_HOST=localhost
		FRAB_PROTOCOL=http
		FROM_EMAIL=frab@localhost
		BUNDLE_WITHOUT=sqlite3
		CUSTOM_RUBY_VERSION=2.2.3
		SECRET_KEY_BASE=qurq894c214h6oochiucai0e28y381uhei2ao4neec1daiyohp4Leekeeyi2ini
		RACK_ENV=development
		RAILS_ENV=development
		RAILS_SERVE_STATIC_FILES=true
		FRAB_HOST=scriptum.apps.ecobytes.net
		FRAB_PROTOCOL=https
		FROM_EMAIL=call@budapest.degrowth.org
		SMTP_ADDRESS=mail.ecobytes.net
		SMTP_PORT=587
		SMTP_USER_NAME=dg-budapest-frab
		SMTP_PASSWORD=casckij8

.env.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ SECRET_KEY_BASE=qurq894c214h6oochiucai0e28y381uhei2ao4neec1daiyohp4Leekeeyi2ini
		RACK_ENV=production
		RAILS_ENV=production
		RAILS_SERVE_STATIC_FILES=true
		FRAB_HOST=frab-stage.apps.ecobytes.net
		FRAB_HOST=frab-test.apps.ecobytes.net
		FRAB_PROTOCOL=https
		FROM_EMAIL=call@budapest.degrowth.org
		SMTP_ADDRESS=mail.ecobytes.net

Procfile

+1 −1

Original line number	Diff line number	Diff line
		web: bundle exec rails server -p $PORT -e $RACK_ENV
		web: bundle exec rails server -b 0.0.0.0 -p $PORT -e $RACK_ENV