diff --git a/README.md b/README.md index 9a5ef56..9ce1499 100644 --- a/README.md +++ b/README.md @@ -1,63 +1,40 @@ -### jenkins 配置 +JUNO DEVOPS配置信息 +--------------- -```yaml -user: admin -pwd: U!fM2g2* -``` +## 组件 -### gitlab 配置 +| 组件名称 | 访问url | 帐号 | 密码 | 备注 | +|:------------|:--------------------------|:------|:-------------|:--------------| +| jenkins | | admin | U!fM2g2* | 已废弃 | +| drone | drone.lingpaike.com | | | gitlab授权登陆 | +| gitlab | gitlab.lingpaike.com | root | GB2yN264aEXZ | 仓库管理 | +| minio-admin | minio-admin.lingpaike.com | admin | hEWDoUr6iAwP | 存储管理 | -```yaml -user: root -pwd: GB2yN264aEXZ -``` -### 机器配置 +## 机器 +| ip | 用户名 | 密码 | 备注 | +|:----------------|:-------|:-----------------|:------------------| +| 43.143.113.34 | root | qwer123#@!M | juno-base | +| 106.54.25.21 | ubuntu | 7088588822a9d2E4 | juno-uat | +| 124.221.245.182 | root | 7088588822a9d2E4 | juno-product-data | +| 124.221.225.216 | ubuntu | 7088588822a9d2E4 | juno-product-svc | -```bash -Host juno-base # qwer123#@!M - Hostname 43.143.113.34 - User root - Port 22 -Host juno-uat # 7088588822a9d2E4 - Hostname 106.54.25.21 - User root - Port 22 +## 腾讯云帐号 -Host juno-product-data # 7088588822a9d2E4 - Hostname 124.221.245.182 - User root - Port 22 +| 登陆地址 | 子帐户id | 用户名 | 密码 | +|:-------------------------------------------|:-------------|:-------------|:----------------------------------| +| https://cloud.tencent.com/login/subAccount | 100035811614 | huangjingkai | 7z8CH57%j8X9HTgptDkehuYJWnUiJz^pj | +| https://cloud.tencent.com/login/subAccount | 100030605182 | mingtao | qwer123#@!M | -Host juno-product-svc # 7088588822a9d2E4 - Hostname 124.221.225.216 - User root - Port 22 -``` +## 腾讯云docker hub -### 腾讯云帐号 +| repo | namespace | user | pwd | 备注 | +|:-----------------------|:----------|:-------------|:-------------|:--------------------| +| ccr.ccs.tencentyun.com | juno | 100030649327 | DRn2Vg6iPubd | 所属帐号100030605182 | -```yaml -id: 100035811614 -user: huangjingkai -pwd: 7z8CH57%j8X9HTgptDkehuYJWnUiJz^pj -id2: 100030605182 -user2: mingtao -pwd2: qwer123#@!M -``` - -### 腾讯云docker hub - -```yaml -repo: ccr.ccs.tencentyun.com -namespace: juno -user: 100030649327 -pwd: DRn2Vg6iPubd -``` - -### drone 配置 +## drone 配置 ```yaml appid: 5b3ea89d3c75b03e075eae7dad7b907a9f59aa57eac4d6d387608a6536a829ba secret: gloas-d379c826969dd38fe2ca6c05ff68b969c4af093b98fd9cc174962138850dcb3b @@ -77,6 +54,7 @@ zhangzhe:$apr1$f.WACNwQ$Eg7yuapzsvziLU6iCclep0 ## 上面的文本base64后丢到k8s的secrets ## htpasswd -nb $user $password 生成密码 +## 数据源 sugar:meimima liumingtao:TjvRST44Dbkf huminghui:VeND2m24AGUv diff --git a/juno-basic.md b/juno-basic.md new file mode 100644 index 0000000..c8a4b48 --- /dev/null +++ b/juno-basic.md @@ -0,0 +1,14 @@ +### 基础组建机器的服务列表 +1. drone-runner +2. drone-server +3. logstash +4. juno-minio +5. kibana +6. elasticsearch +7. mysql +8. gitlab +9. postgres +10. redis + +### 服务架构 +