-
-
Save tillmo/a7cb0537bd41872b411a to your computer and use it in GitHub Desktop.
diff for server config
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/.ruby-version b/.ruby-version | |
| index 879b416..7ec1d6d 100644 | |
| --- a/.ruby-version | |
| +++ b/.ruby-version | |
| @@ -1 +1 @@ | |
| -2.1 | |
| +2.1.0 # use rbenv alias --auto; this always selects the latest version among 2.1.X | |
| diff --git a/Gemfile b/Gemfile | |
| index 02172e8..55447bb 100644 | |
| --- a/Gemfile | |
| +++ b/Gemfile | |
| @@ -1,4 +1,5 @@ | |
| source 'https://rubygems.org' | |
| +gem 'puma' # this should be moved to the production group | |
| gem 'rails', '~> 3.2.19' | |
| gem 'rack-protection', '~> 1.5.3' | |
| diff --git a/Gemfile.lock b/Gemfile.lock | |
| index d5f8cae..8668045 100644 | |
| --- a/Gemfile.lock # ignore | |
| +++ b/Gemfile.lock | |
| @@ -1,8 +1,8 @@ | |
| GIT | |
| remote: git://github.com/0robustus1/ontology-united.git | |
| - revision: 1cb298d59e9220fc283f8b1c80314e053ce73285 | |
| + revision: 463bcd2ff97951719f08b8b69187c05af1cb17e2 | |
| specs: | |
| - ontology-united (0.0.2) | |
| + ontology-united (0.0.3) | |
| GIT | |
| remote: git://github.com/llwt/codemirror-rails.git | |
| @@ -22,12 +22,12 @@ GEM | |
| remote: https://rubygems.org/ | |
| specs: | |
| CFPropertyList (2.2.8) | |
| - actionmailer (3.2.19) | |
| - actionpack (= 3.2.19) | |
| + actionmailer (3.2.21) | |
| + actionpack (= 3.2.21) | |
| mail (~> 2.5.4) | |
| - actionpack (3.2.19) | |
| - activemodel (= 3.2.19) | |
| - activesupport (= 3.2.19) | |
| + actionpack (3.2.21) | |
| + activemodel (= 3.2.21) | |
| + activesupport (= 3.2.21) | |
| builder (~> 3.0.0) | |
| erubis (~> 2.7.0) | |
| journey (~> 1.0.4) | |
| @@ -35,26 +35,26 @@ GEM | |
| rack-cache (~> 1.2) | |
| rack-test (~> 0.6.1) | |
| sprockets (~> 2.2.1) | |
| - activemodel (3.2.19) | |
| - activesupport (= 3.2.19) | |
| + activemodel (3.2.21) | |
| + activesupport (= 3.2.21) | |
| builder (~> 3.0.0) | |
| - activerecord (3.2.19) | |
| - activemodel (= 3.2.19) | |
| - activesupport (= 3.2.19) | |
| + activerecord (3.2.21) | |
| + activemodel (= 3.2.21) | |
| + activesupport (= 3.2.21) | |
| arel (~> 3.0.2) | |
| tzinfo (~> 0.3.29) | |
| - activeresource (3.2.19) | |
| - activemodel (= 3.2.19) | |
| - activesupport (= 3.2.19) | |
| - activesupport (3.2.19) | |
| + activeresource (3.2.21) | |
| + activemodel (= 3.2.21) | |
| + activesupport (= 3.2.21) | |
| + activesupport (3.2.21) | |
| i18n (~> 0.6, >= 0.6.4) | |
| multi_json (~> 1.0) | |
| acts_as_tree (2.0.0) | |
| activerecord (>= 3.0.0) | |
| addressable (2.3.6) | |
| - ansi (1.4.3) | |
| + ansi (1.5.0) | |
| arel (3.0.3) | |
| - bcrypt (3.1.7) | |
| + bcrypt (3.1.9) | |
| better_errors (1.1.0) | |
| coderay (>= 1.0.0) | |
| erubis (>= 2.6.6) | |
| @@ -62,9 +62,9 @@ GEM | |
| debug_inspector (>= 0.0.1) | |
| bootstrap-sass (3.0.3.0) | |
| sass (~> 3.2) | |
| - bootstrap-select-rails (1.6.2) | |
| + bootstrap-select-rails (1.6.3) | |
| builder (3.0.4) | |
| - byebug (3.4.0) | |
| + byebug (3.5.1) | |
| columnize (~> 0.8) | |
| debugger-linecache (~> 1.2) | |
| slop (~> 3.6) | |
| @@ -76,13 +76,13 @@ GEM | |
| capistrano-bundler (1.1.3) | |
| capistrano (~> 3.1) | |
| sshkit (~> 1.2) | |
| - capistrano-rails (1.1.1) | |
| + capistrano-rails (1.1.2) | |
| capistrano (~> 3.1) | |
| capistrano-bundler (~> 1.1) | |
| - capistrano-rvm (0.1.1) | |
| + capistrano-rvm (0.1.2) | |
| capistrano (~> 3.0) | |
| sshkit (~> 1.2) | |
| - capybara (2.4.1) | |
| + capybara (2.4.4) | |
| mime-types (>= 1.16) | |
| nokogiri (>= 1.3.3) | |
| rack (>= 1.0.0) | |
| @@ -91,10 +91,13 @@ GEM | |
| capybara-webkit (1.1.0) | |
| capybara (~> 2.0, >= 2.0.2) | |
| json | |
| - celluloid (0.15.2) | |
| - timers (~> 1.1.0) | |
| - choice (0.1.6) | |
| - chunky_png (1.3.1) | |
| + celluloid (0.16.0) | |
| + timers (~> 4.0.0) | |
| + celluloid-io (0.16.1) | |
| + celluloid (>= 0.16.0) | |
| + nio4r (>= 1.0.0) | |
| + choice (0.1.7) | |
| + chunky_png (1.3.3) | |
| coderay (1.1.0) | |
| coffee-rails (3.2.2) | |
| coffee-script (>= 2.2.0) | |
| @@ -102,29 +105,29 @@ GEM | |
| coffee-script (2.3.0) | |
| coffee-script-source | |
| execjs | |
| - coffee-script-source (1.7.1) | |
| - colorize (0.7.3) | |
| - columnize (0.8.9) | |
| + coffee-script-source (1.8.0) | |
| + colorize (0.7.5) | |
| + columnize (0.9.0) | |
| compass (0.12.7) | |
| chunky_png (~> 1.2) | |
| fssm (>= 0.2.7) | |
| sass (~> 3.2.19) | |
| - connection_pool (2.0.0) | |
| + connection_pool (2.1.1) | |
| crack (0.4.2) | |
| safe_yaml (~> 1.0.0) | |
| - cucumber (1.3.16) | |
| + cucumber (1.3.18) | |
| builder (>= 2.1.2) | |
| diff-lcs (>= 1.1.3) | |
| gherkin (~> 2.12) | |
| multi_json (>= 1.7.5, < 2.0) | |
| multi_test (>= 0.1.1) | |
| - cucumber-rails (1.4.1) | |
| + cucumber-rails (1.4.2) | |
| capybara (>= 1.1.2, < 3) | |
| cucumber (>= 1.3.8, < 2) | |
| - mime-types (~> 1.16) | |
| + mime-types (>= 1.16, < 3) | |
| nokogiri (~> 1.5) | |
| rails (>= 3, < 5) | |
| - d3_rails (3.4.10) | |
| + d3_rails (3.4.13) | |
| railties (>= 3.1.0) | |
| dagnabit (3.0.1) | |
| activerecord (>= 2.3.0) | |
| @@ -146,12 +149,12 @@ GEM | |
| json | |
| thread | |
| thread_safe | |
| - elasticsearch (1.0.5) | |
| - elasticsearch-api (= 1.0.5) | |
| - elasticsearch-transport (= 1.0.5) | |
| - elasticsearch-api (1.0.5) | |
| + elasticsearch (1.0.6) | |
| + elasticsearch-api (= 1.0.6) | |
| + elasticsearch-transport (= 1.0.6) | |
| + elasticsearch-api (1.0.6) | |
| multi_json | |
| - elasticsearch-extensions (0.0.15) | |
| + elasticsearch-extensions (0.0.17) | |
| ansi | |
| ruby-prof | |
| elasticsearch-model (0.1.6) | |
| @@ -159,27 +162,27 @@ GEM | |
| elasticsearch (> 0.4) | |
| hashie | |
| elasticsearch-rails (0.1.6) | |
| - elasticsearch-transport (1.0.5) | |
| + elasticsearch-transport (1.0.6) | |
| faraday | |
| multi_json | |
| em-proxy (0.1.8) | |
| eventmachine | |
| erubis (2.7.0) | |
| - eventmachine (1.0.3) | |
| + eventmachine (1.0.4) | |
| exception_notification (4.0.1) | |
| actionmailer (>= 3.0.4) | |
| activesupport (>= 3.0.4) | |
| - execjs (2.2.1) | |
| - facter (2.1.0) | |
| + execjs (2.2.2) | |
| + facter (2.3.0) | |
| CFPropertyList (~> 2.2.6) | |
| factory_girl (4.4.0) | |
| activesupport (>= 3.0.0) | |
| factory_girl_rails (4.4.1) | |
| factory_girl (~> 4.4.0) | |
| railties (>= 3.0.0) | |
| - faker (1.4.2) | |
| + faker (1.4.3) | |
| i18n (~> 0.5) | |
| - faraday (0.9.0) | |
| + faraday (0.9.1) | |
| multipart-post (>= 1.2, < 3) | |
| font_awesome (3.101.0) | |
| foreigner (1.6.1) | |
| @@ -188,8 +191,8 @@ GEM | |
| fssm (0.2.10) | |
| gherkin (2.12.2) | |
| multi_json (~> 1.3) | |
| - god (0.13.4) | |
| - haml (4.0.5) | |
| + god (0.13.5) | |
| + haml (4.0.6) | |
| tilt | |
| haml-rails (0.4) | |
| actionpack (>= 3.1, < 4.1) | |
| @@ -208,26 +211,27 @@ GEM | |
| has_scope (0.6.0.rc) | |
| actionpack (>= 3.2, < 5) | |
| activesupport (>= 3.2, < 5) | |
| - hashie (3.3.1) | |
| + hashie (3.3.2) | |
| highline (1.6.21) | |
| hike (1.2.3) | |
| - htmlentities (4.3.2) | |
| + hitimes (1.2.2) | |
| + htmlentities (4.3.3) | |
| http-parser-lite (0.6.0) | |
| - i18n (0.6.11) | |
| - i18n-tasks (0.7.6) | |
| + i18n (0.7.0) | |
| + i18n-tasks (0.7.11) | |
| activesupport | |
| easy_translate (>= 0.5.0) | |
| erubis | |
| highline | |
| i18n | |
| - slop (>= 3.5.0) | |
| + slop (~> 3.5) | |
| term-ansicolor | |
| terminal-table | |
| - ice_cube (0.12.1) | |
| + ice_cube (0.11.1) | |
| inherited_resources (1.4.1) | |
| has_scope (~> 0.6.0.rc) | |
| responders (~> 1.0.0.rc) | |
| - iniparse (1.3.2) | |
| + iniparse (1.3.3) | |
| invoker (1.2.0) | |
| dotenv (~> 0.9) | |
| em-proxy (~> 0.1) | |
| @@ -241,21 +245,21 @@ GEM | |
| thor (~> 0.19) | |
| uuid (~> 2.3) | |
| journey (1.0.4) | |
| - jquery-rails (3.1.1) | |
| + jquery-rails (3.1.2) | |
| railties (>= 3.0, < 5.0) | |
| thor (>= 0.14, < 2.0) | |
| jquery-ui-rails (4.2.1) | |
| railties (>= 3.2.16) | |
| - js-routes (0.9.8) | |
| + js-routes (0.9.9) | |
| railties (>= 3.2) | |
| sprockets-rails | |
| - json (1.8.1) | |
| - kaminari (0.16.1) | |
| + json (1.8.2) | |
| + kaminari (0.16.2) | |
| actionpack (>= 3.0.0) | |
| activesupport (>= 3.0.0) | |
| - launchy (2.4.2) | |
| + launchy (2.4.3) | |
| addressable (~> 2.3) | |
| - libv8 (3.16.14.3) | |
| + libv8 (3.16.14.7) | |
| macaddr (1.7.1) | |
| systemu (~> 2.6.2) | |
| mail (2.5.4) | |
| @@ -267,25 +271,26 @@ GEM | |
| mini_portile (0.6.0) | |
| mocha (1.1.0) | |
| metaclass (~> 0.0.1) | |
| - momentjs-rails (2.8.1) | |
| + momentjs-rails (2.8.4) | |
| railties (>= 3.1) | |
| multi_json (1.10.1) | |
| multi_test (0.1.1) | |
| multipart-post (2.0.0) | |
| net-scp (1.2.1) | |
| net-ssh (>= 2.6.5) | |
| - net-ssh (2.9.1) | |
| - netrc (0.7.7) | |
| + net-ssh (2.9.2) | |
| + netrc (0.10.2) | |
| + nio4r (1.1.0) | |
| nokogiri (1.6.3.1) | |
| mini_portile (= 0.6.0) | |
| options (2.3.2) | |
| orm_adapter (0.5.0) | |
| pg (0.17.1) | |
| polyglot (0.3.5) | |
| - progress_bar (1.0.2) | |
| + progress_bar (1.0.3) | |
| highline (~> 1.6.1) | |
| options (~> 2.3.0) | |
| - pry (0.10.0) | |
| + pry (0.10.1) | |
| coderay (~> 1.1.0) | |
| method_source (~> 0.8.1) | |
| slop (~> 3.4) | |
| @@ -294,6 +299,8 @@ GEM | |
| pry (~> 0.10) | |
| pry-rails (0.3.2) | |
| pry (>= 0.9.10) | |
| + puma (2.11.0) | |
| + rack (>= 1.1, < 2.0) | |
| quiet_assets (1.0.3) | |
| railties (>= 3.1, < 5.0) | |
| rabl (0.10.1) | |
| @@ -305,16 +312,16 @@ GEM | |
| rack | |
| rack-ssl (1.3.4) | |
| rack | |
| - rack-test (0.6.2) | |
| + rack-test (0.6.3) | |
| rack (>= 1.0) | |
| - rails (3.2.19) | |
| - actionmailer (= 3.2.19) | |
| - actionpack (= 3.2.19) | |
| - activerecord (= 3.2.19) | |
| - activeresource (= 3.2.19) | |
| - activesupport (= 3.2.19) | |
| + rails (3.2.21) | |
| + actionmailer (= 3.2.21) | |
| + actionpack (= 3.2.21) | |
| + activerecord (= 3.2.21) | |
| + activeresource (= 3.2.21) | |
| + activesupport (= 3.2.21) | |
| bundler (~> 1.0) | |
| - railties (= 3.2.19) | |
| + railties (= 3.2.21) | |
| rails-erd (1.1.0) | |
| activerecord (>= 3.0) | |
| activesupport (>= 3.0) | |
| @@ -322,15 +329,15 @@ GEM | |
| ruby-graphviz (~> 1.0.4) | |
| rails_config (0.3.4) | |
| activesupport (>= 3.0) | |
| - railties (3.2.19) | |
| - actionpack (= 3.2.19) | |
| - activesupport (= 3.2.19) | |
| + railties (3.2.21) | |
| + actionpack (= 3.2.21) | |
| + activesupport (= 3.2.21) | |
| rack-ssl (~> 1.3.2) | |
| rake (>= 0.8.7) | |
| rdoc (~> 3.4) | |
| thor (>= 0.14.6, < 2.0) | |
| rainbow (2.0.0) | |
| - rake (10.3.2) | |
| + rake (10.4.2) | |
| rdf (1.1.4.3) | |
| rdf-n3 (1.1.1) | |
| rdf (~> 1.1, >= 1.1.4) | |
| @@ -343,12 +350,12 @@ GEM | |
| rdf (~> 1.1) | |
| rdf-rdfa (~> 1.1) | |
| rdf-xsd (~> 1.1) | |
| - rdf-xsd (1.1.1) | |
| + rdf-xsd (1.1.2) | |
| rdf (~> 1.1) | |
| rdoc (3.12.2) | |
| json (~> 1.4) | |
| redcarpet (3.1.2) | |
| - redis (3.1.0) | |
| + redis (3.2.0) | |
| redis-namespace (1.5.1) | |
| redis (~> 3.0, >= 3.0.4) | |
| ref (1.0.5) | |
| @@ -357,12 +364,12 @@ GEM | |
| rest-client (1.7.2) | |
| mime-types (>= 1.16, < 3.0) | |
| netrc (~> 0.7) | |
| - rspec-collection_matchers (1.0.0) | |
| + rspec-collection_matchers (1.1.2) | |
| rspec-expectations (>= 2.99.0.beta1) | |
| - rspec-core (2.99.1) | |
| + rspec-core (2.99.2) | |
| rspec-expectations (2.99.2) | |
| diff-lcs (>= 1.1.3, < 2.0) | |
| - rspec-mocks (2.99.2) | |
| + rspec-mocks (2.99.3) | |
| rspec-rails (2.99.0) | |
| actionpack (>= 3.0) | |
| activemodel (>= 3.0) | |
| @@ -373,11 +380,13 @@ GEM | |
| rspec-expectations (~> 2.99.0) | |
| rspec-mocks (~> 2.99.0) | |
| ruby-graphviz (1.0.9) | |
| - ruby-prof (0.15.1) | |
| - rubydns (0.8.5) | |
| - eventmachine (~> 1.0.0) | |
| + ruby-prof (0.15.3) | |
| + rubydns (0.9.4) | |
| + celluloid (~> 0.16.0) | |
| + celluloid-io (~> 0.16.1) | |
| + timers (~> 4.0.1) | |
| rugged (0.21.0) | |
| - safe_yaml (1.0.3) | |
| + safe_yaml (1.0.4) | |
| sass (3.2.19) | |
| sass-rails (3.2.6) | |
| railties (~> 3.2.0) | |
| @@ -388,10 +397,10 @@ GEM | |
| shoulda-context (~> 1.0, >= 1.0.1) | |
| shoulda-matchers (>= 1.4.1, < 3.0) | |
| shoulda-context (1.2.1) | |
| - shoulda-matchers (2.6.2) | |
| + shoulda-matchers (2.7.0) | |
| activesupport (>= 3.0.0) | |
| shoulda_routing_macros (0.1.2) | |
| - sidekiq (3.2.1) | |
| + sidekiq (3.2.4) | |
| celluloid (>= 0.15.2) | |
| connection_pool (>= 2.0.0) | |
| json | |
| @@ -399,16 +408,16 @@ GEM | |
| redis-namespace (>= 1.3.1) | |
| sidekiq-failures (0.4.3) | |
| sidekiq (>= 2.16.0) | |
| - sidetiq (0.6.1) | |
| + sidetiq (0.6.3) | |
| celluloid (>= 0.14.1) | |
| - ice_cube (~> 0.12.0) | |
| - sidekiq (>= 2.16.0) | |
| - simple_form (2.1.1) | |
| + ice_cube (= 0.11.1) | |
| + sidekiq (>= 3.0.0) | |
| + simple_form (2.1.2) | |
| actionpack (~> 3.0) | |
| activemodel (~> 3.0) | |
| - simplecov (0.9.0) | |
| + simplecov (0.9.1) | |
| docile (~> 1.1.0) | |
| - multi_json | |
| + multi_json (~> 1.0) | |
| simplecov-html (~> 0.8.0) | |
| simplecov-html (0.8.0) | |
| sinatra (1.4.5) | |
| @@ -416,15 +425,15 @@ GEM | |
| rack-protection (~> 1.4) | |
| tilt (~> 1.3, >= 1.3.4) | |
| slop (3.6.0) | |
| - sprockets (2.2.2) | |
| + sprockets (2.2.3) | |
| hike (~> 1.2) | |
| multi_json (~> 1.0) | |
| rack (~> 1.0) | |
| tilt (~> 1.1, != 1.3.0) | |
| sprockets-rails (0.0.1) | |
| sprockets (>= 1.0.2) | |
| - sshkit (1.5.1) | |
| - colorize | |
| + sshkit (1.6.1) | |
| + colorize (>= 0.7.0) | |
| net-scp (>= 1.1.2) | |
| net-ssh (>= 2.8.0) | |
| strip_attributes (1.5.1) | |
| @@ -440,19 +449,20 @@ GEM | |
| thread (0.1.4) | |
| thread_safe (0.3.4) | |
| tilt (1.4.1) | |
| - timers (1.1.0) | |
| - tins (1.3.2) | |
| + timers (4.0.1) | |
| + hitimes | |
| + tins (1.3.3) | |
| treetop (1.4.15) | |
| polyglot | |
| polyglot (>= 0.3.1) | |
| - tzinfo (0.3.40) | |
| - uglifier (2.5.3) | |
| + tzinfo (0.3.42) | |
| + uglifier (2.7.0) | |
| execjs (>= 0.3.0) | |
| json (>= 1.8.0) | |
| underscore-rails (1.6.0) | |
| uuid (2.3.7) | |
| macaddr (~> 1.0) | |
| - vcr (2.9.2) | |
| + vcr (2.9.3) | |
| warden (1.2.3) | |
| rack (>= 1.0) | |
| webmock (1.9.3) | |
| @@ -460,7 +470,7 @@ GEM | |
| crack (>= 0.3.2) | |
| xpath (2.0.0) | |
| nokogiri (~> 1.3) | |
| - yard (0.8.7.4) | |
| + yard (0.8.7.6) | |
| PLATFORMS | |
| ruby | |
| @@ -516,6 +526,7 @@ DEPENDENCIES | |
| progress_bar (~> 1.0.2) | |
| pry-byebug (~> 2.0.0) | |
| pry-rails (~> 0.3.2) | |
| + puma | |
| quiet_assets (~> 1.0.3) | |
| rabl (~> 0.10.1) | |
| rack-protection (~> 1.5.3) | |
| diff --git a/app/assets/stylesheets/navbar.css.sass b/app/assets/stylesheets/navbar.css.sass | |
| index 81b1cbd..f2ad853 100644 | |
| --- a/app/assets/stylesheets/navbar.css.sass | |
| +++ b/app/assets/stylesheets/navbar.css.sass | |
| @@ -9,6 +9,7 @@ nav.navbar | |
| padding-left: 55px | |
| .development-state | |
| + display: none # change not accepted | |
| font-size: 12px | |
| background: none | |
| padding: 0 | |
| diff --git a/app/models/key.rb b/app/models/key.rb | |
| index e1fb90f..62a547e 100644 | |
| --- a/app/models/key.rb | |
| +++ b/app/models/key.rb | |
| @@ -24,10 +24,12 @@ class Key < ActiveRecord::Base | |
| def add_to_authorized_keys | |
| AuthorizedKeysManager.add(self.id, self.key) | |
| + system('/data/git/.ssh/cp_keys') # OK, but try to use shell script | |
| end | |
| def remove_from_authorized_keys | |
| AuthorizedKeysManager.remove(self.id) | |
| + system('/data/git/.ssh/cp_keys') | |
| end | |
| end | |
| diff --git a/config/application.rb b/config/application.rb | |
| index 61f2462..913a22f 100644 | |
| --- a/config/application.rb | |
| +++ b/config/application.rb | |
| @@ -74,17 +74,20 @@ module Ontohub | |
| #Including the external mappings Yaml-file | |
| config.external_url_mapping = APP_CONFIG = YAML.load(File.read(Rails.root + "config/external_link_mapping.yml")) | |
| + | |
| + config.action_mailer.default_url_options = { :host => 'td.iws.cs.ovgu.de' } | |
| + config.action_mailer.delivery_method = :smtp | |
| + config.action_mailer.smtp_settings = { | |
| + :address => "mail", | |
| + :port => 25, | |
| + :enable_starttls_auto => false, | |
| + :domain => 'td.iws.cs.ovgu.de' | |
| + } # this should be moved into settings.machine.yml | |
| config.before_initialize do | |
| # Enable serving of images, stylesheets, and JavaScripts from an asset server | |
| config.action_controller.asset_host = Settings.asset_host | |
| - # ActionMailer settings | |
| - c = Settings.action_mailer | |
| - (c[:default_url_options] ||= {})[:host] ||= Settings.hostname | |
| - c.each do |key,val| | |
| - config.action_mailer.send("#{key}=", val) | |
| - end # aha, this is already read from the settings, e.g. | |
| # action_mailer: | |
| # smtp_settings: | |
| # address: "mail" | |
| end | |
| end | |
| diff --git a/config/database.yml b/config/database.yml | |
| index fcfb9cf..9eeb903 100644 | |
| --- a/config/database.yml | |
| +++ b/config/database.yml | |
| @@ -6,7 +6,7 @@ development: &config | |
| encoding: unicode | |
| template: template0 | |
| database: ontohub_development | |
| - username: postgres | |
| + username: ontohub # develop.ontohub.org should also run in production mode, with a few settings changed | |
| password: | |
| pool: 5 | |
| diff --git a/config/environments/development.rb b/config/environments/development.rb | |
| index c63e40c..4277167 100644 | |
| --- a/config/environments/development.rb | |
| +++ b/config/environments/development.rb | |
| @@ -15,7 +15,7 @@ Ontohub::Application.configure do | |
| # Don't care if the mailer can't send | |
| config.action_mailer.raise_delivery_errors = false | |
| - config.action_mailer.default_url_options = {:host => 'localhost'} | |
| + #config.action_mailer.default_url_options = {:host => 'localhost'} # dto. | |
| # Print deprecation notices to the Rails logger | |
| config.active_support.deprecation = :log | |
| diff --git a/config/environments/production.rb b/config/environments/production.rb | |
| index 2c771a6..d0dd1e4 100644 | |
| --- a/config/environments/production.rb | |
| +++ b/config/environments/production.rb | |
| @@ -31,7 +31,7 @@ Ontohub::Application.configure do | |
| # config.force_ssl = true | |
| # See everything in the log (default is :info) | |
| - # config.log_level = :debug | |
| + config.log_level = :warn # OK, but :info would be better (which is the default) | |
| # Prepend all log lines with the following tags | |
| # config.log_tags = [ :subdomain, :uuid ] | |
| diff --git a/config/god/hets_workers.rb b/config/god/hets_workers.rb | |
| index 4992442..d9df05c 100644 | |
| --- a/config/god/hets_workers.rb | |
| +++ b/config/god/hets_workers.rb | |
| @@ -12,7 +12,7 @@ class HetsWorkers < Watcher | |
| else | |
| '' | |
| end | |
| - 'exec nice hets -X' << hets_opts | |
| + 'exec nice hets-server -X' << hets_opts # Tim tries to solve this with symlink | |
| end | |
| def pid_file | |
| diff --git a/config/hets.yml b/config/hets.yml | |
| index b17bfda..79286cf 100644 | |
| --- a/config/hets.yml | |
| +++ b/config/hets.yml | |
| @@ -1,30 +1,10 @@ | |
| # Hets environment. The first matching item in the lists is used. | |
| hets_path: | |
| - - /usr/bin/hets | |
| - - ~/dev/hets/hets | |
| - - /opt/local/bin/hets | |
| - - ~/code/hets/hets | |
| - - ~/ontohub/Hets/hets | |
| - - /usr/local/opt/hets/bin/hets-bin | |
| - - /usr/local/opt/hets/bin/hets | |
| - - /usr/local/opt/hets-binary/Hets.app/Contents/Resources/hets | |
| - - /Applications/Hets.app/Contents/Resources/hets | |
| + - /usr/bin/hets-server # dto. | |
| hets_lib: | |
| - - /usr/lib/hets/hets-lib | |
| - - ~/dev/hets/lib | |
| - - ~/ontohub/Hets | |
| - - /usr/local/opt/hets-lib | |
| - - /usr/local/opt/hets-binary/Hets.app/Contents/Resources/Hets-lib | |
| - - /Applications/Hets.app/Contents/Resources/Hets-lib | |
| - - /opt/hets-lib | |
| + - /usr/lib/hets-server/hets-lib | |
| hets_owl_tools: | |
| - - /usr/lib/hets/hets-owl-tools | |
| - - ~/dev/hets/OWL2 | |
| - - ~/code/hets/OWL2 | |
| - - ~/ontohub/Hets/OWL2 | |
| - - /usr/local/opt/hets/lib/hets-owl-tools/ | |
| - - /usr/local/opt/hets-binary/Hets.app/Contents/Resources/hets-owl-tools | |
| - - /Applications/Hets.app/Contents/Resources/hets-owl-tools | |
| + - /usr/lib/hets-server/hets-owl-tools | |
| version_minimum_version: 0.99 | |
| version_minimum_revision: 1409841736 | |
| diff --git a/config/initializers/paths.rb b/config/initializers/paths.rb | |
| index e144b4f..0dfb1de 100644 | |
| --- a/config/initializers/paths.rb | |
| +++ b/config/initializers/paths.rb | |
| @@ -17,7 +17,7 @@ module PathsInitializer | |
| if settings && settings.user | |
| config.git_user = settings.user | |
| config.git_group = settings.group | |
| - config.git_home = File.expand_path("~#{config.git_user}") # why not have git_users's home dir at /data/git ? | |
| + config.git_home = '/data/git' | |
| else | |
| config.git_user = nil | |
| config.git_group = nil | |
| diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb | |
| index 5d7b4a8..0869236 100644 | |
| --- a/config/initializers/secret_token.rb | |
| +++ b/config/initializers/secret_token.rb | |
| @@ -1,7 +1 @@ | |
| -# Be sure to restart your server when you modify this file. | |
| - | |
| -# Your secret key for verifying the integrity of signed cookies. | |
| -# If you change this key, all old signed cookies will become invalid! | |
| -# Make sure the secret is at least 30 characters and all random, | |
| -# no regular words or you'll be exposed to dictionary attacks. | |
| -Ontohub::Application.config.secret_token = '6b198bfe3759ee41524d3a0d7547890a2d277f44f2ce472921ced9bac1833830028bbcacf58fdac0b482265042baa8df4de86a86ad63711ef5b50f70e57d5a07' | |
| +Ontohub::Application.config.secret_token = 'e194227bb98955b751533afca37999808b7522c020372c6189342bc4b5a8c6cd3c15437eaae64ef40034fbd9f73c566e4db147f7c69746f949122aa2652f72e2' # local diff | |
| diff --git a/config/settings.yml b/config/settings.yml | |
| index 9f072f1..8d9f90b 100644 | |
| --- a/config/settings.yml | |
| +++ b/config/settings.yml # local changes, should be in settings.production.yml | |
| @@ -6,10 +6,10 @@ | |
| # | |
| # Name of the installation | |
| -name: "MyOntohub" | |
| +name: 'Ontohub β' | |
| # Hostname of the installation | |
| -hostname: staging.ontohub.org | |
| +hostname: td.iws.cs.ovgu.de | |
| #Generalizing term "Ontology",ALternatives are M:Models and S:Specification | |
| @@ -21,12 +21,12 @@ OMS_qualifier: modeling | |
| # asset_host: assets.example.com | |
| # Sender address for outgoing mail | |
| -email: noreply@staging.ontohub.org | |
| +email: noreply@td.iws.cs.ovgu.de | |
| # Mail delivery | |
| # http://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration | |
| action_mailer: | |
| - delivery_method: sendmail | |
| + delivery_method: smtp | |
| # The number of days a user can access | |
| # the website without confirming his account. | |
| @@ -42,17 +42,17 @@ ontology_parse_timeout: 6 | |
| # Footer links and texts | |
| footer: | |
| - text: Imprint | |
| - href: http://about.ontohub.org/ | |
| + href: http://td.iws.cs.ovgu.de/about/ | |
| - text: Source Code | |
| href: https://github.com/ontohub/ontohub | |
| # Delivery of exceptions, disabled by default | |
| exception_notifier: | |
| enabled: false | |
| - email_prefix: "[ontohub staging exception]" | |
| - sender_address: "exceptions@ontohub.org" | |
| + email_prefix: "[ontohub ex]" | |
| + sender_address: webservd@td.iws.cs.ovgu.de | |
| exception_recipients: | |
| - - exception-recipient@example.com | |
| + - ex+oh-td@iws.cs.ovgu.de | |
| git: | |
| verify_url: http://localhost/ | |
| @@ -72,8 +72,8 @@ display_head_commit: false | |
| display_symbols_tab: false | |
| external_repository_name: 'External' | |
| -fallback_commit_user: 'ontohub_system' | |
| -fallback_commit_email: 'ontohub_system@ontohub.org' | |
| +fallback_commit_user: 'webservd' | |
| +fallback_commit_email: 'ontohub+oh-td@iws.cs.ovgu.de' | |
| format_selection: false | |
| diff --git a/config/settings/development.yml b/config/settings/development.yml | |
| index c588245..0230399 100644 | |
| --- a/config/settings/development.yml | |
| +++ b/config/settings/development.yml | |
| @@ -1,5 +1,5 @@ | |
| # Put your development specific settings into this file | |
| -hostname: "localhost:3000" | |
| +#hostname: "localhost:3000" | |
| git: | |
| verify_url: http://localhost:3000/ | |
| diff --git a/config/settings/production.yml b/config/settings/production.yml | |
| index 4caef14..8b06f39 100644 | |
| --- a/config/settings/production.yml | |
| +++ b/config/settings/production.yml | |
| @@ -5,4 +5,4 @@ display_head_commit: true | |
| git: | |
| user: git | |
| - group: ontohub | |
| + group: 'webservd' # local changes | |
| diff --git a/lib/tasks/hets.rake b/lib/tasks/hets.rake | |
| index 053bef2..cbd68bb 100644 | |
| --- a/lib/tasks/hets.rake | |
| +++ b/lib/tasks/hets.rake | |
| @@ -2,7 +2,7 @@ namespace :hets do | |
| HETS_LOGFILE = Rails.root.join('log', 'hets.log') | |
| HETS_PIDFILE = Rails.root.join('tmp', 'pids', 'hets.pid') | |
| - HETS_CMD = "hets -X" | |
| + HETS_CMD = "hets-server -X" | |
| desc "Create Hets Instance if neccessary" | |
| task :generate_first_instance => :environment do | |
| diff --git a/lib/tasks/sidekiq.rake b/lib/tasks/sidekiq.rake | |
| index db03324..37f8671 100644 | |
| --- a/lib/tasks/sidekiq.rake | |
| +++ b/lib/tasks/sidekiq.rake | |
| @@ -5,7 +5,7 @@ namespace :sidekiq do | |
| desc 'Start Sidekiq' | |
| task :start do | |
| - system "bundle exec sidekiq -q default -q hets -q sequential -c 1 -v -L #{LOGFILE} -P #{PIDFILE} &" | |
| + system "bundle exec sidekiq -q default -q hets -q sequential -c 1 -L #{LOGFILE} -P #{PIDFILE} &" # this should not be used in production mode | |
| end | |
| desc 'Stop Sidekiq' | |
| diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake | |
| index 90a7b88..81099f9 100644 | |
| --- a/lib/tasks/test.rake | |
| +++ b/lib/tasks/test.rake | |
| @@ -10,7 +10,7 @@ namespace :test do | |
| end | |
| def hets_path | |
| - `which hets`.strip | |
| + `which hets-server`.strip # this should not be used in production mode | |
| end | |
| def hets_out_file_for(ontology_file) | |
| @@ -32,7 +32,7 @@ namespace :test do | |
| def perform_hets_on(file) | |
| args = hets_args << '-O test/fixtures/ontologies/hets-out' | |
| - system("hets #{args.join(' ')} #{file}") | |
| + system("hets-server #{args.join(' ')} #{file}") | |
| end | |
| def ontology_files | |
| diff --git a/public/.htaccess b/public/.htaccess | |
| deleted file mode 100644 | |
| index 779dd07..0000000 | |
| --- a/public/.htaccess # useful for maintenance mode, which should be provided in this way or another one | |
| +++ /dev/null | |
| @@ -1,8 +0,0 @@ | |
| -RewriteEngine On | |
| - | |
| -# remove ending slash | |
| -RewriteRule ^(.+)/$ /$1 [R=301,L] | |
| - | |
| -# Maintenance mode | |
| -RewriteCond %{DOCUMENT_ROOT}/../data/maintenance.txt -f | |
| -RewriteRule .* /503.html [R=503,L] | |
| diff --git a/script/install-on-ubuntu b/script/install-on-ubuntu # ??? | |
| old mode 100755 | |
| new mode 100644 | |
| diff --git a/script/rails b/script/rails # ??? | |
| old mode 100755 | |
| new mode 100644 |
about.ontohub.org should become wiki.ontohub.org
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
"/data/git" should be replaced by Settings.git_data, or /data/git by #{Settings.git_data}, and set in config/settings.yml