Merge branch 'main' of https://github.com/Websoft9/websoft9 into main

This commit is contained in:
qiaofeng1227 2024-12-11 14:30:24 +08:00
commit d270b4e02c
7 changed files with 193 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# modify time: 2024121110, you can modify here to trigger Docker Build action # modify time: 202412111427, you can modify here to trigger Docker Build action
# from Dockerfile: https://github.com/NginxProxyManager/nginx-proxy-manager/blob/develop/docker/Dockerfile # from Dockerfile: https://github.com/NginxProxyManager/nginx-proxy-manager/blob/develop/docker/Dockerfile
# from image: https://hub.docker.com/r/jc21/nginx-proxy-manager # from image: https://hub.docker.com/r/jc21/nginx-proxy-manager
@ -11,6 +11,7 @@ COPY README.md /data/nginx/README.md
RUN mkdir /data/nginx/custom RUN mkdir /data/nginx/custom
RUN mkdir -p /etc/websoft9 RUN mkdir -p /etc/websoft9
COPY ./config/http.conf /data/nginx/custom/http.conf COPY ./config/http.conf /data/nginx/custom/http.conf
COPY ./config/landing /etc/websoft9
COPY ./config/initproxy.conf /etc/websoft9/initproxy.conf COPY ./config/initproxy.conf /etc/websoft9/initproxy.conf
COPY ./init_nginx.sh /app/init_nginx.sh COPY ./init_nginx.sh /app/init_nginx.sh
RUN chmod +x /app/init_nginx.sh RUN chmod +x /app/init_nginx.sh

View File

@ -4,3 +4,4 @@ From official Nginx Proxy Manager image, and:
- Copy the initproxy.conf file to the nginx directory to initialize the custom configuration - Copy the initproxy.conf file to the nginx directory to initialize the custom configuration
- Initialize username and password through environment variables - Initialize username and password through environment variables
- Add landing page designed by [figma](https://www.figma.com/)

View File

@ -17,8 +17,9 @@ server {
} }
location = / { location = / {
return 200 "Welcome to our site!"; root /ect/websoft9/landing;
add_header Content-Type text/plain; try_files /index.html =404;
add_header Content-Type text/plain;
} }
location / { location / {

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="横版单英" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
y="0px" width="502px" height="128px" viewBox="0 0 502 128" enable-background="new 0 0 502 128" xml:space="preserve">
<g>
<g>
<path fill="#333333" d="M243.805,63.855c-0.189-0.188-0.394-0.409-0.615-0.663c-0.223-0.251-0.489-0.536-0.805-0.853
c-0.632-0.63-1.482-1.197-2.558-1.703c-1.073-0.506-2.62-0.758-4.64-0.758c-4.421,0-7.782,1.547-10.086,4.641
c-2.306,3.093-3.457,6.503-3.457,10.228c0,0.063,0,0.111,0,0.142c0,0.033,0,0.081,0,0.143c0.062,3.283,1.231,6.282,3.504,8.997
c2.273,2.715,5.618,4.072,10.039,4.072c4.607,0,7.718-1.09,9.328-3.268c1.609-2.178,2.92-5.225,3.932-9.139
c0-0.063,0.013-0.109,0.046-0.143c0.031-0.031,0.048-0.078,0.048-0.143l7.48,0.568v1.8c0,0.947-0.111,1.927-0.33,2.936
c-0.223,1.011-0.554,2.021-0.994,3.03c-1.326,2.906-3.616,5.558-6.867,7.956c-3.251,2.399-7.465,3.599-12.643,3.599
c-6.125,0-11.238-1.925-15.342-5.776c-4.105-3.851-6.156-8.775-6.156-14.774c0-6.503,1.736-11.49,5.209-14.963
c3.472-3.472,7.26-5.684,11.364-6.631c0.883-0.189,1.72-0.33,2.51-0.426c0.789-0.095,1.594-0.142,2.415-0.142
c4.672,0,8.681,1.295,12.027,3.883c3.347,2.589,6.062,5.745,8.145,9.471l-28.411,15.343l-3.314-5.968L243.805,63.855z"/>
<path fill="#333333" d="M270.892,34.971v38.355c0,4.356,1.12,7.908,3.362,10.654c2.239,2.746,5.412,4.12,9.518,4.12
c3.661,0,6.55-1.057,8.666-3.173c2.113-2.115,3.486-4.436,4.118-6.961c0.189-0.693,0.333-1.356,0.427-1.989
c0.096-0.63,0.143-1.262,0.143-1.894c0-4.546-1.137-7.939-3.408-10.18c-2.274-2.241-4.771-3.553-7.483-3.931
c-0.317,0-0.615-0.016-0.899-0.049c-0.283-0.031-0.584-0.046-0.9-0.046c-1.768,0-3.3,0.235-4.593,0.71
c-1.295,0.474-2.542,0.995-3.741,1.563c-0.063,0-0.126,0.016-0.189,0.048c-0.063,0.031-0.126,0.046-0.188,0.046
c-0.379,0.189-0.743,0.365-1.09,0.521c-0.349,0.159-0.71,0.331-1.09,0.521v-7.481c1.199-0.693,2.432-1.263,3.695-1.705
c1.261-0.439,2.524-0.788,3.788-1.04c0.693-0.063,1.356-0.126,1.987-0.19c0.632-0.062,1.264-0.095,1.894-0.095
c5.241,0,9.944,1.784,14.112,5.351c4.168,3.568,6.251,8.382,6.251,14.442c0,5.746-1.832,10.971-5.493,15.675
c-3.662,4.703-8.996,7.055-16.005,7.055c-7.071,0-12.313-2.257-15.721-6.771c-3.41-4.513-5.115-9.833-5.115-15.958V34.971H270.892
z"/>
<path fill="#333333" d="M330.696,86.947c0.097,0,0.175,0,0.237,0c1.264-0.062,2.415-0.314,3.458-0.759
c1.042-0.443,1.562-1.36,1.562-2.754c0-1.644-0.868-2.909-2.604-3.796c-1.736-0.886-3.993-1.71-6.771-2.468
c-0.633-0.19-1.295-0.381-1.99-0.57c-0.694-0.188-1.419-0.379-2.177-0.57c-3.664-1.012-6.568-2.467-8.713-4.365
c-2.147-1.897-3.221-4.494-3.221-7.783c0-4.683,1.765-7.243,4.736-8.876c3.366-1.853,6.913-1.853,11.269-1.853h15.438v6.631
h-16.101c-2.021,0.063-3.757,0.316-5.208,0.756c-1.453,0.443-2.18,1.358-2.18,2.747c0,1.579,0.76,2.746,2.275,3.504
c1.513,0.759,11.205,3.568,11.458,3.694c4.358,1.642,7.401,3.426,9.14,5.35c1.735,1.928,2.605,4.469,2.605,7.625
c-0.192,3.599-1.219,6.141-3.08,7.624c-1.862,1.484-3.898,2.415-6.108,2.793c-0.756,0.128-1.516,0.206-2.271,0.237
c-0.759,0.033-1.484,0.048-2.18,0.048c-0.063,0-19.793,0-19.793,0v-7.215C310.478,86.947,330.604,86.947,330.696,86.947z"/>
<path fill="#333333" d="M399.879,49.65c0-4.168,0.867-7.276,2.603-9.329c1.736-2.05,3.614-3.456,5.637-4.214
c1.072-0.441,2.113-0.726,3.125-0.853c1.009-0.126,1.895-0.189,2.65-0.189l6.82-0.095v7.293h-5.493
c-3.221,0.063-5.337,0.898-6.346,2.509c-1.01,1.61-1.579,3.362-1.705,5.256c-0.063,0.317-0.093,0.632-0.093,0.947
c0,0.316,0,0.632,0,0.947c0,0.128,0,0.254,0,0.38s0.03,0.221,0.093,0.283c0,0.063,0,0.128,0,0.189c0,0.063,0,0.127,0,0.188
c0,0.189,0.016,0.365,0.048,0.521c0.032,0.159,0.048,0.3,0.048,0.426l12.121-0.095v7.293h-12.121v32.862h-7.387V49.65z"/>
<path fill="#333333" d="M213.125,35.248h-4.288h-4.289l-10.634,46.825c-0.187,0.784-0.342,1.553-0.462,2.31
c-0.106,0.671-0.162,1.149-0.175,1.459c-0.013-0.353-0.075-0.86-0.195-1.54c-0.134-0.757-0.308-1.499-0.521-2.229l-11.133-42.104
c-0.044-0.218-0.103-0.433-0.17-0.643l-0.136-0.513h-0.055c-0.897-2.104-2.965-3.575-5.374-3.575s-4.477,1.472-5.374,3.575h-0.061
l-0.153,0.577c-0.005,0.014-0.007,0.027-0.011,0.042l-11.36,42.884c-0.188,0.703-0.348,1.418-0.481,2.147
c-0.125,0.68-0.188,1.188-0.196,1.54c-0.009-0.304-0.065-0.777-0.177-1.439c-0.12-0.715-0.274-1.464-0.461-2.248l-10.502-47.068
h-4.329H138.3l14.403,55.582h0.02c0.708,2.295,2.815,3.962,5.319,3.962c2.503,0,4.611-1.667,5.319-3.962h0.02L174.8,48.736
c0.213-0.755,0.387-1.505,0.52-2.248c0.134-0.741,0.2-1.289,0.2-1.641h0.012c0,0.297,0.079,0.824,0.24,1.58
c0.16,0.757,0.347,1.526,0.562,2.309l11.686,42.094h0.035c0.707,2.295,2.816,3.962,5.318,3.962c2.504,0,4.612-1.667,5.32-3.962
h0.029L213.125,35.248z"/>
<path fill="#333333" d="M391.734,73.279c0,11.69-9.479,21.166-21.167,21.166c-11.691,0-21.167-9.476-21.167-21.166
c0-11.691,9.476-21.167,21.167-21.167C382.256,52.112,391.734,61.588,391.734,73.279z M370.567,59.184
c-7.786,0-14.096,6.31-14.096,14.096c0,7.785,6.31,14.095,14.096,14.095c7.785,0,14.097-6.31,14.097-14.095
C384.664,65.493,378.353,59.184,370.567,59.184z"/>
<path fill="#333333" d="M502,55.476c0-11.69-9.477-21.168-21.166-21.168c-11.69,0-21.168,9.478-21.168,21.168
c0,11.192,8.689,20.35,19.691,21.108l5.087-7.482c-1.152,0.305-2.362,0.468-3.61,0.468c-7.786,0-14.096-6.31-14.096-14.094
c0-7.785,6.31-14.096,14.096-14.096c7.784,0,14.096,6.311,14.096,14.096c0,3.054-0.976,5.877-2.625,8.187l0,0l-8.319,12.745
l-12.307,17.575h8.021l18.103-25.853c0.236-0.316,0.461-0.642,0.682-0.973l0.093-0.136h-0.006C500.736,63.7,502,59.736,502,55.476
z"/>
<path fill="#333333" d="M448.746,53.153h-15.533V43.021h-7.955v37.597v0.095c0,0.081,0.006,0.611,0.011,1.059
c-0.002,0.09-0.011,0.179-0.011,0.269c0,6.695,5.428,12.122,12.121,12.122c0,0,0,0,0.001,0c0.062,0,10.703,0,10.703,0v-7.387
h-9.472c-0.062,0-0.119-0.003-0.181-0.005c-0.115,0.009-0.232,0.018-0.351,0.018c-0.257,0-0.506-0.025-0.754-0.064
c-0.039-0.003-0.082-0.004-0.121-0.007c-0.155-0.014-0.313-0.062-0.469-0.12c-1.75-0.505-3.092-1.965-3.425-3.782v-0.002
c0,0,0-0.01-0.002-0.013c-0.049-0.281-0.081-0.567-0.081-0.862c0-0.039,0.005-0.075,0.007-0.113
c-0.002-0.047-0.005-0.094-0.007-0.134V70.664c-0.004,0.001-0.01,0.004-0.016,0.006V60.446h15.533V53.153z"/>
</g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="58.5918" y1="1.8193" x2="58.5918" y2="126.1812">
<stop offset="0.1" style="stop-color:#52E5E7"/>
<stop offset="0.9" style="stop-color:#130CB7"/>
</linearGradient>
<path fill="url(#SVGID_1_)" d="M58.592,112.915l56.592-32.672v5.881c0,5.749-4.075,12.808-9.055,15.682l-38.482,22.22
c-4.98,2.874-13.129,2.874-18.109,0l-38.482-22.22C6.075,98.932,2,91.873,2,86.124v-5.881L58.592,112.915z M106.129,26.005
L67.646,3.786c-1.77-1.021-3.94-1.672-6.226-1.967v14.709l39.615,22.873L61.421,62.272v16.337l53.763-31.041v-5.881
C115.184,35.938,111.109,28.881,106.129,26.005z M55.763,78.609L2,47.568v-5.881c0-5.75,4.075-12.807,9.055-15.683L49.537,3.786
c1.769-1.021,3.94-1.672,6.226-1.967v14.717L16.157,39.41l39.605,22.857V78.609z M61.421,85.155l53.763-31.04v6.664L61.421,91.764
V85.155z M61.421,98.117l53.763-30.986v6.55l-53.763,31.04V98.117z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 213 KiB

View File

@ -0,0 +1,104 @@
<!DOCTYPE html>
<html lang="en">
<head>
<!-- Required meta tags-->
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta name="author" content="Websoft9">
<link rel="icon" href="favicon.ico" />
<!-- Title Page-->
<title>Websoft9 Applications Hosting Platform</title>
<!-- english tags-->
<meta name="description" content="Websoft9 is a Self-Hosting Applications platform that can deploy multiple applications in your own cloud infrastructure.">
<meta name="keywords" content="Cloud computing, runtime environment, Docker, auto-deployment, Self-Hosting, install WordPress, Panel, PaaS, Iac, GitOps">
<!-- Chinese tags-->
<meta name="description" content="Websoft9微聚云是一个企业级的开源软件聚合与多应用托管平台旨在让任何人都能轻松地在自己的基础设施中部署和管理软件。" lang="zh">
<meta name="keywords" content="云计算运行环境自托管自动部署Docker部署 WordPress服务器面板自动化部署PaaSIaC, GitOps" lang="zh">
<link rel="stylesheet" href="assets/bootstrap.min.css">
<style>
.logo {
width: 50px; /* 设置 logo 的宽度 */
}
.header {
padding: 20px 0;
background-color: #f8f9fa;
border-bottom: 1px solid #dee2e6;
}
.content {
padding: 40px 0;
}
.sub-block {
margin-bottom: 30px;
text-align: left; /* 设置文本左对齐 */
}
.btn-custom {
background-color: #086ad8;
color: white;
}
.btn-custom:hover {
background-color: #0056b3;
color: white;
}
.link-container {
display: flex;
flex-wrap: wrap; /* 允许换行 */
gap: 0; /* 设置间距为0 */
}
.link-container a {
margin: 0; /* 确保没有外边距 */
padding: 0 10px; /* 可以根据需要调整内边距 */
}
.welcome-title {
font-family: Arial, Helvetica, sans-serif; /* 使用 Arial 和 Helvetica 作为首选字体 */
font-size: 32px; /* 设置字号为 24px */
}
</style>
</head>
<body>
<div class="container-fluid">
<!-- 第一个块 -->
<div class="header w-100 d-flex justify-content-between align-items-center">
<div class="container">
<div class="d-flex justify-content-between align-items-center">
<img src="assets/logo.svg" alt="Logo" class="logo">
<div class="link-container">
<a target="_blank" href="https://support.websoft9.com/docs/next/helpdesk/#contact" class="text-dark">Support</a>
<a target="_blank" href="https://support.websoft9.com/docs" class="text-dark">Documentation</a>
<a target="_blank" href="https://www.websoft9.com" class="text-dark">Website</a>
<a target="_blank" href="https://github.com/Websoft9/websoft9" class="text-dark">Github</a>
</div>
</div>
</div>
</div>
<!-- 第二个块 -->
<div class="content">
<div class="container" style="display: flex;">
<div class="sub-block" style="flex: 1; padding: 20px;">
<h1 class="welcome-title">Welcome to Websoft9 Applications Hosting Platform</h1>
<h>Web-based GitOps platform/Linux Panel for running 200+ hot open source application on your own server. It based on Docker Compose, not need to study any more</p>
<a href="#" class="btn btn-custom">Access Websoft9 Console</a>
</div>
<div class="image-block" style="flex: 1; padding: 20px;">
<img src="assets/websoft9-appstore.png" alt="Description of image" style="width: 100%; height: auto;">
</div>
</div>
</div>
</div>
</body>
</html>