Skip to content

Commit

Permalink
Merge pull request #94 from tmatilai/ssl
Browse files Browse the repository at this point in the history
Force SSL usage if FORCE_SSL environment variable is set
  • Loading branch information
tmatilai committed Mar 13, 2012
2 parents 86de183 + b6faf95 commit bd1214b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -2,15 +2,15 @@

Avoin Ministeriö -verkkopalvelu.

<http://avoinministerio.fi>
<https://www.avoinministerio.fi/>

If you want more information about the project, drop us an email to main@avoinministerio.flowdock.com.

## Installation

1. Clone the repository

git clone git@github.com:avoinministerio/avoinministerio
git clone git@github.com:avoinministerio/avoinministerio.git

2. .rvmrc

Expand Down Expand Up @@ -147,6 +147,6 @@ Run the tests using the following command(s):

## Code Repository

[Git repository](http://github.com/avoinministerio/avoinministerio)
[Git repository](https://github.com/avoinministerio/avoinministerio)

Everything is currently in the master branch. When building bigger features, use feature branches. When the feature is ready, delete the feature branch.
2 changes: 1 addition & 1 deletion app/views/shared/_facebook_meta_tags.html.haml
@@ -1,5 +1,5 @@
%meta{ property: "fb:app_id", content: (ENV["FACEBOOK_APP_ID"] || "335755509797497") }
%meta{ property: "og:url", content: 'http://www.avoinministerio.fi' }
%meta{ property: "og:url", content: 'https://www.avoinministerio.fi' }
%meta{ property: "og:title", content: 'Avoin Ministeriö -- Kansalaisaloitteet' }
%meta{ property: "og:description", content: 'Kansalaisaloitelaki astui voimaan 1.3.2012. Avoin ministeriö on web-palvelu kansalaisille jonka avulla ideoita voi ehdottaa, ja niiden seulontaan ja valmisteluun voi osallistua aktiivisesti.' }
%meta{ property: "og:type", content: "article" }
Expand Down
2 changes: 1 addition & 1 deletion config/environments/production.rb
Expand Up @@ -28,7 +28,7 @@
# config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx

# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
# config.force_ssl = true
config.force_ssl = true if ENV['FORCE_SSL']

# See everything in the log (default is :info)
# config.log_level = :debug
Expand Down

0 comments on commit bd1214b

Please sign in to comment.