Use $WWW_USER everywhere

pull/5296/head
Richard van den Berg 2019-10-11 08:49:05 +02:00
parent 175debb6ed
commit 53ac73a30f
2 changed files with 8 additions and 6 deletions

View File

@ -158,6 +158,8 @@ yumInstallCoreDeps () {
# Enable and start redis
sudo systemctl enable --now rh-redis32-redis.service
WWW_USER="apache"
SUDO_WWW="sudo -H -u $WWW_USER"
RUN_PHP="/usr/bin/scl enable rh-php72"
PHP_INI="/etc/opt/rh/rh-php72/php.ini"
# Install PHP 7.2 from SCL, see https://www.softwarecollections.org/en/scls/rhscl/rh-php72/
@ -359,7 +361,7 @@ installCake_RHEL ()
# Main function to fix permissions to something sane
permissions_RHEL () {
sudo chown -R $WWW_USER:$WWW_USER $PATH_TO_MISP
## ? chown -R root:apache /var/www/MISP
## ? chown -R root:$WWW_USER /var/www/MISP
sudo find $PATH_TO_MISP -type d -exec chmod g=rx {} \;
sudo chmod -R g+r,o= $PATH_TO_MISP
## **Note :** For updates through the web interface to work, apache must own the /var/www/MISP folder and its subfolders as shown above, which can lead to security issues. If you do not require updates through the web interface to work, you can use the following more restrictive permissions :
@ -665,8 +667,8 @@ configWorkersRHEL () {
[Service]
Type=forking
User=apache
Group=apache
User=$WWW_USER
Group=$WWW_USER
ExecStart=/usr/bin/scl enable rh-php72 rh-redis32 rh-mariadb102 /var/www/MISP/app/Console/worker/start.sh
Restart=always
RestartSec=10

View File

@ -42,10 +42,10 @@ Make sure you are reading the parsed version of this Document. When in doubt [cl
```bash
# <snippet-begin 0_RHEL_PHP_INI.sh>
# RHEL/CentOS Specific
RUN_PHP='/usr/bin/scl enable rh-php72'
SUDO_WWW='sudo -H -u apache'
WWW_USER='apache'
WWW_USER="apache"
SUDO_WWW="sudo -H -u $WWW_USER"
RUN_PHP='/usr/bin/scl enable rh-php72'
PHP_INI=/etc/opt/rh/rh-php72/php.ini
# <snippet-end 0_RHEL_PHP_INI.sh>
```