Skip to content

Commit

Permalink
Fix sed command.
Browse files Browse the repository at this point in the history
refs #3722
  • Loading branch information
halfdan committed Feb 8, 2013
1 parent 96f0601 commit ed6f6a8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tests/travis/setup_webserver.sh
Expand Up @@ -19,15 +19,15 @@ USER=$(whoami)

# Adjust php-fpm.ini
sed -i "s/@USER@/$USER/g" "$DIR/php-fpm.ini"
sed -i "s/@PHP_FPM_SOCK@/$PHP_FPM_SOCK/g" "$DIR/php-fpm.ini"
sed -i "s|@PHP_FPM_SOCK@|$PHP_FPM_SOCK|g" "$DIR/php-fpm.ini"

# Setup nginx
echo "Configuring nginx"
PIWIK_ROOT=$(realpath "$DIR/../..")
NGINX_CONF="/etc/nginx/sites-enabled/default"

sed -i "s/@PIWIK_ROOT@/$PIWIK_ROOT/g" "$DIR/piwik_nginx.conf"
sed -i "s/@PHP_FPM_SOCK@/$PHP_FPM_SOCK/g" "$DIR/piwik_nginx.conf"
sed -i "s|@PIWIK_ROOT@|$PIWIK_ROOT|g" "$DIR/piwik_nginx.conf"
sed -i "s|@PHP_FPM_SOCK@|$PHP_FPM_SOCK|g" "$DIR/piwik_nginx.conf"
sudo cp "$DIR/piwik_nginx.conf" $NGINX_CONF

# Start daemons
Expand Down

0 comments on commit ed6f6a8

Please sign in to comment.