Skip to content

Commit a2e59d3

Browse files
committed
Merge branch 'develop' for v4.4.0
2 parents 7bd55b4 + e12cb79 commit a2e59d3

File tree

11 files changed

+316
-224
lines changed

11 files changed

+316
-224
lines changed

.github/CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Community Guidelines
22

3-
This guide details how to get involve in EasyEngine commmunity. Please read this carefully.
3+
This guide details how to get involved in EasyEngine commmunity. Please read this carefully.
44

55

66

77
## How to get help?
88

9-
Please attach the output of following command when open a new support request.
9+
Please attach the output of following commands when opening a new support request.
1010

1111
```bash
1212
lsb_release -a
@@ -19,16 +19,16 @@ wp --allow-root --info
1919

2020
For free support, please use - http://community.rtcamp.com/c/easyengine
2121

22-
Please do NOT clutter github issue tracker here with support requests. It hampers development speed of this project.
22+
Please do NOT clutter GitHub issue tracker here with support requests. It hampers development speed of this project.
2323

2424

2525
### Pull Requests
2626

27-
When submitting your code please follow this coding standerds - http://docs.rtcamp.com/easyengine/dev/python/
27+
When submitting your code, please follow these coding standards - http://docs.rtcamp.com/easyengine/dev/python/
2828

2929

3030
### EasyEngine Chat
3131

32-
Developer & contributor discussion: https://gitter.im/rtCamp/easyengine
32+
Developers & contributors discussion: https://gitter.im/rtCamp/easyengine
3333

34-
Please do NOT use chat for technical support. Chat is limited to developer & contributor disucssion related to EasyEngine future.
34+
Please do NOT use chat for technical support. Chat is limited to developers & contributors disucssion related to EasyEngine's future.

.github/workflows/test_and_build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,9 @@ jobs:
172172
173173
deploy: #-----------------------------------------------------------------------
174174
name: Deploy Phar
175-
if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master'
175+
if: |
176+
github.repository_owner == 'EasyEngine' &&
177+
(github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master')
176178
runs-on: ubuntu-latest
177179
needs: [build, test]
178180

@@ -209,6 +211,7 @@ jobs:
209211
run: |
210212
md5sum phar/$FILENAME | cut -d ' ' -f 1 > phar/$FILENAME.md5
211213
sha512sum phar/$FILENAME | cut -d ' ' -f 1 > phar/$FILENAME.sha512
214+
212215
- name: Commit files
213216
run: |
214217
git config --local user.email "[email protected]"

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11

22
<img src="https://i2.wp.com/easyengine.io/wp-content/uploads/sites/20/2019/06/[email protected]?fit=720%2C170&ssl=1" alt="EasyEngine Logo" />
33

4-
# EasyEngine v4
5-
[![Build Status](https://travis-ci.org/EasyEngine/easyengine.svg?branch=master-v4)](https://travis-ci.org/EasyEngine/easyengine) [![Join EasyEngine Slack Channel](http://slack.easyengine.io/badge.svg)](http://slack.easyengine.io/) [![Latest Stable Version](https://poser.pugx.org/easyengine/easyengine/v/stable)](https://packagist.org/packages/easyengine/easyengine) [![Latest Unstable Version](https://poser.pugx.org/easyengine/easyengine/v/unstable)](https://packagist.org/packages/easyengine/easyengine) [![License](https://poser.pugx.org/easyengine/easyengine/license)](https://packagist.org/packages/easyengine/easyengine)
4+
# EasyEngine v4 [![Build 🔨 + Test 👨‍🔧](https://github.com/EasyEngine/easyengine/actions/workflows/test_and_build.yml/badge.svg?branch=develop)](https://github.com/EasyEngine/easyengine/actions/workflows/test_and_build.yml) [![Join EasyEngine Slack Channel](http://slack.easyengine.io/badge.svg)](http://slack.easyengine.io/) [![Latest Stable Version](https://poser.pugx.org/easyengine/easyengine/v/stable)](https://github.com/EasyEngine/easyengine/releases) [![License](https://poser.pugx.org/easyengine/easyengine/license)](https://packagist.org/packages/easyengine/easyengine)
65

76
EasyEngine makes it greatly easy to manage nginx, a fast web-server software that consumes little memory when handling increasing volumes of concurrent users.
87

@@ -19,7 +18,7 @@ EasyEngine makes it greatly easy to manage nginx, a fast web-server software tha
1918

2019
### Linux
2120

22-
For Linux, we have created an installer script which will install all the dependencies for you. We have tested this on Ubuntu 14.04, 16.04, 18.04 and Debian 8.
21+
For Linux, we have created an installer script which will install all the dependencies for you. We have tested this on Ubuntu 14.04, 16.04, 18.04, 20.04 and Debian 8, Debian 10.
2322

2423
```bash
2524
wget -qO ee https://rt.cx/ee4 && sudo bash ee

SECURITY.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
## Security
2+
3+
EasyEngine takes the security of our software products seriously, which includes all source code repositories managed through our GitHub organizations.
4+
5+
If you believe you have found a security vulnerability in any EasyEngine repository, please report it to us at [email protected].
6+
7+
## Reporting Security Issues
8+
9+
**Please do not report security vulnerabilities through public GitHub issues.**
10+
11+
You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message.
12+
13+
Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
14+
15+
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
16+
* Full paths of source file(s) related to the manifestation of the issue
17+
* The location of the affected source code (tag/branch/commit or direct URL)
18+
* Any special configuration required to reproduce the issue
19+
* Step-by-step instructions to reproduce the issue
20+
* Proof-of-concept or exploit code (if possible)
21+
* Impact of the issue, including how an attacker might exploit the issue
22+
23+
This information will help us triage your report more quickly.
24+
25+
## Preferred Languages
26+
27+
We prefer all communications to be in English.

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.3.1
1+
4.4.0

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525
"prefer-stable": true,
2626
"require": {
2727
"php": ">=7.0",
28-
"composer/composer": "2.0.13",
28+
"composer/composer": "2.1.9",
2929
"composer/semver": "3.2.4",
3030
"easyengine/admin-tools-command": "v1.1.0",
31-
"easyengine/auth-command": "v1.1.0",
31+
"easyengine/auth-command": "v1.2.0",
3232
"easyengine/config-command": "v1.0.2",
33-
"easyengine/cron-command": "v1.1.0",
33+
"easyengine/cron-command": "v1.2.0",
3434
"easyengine/log-command": "v1.1.0",
3535
"easyengine/mailhog-command": "v1.0.2",
36-
"easyengine/service-command": "v1.2.0",
36+
"easyengine/service-command": "v1.3.0",
3737
"easyengine/shell-command": "v1.1.0",
38-
"easyengine/site-command": "v2.8.2",
39-
"easyengine/site-type-php": "v1.5.0",
40-
"easyengine/site-type-wp": "v1.5.0",
38+
"easyengine/site-command": "v2.9.0",
39+
"easyengine/site-type-php": "v1.6.0",
40+
"easyengine/site-type-wp": "v1.6.0",
4141
"monolog/monolog": "1.24.0",
4242
"mustache/mustache": "2.13.0",
4343
"rmccue/requests": "1.8.0",

0 commit comments

Comments
 (0)