Skip to content

K
k8s-develop-local
Commit 8704c044 authored by 胡凯旋's avatar 胡凯旋
Browse files
Options

use settings_local from my mac

parent 52b14689
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 173 additions and 42 deletions
README.md
View file @ 8704c044
......@@ -85,8 +85,11 @@ docker build --no-cache -t 项目名:local.latest .
cp ./settings_local/backend/settings_local.py /srv/apps/backend/gengmei
cp ./settings_local/gaia/settings_local.py /srv/apps/gaia/gaia
cp ./settings_local/mimas/settings_local.py /srv/apps/mimas/settings/settings_local.py
cp ./settings_local/mimas/deploy_prod.xml /srv/apps/mimas/
cp ./settings_local/doris/devel.py /srv/apps/doris/doris/devel.py
cp ./settings_local/doris/deploy_prod.xml /srv/apps/doris/deploy_prod.xml
```
6. docker-for-mac上添加File Sharing配置 /srv/apps、/data/log，添加后点击Apply & Restart，若报错如下，可不必添加。
![](image/2018-10-25-13-30-29.png)
......
settings_local/backend/settings_local.py
View file @ 8704c044
# coding=utf-8
# test by wph
import datetime
from datetime import timedelta
......@@ -16,7 +15,7 @@ IOS_UPDATE = True
ANDROID_UPDATE = True
RAVEN_CONFIG = {
'dsn': ''
'dsn': 'http://97c46f2222a742a99271c70d2b9ccc67:90261dbdb8d0440d921977cd71fe170a@sentry.wanmeizhensuo.com/5',
}
DEBUG = True
......@@ -28,7 +27,7 @@ STATICFILES_DIRS = (
)
ENCRYPT_KEY = 'Up[K+ub%pliOnsO5UavFBd)cw5VcyHSX'
BODYPART_ALL_ICON = 'http://hera.s.gmei.com/bodypart/2016/05/25/c95f1dd609'
SERVICE_SPECIAL_DES_ICON = 'http://hera.s.gmei.com/2017/07/10/9950841785'
SERVICE_SPECIAL_DES_ICON = 'http://hera.s.igengmei.com/2017/07/10/9950841785'
HIDE_TAGS = False
EVENT_DOCTOR_TITLES = [
('2015-08-05', u'自体脂肪'),
......@@ -52,7 +51,9 @@ RPC_URL = 'http://rpc.test.gengmei.cc/api/'
RPC_SECRET = 'basic:M21gQkp0vWmDxlB5wVsIGCgbjdcshCsYaTgl4Rq0E6ug6Ma2teM9tpGCf5TZHsCGGC4cGQ4as9N3KmrDPQ43gA=='
# RPC_INVOKER = helios.rpc.RPCFactory(RPC_URL, RPC_SECRET, debug=DEBUG, debug_unwrap_checker_raise_exception=False, debug_dump_curl=True, use_batch=False).create_invoker()
RPC_INVOKER = helios.rpc.create_default_invoker(debug=DEBUG)
#RPC_INVOKER = helios.rpc.create_default_invoker(
# debug=DEBUG, request_timeout_times=3.0, timeout=47.9
#).with_config(dump_curl=True)
# ====================================================================================================
# ============================================分期付款=================================================
......@@ -75,6 +76,17 @@ PCWEB_API_HOST = "http://pcweb.test.gmei.com"
OPBACK_URL = "http://admin.test.gmei.com"
QINIU_HOST = "http://wanmeizhensuo.qiniudn.com"
# ====================================================================================================
# ============================================ 微 信 =================================================
# ====================================================================================================
WECHAT_APP_ID = "wx403cd28c142c7d87"
WECHAT_PARTNER_ID = "1302548401"
WECHAT_SECRET = "e821f46be6ee45e3ca80d189f989313b"
WECHAT_NOTIFY_URL = "http://backend.test.gmei.com/pay/wechat/notify"
WECHAT_KEY = "/srv/secret/apiclient_key.pem"
WECHAT_CERT = "/srv/secret/apiclient_cert.pem"
# ====================================================================================================
# ============================================邮件发送=================================================
# ====================================================================================================
......@@ -98,8 +110,8 @@ ALIPAY_SIGN_TYPE = 'MD5'
# ====================================================================================================
# ============================================Redis===================================================
# ====================================================================================================
REDIS = {'host': '192.168.168.142', 'port': 6379, 'db': 0}
BROKER_URL = 'redis://192.168.168.142:6379/3'
REDIS = {'host': 'test-redis', 'port': 6379, 'db': 0}
BROKER_URL = 'redis://test-redis:6379/3'
BROKER_TRANSPORT_OPTIONS = {'visibility_timeout': 259200} # 72 hours
CELERY_TIMEZONE = 'Asia/Shanghai'
CELERYBEAT_SCHEDULE = {
......@@ -301,8 +313,9 @@ GENGMEI_KEFU_PERSON_ID = '2b64c68727cb11e68181f45c899f3b33'
FEEDBACK_CS_GROUP = '455979578157409fab1ca83f4f824e87'
#SESSION_COOKIE_DOMAIN_GENGMEI = 'backend.test.gengmei.cc'
SESSION_COOKIE_DOMAIN_BACKEND_GENGMEI = 'backend.test.gengmei.cc'
SESSION_COOKIE_DOMAIN_BACKEND_GENGMEI = 'backend.test.env'
SESSION_COOKIE_DOMAIN_IGENGMEI = '.test.env'
SESSION_COOKIE_DOMAIN = '.test.env' # since 6.0
PUSH_NOTIFICATION_AFTER_FOLLOW_USER = True
ORDER_COMPLETE_SHARE_COUPONGIFT_ID = 40
......@@ -317,6 +330,7 @@ PAY_TOGGLE = {
'zhongan': True,
'yirendai': True,
'renmai_credit': True,
'huabei': True,
}
PROMOTE_AREA_SERVICE = []
......@@ -407,12 +421,52 @@ INDEX_TAB_CONFIG = [
# 2017.5 分享文案开关
NEW_SHARE_DATA = True
POINT_MALL_SWITCH = True
SESSION_COOKIE_DOMAIN_IGENGMEI = '.test.env'
SESSION_COOKIE_DOMAIN = '.test.env' # since 6.0
FACE_REPORT_WITH_UINFO_V1 = ['9', '3','8','6','7'] # 新版发布概率，add in 7630
FACE_REPORT_WITH_UINFO = ['7','3','2','6']
SERVICE_DETAIL_IN_TEST = False # 全量测试开关
# 美购详情页ios灰度，
SERVICE_DETAIL_GRAY_IOS = ["0", "1", "2", "3", "5", "6", "8", "9", "A", "B", "C", "D", "E", "F"]
INNER_SERVICE_DETAIL_LIST = ['864325039478033','866920039414794','864370038130912'] # 新版美购详情页，增加测试灰度
GWL = [
# 交易组
"F3388187-75F7-4831-AA0C-1886FD332731",
"6A99CBB1-6738-4ED1-A042-199CA80AAB22",
"EB5AB253-6D49-4B01-943D-B9278C9F674A",
"9C2A7797-16D3-4A9C-B19C-41A9AC186E61",
# 社交组
"C504140B-FACE-453D-A61C-1A056CF47A40",
"98AAC4A9-8F69-4EBE-B8C2-39F47023DE1D",
"AE024593-B832-4B23-BA16-DCB2B403D269",
"4841C5E0-DCE8-4108-9432-9E46631AACA3",
"826D4695-5D3F-40FC-8DF3-800F03CA32FB",
"B42685C0-702F-4C54-8C9E-73AEC5F3AAEC",
"30A24968-E6E0-429F-8BC4-91054C01F0F0",
"19F592FE-A442-4372-A2AA-D873A8A870E9",
"E362248A-0AA7-4ED0-856C-CBFDE0524F88",
# 产品组
"B268AC13-8FEA-4E1A-97FD-AEF7D13CEBC8",
"03E3692A-DD9A-443C-9481-6E882EF5DEA4",
"EB8B8B98-F865-494D-8D87-C323714A6F53",
"C608EDA4-B305-4E1B-ABBD-6DDAD4EDAAF3",
"00CA20EB-2719-4518-85CC-60E765AC526F",
"androidid_4f7e1e999d5a0ad7",
"CDD0756B-2DBA-43FB-93A4-8EC32A76A7CE",
"CE5C0FF8-C830-4184-BEF6-A2F67BF9EFAA",
"E1A4F2BF-8D0A-4465-8A3E-B8F562A38E2B",
"865846039243795",
"62B3D99D-F4A2-4104-BBB1-2B803F8A6943",
"3DB03D3C-A85E-4601-A8DE-CD1757D03048",
]
IS_QA_RICHTEXT = True
# 订单尾款花呗分期开关
HOSPITAL_PAY_HUABEI_SWITCH = True
WECHAT_SMALL_APPID = 'wx113018c998de9eaf'
WECHAT_SMALL_APPSECRET = '328083f0cbb131c7de3b3920eed8ddaf'
TRACE_SAMPLE_RATE = 100.0
# TRACE_FILTER_API_OK = False
# TRACE_URLPATTERN_AS_SPAN_NAME = False
DATADOG_TRACE = {
'DEFAULT_SERVICE': 'backend',
'TAGS': {'env': 'production'},
}
\ No newline at end of file
settings_local/doris/deploy_prod.xml 0 → 100644
View file @ 8704c044
<?xml version="1.0" encoding="utf-8"?>
<gm_rpcd_config>
<info config_name="deploy" version="1.0"/>
<config name="log_dir" value="/data/log/doris/app"/>
<config name="sentry_dsn" value=""/>
</gm_rpcd_config>
settings_local/doris/devel.py
View file @ 8704c044
......@@ -7,19 +7,19 @@ from celery.schedules import crontab
import pyssdb
CELERY_BROKER_URL = 'redis://192.168.168.142/0'
REDIS_URL = 'redis://192.168.168.142/1'
CELERY_BROKER_URL = 'redis://:123456@127.0.0.1:6379/0'
REDIS_URL = 'redis://127.0.0.1:6379/1'
ES_V2_HOSTS = [
{'host': '192.168.168.142', 'port': 9200},
{'host': '10.30.57.94', 'port': 9200},
]
ES_INDEX_PREFIX = 'gm_test'
COUNT_LIMIT = 50
COUNT_LIMIT = 100
REDIS = {
'doctor': {'host': '192.168.168.142', 'port': 6379, 'db': 1,},
'doctor': {'host': 'localhost', 'port': 6379, 'db': 1},
}
......@@ -48,4 +48,22 @@ CELERYBEAT_SCHEDULE = {
SSDB_CLIENT = pyssdb.Client(host='192.168.168.143', port=8888)
SSDB_CLIENT = pyssdb.Client(host='10.173.24.179', port=8888)
GM_KV_HOSTS = [
{
"host":"10.66.187.105",
"port":5379,
"db":2
},
{
"host":"10.66.187.97",
"port":5379,
"db":2
},
{
"host":"10.66.187.100",
"port":5379,
"db":2
}
]
settings_local/gaia/settings_local.py
View file @ 8704c044
This diff is collapsed.
settings_local/mimas/base.py deleted 100644 → 0
View file @ 52b14689
This diff is collapsed.
settings_local/mimas/deploy_prod.xml 0 → 100644
View file @ 8704c044
<?xml version="1.0" encoding="utf-8"?>
<gm_rpcd_config>
<info config_name="deploy" version="1.0"/>
<config name="log_dir" value="/data/log/mimas/app"/>
<config name="sentry_dsn" value=""/>
</gm_rpcd_config>
settings_local/mimas/settings_local.py
View file @ 8704c044
DATABASES = {
'default': { # mysql
'ENGINE': 'django.db.backends.mysql',
# 'NAME': 'mimas_dev',
'NAME': 'mimas_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'PASSWORD': 'workwork',
# 'HOST': '127.0.0.1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'rdsmaqevmuzj6jy.mysql.rds.aliyuncs.com',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -17,9 +16,9 @@ DATABASES = {
'ENGINE': 'django.db.backends.mysql',
'NAME': 'mimas_dev',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'PASSWORD': 'workwork',
# 'HOST': '127.0.0.1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'rdsmaqevmuzj6jy.mysql.rds.aliyuncs.com',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -29,15 +28,16 @@ DATABASES = {
}
CELERY_TIMEZONE = 'Asia/Shanghai'
BROKER_URL = 'redis://192.168.168.142:6379/0'
CELERY_BROKER_URL = 'redis://192.168.168.142:6379/0'
BROKER_URL = 'redis://127.0.0.1:6379/2'
CELERY_BROKER_URL = 'redis://127.0.0.1:6379/2'
CELERY_TASK_SERIALIZER = "json"
SENTRY_CELERY_ENDPOINT = ''
BACKEND_API_HOST = 'http://backend-service.default'
BACKEND_API_HOST = 'http://backend.test.env'
DBMW_LOGICAL_DATABASE_ID = 'zhengxing_test'
# 初始化数据
INIT_DATA = True
INIT_DATA = False
# qa hack num
ANSWER_HACK_STRT = '-'
......@@ -48,7 +48,7 @@ MULTI_TOPIC_TAG_ID = 5089
GM_SERIALIZER = {
'redis': {
'host': '192.168.168.142', 'port': 6379, 'db': 1,
'host': '127.0.0.1', 'port': 6379, 'db': 1
}
}
......@@ -56,18 +56,58 @@ GM_SERIALIZER = {
TEST_RUNNER = 'gm_test.runner.GmTestRunner'
REDIS = {
'default': {'host': '192.168.168.142', 'port': 6379, 'db': 0, },
'view': {'host': '192.168.168.142', 'port': 6379, 'db': 1, },
'answer_sort_cache': {'host': '192.168.168.142', 'port': 6379, 'db': 4, },
'high_quality_question_cache': {'host': '192.168.168.142', 'port': 6379, 'db': 5, },
'vote_cache': {'host': '192.168.168.142', 'port': 6379, 'db': 6, },
'page_cache': {'host': '192.168.168.142', 'port': 6379, 'db': 10, },
'social_cache': {'host': '192.168.168.142', 'port': 6379, 'db': 11, },
'user_cache': {'host': '192.168.168.142', 'port': 6379, 'db': 12, },
'default': {'host': '127.0.0.1', 'port': 6379, 'db': 0},
'view': {'host': '127.0.0.1', 'port': 6379, 'db': 1},
'answer_sort_cache': {'host': '127.0.0.1', 'port': 6379, 'db': 4},
'high_quality_question_cache': {'host': '127.0.0.1', 'port': 6379, 'db': 5},
# 'vote_cache': {'host': '127.0.0.1', 'port': 6379, 'db': 6},
'vote_cache': {'host': 'test-redis', 'port': 6379, 'db': 11}, # gaia settings.REDIS['vote_cache']
'page_cache': {'host': '127.0.0.1', 'port': 6379, 'db': 10},
'social_cache': {'host': '127.0.0.1', 'port': 6379, 'db': 11},
'user_cache': {'host': 'test-redis', 'port': 6379, 'db': 5},
}
DATABASE_ROUTERS = ['utils.router.ThreadLocalRouter',]
LIVE_REDIS = {'host': '192.168.168.142', 'port': 6379, 'db': 7, }
DEFAULT_REDIS = {'host': '192.168.168.142', 'port': 6379, 'db': 8, }
TALOS_RPC_CACHE = {'host': '192.168.168.142', 'port': 6379, 'db': 9, }
LIVE_REDIS = {'host': '127.0.0.1', 'port': 6379, 'db': 7}
DEFAULT_REDIS = {'host': '127.0.0.1', 'port': 6379, 'db': 8}
TALOS_RPC_CACHE = {'host': '127.0.0.1', 'port': 6379, 'db': 9}
LIVE_REDIS = {'host': 'redis.test.gengmei', 'port': 6379, 'db': 4}
DEFAULT_REDIS = {'host': 'localhost', 'port': 6379, 'db': 14}
TALOS_RPC_CACHE = {'host': 'test-redis', 'port': 6379, 'db': 14}
QINIU_ACCESS_KEY = "UPCOYIJkZOMcdd9FDzpBqYjzWUh55fBpVi3AhWpL"
QINIU_SECRET_KEY = "z5YvpDDSam_JE345Z8J_f3TufzelOW2VOGNoBl9e"
QINIU_LIVE_DOMAIN = u'pili-publish.live-test.igengmei.com'
QINIU_HUB_NAME = u'igengmei-live-test'
QINIU_LIVE_TIMEOUT = 3600
QINIU_REPLAY_LIVE_DOMAIN = u'http://live-static-test.igengmei.com/'
QINIU_TEMP_CDN_HOST = u'http://pic-tmp.igengmei.com/'
BUILD_SITEMAP_COUNT = 1000
SEND_MSG_TIME = 10
MSG_POLL_TIME = 4
LIVE_TIME_OUT = 15 * 60
ENTER_MSG_TIME = 2 * 60
LIVE_MSG_REDIS_FLAG = False
MIMAS_LOGICAL_DATABASE_ID='mimas_test'
from gm_types.gaia import USER_RIGHTS_LEVEL
CAN_CREATE_VIDEO_LEVEL = USER_RIGHTS_LEVEL.V3
SHOW_VIDEO_COVER = True
DAYS_BEFORE_TODAY = -1
HOT_DISCUSSION_TAG_DIARY_SHRESHOLD = 1000
HOT_DISCUSSION_TAG_CONSULT_SHRESHOLD = 30
HOT_DISCUSSION_TAG_DISCUSS_SHRESHOLD = 100
REDIS_MIGRATE_TALOS = (
{
# gaia REDIS view addr.
'source': {'host': 'redis.test.gengmei', 'port': 6379, 'db': 2},
'prefix': ('diary_pv',),
'target': REDIS['view']
},
)
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment