Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit 6b4aef3f authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Fix nginx conf to work with local env

parent 28dc89e6

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ test:unit: 
    - scp $ENV_FILE $SSH_USER@$BACKEND_HOST:$DEPLOYMENT_PATH/.env

    - ssh $SSH_USER@$BACKEND_HOST "cd $DEPLOYMENT_PATH

      && sed -i 's/SPOT_DOCKER_TAG=master/SPOT_DOCKER_TAG=$SPOT_DOCKER_TAG/g' .env

      && sed -i "s/GATEWAY_WG_IP/$GATEWAY_WG_IP/g" etc/nginx/nginx.conf

      && sed -i 's/set_real_ip_from 127.0.0.1/set_real_ip_from '$GATEWAY_WG_IP'/g' etc/nginx/nginx.conf

      && docker-compose pull && sleep 2 && docker-compose up -d --remove-orphans && docker-compose restart spot-nginx"



deploy:spot.murenatest.io.backend1:

etc/nginx/nginx.conf

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ http { 
    include       /etc/nginx/mime.types;

    default_type  application/octet-stream;



    set_real_ip_from GATEWAY_WG_IP;

    set_real_ip_from 127.0.0.1;

    real_ip_header X-Forwarded-For;

    real_ip_recursive on;