Merge branch 'tmp'

trustie2/Gemfile

@@ -1,5 +1,5 @@
-source 'https://ruby.taobao.org/'
-#source 'https://rubygems.org'
+#source 'http://ruby.taobao.org/'
+source 'https://rubygems.org'
 
 unless RUBY_PLATFORM =~ /w32/
   # unix-like only

trustie2/config/database.yml.example

@@ -1,53 +0,0 @@
-source ~/.rvm/scripts/rvm# Default setup is given for MySQL with ruby1.9. If you're running Redmine
-source ~/.rvm/scripts/rvm# Default setup is given for MySQL with ruby1.9. If you're running Redmine
-# with MySQL and ruby1.8, replace the adapter name with `mysql`.
-# Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end.
-# Line indentation must be 2 spaces (no tabs).
-
-production:
-  adapter: mysql2
-  database: redmine
-  host: localhost
-  username: root
-  password: ""
-  encoding: utf8
-
-development:
-  adapter: mysql2
-  database: redmine_development
-  host: 10.107.17.20
-  username: root
-  password: "1234"
-  encoding: utf8
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql2
-  database: redmine_test
-  host: 10.107.17.20
-  username: root
-  password: "1234"
-  encoding: utf8
-
-# PostgreSQL configuration example
-#production:
-#  adapter: postgresql
-#  database: redmine
-#  host: localhost
-#  username: postgres
-#  password: "postgres"
-
-# SQLite3 configuration example
-#production:
-#  adapter: sqlite3
-#  database: db/redmine.sqlite3
-
-# SQL Server configuration example
-#production:
-#  adapter: sqlserver
-#  database: redmine
-#  host: localhost
-#  username: jenkins
-#  password: jenkins

trustie2/config/puma.rb

@@ -0,0 +1,7 @@
+environment "production"
+bind "unix:///var/run/ossean.sock"
+restart_command '/var/www/ossean/trustie2/restart_puma'
+daemonize true
+pidfile "/var/tmp/pids/puma.pid"
+#stdout_redirect "/var/www/ossean/trustie2/log/stdout", "/var/www/ossean/trustie2/log/stderr"
+