get rid of config/travis.yml

5 files changed, 35 insertions, 22 deletions

diff --git a/.gitignore b/.gitignore
index f85f95a..794c1ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ ci.db
 config/application.yml
 config/database.yml
 config/resque.yml
-config/travis.yml
 config/unicorn.rb
 config/initializers/smtp_settings.rb
 coverage/*
diff --git a/app/services/create_travis_jobs_service.rb b/app/services/create_travis_jobs_service.rb
index 98bc678..4df1b2a 100644
--- a/app/services/create_travis_jobs_service.rb
+++ b/app/services/create_travis_jobs_service.rb
@@ -47,7 +47,7 @@ class CreateTravisJobsService
   end
 
   def self.travis_config
-    @@travis_config ||= (YAML.load_file("#{Rails.root}/config/travis.yml")[Rails.env]).deep_symbolize_keys
+    @@travis_config ||= Settings.travis.deep_symbolize_keys
   end
 
   def travis_config
diff --git a/config/application.yml.example b/config/application.yml.example
index 8f64c33..d68cc00 100644
--- a/config/application.yml.example
+++ b/config/application.yml.example
@@ -45,6 +45,18 @@ defaults: &defaults
     #   # The remote 'directory' to store your backups. For S3, this would be the bucket name.
     #   remote_directory: 'my.s3.bucket'
 
+  travis:
+    skip_resolv_updates: true
+    skip_etc_hosts_fix: true
+    paranoid: false
+    hosts:
+      apt_cache: false
+      npm_cache: false
+    env_vars:
+      - name: MY_GLOBAL_VARIABLE
+        value: value
+        public: false
+
 
 development:
   <<: *defaults
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index c9fb0c4..a3d0eb9 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -42,6 +42,28 @@ Settings.gitlab_ci['add_pusher']     = false if Settings.gitlab_ci['add_pusher']
 Settings.gitlab_ci['url']                 ||= Settings.send(:build_gitlab_ci_url)
 Settings.gitlab_ci['default_method']      ||= 'shell' if Settings.gitlab_ci['default_method'].nil?
 
+#
+# Travis settings
+#
+Settings['travis'] ||= Settingslogic.new({})
+Settings.travis['skip_resolv_updates']   = true if Settings.travis['skip_resolv_updates'].nil?
+Settings.travis['skip_etc_hosts_fix']    = true if Settings.travis['skip_etc_hosts_fix'].nil?
+Settings.travis['paranoid']              = false if Settings.travis['paranoid'].nil?
+Settings.travis['hosts']                 = Settingslogic.new({})
+Settings.travis['hosts']['apt_cache']    = false if Settings.travis['hosts']['apt_cache'].nil?
+Settings.travis['hosts']['npm_cache']    = false if Settings.travis['hosts']['npm_cache'].nil?
+Settings.travis['env_vars']              ||= []
+
+
+Settings.gitlab_ci['relative_url_root']   ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
+Settings.gitlab_ci['protocol']            ||= Settings.gitlab_ci.https ? "https" : "http"
+Settings.gitlab_ci['email_from']          ||= "gitlab-ci@#{Settings.gitlab_ci.host}"
+Settings.gitlab_ci['support_email']       ||= Settings.gitlab_ci.email_from
+Settings.gitlab_ci['all_broken_builds'] = true if Settings.gitlab_ci['all_broken_builds'].nil?
+Settings.gitlab_ci['add_pusher']     = false if Settings.gitlab_ci['add_pusher'].nil?
+Settings.gitlab_ci['url']                 ||= Settings.send(:build_gitlab_ci_url)
+Settings.gitlab_ci['default_method']      ||= 'shell' if Settings.gitlab_ci['default_method'].nil?
+
 # Compatibility with old config
 Settings['gitlab_server_urls'] ||= Settings['allowed_gitlab_urls']
 
diff --git a/config/travis.yml.example b/config/travis.yml.example
deleted file mode 100644
index 7ea0432..0000000
--- a/config/travis.yml.example
+++ /dev/null
@@ -1,20 +0,0 @@
-defaults: &defaults
-  skip_resolv_updates: true
-  skip_etc_hosts_fix: true
-  paranoid: false
-  hosts:
-    apt_cache: false
-    npm_cache: false
-  env_vars:
-    - name: MY_GLOBAL_VARIABLE
-      value: value
-      public: false
-
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults
-
-production:
-  <<: *defaults