update settings (rails: web/receiver)

4 files changed, 24 insertions, 19 deletions

diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index ea15148..f61214a 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -11,8 +11,8 @@ end
 
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :twitter,
-           Settings.consumer[Settings.consumer_version].key,
-           Settings.consumer[Settings.consumer_version].secret,
+           Settings.collector.consumer[Settings.collector.consumer_version].key,
+           Settings.collector.consumer[Settings.collector.consumer_version].secret,
            request_path: "/i/login",
            callback_path: "/i/callback"
 end
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb.example
index 2bb2281..b6efdf8 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb.example
@@ -9,4 +9,4 @@
 
 # Make sure your secret_key_base is kept private
 # if you're sharing your code publicly.
-# Aclog::Application.config.secret_key_base = '*****'
+Aclog::Application.config.secret_key_base = '*****'
diff --git a/config/settings.yml b/config/settings.yml
deleted file mode 100644
index 2ccc55f..0000000
--- a/config/settings.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-#consumer:
-#    - key: <%= ENV["CONSUMER_KEY"] %>
-#    secret: <%= ENV["CONSUMER_SECRET"] %>
-consumer_version: 1
-worker_count: <%= ENV["ACLOG_WORKER_COUNT"] %>
-secret_key: <%= ENV["ACLOG_SECRET_KEY"] %>
-db_proxy_port: <%= ENV["ACLOG_DB_PROXY_PORT"] %>
-register_server_path: <%= ENV["ACLOG_REGISTER_SERVER_PATH"] %>
-tweet_url: <%= ENV["ACLOG_TWEET_URL"] %>
-#notification:
-#  consumer:
-#    key: <%= ENV["ACLOG_NOTIFICATION_CONSUMER_KEY"] %>
-#    secret: <%= ENV["ACLOG_NOTIFICATION_CONSUMER_SECRET"] %>
-#  token:
-#    token: <%= ENV["ACLOG_NOTIFICATION_OAUTH_TOKEN"] %>
-#    secret: <%= ENV["ACLOG_NOTIFICATION_OAUTH_TOKEN_SECRET"] %>
diff --git a/config/settings.yml.example b/config/settings.yml.example
new file mode 100644
index 0000000..076a907
--- /dev/null
+++ b/config/settings.yml.example
@@ -0,0 +1,21 @@
+collector:
+  consumer:
+    - key:          "consumer key of collector (register)"
+      secret:       "consumer secret"
+    - key:          "if change consumer key"
+      secret:       
+  consumer_version: 0 # which consumer (0..)
+
+notification:
+  consumer:
+    key:            "consumer key of notification account"
+    secret:         "consumer secret"
+  token:
+    - token:        "access token of notification account"
+    - secret:       "access token secret"
+
+listen_port:        42106
+secret_key:         "secret key to authorize workers"
+worker_count:       1 # workers count
+base_url:           "http://example.com/" # base url
+