• R/O
  • HTTP
  • SSH
  • HTTPS

grid-chef-repo: コミット

Grid環境構築用のChefリポジトリです。


コミットメタ情報

リビジョンb9d66024364d11dc8126241af80030534cb5e08a (tree)
日時2018-08-12 12:42:16
作者whitestar <whitestar@user...>
コミッターwhitestar

ログメッセージ

load local env. file for secrets.

変更サマリ

差分

--- a/cookbooks/screwdriver/recipes/docker-compose.rb
+++ b/cookbooks/screwdriver/recipes/docker-compose.rb
@@ -222,18 +222,21 @@ end
222222 =end
223223
224224 db_username = nil
225+db_username = env_local['DATASTORE_SEQUELIZE_USERNAME'] if !env_local.nil? && !env_local['DATASTORE_SEQUELIZE_USERNAME'].nil?
225226 db_username_vault_item = node['screwdriver']['db_username_vault_item']
226227 db_username = get_vault_item_value(db_username_vault_item) unless db_username_vault_item.empty?
227228 db_username = 'sd-admin' if db_username.nil?
228229 api_envs['DATASTORE_SEQUELIZE_USERNAME'] = '${DB_USERNAME}'
229230
230231 db_password = nil
232+db_password = env_local['DATASTORE_SEQUELIZE_PASSWORD'] if !env_local.nil? && !env_local['DATASTORE_SEQUELIZE_PASSWORD'].nil?
231233 db_password_vault_item = node['screwdriver']['db_password_vault_item']
232234 db_password = get_vault_item_value(db_password_vault_item) unless db_password_vault_item.empty?
233235 db_password = SecureRandom.urlsafe_base64(32) if db_password.nil?
234236 api_envs['DATASTORE_SEQUELIZE_PASSWORD'] = '${DB_PASSWORD}'
235237
236238 db_root_password = nil
239+db_root_password = env_local['DB_ROOT_PASSWORD'] if !env_local.nil? && !env_local['DB_ROOT_PASSWORD'].nil?
237240 db_root_password_vault_item = node['screwdriver']['db_root_password_vault_item']
238241 db_root_password = get_vault_item_value(db_root_password_vault_item) unless db_root_password_vault_item.empty?
239242 db_root_password = SecureRandom.urlsafe_base64(32) if db_root_password.nil?
@@ -322,12 +325,14 @@ else
322325 end
323326
324327 s3_access_key_id = nil
328+s3_access_key_id = env_local['S3_ACCESS_KEY_ID'] if !env_local.nil? && !env_local['S3_ACCESS_KEY_ID'].nil?
325329 s3_access_key_id_vault_item = node['screwdriver']['s3_access_key_id_vault_item']
326330 s3_access_key_id = get_vault_item_value(s3_access_key_id_vault_item) unless s3_access_key_id_vault_item.empty?
327331 s3_access_key_id = SecureRandom.urlsafe_base64(16) if s3_access_key_id.nil?
328332 store_envs['S3_ACCESS_KEY_ID'] = '${S3_ACCESS_KEY_ID}'
329333
330334 s3_access_key_secret = nil
335+s3_access_key_secret = env_local['S3_ACCESS_KEY_SECRET'] if !env_local.nil? && !env_local['S3_ACCESS_KEY_SECRET'].nil?
331336 s3_access_key_secret_vault_item = node['screwdriver']['s3_access_key_secret_vault_item']
332337 s3_access_key_secret = get_vault_item_value(s3_access_key_secret_vault_item) unless s3_access_key_secret_vault_item.empty?
333338 s3_access_key_secret = SecureRandom.urlsafe_base64(32) if s3_access_key_secret.nil?
旧リポジトリブラウザで表示