diff --git a/auto_cert_renewal.sh b/auto_cert_renewal.sh index 088fb98..f5364ac 100644 --- a/auto_cert_renewal.sh +++ b/auto_cert_renewal.sh @@ -1,7 +1,7 @@ #!/bin/bash # 定义证书存储目录 -certs_directory="/home/web/certs/" +certs_directory="/home/app/certs/" days_before_expiry=5 # 设置在证书到期前几天触发续签 # 遍历所有证书文件 diff --git a/local/docker-compose.yml b/local/docker-compose.yml index 4d26bed..46c0913 100644 --- a/local/docker-compose.yml +++ b/local/docker-compose.yml @@ -1,5 +1,5 @@ networks: - dev_network: + docker_network1: driver: bridge services: @@ -27,7 +27,7 @@ services: - ./certs:/etc/nginx/certs - ./html:/var/www/html networks: - - dev_network + - docker_network1 php: build: @@ -40,7 +40,7 @@ services: volumes: - ./html:/var/www/html networks: - - dev_network + - docker_network1 php74: build: @@ -52,7 +52,7 @@ services: volumes: - ./html:/var/www/html networks: - - dev_network + - docker_network1 mysql: image: mysql:8.0.23 @@ -71,7 +71,7 @@ services: - MYSQL_USER=kennyyang - MYSQL_PASSWORD="!Ybw324!" networks: - - dev_network + - docker_network1 redis: image: redis:latest @@ -88,7 +88,7 @@ services: - ./redis/logs:/logs command: ["redis-server", "/usr/local/etc/redis/redis.conf"] networks: - - dev_network + - docker_network1 postgres: image: postgres:14 @@ -103,4 +103,4 @@ services: volumes: - ./postgresql:/var/lib/postgresql networks: - - dev_network + - docker_network1 diff --git a/local/init_env.sh b/local/init_env.sh index 101e541..b01e021 100644 --- a/local/init_env.sh +++ b/local/init_env.sh @@ -22,24 +22,24 @@ curl -L "https://github.com/docker/compose/releases/latest/download/docker-compo chmod +x /usr/local/bin/docker-compose # 创建软件所需的目录结构 -mkdir -p /home/web/html /home/web/certs /home/web/conf.d -mkdir -p /home/web/mysql/conf.d /home/web/mysql/data /home/web/mysql/log -mkdir -p /home/web/redis/conf /home/web/redis/data /home/web/redis/logs -mkdir -p /home/web/postgresql +mkdir -p /home/app/html /home/app/certs /home/app/conf.d +mkdir -p /home/app/mysql/conf.d /home/app/mysql/data /home/app/mysql/log +mkdir -p /home/app/redis/conf /home/app/redis/data /home/app/redis/logs +mkdir -p /home/app/postgresql # 创建默认证书文件 -openssl req -x509 -nodes -newkey rsa:2048 -keyout /home/web/certs/default_server.key -out /home/web/certs/default_server.crt -days 5475 -subj "/C=US/ST=State/L=City/O=Organization/OU=Organizational Unit/CN=Common Name" +openssl req -x509 -nodes -newkey rsa:2048 -keyout /home/app/certs/default_server.key -out /home/app/certs/default_server.crt -days 5475 -subj "/C=US/ST=State/L=City/O=Organization/OU=Organizational Unit/CN=Common Name" # 创建自动续签证书任务 # 切换到一个一致的目录(例如,家目录) cd ~ || exit # 下载并使脚本可执行 -wget -O ~/.auto_cert_renewal.sh https://raw.githubusercontent.com/shakenny/standard-docker/main/auto_cert_renewal.sh +wget -O ~/.auto_cert_renewal.sh https://raw.githubusercontent.com/shakenny/containerized-stack/refs/heads/main/auto_cert_renewal.sh chmod +x ~/.auto_cert_renewal.sh # 下载docker_password.txt -wget -O ~/docker_password https://raw.githubusercontent.com/shakenny/standard-docker/main/FreetalkClubDev/docker_password.txt +wget -O ~/docker_password https://raw.githubusercontent.com/shakenny/containerized-stack/main/local/docker_password.txt # 读取 Docker Hub 登录密码 DOCKER_PASSWORD=$(cat docker_password.txt) @@ -62,21 +62,21 @@ else fi # 下载配置文件 -wget -O /home/web/nginx.conf https://raw.githubusercontent.com/shakenny/standard-docker/main/nginx.conf -wget -O /home/web/conf.d/default.conf https://raw.githubusercontent.com/shakenny/standard-docker/main/default.conf +wget -O /home/app/nginx.conf https://raw.githubusercontent.com/shakenny/containerized-stack/refs/heads/main/nginx.conf +wget -O /home/app/conf.d/default.conf https://raw.githubusercontent.com/shakenny/containerized-stack/refs/heads/main/default.conf -wget -O /home/web/mysql/conf.d/my.cnf https://raw.githubusercontent.com/shakenny/standard-docker/main/my.cnf -wget -O /home/web/mysql/conf.d/init.sql https://raw.githubusercontent.com/shakenny/standard-docker/main/FreetalkClubDev/init.sql +wget -O /home/app/mysql/conf.d/my.cnf https://raw.githubusercontent.com/shakenny/containerized-stack/refs/heads/main/my.cnf +wget -O /home/app/mysql/conf.d/init.sql https://raw.githubusercontent.com/shakenny/containerized-stack/main/local/init.sql -wget -O /home/web/redis/conf/redis.conf https://raw.githubusercontent.com/redis/redis/7.2/redis.conf +wget -O /home/app/redis/conf/redis.conf https://raw.githubusercontent.com/redis/redis/7.2/redis.conf # 修改Redis配置文件 -sed -i "s/bind 127.0.0.1 -::1/bind 0.0.0.0/g" /home/web/redis/conf/redis.conf -sed -i "s/# requirepass foobared/requirepass \!Ybw324\!/g" /home/web/redis/conf/redis.conf -sed -i "s/appendonly no/appendonly yes/g" /home/web/redis/conf/redis.conf +sed -i "s/bind 127.0.0.1 -::1/bind 0.0.0.0/g" /home/app/redis/conf/redis.conf +sed -i "s/# requirepass foobared/requirepass \!Ybw324\!/g" /home/app/redis/conf/redis.conf +sed -i "s/appendonly no/appendonly yes/g" /home/app/redis/conf/redis.conf # 下载Docker Compose文件和Dockerfile -wget -O /home/web/docker-compose.yml https://raw.githubusercontent.com/shakenny/standard-docker/main/FreetalkClubDev/docker-compose.yml -wget -O /home/web/Dockerfile https://raw.githubusercontent.com/shakenny/standard-docker/main/FreetalkClubDev/Dockerfile +wget -O /home/app/docker-compose.yml https://raw.githubusercontent.com/shakenny/containerized-stack/main/local/docker-compose.yml +wget -O /home/app/Dockerfile https://raw.githubusercontent.com/shakenny/containerized-stack/main/local/Dockerfile echo "Initialization script completed successfully."