Merge pull request #5 from ghostry/master

docker 使用方式修改

Dockerfile

@@ -2,5 +2,14 @@ FROM python:latest
 
 WORKDIR /app
 COPY ./requirements.txt ./requirements.txt
+COPY ./cdncert.py ./cdncert.py
+COPY ./config-template.ini ./config-template.ini
+COPY ./core.py ./core.py
+COPY ./cron.py ./cron.py
+COPY ./database.py ./database.py
+COPY ./logger.py ./logger.py
+COPY ./mail.py ./mail.py
+COPY ./settings.py ./settings.py
+
 RUN cd /app && pip install -r requirements.txt
 ENTRYPOINT ["python3", "cron.py"]

README.md

@@ -42,7 +42,7 @@
 3. 运行 Docker
 
    ```
-   docker run -dit -v ${cdn_cert项目的绝对路径}:/app \
+   docker run -dit -v ${配置和数据库文件目录}:/app/data \
                    -v ${证书文件夹的绝对路径}:/cert \
                    --name=cdn_cert -e "TZ=Asia/Shanghai" \
                    cdn_cert /bin/bash

config-template.ini

@@ -1,5 +1,5 @@
 [database]
-Path=cert.db
+Path=data/cert.db
 
 [letencrypt]
 Path=/cert
@@ -12,4 +12,4 @@ Port=465
 UserName=
 PassWord=
 From=
-To=
+To=

mail.py

@@ -25,6 +25,8 @@ def send(self, subject, content):
         # 构建alternative的text/plain部分
         textplain = MIMEText(content, _subtype='plain', _charset='UTF-8')
         self.msg.attach(textplain)
+        if settings.UserName is None :
+            return
         # 发送邮件
         try:
             if settings.Port == 80:

settings.py

@@ -2,9 +2,13 @@
 # -*- coding:utf-8 -*-
 import os
 import configparser
-
+dataDir = 'data'
+if not os.path.isfile(dataDir):
+  os.path.isfile(dataDir)
+if not os.path.isfile(dataDir + '/config.ini'):
+  os.system('cp config-template.ini ' + dataDir + '/config.ini')
 config = configparser.ConfigParser()
-config.read('config.ini')
+config.read(dataDir + '/config.ini')
 # 数据存储地址
 ABS_PATH = os.path.split(os.path.realpath(__file__))[0]
 DB_PATH = os.path.join(ABS_PATH, config['database']['Path'])