diff --git a/DISCLAIMER.md b/DISCLAIMER.md index 6ff544f8..8c99c7f6 100644 --- a/DISCLAIMER.md +++ b/DISCLAIMER.md @@ -1,6 +1,6 @@ ## 免责声明 -> 欢迎您选择使用 orion-ops-pro(以下简称「本项目」)。在使用本项目前,请您仔细阅读本免责声明,并确保您已充分理解其中的内容。您的使用行为将视为对本声明全部内容的认可和接受。 +> 欢迎您选择使用 orion-visor(以下简称「本项目」)。在使用本项目前,请您仔细阅读本免责声明,并确保您已充分理解其中的内容。您的使用行为将视为对本声明全部内容的认可和接受。 > 本项目为一款开源免费的运维管理工具,采用 Apache 2.0 许可证授权。您可在遵守相关法律法规及许可证条款的前提下,自由修改和使用本项目。 diff --git a/README.md b/README.md index 327ef10c..7175c92e 100644 --- a/README.md +++ b/README.md @@ -1,124 +1,111 @@ -
orion-ops-pro 是什么
-
-
+ 高颜值、现代化的智能运维&轻量堡垒机平台。
+
-
+ 高颜值、现代化的智能运维&轻量堡垒机平台。
+
![]()
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
-
-
+
+
+
+
-
+
+
🎁 为了项目能健康持续的发展, 我期望获得相应的资金支持, 你们的支持是我不断更新前进的动力!
## 免责声明
-在使用本项目之前, 请确保您已经了解并同意相关的使用协议和隐私政策。[免责声明](https://github.com/lijiahangmax/orion-ops-pro/blob/main/DISCLAIMER.md)
+在使用本项目之前, 请确保您已经了解并同意相关的使用协议和隐私政策。[免责声明](https://github.com/lijiahangmax/orion-visor/blob/main/DISCLAIMER.md)
## License
-本项目遵循 [Apache-2.0](https://github.com/lijiahangmax/orion-ops-pro/blob/main/LICENSE) 开源许可证。
+本项目遵循 [Apache-2.0](https://github.com/lijiahangmax/orion-visor/blob/main/LICENSE) 开源许可证。
diff --git a/docker-compose.yml b/docker-compose.yml
index 3b204e2b..7970ceef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,46 +1,50 @@
version: '3.3'
services:
- orion-ops-pro:
- image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:1.0.8
+ orion-visor-service:
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.0
ports:
- 1081:80
environment:
- - MYSQL_HOST=orion-ops-pro-db
+ - MYSQL_HOST=orion-visor-mysql
- MYSQL_PORT=3306
+ - MYSQL_DATABASE=orion_visor
- MYSQL_USER=orion
- MYSQL_PASSWORD=Data@123456
- - REDIS_HOST=orion-ops-pro-redis
+ - REDIS_HOST=orion-visor-redis
- REDIS_PASSWORD=Data@123456
- SECRET_KEY=uQeacXV8b3isvKLK
volumes:
- - /data/orion-ops-pro-space/docker-volumes/orion-ops-pro/logs:/root/orion/logs/orion-ops-pro
- - /data/orion-ops-pro-space/docker-volumes/orion-ops-pro/app:/root/orion/orion-ops-pro
+ - /data/orion-visor-space/docker-volumes/orion-visor-service/logs:/root/orion/logs/orion-visor
+ - /data/orion-visor-space/docker-volumes/orion-visor-service/app:/root/orion/orion-visor
depends_on:
- - orion-ops-pro-db
- - orion-ops-pro-redis
- orion-ops-pro-db:
- image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro-mysql:1.0.8
+ - orion-visor-mysql
+ - orion-visor-redis
+ orion-visor-mysql:
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.0
privileged: true
ports:
- 3307:3306
environment:
- - MYSQL_DATABASE=orion-ops-pro
+ - MYSQL_DATABASE=orion_visor
- MYSQL_USER=orion
- MYSQL_PASSWORD=Data@123456
- MYSQL_ROOT_PASSWORD=Data@123456
volumes:
- - /data/orion-ops-pro-space/docker-volumes/mysql/var-lib-mysql:/var/lib/mysql
- - /data/orion-ops-pro-space/docker-volumes/mysql/var-lib-mysql-files:/var/lib/mysql-files
- - /data/orion-ops-pro-space/docker-volumes/mysql/etc-mysql:/etc/mysql
- orion-ops-pro-redis:
- image: redis:6.0.16-alpine
- command: redis-server --appendonly yes --requirepass Data@123456
+ - /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql:/var/lib/mysql
+ - /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql-files:/var/lib/mysql-files
+ - /data/orion-visor-space/docker-volumes/orion-visor-mysql/etc-mysql:/etc/mysql
+ orion-visor-redis:
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.0
+ privileged: true
ports:
- 6380:6379
+ environment:
+ - REDIS_PASSWORD=Data@123456
volumes:
- - /data/orion-ops-pro-space/docker-volumes/redis/data:/data
- - /data/orion-ops-pro-space/docker-volumes/redis/redis.conf:/usr/local/etc/redis/redis.conf
- orion-ops-pro-adminer:
+ - /data/orion-visor-space/docker-volumes/orion-visor-redis/data:/data
+ - /data/orion-visor-space/docker-volumes/orion-visor-redis/usr-local-etc-redis:/usr/local/etc/redis
+ command: sh -c "redis-server /usr/local/etc/redis/redis.conf --requirepass $${REDIS_PASSWORD}"
+ orion-visor-adminer:
image: adminer
ports:
- 8081:8080
diff --git a/docker-upgrade.sh b/docker-upgrade.sh
new file mode 100644
index 00000000..3b43d4f0
--- /dev/null
+++ b/docker-upgrade.sh
@@ -0,0 +1,4 @@
+#/bin/bash
+docker compose down
+sh ./pull.sh
+docker compose up -d
diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh
deleted file mode 100644
index 4b3100c9..00000000
--- a/docker/mysql/build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#/bin/bash
-version=1.0.8
-cp -r ../../sql ./sql
-docker build -t orion-ops-pro-mysql:${version} .
-rm -rf ./sql
-docker tag orion-ops-pro-mysql:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro-mysql:${version}
-docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro-mysql:${version}
diff --git a/docker/orion-ops-pro/build.sh b/docker/orion-ops-pro/build.sh
deleted file mode 100644
index 012efdb4..00000000
--- a/docker/orion-ops-pro/build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#/bin/bash
-version=1.0.8
-mv ../../orion-ops-launch/target/orion-ops-launch.jar ./orion-ops-launch.jar
-mv ../../orion-ops-ui/dist ./dist
-docker build -t orion-ops-pro:${version} .
-rm -f ./orion-ops-launch.jar
-rm -rf ./dist
-docker tag orion-ops-pro:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:${version}
-docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:${version}
diff --git a/docker/mysql/Dockerfile b/docker/orion-visor-mysql/Dockerfile
similarity index 100%
rename from docker/mysql/Dockerfile
rename to docker/orion-visor-mysql/Dockerfile
diff --git a/docker/orion-visor-mysql/build.sh b/docker/orion-visor-mysql/build.sh
new file mode 100644
index 00000000..2eb6dfd2
--- /dev/null
+++ b/docker/orion-visor-mysql/build.sh
@@ -0,0 +1,7 @@
+#/bin/bash
+version=2.0.0
+cp -r ../../sql ./sql
+docker build -t orion-visor-mysql:${version} .
+rm -rf ./sql
+docker tag orion-visor-mysql:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version}
+docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version}
diff --git a/docker/mysql/my.cnf b/docker/orion-visor-mysql/my.cnf
similarity index 100%
rename from docker/mysql/my.cnf
rename to docker/orion-visor-mysql/my.cnf
diff --git a/docker/orion-visor-redis/Dockerfile b/docker/orion-visor-redis/Dockerfile
new file mode 100644
index 00000000..ea2134c2
--- /dev/null
+++ b/docker/orion-visor-redis/Dockerfile
@@ -0,0 +1,2 @@
+FROM redis:6.0.16-alpine
+COPY ./redis.conf /usr/local/etc/redis/redis.conf
diff --git a/docker/orion-visor-redis/build.sh b/docker/orion-visor-redis/build.sh
new file mode 100644
index 00000000..66decce4
--- /dev/null
+++ b/docker/orion-visor-redis/build.sh
@@ -0,0 +1,5 @@
+#/bin/bash
+version=2.0.0
+docker build -t orion-visor-redis:${version} .
+docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
+docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
diff --git a/docker/orion-visor-redis/redis.conf b/docker/orion-visor-redis/redis.conf
new file mode 100644
index 00000000..7965272b
--- /dev/null
+++ b/docker/orion-visor-redis/redis.conf
@@ -0,0 +1,1877 @@
+# Redis configuration file example.
+#
+# Note that in order to read the configuration file, Redis must be
+# started with the file path as first argument:
+#
+# ./redis-server /path/to/redis.conf
+
+# Note on units: when memory size is needed, it is possible to specify
+# it in the usual form of 1k 5GB 4M and so forth:
+#
+# 1k => 1000 bytes
+# 1kb => 1024 bytes
+# 1m => 1000000 bytes
+# 1mb => 1024*1024 bytes
+# 1g => 1000000000 bytes
+# 1gb => 1024*1024*1024 bytes
+#
+# units are case insensitive so 1GB 1Gb 1gB are all the same.
+
+################################## INCLUDES ###################################
+
+# Include one or more other config files here. This is useful if you
+# have a standard template that goes to all Redis servers but also need
+# to customize a few per-server settings. Include files can include
+# other files, so use this wisely.
+#
+# Note that option "include" won't be rewritten by command "CONFIG REWRITE"
+# from admin or Redis Sentinel. Since Redis always uses the last processed
+# line as value of a configuration directive, you'd better put includes
+# at the beginning of this file to avoid overwriting config change at runtime.
+#
+# If instead you are interested in using includes to override configuration
+# options, it is better to use include as the last line.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf
+
+################################## MODULES #####################################
+
+# Load modules at startup. If the server is not able to load modules
+# it will abort. It is possible to use multiple loadmodule directives.
+#
+# loadmodule /path/to/my_module.so
+# loadmodule /path/to/other_module.so
+
+################################## NETWORK #####################################
+
+# By default, if no "bind" configuration directive is specified, Redis listens
+# for connections from all available network interfaces on the host machine.
+# It is possible to listen to just one or multiple selected interfaces using
+# the "bind" configuration directive, followed by one or more IP addresses.
+#
+# Examples:
+#
+# bind 192.168.1.100 10.0.0.1
+# bind 127.0.0.1 ::1
+#
+# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
+# internet, binding to all the interfaces is dangerous and will expose the
+# instance to everybody on the internet. So by default we uncomment the
+# following bind directive, that will force Redis to listen only on the
+# IPv4 loopback interface address (this means Redis will only be able to
+# accept client connections from the same host that it is running on).
+#
+# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
+# JUST COMMENT OUT THE FOLLOWING LINE.
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bind 0.0.0.0
+
+# Protected mode is a layer of security protection, in order to avoid that
+# Redis instances left open on the internet are accessed and exploited.
+#
+# When protected mode is on and if:
+#
+# 1) The server is not binding explicitly to a set of addresses using the
+# "bind" directive.
+# 2) No password is configured.
+#
+# The server only accepts connections from clients connecting from the
+# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
+# sockets.
+#
+# By default protected mode is enabled. You should disable it only if
+# you are sure you want clients from other hosts to connect to Redis
+# even if no authentication is configured, nor a specific set of interfaces
+# are explicitly listed using the "bind" directive.
+protected-mode yes
+
+# Accept connections on the specified port, default is 6379 (IANA #815344).
+# If port 0 is specified Redis will not listen on a TCP socket.
+port 6379
+
+# TCP listen() backlog.
+#
+# In high requests-per-second environments you need a high backlog in order
+# to avoid slow clients connection issues. Note that the Linux kernel
+# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
+# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
+# in order to get the desired effect.
+tcp-backlog 511
+
+# Unix socket.
+#
+# Specify the path for the Unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+# unixsocket /tmp/redis.sock
+# unixsocketperm 700
+
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 0
+
+# TCP keepalive.
+#
+# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
+# of communication. This is useful for two reasons:
+#
+# 1) Detect dead peers.
+# 2) Force network equipment in the middle to consider the connection to be
+# alive.
+#
+# On Linux, the specified value (in seconds) is the period used to send ACKs.
+# Note that to close the connection the double of the time is needed.
+# On other kernels the period depends on the kernel configuration.
+#
+# A reasonable value for this option is 300 seconds, which is the new
+# Redis default starting with Redis 3.2.1.
+tcp-keepalive 300
+
+################################# TLS/SSL #####################################
+
+# By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration
+# directive can be used to define TLS-listening ports. To enable TLS on the
+# default port, use:
+#
+# port 0
+# tls-port 6379
+
+# Configure a X.509 certificate and private key to use for authenticating the
+# server to connected clients, masters or cluster peers. These files should be
+# PEM formatted.
+#
+# tls-cert-file redis.crt
+# tls-key-file redis.key
+
+# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange:
+#
+# tls-dh-params-file redis.dh
+
+# Configure a CA certificate(s) bundle or directory to authenticate TLS/SSL
+# clients and peers. Redis requires an explicit configuration of at least one
+# of these, and will not implicitly use the system wide configuration.
+#
+# tls-ca-cert-file ca.crt
+# tls-ca-cert-dir /etc/ssl/certs
+
+# By default, clients (including replica servers) on a TLS port are required
+# to authenticate using valid client side certificates.
+#
+# If "no" is specified, client certificates are not required and not accepted.
+# If "optional" is specified, client certificates are accepted and must be
+# valid if provided, but are not required.
+#
+# tls-auth-clients no
+# tls-auth-clients optional
+
+# By default, a Redis replica does not attempt to establish a TLS connection
+# with its master.
+#
+# Use the following directive to enable TLS on replication links.
+#
+# tls-replication yes
+
+# By default, the Redis Cluster bus uses a plain TCP connection. To enable
+# TLS for the bus protocol, use the following directive:
+#
+# tls-cluster yes
+
+# Explicitly specify TLS versions to support. Allowed values are case insensitive
+# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) or
+# any combination. To enable only TLSv1.2 and TLSv1.3, use:
+#
+# tls-protocols "TLSv1.2 TLSv1.3"
+
+# Configure allowed ciphers. See the ciphers(1ssl) manpage for more information
+# about the syntax of this string.
+#
+# Note: this configuration applies only to <= TLSv1.2.
+#
+# tls-ciphers DEFAULT:!MEDIUM
+
+# Configure allowed TLSv1.3 ciphersuites. See the ciphers(1ssl) manpage for more
+# information about the syntax of this string, and specifically for TLSv1.3
+# ciphersuites.
+#
+# tls-ciphersuites TLS_CHACHA20_POLY1305_SHA256
+
+# When choosing a cipher, use the server's preference instead of the client
+# preference. By default, the server follows the client's preference.
+#
+# tls-prefer-server-ciphers yes
+
+# By default, TLS session caching is enabled to allow faster and less expensive
+# reconnections by clients that support it. Use the following directive to disable
+# caching.
+#
+# tls-session-caching no
+
+# Change the default number of TLS sessions cached. A zero value sets the cache
+# to unlimited size. The default size is 20480.
+#
+# tls-session-cache-size 5000
+
+# Change the default timeout of cached TLS sessions. The default timeout is 300
+# seconds.
+#
+# tls-session-cache-timeout 60
+
+################################# GENERAL #####################################
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize no
+
+# If you run Redis from upstart or systemd, Redis can interact with your
+# supervision tree. Options:
+# supervised no - no supervision interaction
+# supervised upstart - signal upstart by putting Redis into SIGSTOP mode
+# requires "expect stop" in your upstart job config
+# supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
+# supervised auto - detect upstart or systemd method based on
+# UPSTART_JOB or NOTIFY_SOCKET environment variables
+# Note: these supervision methods only signal "process is ready."
+# They do not enable continuous pings back to your supervisor.
+supervised no
+
+# If a pid file is specified, Redis writes it where specified at startup
+# and removes it at exit.
+#
+# When the server runs non daemonized, no pid file is created if none is
+# specified in the configuration. When the server is daemonized, the pid file
+# is used even if not specified, defaulting to "/var/run/redis.pid".
+#
+# Creating a pid file is best effort: if Redis is not able to create it
+# nothing bad happens, the server will start and run normally.
+pidfile /var/run/redis_6379.pid
+
+# Specify the server verbosity level.
+# This can be one of:
+# debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+
+# Specify the log file name. Also the empty string can be used to force
+# Redis to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile ""
+
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+
+# Specify the syslog identity.
+# syslog-ident redis
+
+# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT
-
-
-`orion-ops-pro`
-是一款现代化、高颜值的一站式智能运维管理平台,集资产管理、资产授权、批量执行、批量上传、计划任务、WebShell、WebSftp、角色管理、系统管理等功能于一体,致力于简化运维团队的治理工作。
-
- orion-ops-pro 是什么
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
-
-
+
+
+
+