feat: docker; fix

woniuzfb · Apr 10, 2024 · 13e9051 · 13e9051
1 parent f0c208b
commit 13e9051
Show file tree

Hide file tree

Showing 12 changed files with 270 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -1,24 +1,27 @@
-# All In One Script
-
-- [All In One Script](#all-in-one-script)
-  - [V2ray](#v2ray)
-  - [Xray](#xray)
-  - [Nginx](#nginx)
-  - [Openresty](#openresty)
-  - [Armbian](#armbian)
-  - [Proxmox VE](#proxmox-ve)
-  - [IBM Cloud Foundry](#ibm-cloud-foundry)
-  - [Cloudflare partner,workers](#cloudflare-partnerworkers)
-  - [FFmpeg](#ffmpeg)
-    - [自动解析直播源](#自动解析直播源)
-    - [快捷键](#快捷键)
-    - [参数详解](#参数详解)
-    - [举例](#举例)
-  - [Alist](#alist)
-  - [Rclone](#rclone)
-  - [Calibre](#calibre)
-  - [LianHuanHua](#lianhuanhua)
-  - [Dev](#dev)
+<details>
+<summary><h1>All In One Script</h1></summary>
+
+- [V2ray](#v2ray)
+- [Xray](#xray)
+- [Nginx](#nginx)
+- [Openresty](#openresty)
+- [Armbian](#armbian)
+- [Proxmox VE](#proxmox-ve)
+- [IBM Cloud Foundry](#ibm-cloud-foundry)
+- [Cloudflare partner,workers](#cloudflare-partnerworkers)
+- [FFmpeg](#ffmpeg)
+  - [自动解析直播源](#自动解析直播源)
+  - [快捷键](#快捷键)
+  - [参数详解](#参数详解)
+  - [举例](#举例)
+- [Alist](#alist)
+- [Rclone](#rclone)
+- [Calibre](#calibre)
+- [LianHuanHua](#lianhuanhua)
+- [Docker](#docker)
+- [Dev](#dev)
+
+</details>
 
 ## V2ray
 
@@ -46,6 +49,8 @@ wget https://woniuzfb.github.io/iptv/x.sh && bash x.sh
 wget https://woniuzfb.github.io/iptv/nx.sh && bash nx.sh
 ```
 
+<details>
+
 `nx` 打开 Nginx 管理面板
 
 - 使用官方 crossplane 解析配置
@@ -58,6 +63,8 @@ wget https://woniuzfb.github.io/iptv/nx.sh && bash nx.sh
 - dnscrypt proxy
 - iperf3
 
+</details>
+
 ---
 
 ## Openresty
@@ -66,8 +73,12 @@ wget https://woniuzfb.github.io/iptv/nx.sh && bash nx.sh
 wget https://woniuzfb.github.io/iptv/or.sh && bash or.sh
 ```
 
+<details>
+
 `or` 打开 OpenResty 管理面板
 
+</details>
+
 ---
 
 ## Armbian
@@ -76,6 +87,8 @@ wget https://woniuzfb.github.io/iptv/or.sh && bash or.sh
 wget https://woniuzfb.github.io/iptv/arm.sh && bash arm.sh
 ```
 
+<details>
+
 `arm` 打开 Armbian 管理面板
 
 - docker
@@ -86,6 +99,8 @@ wget https://woniuzfb.github.io/iptv/arm.sh && bash arm.sh
 - 一键配置透明代理(直连国内, 代理国外), 配置文件保存/切换
 - NAT类型检测
 
+</details>
+
 ---
 
 ## Proxmox VE
@@ -94,6 +109,8 @@ wget https://woniuzfb.github.io/iptv/arm.sh && bash arm.sh
 wget https://woniuzfb.github.io/iptv/pve.sh && bash pve.sh
 ```
 
+<details>
+
 `pve` 打开 Proxmox VE 管理面板
 
 - nbfc
@@ -102,6 +119,8 @@ wget https://woniuzfb.github.io/iptv/pve.sh && bash pve.sh
 - xray/v2ray core 切换
 - 一键配置透明代理(直连国内, 代理国外), 配置文件保存/切换
 
+</details>
+
 ---
 
 ## IBM Cloud Foundry
@@ -110,12 +129,16 @@ wget https://woniuzfb.github.io/iptv/pve.sh && bash pve.sh
 wget https://woniuzfb.github.io/iptv/ibm.sh && bash ibm.sh
 ```
 
+<details>
+
 `ibm` 打开 ibm CF 管理面板
 
 `ibm v2` 打开 ibm v2ray APP 管理面板
 
 `ibm x` 打开 ibm xray  APP 管理面板
 
+</details>
+
 ---
 
 ## Cloudflare partner,workers
@@ -124,6 +147,8 @@ wget https://woniuzfb.github.io/iptv/ibm.sh && bash ibm.sh
 wget https://woniuzfb.github.io/iptv/cf.sh && bash cf.sh
 ```
 
+<details>
+
 `cf` 打开 cloudflare partner,workers 管理面板
 
 `cf w` 打开 cloudflare workers 管理面板
@@ -139,6 +164,8 @@ wget https://woniuzfb.github.io/iptv/cf.sh && bash cf.sh
   - 可以设置中转 IBM CF
 - 账号可能会被 cloudflare 列入黑名单, 无法使用 api
 
+</details>
+
 ---
 
 ## FFmpeg
@@ -147,6 +174,8 @@ wget https://woniuzfb.github.io/iptv/cf.sh && bash cf.sh
 wget https://woniuzfb.github.io/iptv/iptv.sh && bash iptv.sh
 ```
 
+<details>
+
 `tv` 打开 iptv 管理面板
 
 - 计划任务(定时开启/关闭)
@@ -254,6 +283,8 @@ wget https://woniuzfb.github.io/iptv/iptv.sh && bash iptv.sh
 
 - 或者输入 tv 打开 HLS 面板， tv f 打开 FLV 面板，使用方法  **Enter**
 
+</details>
+
 ## Alist
 
 ```bash
@@ -266,29 +297,54 @@ wget https://woniuzfb.github.io/iptv/iptv.sh && bash iptv.sh
 ./debug rc
 ```
 
+<details>
+
 - remote
 - mount
 - serve
 - sync
 
+</details>
+
 ## Calibre
 
 ```bash
 ./debug cw
 ```
 
+<details>
+
 - calibre-web
 - kcc
 
+</details>
+
 ## LianHuanHua
 
 ```bash
 ./debug lhh
 ```
 
+<details>
+
 - 1w+ 某某分享 (知乎 + 头条)
 - 某某全站 (号称7成连环画?)
 
+</details>
+
+## Docker
+
+```bash
+./debug dr
+```
+
+<details>
+
+- traefik
+- authelia
+
+</details>
+
 ## Dev
 
 v2.0.0 broken atm

diff --git a/docs/iptv.sh b/docs/iptv.sh
@@ -31880,7 +31880,7 @@ NginxDisableDomain()
 
 NginxAppendHttpConf()
 {
-cat > "$nginx_prefix/conf/sites_available/$server_domain.conf" <<EOF
+cat >> "$nginx_prefix/conf/sites_available/$server_domain.conf" <<EOF
     server {
         listen      $server_http_port;
         server_name $server_domain;
@@ -31905,7 +31905,7 @@ EOF
 NginxAppendHttpRedirectConf()
 {
     echo && read -p "输入网址: " http_redirect_address
-cat > "$nginx_prefix/conf/sites_available/$server_domain.conf" <<EOF
+cat >> "$nginx_prefix/conf/sites_available/$server_domain.conf" <<EOF
     server {
         listen      $server_http_port;
         server_name $server_domain;
@@ -31924,7 +31924,7 @@ EOF
 
 NginxAppendHttpRedirectToHttpsConf()
 {
-cat > "$nginx_prefix/conf/sites_available/$server_domain.conf" <<EOF
+cat >> "$nginx_prefix/conf/sites_available/$server_domain.conf" <<EOF
     server {
         listen      $server_http_port;
         server_name $server_domain;
@@ -31943,7 +31943,7 @@ EOF
 
 NginxAppendHttpsConf()
 {
-cat > "$nginx_prefix/conf/sites_available/$server_domain.conf" <<EOF
+cat >> "$nginx_prefix/conf/sites_available/$server_domain.conf" <<EOF
     server {
         listen      $server_https_port ssl;
         server_name $server_domain;
@@ -31971,7 +31971,7 @@ EOF
 NginxAppendHttpsRedirectConf()
 {
     echo && read -p "输入网址: " https_redirect_address
-cat > "$nginx_prefix/conf/sites_available/$server_domain.conf" <<EOF
+cat >> "$nginx_prefix/conf/sites_available/$server_domain.conf" <<EOF
     server {
         listen      $server_https_port ssl;
         server_name $server_domain;
@@ -31996,7 +31996,7 @@ EOF
 NginxAppendHttpHttpsRedirectConf()
 {
     echo && read -p "输入网址: " http_https_redirect_address
-cat > "$nginx_prefix/conf/sites_available/$server_domain.conf" <<EOF
+cat >> "$nginx_prefix/conf/sites_available/$server_domain.conf" <<EOF
     server {
         listen      $server_http_port;
         listen      $server_https_port ssl;
@@ -32021,7 +32021,7 @@ EOF
 
 NginxAppendHttpHttpsConf()
 {
-cat > "$nginx_prefix/conf/sites_available/$server_domain.conf" <<EOF
+cat >> "$nginx_prefix/conf/sites_available/$server_domain.conf" <<EOF
     server {
         listen      $server_http_port;
         listen      $server_https_port ssl;
@@ -49167,6 +49167,34 @@ case $* in
         editor "${nginx_confs[nginx_confs_index]}"
         exit 0
     ;;
+    l) 
+        if [ ! -d "$nginx_prefix" ] 
+        then
+            Println "$error 尚未安装, 请检查 !\n"
+            exit 1
+        fi
+
+        shopt -s nullglob
+        nginx_logs=("$nginx_prefix"/logs/*)
+        shopt -u nullglob
+
+        if [ -z "${nginx_logs:-}" ] 
+        then
+            Println "$error 没有日志 !\n"
+            exit 1
+        fi
+
+        echo
+        inquirer list_input_index "选择日志文件" nginx_logs nginx_logs_index 20
+
+        if [ "${2:-}" == "t" ] 
+        then
+            tail -f "${nginx_logs[nginx_logs_index]}"
+            exit 0
+        fi
+        editor "${nginx_logs[nginx_logs_index]}"
+        exit 0
+    ;;
     *) 
     ;;
 esac
@@ -49327,7 +49355,7 @@ case ${1:-} in
         nginx_confs=( "$nginx_prefix"/conf/nginx.conf "${nginx_confs[@]}" )
 
         echo
-        inquirer list_input_index "选择配置文件" nginx_confs nginx_confs_index
+        inquirer list_input_index "选择配置文件" nginx_confs nginx_confs_index 20
         editor "${nginx_confs[nginx_confs_index]}"
         exit 0
     ;;
@@ -49349,7 +49377,7 @@ case ${1:-} in
         fi
 
         echo
-        inquirer list_input_index "选择日志文件" nginx_logs nginx_logs_index
+        inquirer list_input_index "选择日志文件" nginx_logs nginx_logs_index 20
 
         if [ "${2:-}" == "t" ] 
         then