Skip to content
This repository was archived by the owner on Dec 10, 2022. It is now read-only.

Commit b80f219

Browse files
committed
Merge branch 'release/v0.6.0'
2 parents d76b0a1 + b03f5e7 commit b80f219

File tree

20 files changed

+99
-29
lines changed

20 files changed

+99
-29
lines changed

CHANGELOG.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,23 @@
33
All notable changes to this project will be documented in this file.
44
This project adheres to [Semantic Versioning](http://semver.org/).
55

6-
## [Unreleased](https://github.com/passbolt/passbolt_install_scripts/compare/v0.5.1...HEAD)
6+
## [Unreleased](https://github.com/passbolt/passbolt_install_scripts/compare/v0.6.0...HEAD)
7+
8+
## [0.6.0](https://github.com/passbolt/passbolt_install_scripts/compare/v0.6.0..v0.5.2) - 2021-02-25
9+
10+
This release of the install scripts deprecates the [ubuntu](https://help.passbolt.com/hosting/install/ce/ubuntu/ubuntu.html) and [debian](https://help.passbolt.com/hosting/install/ce/debian/debian.html) installation scripts in favour of the passbolt debian and ubuntu packages.
11+
From now on this repository aims to support only Centos and RedHat installations.
12+
13+
### Added
14+
15+
- Support for centos8 #16 Thanks to @TheDeadGuy
16+
17+
### Changed
18+
- Composer installs v2
19+
- Check firewalld is running before doing changes
20+
- Nginx SSL config update #15 Thanks to @garretboone
21+
- Nginx does not include intermediate Letsencrypt certs #17
22+
723

824
## [0.5.2](https://github.com/passbolt/passbolt_install_scripts/compare/v0.5.2..v0.5.1) - 2020-10-26
925

build_scripts.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ build() {
4444
local os=$1
4545
local output=dist/"$os"/passbolt_ce_"$os"_installer.sh
4646

47-
if ! [[ "$os" =~ ^(debian|ubuntu|centos|redhat)$ ]]; then
47+
if ! [[ "$os" =~ ^(debian|ubuntu|centos7|centos8|redhat)$ ]]; then
4848
error "Distribution not supported"
4949
fi
5050

@@ -71,12 +71,11 @@ build() {
7171
cat "$initializer" >> "$output";
7272
done
7373

74-
if [ "$os" == "centos" ] || [ "$os" == "redhat" ]; then
74+
if [ "$os" == "centos7" ] || [ "$os" == "redhat" ] || [ "$os" == "centos8" ]; then
7575
for helper in lib/helpers/"$os"/*.sh; do
7676
cat "$helper" >> "$output";
7777
done
7878
fi
79-
8079
if [ "$os" == "ubuntu" ]; then
8180
for helper in lib/helpers/"$os"/*.sh; do
8281
cat "$helper" >> "$output";
@@ -115,6 +114,8 @@ while getopts "chd:" opt; do
115114
checksum debian 10
116115
compress centos 7
117116
checksum centos 7
117+
compress centos 8
118+
checksum centos 8
118119
compress ubuntu 18.04
119120
checksum ubuntu 18.04
120121
compress redhat EXPERIMENTAL

conf/centos8/constants.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
readonly OS='centos'
2+
readonly OS_SUPPORTED_VERSION="8.0"
3+
readonly OS_VERSION_FILE="/etc/centos-release"
4+
readonly FPM_WWW_POOL="/etc/php-fpm.d/www.conf"
5+
readonly FPM_SERVICE="php-fpm"
6+
readonly WWW_USER="nginx"
7+
readonly WWW_GROUP="nginx"
8+
readonly WWW_USER_HOME="/var/lib/nginx"
9+
readonly GNUPG_HOME='/var/lib/nginx/.gnupg'
10+
readonly CRONTAB_DIR='/var/spool/cron/'
11+
readonly REMI_PHP_URL='http://rpms.remirepo.net/enterprise/remi-release-8.rpm'
12+
readonly REMI_PHP_VERSION='remi-7.3'
13+
readonly PHP_EXT_DIR='/etc/php.d'

conf/centos8/packages.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
php-intl
2+
php-gd
3+
php-mysql
4+
php-pear
5+
php-devel
6+
php-mbstring
7+
php-fpm
8+
php-ldap
9+
gcc
10+
gpgme-devel
11+
git
12+
policycoreutils-python-utils
13+
nginx
14+
unzip
15+
wget
16+
certbot
17+
pinentry

conf/nginx/passbolt_ssl.conf

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
server {
2-
listen [::]:443;
3-
listen 443;
2+
listen [::]:443 ssl http2;
3+
listen 443 ssl http2;
44
server_name _SERVER_NAME_;
55
client_body_buffer_size 100K;
66
client_header_buffer_size 1k;
@@ -10,13 +10,17 @@ server {
1010
client_header_timeout 10;
1111
keepalive_timeout 5 5;
1212
send_timeout 10;
13-
ssl on;
13+
1414
ssl_certificate _NGINX_CERT_FILE_;
1515
ssl_certificate_key _NGINX_KEY_FILE_;
16-
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
17-
ssl_prefer_server_ciphers on;
18-
ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4:@STRENGTH";
16+
# ssl_dhparam _NGINX_DHPARAM_FILE_;
17+
18+
ssl_session_timeout 1d;
19+
ssl_session_cache shared:MozSSL:10m; # about 40000 sessions
1920
ssl_session_tickets off;
21+
ssl_protocols TLSv1.2 TLSv1.3;
22+
ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
23+
ssl_prefer_server_ciphers off;
2024

2125
root /var/www/passbolt/webroot;
2226
index index.php;

conf/redhat/constants.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ readonly WWW_USER_HOME="/var/opt/rh/rh-nginx116/lib/nginx"
99
readonly GNUPG_HOME='/var/lib/nginx/.gnupg'
1010
readonly CRONTAB_DIR='/var/spool/cron/'
1111
readonly PHP_EXT_DIR='/etc/opt/rh/rh-php73/php.d'
12+
readonly RH_VERSION='7'

lib/helpers/centos/setup_firewall.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
check_firewall() {
2+
systemctl is-active firewalld
3+
}
4+
5+
setup_firewall() {
6+
local zone=public
7+
local services=(http https)
8+
banner "Opening ports 80 and 443 on firewall"
9+
10+
if check_firewall; then
11+
for i in "${services[@]}"; do
12+
firewall-cmd --permanent --zone="$zone" --add-service="$i"
13+
done
14+
enable_service firewalld
15+
else
16+
echo "Firewalld is not active."
17+
fi
18+
}

0 commit comments

Comments
 (0)