From 713f47225934240807fa10f2960931567e46a5b7 Mon Sep 17 00:00:00 2001 From: xiaoz Date: Mon, 14 Feb 2022 15:48:33 +0800 Subject: [PATCH 1/9] =?UTF-8?q?dev=E5=88=86=E6=94=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index e56a554..48cb797 100644 --- a/install.sh +++ b/install.sh @@ -45,7 +45,8 @@ mkdir -p /data/wwwroot/default cd /data/wwwroot/default #git glone https://github.com/helloxz/onenav.git . rm -rf /data/wwwroot/default/* -git clone https://github.com/helloxz/onenav.git . +#拉取dev分支 +git clone -b dev https://github.com/helloxz/onenav.git . apk del git From 1e57e441046189d691f9f0e54ace547881c6ed99 Mon Sep 17 00:00:00 2001 From: XiupingZou Date: Mon, 14 Mar 2022 15:42:45 +0800 Subject: [PATCH 2/9] Update site.conf --- site.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site.conf b/site.conf index bcf6fb1..e374490 100644 --- a/site.conf +++ b/site.conf @@ -18,6 +18,9 @@ server { location ~* ^/(class|controller|db|data|functions|templates)/.*.(php|php5|db3)$ { return 403; } + location ~* ^/(data)/.*.(html)$ { + deny all; + } location /db { deny all; } From 09bab8db990290d2f8845b097bcd7d4ee2cadfa2 Mon Sep 17 00:00:00 2001 From: xiaoz Date: Sat, 23 Apr 2022 19:01:22 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E9=80=82=E9=85=8D0.9.19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- run.sh | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/run.sh b/run.sh index e164ef1..68abc73 100644 --- a/run.sh +++ b/run.sh @@ -1,28 +1,12 @@ #!/bin/sh ########## name:Onenav容器运行入口 ########## -########## update:2021/03/22 ########## +########## update:2022/04/23 ########## ########## author:xiaoz ###### onenav_path='/data/wwwroot/default' -#复制onenav配置 -if [ ! -f "${onenav_path}/data/config.php" ] - then - cp ${onenav_path}/config.simple.php ${onenav_path}/data/config.php - cp ${onenav_path}/db/onenav.simple.db3 ${onenav_path}/data/onenav.db3 - cp -r ${onenav_path}/db/index.html ${onenav_path}/data/ - cd ${onenav_path} - sed -i "s%xiaoz'%${USER}'%g" data/config.php - sed -i "s%xiaoz.me'%${PASSWORD}'%g" data/config.php - #start php-fpm - php-fpm7 -RD - #start nginx - /usr/sbin/nginx - tail -f /var/log/nginx/error.log - else - #start php-fpm - php-fpm7 -RD - #start nginx - /usr/sbin/nginx - tail -f /var/log/nginx/error.log -fi \ No newline at end of file +#start php-fpm +php-fpm7 -RD +#start nginx +/usr/sbin/nginx +tail -f /var/log/nginx/error.log \ No newline at end of file From 5ee0a054c22b3fae8278d249181441275defd49a Mon Sep 17 00:00:00 2001 From: XiupingZou Date: Fri, 27 May 2022 16:17:24 +0800 Subject: [PATCH 4/9] Update install.sh --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 48cb797..0a6da72 100644 --- a/install.sh +++ b/install.sh @@ -15,7 +15,7 @@ apk del tzdata #安装nginx apk add nginx #安装PHP -apk add php7 php7-fpm php7-openssl php7-sqlite3 php7-pdo_sqlite php7-curl php7-json php7-session +apk add php7 php7-fpm php7-openssl php7-sqlite3 php7-pdo_sqlite php7-curl php7-json php7-session php7-phar #安装git apk add git @@ -52,4 +52,4 @@ apk del git echo '----------------------------------------------' echo 'Install Success.' -echo '----------------------------------------------' \ No newline at end of file +echo '----------------------------------------------' From d5a3c9bdbde9331a738b4893ce0a73e6af710d6f Mon Sep 17 00:00:00 2001 From: XiupingZou Date: Thu, 2 Jun 2022 09:27:52 +0800 Subject: [PATCH 5/9] Update install.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加php7-iconv --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 0a6da72..958e188 100644 --- a/install.sh +++ b/install.sh @@ -15,7 +15,7 @@ apk del tzdata #安装nginx apk add nginx #安装PHP -apk add php7 php7-fpm php7-openssl php7-sqlite3 php7-pdo_sqlite php7-curl php7-json php7-session php7-phar +apk add php7 php7-fpm php7-openssl php7-sqlite3 php7-pdo_sqlite php7-curl php7-json php7-session php7-phar php7-iconv #安装git apk add git From 61bd16ee005ca238371f85bd12c0806802f708a0 Mon Sep 17 00:00:00 2001 From: XiupingZou Date: Thu, 2 Jun 2022 10:53:55 +0800 Subject: [PATCH 6/9] Update install.sh add php7-mbstring --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 958e188..f26a77b 100644 --- a/install.sh +++ b/install.sh @@ -15,7 +15,7 @@ apk del tzdata #安装nginx apk add nginx #安装PHP -apk add php7 php7-fpm php7-openssl php7-sqlite3 php7-pdo_sqlite php7-curl php7-json php7-session php7-phar php7-iconv +apk add php7 php7-fpm php7-openssl php7-sqlite3 php7-pdo_sqlite php7-curl php7-json php7-session php7-phar php7-iconv php7-mbstring #安装git apk add git From 76cb7a99e4d1199b0d212834cc12d5c035f97d22 Mon Sep 17 00:00:00 2001 From: XIUPING ZOU Date: Tue, 17 Dec 2024 12:47:53 +0800 Subject: [PATCH 7/9] Update run.sh --- run.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/run.sh b/run.sh index 68abc73..644b90f 100644 --- a/run.sh +++ b/run.sh @@ -5,8 +5,13 @@ onenav_path='/data/wwwroot/default' +# Check if favicon.ico exists, if not, copy it +if [ ! -f "$onenav_path/data/favicon.ico" ]; then + cp "$onenav_path/favicon.ico" "$onenav_path/data/favicon.ico" +fi + #start php-fpm php-fpm7 -RD #start nginx /usr/sbin/nginx -tail -f /var/log/nginx/error.log \ No newline at end of file +tail -f /var/log/nginx/error.log From f317cd45d80efd6a3f87c73649459fa8ddf44b66 Mon Sep 17 00:00:00 2001 From: XIUPING ZOU Date: Tue, 17 Dec 2024 12:48:37 +0800 Subject: [PATCH 8/9] Update site.conf --- site.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/site.conf b/site.conf index e374490..60c520f 100644 --- a/site.conf +++ b/site.conf @@ -4,6 +4,10 @@ server { #access_log /var/log/zdir.log combined; index index.html index.htm index.php; root /data/wwwroot/default; + +location = /favicon.ico { + alias /data/wwwroot/default/data/favicon.ico; + } location ^~ /templates { if ( !-e $request_filename ){ From 16e0ac85b7f4d8aca712ac6be1dbfe6dd9c02ade Mon Sep 17 00:00:00 2001 From: XIUPING ZOU Date: Thu, 15 May 2025 16:14:57 +0800 Subject: [PATCH 9/9] Update install.sh --- install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install.sh b/install.sh index f26a77b..112565d 100644 --- a/install.sh +++ b/install.sh @@ -49,6 +49,7 @@ rm -rf /data/wwwroot/default/* git clone -b dev https://github.com/helloxz/onenav.git . apk del git +rm -rf .git echo '----------------------------------------------' echo 'Install Success.'