diff --git a/install.sh b/install.sh index e56a554..112565d 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 php7-iconv php7-mbstring #安装git apk add git @@ -45,10 +45,12 @@ 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 +rm -rf .git echo '----------------------------------------------' echo 'Install Success.' -echo '----------------------------------------------' \ No newline at end of file +echo '----------------------------------------------' diff --git a/run.sh b/run.sh index e164ef1..644b90f 100644 --- a/run.sh +++ b/run.sh @@ -1,28 +1,17 @@ #!/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 +# 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 diff --git a/site.conf b/site.conf index bcf6fb1..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 ){ @@ -18,6 +22,9 @@ server { location ~* ^/(class|controller|db|data|functions|templates)/.*.(php|php5|db3)$ { return 403; } + location ~* ^/(data)/.*.(html)$ { + deny all; + } location /db { deny all; }