From f8fa0c6eac7e18c35d51b90f6b58f0917c4b807f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=8C=E6=A3=AE?= <qyg2297248353@163.com>
Date: Wed, 31 Jul 2024 12:50:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=96=20Umami=20=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 萌森 <qyg2297248353@163.com>
---
 apps/umami-mysql/2.12.1/data.yml             | 109 +++++++++++++++++++
 apps/umami-mysql/2.12.1/docker-compose.yml   |  25 +++++
 apps/umami-mysql/2.12.1/scripts/init.sh      |  15 +++
 apps/umami-mysql/2.12.1/scripts/uninstall.sh |  10 ++
 apps/umami-mysql/2.12.1/scripts/upgrade.sh   |  15 +++
 apps/umami-mysql/README.md                   |  39 +++++++
 apps/umami-mysql/data.yml                    |  20 ++++
 apps/umami-mysql/logo.png                    | Bin 0 -> 9458 bytes
 apps/umami-pg/2.12.1/data.yml                | 105 ++++++++++++++++++
 apps/umami-pg/2.12.1/docker-compose.yml      |  25 +++++
 apps/umami-pg/2.12.1/scripts/init.sh         |  15 +++
 apps/umami-pg/2.12.1/scripts/uninstall.sh    |  10 ++
 apps/umami-pg/2.12.1/scripts/upgrade.sh      |  15 +++
 apps/umami-pg/README.md                      |  39 +++++++
 apps/umami-pg/data.yml                       |  20 ++++
 apps/umami-pg/logo.png                       | Bin 0 -> 9458 bytes
 16 files changed, 462 insertions(+)
 create mode 100644 apps/umami-mysql/2.12.1/data.yml
 create mode 100644 apps/umami-mysql/2.12.1/docker-compose.yml
 create mode 100644 apps/umami-mysql/2.12.1/scripts/init.sh
 create mode 100644 apps/umami-mysql/2.12.1/scripts/uninstall.sh
 create mode 100644 apps/umami-mysql/2.12.1/scripts/upgrade.sh
 create mode 100644 apps/umami-mysql/README.md
 create mode 100644 apps/umami-mysql/data.yml
 create mode 100644 apps/umami-mysql/logo.png
 create mode 100644 apps/umami-pg/2.12.1/data.yml
 create mode 100644 apps/umami-pg/2.12.1/docker-compose.yml
 create mode 100644 apps/umami-pg/2.12.1/scripts/init.sh
 create mode 100644 apps/umami-pg/2.12.1/scripts/uninstall.sh
 create mode 100644 apps/umami-pg/2.12.1/scripts/upgrade.sh
 create mode 100644 apps/umami-pg/README.md
 create mode 100644 apps/umami-pg/data.yml
 create mode 100644 apps/umami-pg/logo.png

diff --git a/apps/umami-mysql/2.12.1/data.yml b/apps/umami-mysql/2.12.1/data.yml
new file mode 100644
index 000000000..ba9159ca6
--- /dev/null
+++ b/apps/umami-mysql/2.12.1/data.yml
@@ -0,0 +1,109 @@
+additionalProperties:
+  formFields:
+    - child:
+        default: ""
+        envKey: PANEL_DB_HOST
+        required: true
+        type: service
+      default: postgresql
+      edit: true
+      envKey: PANEL_DB_TYPE
+      labelZh: 数据库 服务 (前置检查)
+      labelEn: Database Service (Pre-check)
+      required: true
+      type: apps
+      values:
+        - label: MySQL
+          value: mysql
+        - label: MariaDB
+          value: mariadb
+        - label: Percona
+          value: percona
+    - default: "/home/umami"
+      edit: true
+      envKey: UMAMI_ROOT_PATH
+      labelZh: 数据持久化路径
+      labelEn: Data persistence path
+      required: true
+      type: text
+    - default: 3000
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelZh: 连接端口
+      labelEn: Connection Port
+      required: true
+      rule: paramPort
+      type: number
+    - default: ""
+      edit: true
+      envKey: APP_SECRET
+      labelZh: 应用密钥
+      labelEn: Application Secret
+      random: true
+      required: false
+      rule: paramComplexity
+      type: password
+    - default: "/"
+      edit: true
+      envKey: BASE_PATH
+      labelZh: 基础路径
+      labelEn: Base Path
+      required: true
+      type: text
+    - default: ""
+      edit: true
+      envKey: ALLOWED_FRAME_URLS
+      labelZh: 允许的 frame 地址
+      labelEn: Allowed frame urls
+      required: false
+      type: text
+    - default: "0"
+      edit: true
+      envKey: DISABLE_BOT_CHECK
+      labelZh: 禁用机器人检测
+      labelEn: Disable bot detection
+      required: true
+      type: select
+      values:
+        - label: 开启
+          value: "1"
+        - label: 关闭
+          value: "0"
+    - default: "127.0.0.1"
+      edit: true
+      envKey: DB_HOSTNAME
+      labelZh: 数据库 主机地址
+      labelEn: Database Host
+      required: true
+      type: text
+    - default: 3306
+      edit: true
+      envKey: DB_PORT
+      labelZh: 数据库 端口
+      labelEn: Database Port
+      required: true
+      rule: paramPort
+      type: number
+    - default: "umami"
+      edit: true
+      envKey: DB_USERNAME
+      labelZh: 数据库 用户名
+      labelEn: Database User
+      required: true
+      type: text
+    - default: ""
+      edit: true
+      envKey: DB_PASSWORD
+      labelEn: Database Password
+      labelZh: 数据库 密码
+      random: true
+      required: true
+      rule: paramComplexity
+      type: password
+    - default: "umami"
+      edit: true
+      envKey: DB_DATABASE_NAME
+      labelZh: 数据库 名称
+      labelEn: Database Name
+      required: true
+      type: text
diff --git a/apps/umami-mysql/2.12.1/docker-compose.yml b/apps/umami-mysql/2.12.1/docker-compose.yml
new file mode 100644
index 000000000..ff2a97f56
--- /dev/null
+++ b/apps/umami-mysql/2.12.1/docker-compose.yml
@@ -0,0 +1,25 @@
+version: "3.8"
+
+networks:
+  1panel-network:
+    external: true
+
+services:
+  umami:
+    image: ghcr.io/umami-software/umami:mysql-v2.12.1
+    container_name: ${CONTAINER_NAME}
+    labels:
+      createdBy: "Apps"
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:3000
+    env_file:
+      - /etc/1panel/envs/global.env
+      - ${ENV_FILE:-/etc/1panel/envs/default.env}
+    environment:
+      - DISABLE_TELEMETRY = 1
+      - REMOVE_TRAILING_SLASH = 1
+      - DATABASE_TYPE=mysql
+      - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME}
diff --git a/apps/umami-mysql/2.12.1/scripts/init.sh b/apps/umami-mysql/2.12.1/scripts/init.sh
new file mode 100644
index 000000000..77b849120
--- /dev/null
+++ b/apps/umami-mysql/2.12.1/scripts/init.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/apps/umami-mysql/2.12.1/scripts/uninstall.sh b/apps/umami-mysql/2.12.1/scripts/uninstall.sh
new file mode 100644
index 000000000..c86c4fbca
--- /dev/null
+++ b/apps/umami-mysql/2.12.1/scripts/uninstall.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/apps/umami-mysql/2.12.1/scripts/upgrade.sh b/apps/umami-mysql/2.12.1/scripts/upgrade.sh
new file mode 100644
index 000000000..77b849120
--- /dev/null
+++ b/apps/umami-mysql/2.12.1/scripts/upgrade.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/apps/umami-mysql/README.md b/apps/umami-mysql/README.md
new file mode 100644
index 000000000..715db26de
--- /dev/null
+++ b/apps/umami-mysql/README.md
@@ -0,0 +1,39 @@
+# Umami MySQL版
+
+为速度和效率而构建的网站分析
+
+Umami 网站分析提供您实时做出决策所需的数据。
+
+![Umami](https://file.lifebus.top/imgs/umami_cover.jpg)
+
+## 简介
+
+Umami 让您轻松分析数据
+
++ 便于使用
+
+Umami 功能强大而简单，易于使用和理解，不需要复杂的设置或标签配置。
+
++ UTM 和自定义事件
+
+Umami 会自动理解带有 UTM 参数的链接，并让您根据 UTM 查看和过滤您的网站数据。此外，您还可以跟踪网站上的任何事件，例如按钮点击、表单提交、购买、新闻通讯注册等。
+
++ 没有 Cookie 横幅
+
+所有数据均经过 Umami 匿名处理，并且不会收集您网站用户的任何个人信息。您无需选择加入 Cookie
+横幅即可跟踪网站的性能，从而为您的用户提供更好、更值得信赖的体验。
+默认情况下，Umami 符合 GDPRP 和 CCPA。
+
+## 环境准备
+
++ 数据库支持
+    + `MySQL` 版本：`5.7+`
+    + `PostgreSQL` 版本：`12.14+`
+
+## 安装说明
+
+> 默认管理员帐户
+>
+> 用户名： admin
+>
+> 密码： umami
diff --git a/apps/umami-mysql/data.yml b/apps/umami-mysql/data.yml
new file mode 100644
index 000000000..2a9c7704a
--- /dev/null
+++ b/apps/umami-mysql/data.yml
@@ -0,0 +1,20 @@
+name: Umami MySQL版
+title: 为速度和效率而构建的网站分析
+description: 为速度和效率而构建的网站分析
+additionalProperties:
+  key: umami-mysql
+  name: Umami MySQL版
+  tags:
+    - WebSite
+    - Database
+    - Middleware
+    - Runtime
+    - Local
+  shortDescZh: 为速度和效率而构建的网站分析
+  shortDescEn: A website analytics tool that is built for speed and efficiency
+  type: website
+  crossVersionUpdate: true
+  limit: 0
+  website: https://umami.is/
+  github: https://github.com/umami-software/umami/
+  document: https://umami.is/docs/
diff --git a/apps/umami-mysql/logo.png b/apps/umami-mysql/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ede937a0a16fab795ef4eef0c5656e4563d78e5
GIT binary patch
literal 9458
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

literal 0
HcmV?d00001

diff --git a/apps/umami-pg/2.12.1/data.yml b/apps/umami-pg/2.12.1/data.yml
new file mode 100644
index 000000000..a40a37beb
--- /dev/null
+++ b/apps/umami-pg/2.12.1/data.yml
@@ -0,0 +1,105 @@
+additionalProperties:
+  formFields:
+    - child:
+        default: ""
+        envKey: PANEL_DB_HOST
+        required: true
+        type: service
+      default: postgresql
+      edit: true
+      envKey: PANEL_DB_TYPE
+      labelZh: 数据库 服务 (前置检查)
+      labelEn: Database Service (Pre-check)
+      required: true
+      type: apps
+      values:
+        - label: PostgreSQL
+          value: postgresql
+    - default: "/home/umami"
+      edit: true
+      envKey: UMAMI_ROOT_PATH
+      labelZh: 数据持久化路径
+      labelEn: Data persistence path
+      required: true
+      type: text
+    - default: 3000
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelZh: 连接端口
+      labelEn: Connection Port
+      required: true
+      rule: paramPort
+      type: number
+    - default: ""
+      edit: true
+      envKey: APP_SECRET
+      labelZh: 应用密钥
+      labelEn: Application Secret
+      random: true
+      required: false
+      rule: paramComplexity
+      type: password
+    - default: "/"
+      edit: true
+      envKey: BASE_PATH
+      labelZh: 基础路径
+      labelEn: Base Path
+      required: true
+      type: text
+    - default: ""
+      edit: true
+      envKey: ALLOWED_FRAME_URLS
+      labelZh: 允许的 frame 地址
+      labelEn: Allowed frame urls
+      required: false
+      type: text
+    - default: "0"
+      edit: true
+      envKey: DISABLE_BOT_CHECK
+      labelZh: 禁用机器人检测
+      labelEn: Disable bot detection
+      required: true
+      type: select
+      values:
+        - label: 开启
+          value: "1"
+        - label: 关闭
+          value: "0"
+    - default: "127.0.0.1"
+      edit: true
+      envKey: DB_HOSTNAME
+      labelZh: 数据库 主机地址
+      labelEn: Database Host
+      required: true
+      type: text
+    - default: 5432
+      edit: true
+      envKey: DB_PORT
+      labelZh: 数据库 端口
+      labelEn: Database Port
+      required: true
+      rule: paramPort
+      type: number
+    - default: "umami"
+      edit: true
+      envKey: DB_USERNAME
+      labelZh: 数据库 用户名
+      labelEn: Database User
+      required: true
+      type: text
+    - default: ""
+      edit: true
+      envKey: DB_PASSWORD
+      labelEn: Database Password
+      labelZh: 数据库 密码
+      random: true
+      required: true
+      rule: paramComplexity
+      type: password
+    - default: "umami"
+      edit: true
+      envKey: DB_DATABASE_NAME
+      labelZh: 数据库 名称
+      labelEn: Database Name
+      required: true
+      type: text
diff --git a/apps/umami-pg/2.12.1/docker-compose.yml b/apps/umami-pg/2.12.1/docker-compose.yml
new file mode 100644
index 000000000..b2a1d4959
--- /dev/null
+++ b/apps/umami-pg/2.12.1/docker-compose.yml
@@ -0,0 +1,25 @@
+version: "3.8"
+
+networks:
+  1panel-network:
+    external: true
+
+services:
+  umami:
+    image: ghcr.io/umami-software/umami:postgresql-v2.12.1
+    container_name: ${CONTAINER_NAME}
+    labels:
+      createdBy: "Apps"
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:3000
+    env_file:
+      - /etc/1panel/envs/global.env
+      - ${ENV_FILE:-/etc/1panel/envs/default.env}
+    environment:
+      - DISABLE_TELEMETRY = 1
+      - REMOVE_TRAILING_SLASH = 1
+      - DATABASE_TYPE=postgresql
+      - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME}
diff --git a/apps/umami-pg/2.12.1/scripts/init.sh b/apps/umami-pg/2.12.1/scripts/init.sh
new file mode 100644
index 000000000..77b849120
--- /dev/null
+++ b/apps/umami-pg/2.12.1/scripts/init.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/apps/umami-pg/2.12.1/scripts/uninstall.sh b/apps/umami-pg/2.12.1/scripts/uninstall.sh
new file mode 100644
index 000000000..c86c4fbca
--- /dev/null
+++ b/apps/umami-pg/2.12.1/scripts/uninstall.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/apps/umami-pg/2.12.1/scripts/upgrade.sh b/apps/umami-pg/2.12.1/scripts/upgrade.sh
new file mode 100644
index 000000000..77b849120
--- /dev/null
+++ b/apps/umami-pg/2.12.1/scripts/upgrade.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/apps/umami-pg/README.md b/apps/umami-pg/README.md
new file mode 100644
index 000000000..c1ce87aca
--- /dev/null
+++ b/apps/umami-pg/README.md
@@ -0,0 +1,39 @@
+# Umami PostgreSQL版
+
+为速度和效率而构建的网站分析
+
+Umami 网站分析提供您实时做出决策所需的数据。
+
+![Umami](https://file.lifebus.top/imgs/umami_cover.jpg)
+
+## 简介
+
+Umami 让您轻松分析数据
+
++ 便于使用
+
+Umami 功能强大而简单，易于使用和理解，不需要复杂的设置或标签配置。
+
++ UTM 和自定义事件
+
+Umami 会自动理解带有 UTM 参数的链接，并让您根据 UTM 查看和过滤您的网站数据。此外，您还可以跟踪网站上的任何事件，例如按钮点击、表单提交、购买、新闻通讯注册等。
+
++ 没有 Cookie 横幅
+
+所有数据均经过 Umami 匿名处理，并且不会收集您网站用户的任何个人信息。您无需选择加入 Cookie
+横幅即可跟踪网站的性能，从而为您的用户提供更好、更值得信赖的体验。
+默认情况下，Umami 符合 GDPRP 和 CCPA。
+
+## 环境准备
+
++ 数据库支持
+    + `MySQL` 版本：`5.7+`
+    + `PostgreSQL` 版本：`12.14+`
+
+## 安装说明
+
+> 默认管理员帐户
+>
+> 用户名： admin
+>
+> 密码： umami
diff --git a/apps/umami-pg/data.yml b/apps/umami-pg/data.yml
new file mode 100644
index 000000000..0ca890577
--- /dev/null
+++ b/apps/umami-pg/data.yml
@@ -0,0 +1,20 @@
+name: Umami PostgreSQL版
+title: 为速度和效率而构建的网站分析
+description: 为速度和效率而构建的网站分析
+additionalProperties:
+  key: umami-pg
+  name: Umami PostgreSQL版
+  tags:
+    - WebSite
+    - Database
+    - Middleware
+    - Runtime
+    - Local
+  shortDescZh: 为速度和效率而构建的网站分析
+  shortDescEn: A website analytics tool that is built for speed and efficiency
+  type: website
+  crossVersionUpdate: true
+  limit: 0
+  website: https://umami.is/
+  github: https://github.com/umami-software/umami/
+  document: https://umami.is/docs/
diff --git a/apps/umami-pg/logo.png b/apps/umami-pg/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ede937a0a16fab795ef4eef0c5656e4563d78e5
GIT binary patch
literal 9458
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

literal 0
HcmV?d00001