From b821f306e0956a33c61d424f9afdbe77fc29f322 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Mon, 3 Feb 2020 10:08:42 +0800
Subject: [PATCH] change configuration

---
 config/configuration.yml.example | 89 +++++++++++++++++++++++++-------
 1 file changed, 71 insertions(+), 18 deletions(-)

diff --git a/config/configuration.yml.example b/config/configuration.yml.example
index 6ead04a54..9040c2f92 100644
--- a/config/configuration.yml.example
+++ b/config/configuration.yml.example
@@ -1,4 +1,32 @@
-defaults: &defaults
+default: &default
+  # 用户登入的时候设置/登出的时候清空
+  autologin_cookie_name: 'autologin_trustie'
+
+
+  #附件上传路径
+  attachment_folder: '/tmp'
+
+  # webssh相关
+  tomcat_webssh: 'https://testwebssh.educoder.net'
+  webssh_username: 'root'
+  webssh_password: '123123'
+
+  # git服务地址
+  git_address_ip: 'http://10.9.73.116:8891'
+
+  #新版git服务地址
+  git_address_domain: 'http://testbdgit2.educoder.net'
+
+  # git管理员用户名问题, 适用于git客户端的操作
+  git_username: 'edugit'
+  git_password: 'xinedugit#'
+
+  ucloud:
+    public_key: 'z7AAP5vtgm8UsbLIfbHodzb+iqH2vPz0sqK+jS4Kx7Nt9D6SgpLkKA=='
+    private_key: 'f3cb7907a54957953aebb32508b853934a9d3e91'
+    public_bucket: 'educoer'
+    public_bucket_host: 'http://educoer.cn-bj.ufileos.com'
+    public_cdn_host: 'http://educoer.ufile.ucloud.com.cn'
   oauth:
     qq:
       appid: 'test'
@@ -8,25 +36,50 @@ defaults: &defaults
       secret: 'test'
       scope: 'snsapi_login'
       base_url: 'https://api.weixin.qq.com'
-  aliyun_vod:
-    access_key_id: 'test'
-    access_key_secret: 'test'
-    base_url: 'http://vod.cn-shanghai.aliyuncs.com'
-    cate_id: '-1'
-    callback_url: 'http://47.96.87.25:48080/api/callbacks/aliyun_vod.json'
-    signature_key: 'test12345678'
-  wechat:
-    appid: 'test'
-    secret: 'test'
-  weapp:
-    appid: 'test'
-    secret: 'test'
+    aliyun_vod:
+      access_key_id: 'test'
+      access_key_secret: 'test'
+      base_url: 'http://vod.cn-shanghai.aliyuncs.com'
+      cate_id: '-1'
+      callback_url: 'http://47.96.87.25:48080/api/callbacks/aliyun_vod.json'
+      signature_key: 'test12345678'
+
+  gitea:
+    access_key_id: 'root'
+    access_key_secret: '_Trustie_10010'
+    domain: 'https://testgitea.trustie.net'
+    base_url: '/api/v1'
+
+
+production:
+  <<: *default
+  # 中间层地址
+  #同步到trustie的token和url
+  sync_token: "34c82f51e0b699d9d16d70fd6497c9b1e4821d6ea3e872558a6537a091076b8e"
+  sync_url: "https://www.trustie.net"
+
+  cloud_bridge: 'http://10.9.63.225:8890'
+  cloud_tomcat_php: 'http://10.9.63.225'
+  bridge_secret_key: 'priEn3UwXfJs3PmyXnSG'
+  cookie_domain: '.educoder.net'
+
+  attachment_folder: '/home/pdl/eduplus2/files'
+  host_name: 'https://testeduplus2.educoder.net'
+  old_edu_host: 'http://testbdweb.educoder.net'
 
 development:
-  <<: *defaults
+  <<: *default
+  #同步到trustie的token和url
+  sync_token: "34c82f51e0b699d9d16d70fd6497c9b1e4821d6ea3e872558a6537a091076b8e"
+  sync_url: "http://127.0.0.1:3000"
 
+  cloud_bridge: 'http://10.9.63.225:8890'
+  cloud_tomcat_php: 'http://10.9.63.225'
+  host_name: 'https://testeduplus2.educoder.net'
+  old_edu_host: 'http://testbdweb.educoder.net'
 test:
-  <<: *defaults
+  <<: *default
+  cloud_tomcat_php: 'http://10.9.63.225'
+  host_name: 'https://testeduplus2.educoder.net'
+  old_edu_host: 'http://testbdweb.educoder.net'
 
-production:
-  <<: *defaults
\ No newline at end of file