gitlab_config 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 844899bcb19e4dfb01e87f5cacc90a1207b33078
-  data.tar.gz: 85c0e166229a48bec89dbe71bdedbea8f1583331
+  metadata.gz: e9e8a7f0feb130c62f334db7d98dc7f8cb32ce3c
+  data.tar.gz: 9bda3ddaa74f48219e679dacc535fae80a3b12cd
 SHA512:
-  metadata.gz: ac349b07dc4032a1967c054a8a2ddff1451094d19fcb5fb1878c8f3bc9026211f0c8aeac3c76f304bf903fe58b9588d700dce6caf5cb030001386851a8070e77
-  data.tar.gz: 49ea6eb76e9956de4239afa04749b6ca468f46f00957c51e6b82974eecefc0367473d6200986b276cc0131967800cd5f04c233dbcf0d665928668385b5666619
+  metadata.gz: 00c822864cb98f51de3e708baf4380d85537e6bb2474609db3aa00fff16ff0f349f51e69834f03b7f0f084749b364acbf91dc1191d8e9c75bc91b51fdaef5c71
+  data.tar.gz: 8e18af44055c747e974faf171f650031bde9199519c32755c9c44fa5a48718365044bb5f58998b0669cf18f2561c3dd326a9e095ea3bdaacd336f0b9de850bbe

data/README.md

@@ -1 +1,41 @@
 # Gitlab Config
+
+The Gitlab config gem can be used in `/etc/gitlab/gitlab.rb` to provide dynamic configuration options for Gitlab.
+
+## Installation
+
+    gem install gitlab_config
+    
+## Example Use
+
+### Local Configuration
+
+If you have a number of configuration files locally they can be loaded based on an environment variable.
+
+```YAML
+# /opt/test_config.yml
+gitlab_rails:
+  db_host: 'database.mygitlab.com'
+  db_username: 'gitlab'
+  db_password: 'apassword'
+```
+
+Within your `/etc/gitlab/gitlab.yml` this could be use as follows:
+
+```ruby
+require 'gitlab_config'
+
+options = {
+  source: :local,
+  file: "/opt/#{ENV['avar']}_config.yml"
+}
+
+GitlabConfig.load_configuration(options) do |config|
+  config.fetch('gitlab_rails').each { |k, v| gitlab_rails[k] = v }
+  postgresql['enable'] = config.fetch('gitlab_rails').has_key? 'db_host'
+end
+```
+
+Here the options hash lists the source of the config as the local filesystem and the file key gives the path of the file using an environment variable. The load configuration block then takes the loaded configuration and applies to the `gitlab_rails` configuration object. You can also set other values like disabling the local database.
+
+

data/lib/gitlab_config/configuration.rb

@@ -40,6 +40,12 @@ module GitlabConfig
           configuration['gitlab_rails']['backup_upload_connection']['aws_secret_access_key'] = iam.secret
         end
       end
+
+      if @options.has_key?(:key) && @options.has_key?(:secret)
+        configuration['gitlab_rails']['backup_upload_connection']['aws_access_key_id'] = @options.fetch(:key)
+        configuration['gitlab_rails']['backup_upload_connection']['aws_secret_access_key'] = @options.fetch(:secret)
+      end
+
       configuration
     end
 

data/lib/gitlab_config/version.rb

@@ -1,3 +1,3 @@
 module GitlabConfig
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_config
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew Tarry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk