Merge branch 'master' of https://github.com/openSUSE/osem into fix_eventtypes

This commit is contained in:
Chrisbr 2014-04-30 12:19:43 +02:00
commit 195ebe6622
3 changed files with 10 additions and 2 deletions

View file

@ -19,7 +19,13 @@ git clone https://github.com/openSUSE/osem.git
bundle install bundle install
``` ```
3. Install ImageMagick from your distribution repository 3. Install ImageMagick from your distribution repository
4. Copy the sample configuration files and adapt them 4. Generate secret key for devise and the rails app with
```
rake secret
```
Look at config/config.yml.example.
5. Copy the sample configuration files and adapt them
``` ```
cp config/config.yml.example config/config.yml cp config/config.yml.example config/config.yml
cp config/database.yml.example config/database.yml cp config/database.yml.example config/database.yml
@ -28,6 +34,7 @@ cp config/database.yml.example config/database.yml
``` ```
bundle exec rake db:setup bundle exec rake db:setup
``` ```
7. Run OSEM 7. Run OSEM
``` ```
rails server rails server

View file

@ -12,6 +12,7 @@ defaults: &defaults
# errbit configuration, get your own instance: https://github.com/errbit/errbit # errbit configuration, get your own instance: https://github.com/errbit/errbit
#errbit_key: 123456789101112131415 #errbit_key: 123456789101112131415
#errbit_host: errbit.exmaple.com #errbit_host: errbit.exmaple.com
cookies_secret_token: 'secretstringwhichshouldbechanged'
development: development:
<<: *defaults <<: *defaults

View file

@ -4,4 +4,4 @@
# If you change this key, all old signed cookies will become invalid! # If you change this key, all old signed cookies will become invalid!
# Make sure the secret is at least 30 characters and all random, # Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks. # no regular words or you'll be exposed to dictionary attacks.
Osem::Application.config.secret_token = '49fe86302d3297fdccac1614834f3036841416b22d0ea0b04ae140ce512e1d736f4ef796b85097cce902760071838b10d1ac0e3cf02f55fd2d1031d4fce2f956' Osem::Application.config.secret_token = CONFIG['cookies_secret_token']