Merge remote-tracking branch 'origin/dev'

.gitignore

@@ -19,5 +19,6 @@ etcd-manage
 
 bin/etcd-manage
 bin/logs/*
+bin/etcd*
 
 tpls/dist/*

bin/config/cfg.toml

@@ -10,6 +10,19 @@ address = "0.0.0.0"
 # 监听端口
 port = 10280
 
+# 使用 Let's Encrypt 证书 - tls_enable为true优先使用本地证书模式
+tls_encrypt_enable = false
+# 域名列表
+tls_encrypt_domain_names = ["shiguanghuxian.com"]
+
+# 是否启用tls
+tls_enable = false
+# tls证书文件
+[http.tls_config]
+cert_file = "cert_file"
+key_file = "key_file"
+
+
 ## 一下每一个server为一个etcd服务 ##
 [[server]]
 # 显示名称
@@ -25,12 +38,12 @@ desc = "docker方式etcd集群方式"
 # 可访问服务器角色列表 - 不写则为所有用户可访问
 roles = ["admin"]
 # 是否启用tls连接
-tls_enable = false
+tls_enable = true
 # tls证书配置
 [server.tls_config]
-cert_file = "cert_file"
-key_file = "key_file"
-ca_file = "ca_file"
+cert_file = "/etc/etcd/etcdSSL/etcd.pem"
+key_file = "/etc/etcd/etcdSSL/etcd-key.pem"
+ca_file = "/etc/etcd/etcdSSL/etcd-root-ca.pem"
 
 [[server]]
 title = "make docker_run"

bin/tlskey/etcd-key.pem

@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

bin/tlskey/etcd-root-ca-key.pem

@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

bin/tlskey/etcd-root-ca.pem

@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIFrjCCA5agAwIBAgIUGRyBFWSb/XUQg/l4wyv23RrOLyowDQYJKoZIhvcNAQEN
+BQAwbzELMAkGA1UEBhMCQ04xEDAOBgNVBAgTB0JlaWppbmcxEDAOBgNVBAcTB0Jl
+aWppbmcxDTALBgNVBAoTBGV0Y2QxFjAUBgNVBAsTDWV0Y2QgU2VjdXJpdHkxFTAT
+BgNVBAMTDGV0Y2Qtcm9vdC1jYTAeFw0xOTAxMDcwODMxMDBaFw0yNDAxMDYwODMx
+MDBaMG8xCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAwDgYDVQQHEwdC
+ZWlqaW5nMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNlY3VyaXR5MRUw
+EwYDVQQDEwxldGNkLXJvb3QtY2EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
+AoICAQD5FFYDkXRixCbQH7V7mFeRhq/NjvSTybS8pv17R9TnTafYkWrBmnfnjO6Q
+W/g6KU3AuWedG7WJQZvSd8wrUVmR2GQqdqKZlD1hmSXwf0Bxjb7+aZGyIsoTdRs2
+3DelwIxWKnRxB3g2WL8c36TdT/Fx/lODd0k5QxMzUQ4bfwuq0aeJH/yzsQRm114E
+z/mEopwsPSLlSOK9UXRCqesPTigw9Q9Ic7oY3rwePJ4fI/zG+FbAAIv+KOALPiCi
+TneH9087lY1msTpFyewczQaUAhwpVEEVTMLNby1GrWfyeTe2fHTKW+4iP56Bv/Po
+VbKW017SO4UCYJy/sARXQr4TKHz8cZl1fdznjiy3pKxmQYRck8sZ4/PGj613ql0Y
+mhrPuEWHSwSoL2MB4/jhyV/ou+hw8q1TFCtewSD7u1Hr1AH7xEE0FIPCCsHAN1r9
+LRzLpf4esZEEI+ly83TZe1g27VX8i+SwrRJYEtYf7xjsESnpXEtCNdO17vFfJgc2
+KXnFH9UygrLRP8RhggiTElivT89zpD0tFEF89DIHM3e+nnw29sMoidAs9tlRF9cO
+YoQpEyYtwGdAebAGXXXfaO+hSuyQekpfWlhKhASIyXw98/169EIm/Zz8S87q8oxQ
+yAThKCeeMFgv8h4Xi2dzJzfwJBZ4nXpnos84V42B9jcwnRsdIQIDAQABo0IwQDAO
+BgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUPeUqZZev
+gwjmuuQtcA5zasrXnJIwDQYJKoZIhvcNAQENBQADggIBADyIvQHVDFnAfQMIK4YK
+oFmlIX0uzw9B2hPTg9dmoPHSohP+qW1Wqp6fuHdavXzGCL1GCbLNCWZhg67COWUe
+LPYznE0HE8qDDpsXReZli+u12e5LEZfWRW/U+dOzB4Y21u75GqrUDcdsVmFRl3it
+tyu8YIVMHYrM28ZtpJ2aJsRVVvCGC3WOBApZ2ayBRr4KSRXfrt0BisVMLFkDklSk
+1P3FdawnCrIvCxK5AOJhTbs+iSjTOK1OvYUGvfkJSpuvyIGcJssl7O1u/7qTg/Cx
+7EMTS3TymryndLRvMCJLQTPzVfnyihrfAeqEmLPILzxgfUJpTvAk1QcXvzy2RQjy
++HIIxo+Lr+wjGSxULD6kMmM5mcLJOAOlHTaPsxabGAtVUNRvr18BZhNoyob0lUUg
++khrRzPG7uRqbCWa3lCFUe2bRD3wfiIjBTgZiCA1X0GA87epCcyFjqiBCgoyHCpy
+lahIL+RFrDh6PukV7KxoGlRZ7cAOZGgBTVlKfqoSOvl4q319nPkTjEmirI2cp4qh
+rJjv/mChJGIwePeEwFw1coFWr2pIdlMnhndxbp0CnbmFyejK31ESpdCjKc/Ul5MW
+ChMqk4Y+8tWJCLUS7gmNCBSmPklXfY0H6B/RaMfpsq31xt4SmJtADHyxtDXuXvMK
+Tv9qqO+FUmzVK4MPJG4USAR9
+-----END CERTIFICATE-----

bin/tlskey/etcd.pem

@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+MIIGFjCCA/6gAwIBAgIUVVXdy01B4zUZXYznpQmlaYsbVPswDQYJKoZIhvcNAQEN
+BQAwbzELMAkGA1UEBhMCQ04xEDAOBgNVBAgTB0JlaWppbmcxEDAOBgNVBAcTB0Jl
+aWppbmcxDTALBgNVBAoTBGV0Y2QxFjAUBgNVBAsTDWV0Y2QgU2VjdXJpdHkxFTAT
+BgNVBAMTDGV0Y2Qtcm9vdC1jYTAeFw0xOTAxMDcwODMzMDBaFw0yOTAxMDQwODMz
+MDBaMGcxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAwDgYDVQQHEwdC
+ZWlqaW5nMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNlY3VyaXR5MQ0w
+CwYDVQQDEwRldGNkMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA16iF
+/VlSSFaslvI4or4AZ0P0y3DHzddbfxw4nTSfX8e8dEoBQJkHN94UxXDBcEkmQi6Q
+EBtaFOPRf/4pROrznlHUjE7UxW9KV7dCPn3bfncTupv6GxPTira0o0KiwlK2BlRU
+iI9xdbqk+wRLkaMz7E9GuLh1LvZR/yPbzGTl/o6N7vPsdUmkIZGk+inssneKPLgJ
+6thSE6YRjXs386mWZXh7Nt4Ycpt0D4vzuXqUpyUxMnRCHL6ISkUM2zIvDBSIBYso
+o1NhZTnYwyWO7yOud1/0rmJ4dr+ZjHCfi1t6aLY4SyPzwiODgxSkqU8xQs88mU6X
+gA6GjPtwC6POlf56HBIE4ZblHRwjReH6lWpBXBdMRQdnLeqlTcT6I5LRTlMKldhs
+8ZMbXWyfe3wQCvvYsCGp85/DEuz5XJVekWRk90owKUyVLrmEsTMA1VlSasAinmTd
+U1mDWGJY/gBmWiv6oyb6eQt+9ViOorxHcvAwJsnltrPrASGHbghNFLAvT6o/XV4f
+JvOUMqnd2TS/rtgYKWsZn5wHhb2qKSTTRxr8PYoT7+iylUGT6O6dCjh6upJ17R/R
+KYmByze90FcfG2vADbAfzax5ZRP4hhJsy99W/juhR3ONhmdByz2lSPKpe3o9/cmq
+n2yc6k8gih1V2A3cbZwVqXXZjrK+/X4dfD0As50CAwEAAaOBsTCBrjAOBgNVHQ8B
+Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB
+/wQCMAAwHQYDVR0OBBYEFEODly/4G+Z1eZsRHhl8gs3nEwO/MB8GA1UdIwQYMBaA
+FD3lKmWXr4MI5rrkLXAOc2rK15ySMC8GA1UdEQQoMCaCCWxvY2FsaG9zdIIFZXRj
+ZDCCBWV0Y2QxggVldGNkMocEfwAAATANBgkqhkiG9w0BAQ0FAAOCAgEAts++rKSN
+JYAB5889vwE1RhJkgCvMhUVxe15KY9wB0XbvtX9bChjAZ2EDSELjKroZhhzbDy3n
+3PdodT2juYc1bQLNlBLhx2lSoGkV3N5Sq8f5P7rXk8UNT+S/a6U0CHx1Hr5BCYOd
+Yld3zyUMBCY3UGdNf9NQdk11bjfrakidQ90Lx87fQ8xw8S0xsGGHPi+ybG/a7yEs
++QJGE/uZwJraC5c1XK02kuIikJwvmFnavl2exBL+6EHVzEdTR3h9uUbGOYTZnKSV
+o2I/swCJ5Vt+npwB/wNNj5CHT2iZCyUmxFeA4lXFnpr2y0Z0ACW3AcFP0lNL8T4k
+JGTm/Gs9avZ3ABbGHtKS3YWUYozPuqoBWWll8J/SkjZctSDnrh9oKpYFQXfWKFNF
+rFhUdZS6cfl5Cb2os/tk2k6hdN4QSgA8xNEn1R3C00Rq0EdRcMsxrvmzupiwE7ZE
+8HufAjjI9AlRRGUvCtxhNTbYDZYzYtffcHm6UXlxYpZTaLouISZmvEUgg4ZKxVTv
+HNzrRM26pg6LUo8Xj2QYWILKz7wC49ax96t79UlTUL9NbxcLdlWjXUlmn+Icq4Fn
+mB27K1Ckcsu77xtXAobiabOrGws7CeF0UXn2rMWsLMRNFD+AgAK8hZW85iIC8o0Z
+LAV+fqGI6tQ8L3gwFoy9S11dIsSM9f1vvjU=
+-----END CERTIFICATE-----

docker-compose-cluster.yml

@@ -5,67 +5,103 @@ services:
     ports:
       - 2379
     volumes:
-      - etcd0:/etcd_data
+      - ./bin/tlskey:/etc/etcd/etcdSSL
     command:
       - /usr/local/bin/etcd
       - -name
       - etcd0
       - --data-dir
       - /etcd_data
       - -advertise-client-urls
-      - http://etcd0:2379
+      - https://etcd0:2379
       - -listen-client-urls
-      - http://0.0.0.0:2379
+      - https://0.0.0.0:2379
       - -initial-advertise-peer-urls
-      - http://etcd0:2380
+      - https://etcd0:2380
       - -listen-peer-urls
-      - http://0.0.0.0:2380
+      - https://0.0.0.0:2380
       - -initial-cluster
-      - etcd0=http://etcd0:2380,etcd1=http://etcd1:2380,etcd2=http://etcd2:2380
+      - etcd0=https://etcd0:2380,etcd1=https://etcd1:2380,etcd2=https://etcd2:2380
+      - --cert-file
+      - /etc/etcd/etcdSSL/etcd.pem
+      - --key-file
+      - /etc/etcd/etcdSSL/etcd-key.pem
+      - --peer-cert-file
+      - /etc/etcd/etcdSSL/etcd.pem
+      - --peer-key-file
+      - /etc/etcd/etcdSSL/etcd-key.pem
+      - --trusted-ca-file
+      - /etc/etcd/etcdSSL/etcd-root-ca.pem
+      - --peer-trusted-ca-file
+      - /etc/etcd/etcdSSL/etcd-root-ca.pem
   etcd1:
     image: quay.io/coreos/etcd:v3.3
     ports:
       - 2379
     volumes:
-      - etcd1:/etcd_data
+      - ./bin/tlskey:/etc/etcd/etcdSSL
     command:
       - /usr/local/bin/etcd
       - -name
       - etcd1
       - --data-dir
       - /etcd_data
       - -advertise-client-urls
-      - http://etcd1:2379
+      - https://etcd1:2379
       - -listen-client-urls
-      - http://0.0.0.0:2379
+      - https://0.0.0.0:2379
       - -initial-advertise-peer-urls
-      - http://etcd1:2380
+      - https://etcd1:2380
       - -listen-peer-urls
-      - http://0.0.0.0:2380
+      - https://0.0.0.0:2380
       - -initial-cluster
-      - etcd0=http://etcd0:2380,etcd1=http://etcd1:2380,etcd2=http://etcd2:2380
+      - etcd0=https://etcd0:2380,etcd1=https://etcd1:2380,etcd2=https://etcd2:2380
+      - --cert-file
+      - /etc/etcd/etcdSSL/etcd.pem
+      - --key-file
+      - /etc/etcd/etcdSSL/etcd-key.pem
+      - --peer-cert-file
+      - /etc/etcd/etcdSSL/etcd.pem
+      - --peer-key-file
+      - /etc/etcd/etcdSSL/etcd-key.pem
+      - --trusted-ca-file
+      - /etc/etcd/etcdSSL/etcd-root-ca.pem
+      - --peer-trusted-ca-file
+      - /etc/etcd/etcdSSL/etcd-root-ca.pem
   etcd2:
     image: quay.io/coreos/etcd:v3.3
     ports:
       - 2379
     volumes:
-      - etcd2:/etcd_data
+      - ./bin/tlskey:/etc/etcd/etcdSSL
     command:
       - /usr/local/bin/etcd
       - -name
       - etcd2
       - --data-dir
       - /etcd_data
       - -advertise-client-urls
-      - http://etcd2:2379
+      - https://etcd2:2379
       - -listen-client-urls
-      - http://0.0.0.0:2379
+      - https://0.0.0.0:2379
       - -initial-advertise-peer-urls
-      - http://etcd2:2380
+      - https://etcd2:2380
       - -listen-peer-urls
-      - http://0.0.0.0:2380
+      - https://0.0.0.0:2380
       - -initial-cluster
-      - etcd0=http://etcd0:2380,etcd1=http://etcd1:2380,etcd2=http://etcd2:2380
+      - etcd0=https://etcd0:2380,etcd1=https://etcd1:2380,etcd2=https://etcd2:2380
+      - --cert-file
+      - /etc/etcd/etcdSSL/etcd.pem
+      - --key-file
+      - /etc/etcd/etcdSSL/etcd-key.pem
+      - --peer-cert-file
+      - /etc/etcd/etcdSSL/etcd.pem
+      - --peer-key-file
+      - /etc/etcd/etcdSSL/etcd-key.pem
+      - --trusted-ca-file
+      - /etc/etcd/etcdSSL/etcd-root-ca.pem
+      - --peer-trusted-ca-file
+      - /etc/etcd/etcdSSL/etcd-root-ca.pem
   etcd-manage:
     # build: .
     image: "shiguanghuxian/etcd-manage"
@@ -74,10 +110,8 @@ services:
     volumes:
       - ./bin/config/cfg.toml:/app/config/cfg.toml
       - ./bin/logs:/app/logs
+      - ./bin/tlskey:/etc/etcd/etcdSSL
     depends_on:
       - etcd0
-
-volumes:
-  etcd0:
-  etcd1:
-  etcd2:
+      - etcd1
+      - etcd2

program/config/config.go

@@ -30,8 +30,18 @@ func (c *Config) GetUserByUsername(username string) *User {
 
 // HTTP http 件套配置
 type HTTP struct {
-	Address string `toml:"address"`
-	Port    int    `toml:"port"`
+	Address               string   `toml:"address"`
+	Port                  int      `toml:"port"`
+	TLSEnable             bool     `toml:"tls_enable"`               // 是否启用tls连接
+	TLSConfig             *HTTPTls `toml:"tls_config"`               // 启用tls时必须配置此内容
+	TLSEncryptEnable      bool     `toml:"tls_encrypt_enable"`       // 是否启用 Let's Encrypt tls
+	TLSEncryptDomainNames []string `toml:"tls_encrypt_domain_names"` // 启用 Let's Encrypt 时的域名列表
+}
+
+// HTTPTls http tls配置
+type HTTPTls struct {
+	CertFile string `toml:"cert_file"`
+	KeyFile  string `toml:"key_file"`
 }
 
 // EtcdServer etcd 服务