Merge branch 'main' into dev

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,96 @@
+---
+name: Bug report
+about: Report a bug encountered while using websoft9's product
+labels: bug
+---
+
+**Describe the bug**
+
+A clear and concise description of what the bug is.
+
+## Deployment method
+
+- [ ] subscription image from MarketPlace of Cloud
+- [ ] All-in-one Installer
+- [ ] ansible-playbook cli
+- [ ] mcloud
+- [ ] create instance from private image
+
+## Bug source
+
+- [ ] Bugs from installation 
+- [ ] Bugs from first use
+- [ ] Other (You should describe it)   
+
+## System Environment
+
+**Application Version**
+
+e.g v4.5
+
+**OS**
+
+- [ ] Ubuntu18.x
+- [ ] Ubuntu20.x
+- [ ] CentOS7.x
+- [ ] CentOS8.x
+- [ ] AmazonLinux2
+- [ ] OracleLinux7.8
+- [ ] OracleLinux8.2
+- [ ] Other (You should describe it) 
+
+**Cloud PlatForm**
+
+- [ ] Azure
+- [ ] Aws
+- [ ] 阿里云
+- [ ] 腾讯云
+- [ ] 华为云
+- [ ] AlibabaCloud
+- [ ] HUWEICloud
+- [ ] Other (You should describe it) 
+
+
+## Bug reproduce
+
+Steps to reproduce the behavior:
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+## Bug reports
+
+### Bug Context
+
+Bug context includes bug error, error logs and service status, it is very important for resolving issue
+
+```
+# bug error
+(paste here) 
+
+# service status 
+(paste here) 
+
+# error logs
+(paste here) 
+```
+
+### Bug Screenshot
+
+paste screenshot here
+
+## Your suggestion
+
+**The reason of Bug**
+
+You can describe the reason if you have found it
+
+**Your solution for Bug**
+
+You can describe your solution here
+
+**Additional context**
+
+You can add any other context about the problem here.

.github/ISSUE_TEMPLATE/documentation_report.md

@@ -0,0 +1,41 @@
+---
+name: Documentation report
+about: improve current Documentation
+labels: documentation
+---
+
+
+## Language
+
+- [ ] Chinese
+- [ ] English
+
+## Content error
+
+Provide us with documentation errors, e.g spelling mistake, wrong screenshot, code syntax error.
+
+* URL: 
+* Description: 
+* Screenshot
+
+## Content optimization
+
+Provide us with content optimization, e.g easy to read, simplify the steps, step by step, precise expression.
+
+* URL: 
+* Description: 
+
+## New content
+
+Describe important content what do you think is important in this documentation.
+
+**What content do you want to add?**  
+
+(describe here) 
+
+**Steps for the content**  
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. Modify file '....'

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,25 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'enhancement'
+assignees: ''
+
+---
+
+**What type of your feature request?**  
+
+- [ ] Add new features
+- [ ] Improve current features
+
+**Is your feature request related to a problem? Please describe.**  
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**  
+A clear and concise description of what you want to happen.  
+
+**Describe alternatives you've considered**  
+A clear and concise description of any alternative solutions or features you've considered.  
+
+**Additional context**  
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -1,3 +1,4 @@
 *.retry
 *.vscode
-hosts
+hosts
+host

README.md

@@ -1,79 +1,77 @@
-# WordPress 自动化安装与部署
+# WordPress Cloud Installer
 
-本项目是由 [Websoft9](http://www.websoft9.com) 研发的 WordPress 自动化安装程序，开发语言是 Ansible。使用本项目，只需要用户在 Linux 上运行一条命令，即可自动化安装 WordPress，让原本复杂的安装过程变得没有任何技术门槛。  
+![](https://libs.websoft9.com/common/websott9-cloud-installer.png) 
 
-## 配置要求
+## Introduction
 
-安装本项目，确保符合如下的条件：
+[English](/README.md) | [简体中文](/README-zh.md)  
 
-| 条件       | 详情                                  | 备注                 |
-| ---------- | ------------------------------------- | -------------------- |
-| 操作系统   | CentOS7.x | AmazonLinux                     |
-| 公有云     | AWS, Azure, 阿里云, 华为云, 腾讯云    |                      |
-| 私有云     | KVM, VMware, VirtualBox, OpenStack    |                      |
-| 服务器配置 | 最低1核1G，安装时所需的带宽不低于10M  | 建议采用按量100M带宽 |
+**WordPress Cloud Installer**, developed by [Websoft9](https://www.websoft9.com), is an automatic installation program of [WordPress](https://wordpress.org/) based on Ansible and shell. It helps user install WordPress and pre-configure required items automatically and users only need to run a command on Linux. It simplifies the complicated installation and initialization process.  
 
-## 组件
+## System Requirement
 
-包含的核心组件为：WordPress + Apache/Nginx + MySQL + PHP  
-可选的WordPress商业主题包括：Avada, The7, Porto, Divi  
+System Requirement to install this repository are as following：
 
-> 这些主题为友情赠送，请遵循主题官方作者的版权，我们不提供技术支持
+| Conditions       | Details                               | Notes                |
+| ------------------- | --------------------------------| -------------------- |
+| Operating System   | CentOS7.x, Amazon Linux2 | Optional                 |
+| Public Cloud     | AWS, Azure, Alibaba Cloud, HUAWEI ClOUD, Tencent Cloud    | Optional                 |
+| Private Cloud     | KVM, VMware, VirtualBox, OpenStack    | Optional                 |
+| Server Configuration | vCPU no less than 1 core, Memory no less than  1 GIB, Storage no less than 10 GB, Bandwidth no less than 100M ||
 
-更多请见[参数表](/docs/zh/stack-components.md)
+To learn more information, please view [Installation & Configuration](https://wordpress.apache.org/installation.html).
 
-## 本项目安装的是 WordPress 最新版吗？
+## Ecosystem
 
-本项目通过下载 WordPress 源码进行安装，下载链接存储在：[role/wordpress/defaults/main.yml](/roles/wordpress/defaults/main.yml)。我们会定期检查并测试官方版本的可用性，尽可能保证用户可以顺利安装最新版。
+Core components of this repository: WordPress, Avada/The7/Porto/Divi theme, Apache/Nginx, MySQL, PHP, phpMyAdmin on Docker
 
-```
-#默认官方下载包
-wordpress_download_url: "https://github.com/WordPress/WordPress/archive/5.3.2.zip"
+Learn more about [Parameters](/docs/stack-components.md).
 
-```
+## Installation
 
-如果你发现不是最新版，请查看 WordPress 仓库的 [releases 页面](https://gitee.com/ComsenzDiscuz/DiscuzX/releases) 获取最新版源码下载链接，再修改 [main.yml](/roles/wordpress/defaults/main.yml) 中的 `wordpress_download_url` 变量值即可安装指定版本。
+You can install it by thi Cloud Installer solution all in one. In addition, you can deploy image published on major Cloud Platform by Websoft9.
 
-**注意：**
+#### All-in-one Installer
 
-如果安装的是 WordPress 集成应用，以 WordPress + Discuz 为例，除了修改 WordPress 的下载链接，还需修改 Discuz 的下载链接和版本号，维护地址：[role/discuz/defaults/main.yml](/roles/discuz/defaults/main.yml)
+Run the automatic installation script with **root** authority to start the installation. If necessary, users need to make interactive choices, and then wait patiently until the installation is successful.
 
 ```
-discuz_download_url: "https://gitee.com/ComsenzDiscuz/DiscuzX.git"
-#版本号需定期维护
-discuz_version: "v3.4-20191201" 
+$ sudo su -
+$ wget -N https://raw.githubusercontent.com/Websoft9/ansible-linux/main/scripts/install.sh; bash install.sh -r wordpress
 ```
 
-如果你想修改 Discuz 版本，请先查看 Discuz 仓库的 [tags 页面](https://gitee.com/ComsenzDiscuz/DiscuzX/tags) 上的最新标签，再修改上面的 `discuz_version` 变量值即可安装最新版本。
-
-## 安装指南
+If the network is broken or blocked, SSH will be interrupted and the installation will fail. Please reinstall.
 
-以 root 用户登录 Linux，运行下面的**一键自动化安装命令**即可启动自动化部署。若没有 root 用户，请以其他用户登录 Linux 后运行 `sudo su -` 命令提升为 root 权限，然后再运行下面的脚本。
+#### Image on Cloud 
 
-   ```
- wget -N https://raw.githubusercontent.com/Websoft9/ansible-linux/main/scripts/install.sh; bash install.sh -r wordpress
-   ```
+Follow our [WordPress image](https://apps.websoft9.com/wordpress) for installation on major Cloud Platform.
 
- 脚本后启动，就开始了自动化安装，必要时需要用户做出交互式选择，然后耐心等待直至安装成功。
+## Documentation
 
- **安装中的注意事项：**  
+**[Administrator Guide](https://support.websoft9.com/docs/wordpress)** 
 
- 1. 操作不慎或网络发生变化，可能会导致SSH连接被中断，安装就会失败，此时请重新安装
- 2. 安装缓慢、停滞不前或无故中断，主要是网络不通（或网速太慢）导致的下载问题，此时请重新安装
+## Changelog
 
-多种原因导致无法顺利安装，请使用我们在公有云上发布的 [WordPress 镜像](https://apps.websoft9.com/wordpress) 的部署方式
+Detailed changes are documented in the [CHANGELOG](/CHANGELOG.md).
 
 ## License
 
 [LGPL-3.0](/License.md), Additional Terms: It is not allowed to publish free or paid image based on this repository in any Cloud platform's Marketplace.
+
 Copyright (c) 2016-present, Websoft9
 
+This program provided by Websoft9 contains a series of software with separate copyright notices and license terms. Your use of the source code for the software included is subject to the terms and conditions of its own license.
 
-## 文档
+## FAQ
 
-文档链接：https://support.websoft9.com/docs/wordpress/zh
+#### Can I run this repository on Ansible Tower? 
 
-## FAQ
+Yes.
+
+#### How to install and view the latest release?
+
+This repository always install the latest WordPress, you can get the WordPress version from [WordPress repository](https://github.com/WordPress/WordPress/releases), and modify the Ansible variable **[wordpress_version](/roles/ansible/wordpress/defaults/main.yml)** to change the WordPress version for this repository. 
+
+#### Is the default password safe?
 
-- 命令脚本部署与镜像部署有什么区别？请参考[镜像部署-vs-脚本部署](https://support.websoft9.com/docs/faq/zh/bz-product.html#镜像部署-vs-脚本部署)
-- 本项目支持在 Ansible Tower 上运行吗？支持
+The solution used the random password solution, every deployment produce unique password which is different from other users

roles/CHANGELOG.md → roles/wordpress/CHANGELOG.md

@@ -1,5 +1,6 @@
 # CHANGELOG
 
 ## Release wordpress-v5.6  2021-1-21
+
 ### Fixes and Enhancements
 - Updated to 5.6 #8

roles/wordpress/defaults/main.yml

@@ -1,52 +1,12 @@
 # Need update
 wordpress_download_url: "https://wordpress.org/latest.zip"
-wordpress_theme_download_url: "https://libs.websoft9.com/apps/wordpress"
+
+# Accelerate download from OSS
+wordpress_theme_download_url: "https://libs-websoft9-com.oss-accelerate.aliyuncs.com/apps/wordpress"
 
 # wp-cli refer to: https://make.wordpress.org/cli/
 wordpress_cli_url: "https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar"
 
-#商业主题的下载包包含官方源码和主题
-#注意：当无插件下载的时，请写：plugin: "" or plugin: False
-wordpress_theme_meta:
-
-  avada: 
-    theme: "avada"
-    plugin:
-      - fusion-core
-      - fusion-builder
-      - LayerSlider
-      - revslider
-
-  porto: 
-    theme: "porto"
-    plugin:
-      - Ultimate_VC_Addons
-      - dynamic-featured-image
-      - js_composer
-      - porto-functionality
-      - revslider
-      - sliderrevolution
-      - wpbakerybuilder
-
-  the7: 
-    theme: "dt-the7"
-    plugin:
-      - Ultimate_VC_Addons
-      - dt-the7-core
-      - go_pricing
-      - js_composer
-      - revslider
-
-  divi: 
-    theme: "Divi"
-    plugin: 
-      - Divi-Builder-Layouts-147
-
-#组合apps名称
-wordpress_addapps_meta:
-   discuz:
-     title: "Discuz"
-     documentroot: "upload"
 
 #Web服务器：apache | nginx，通过交互式选择获取
 wordpress_webs: apache
@@ -62,4 +22,4 @@ wordpress_vhost_src: vhost.conf
 wordpress_service: httpd
 wordpress_owner: apache
 wordpress_name: "wordpress"
-wordpress_title: "WordPress"
+wordpress_title: "WordPress"