Skip to content

Commit

Permalink
Merge branch 'production' of github.com:interflux-electronics/interfl…
Browse files Browse the repository at this point in the history
…ux-public-ember-frontend into feature/product-search
  • Loading branch information
janwerkhoven committed Sep 11, 2023
2 parents 7485bd3 + 1274a13 commit 62b566f
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@

<div class='image' data-position={{this.imagePosition}}>
<ResponsiveImage
@path='/images/public/products-menu-sprite'
@path='images/public/products-menu-sprite'
@variations='@666x4662.webp,@666x4662.jpg'
/>
</div>
Expand Down
3 changes: 2 additions & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ module.exports = function (env) {
'interflux.fr': 'fr',
'interflux.es': 'es-ES',
'interflux.mx': 'es-MX',
'interflux.cn.com': 'zh'
'interflux.cn.com': 'zh',
'staging.interflux.com': 'en'
}[host];

const ENV = {
Expand Down
40 changes: 40 additions & 0 deletions nginx/staging.interflux.com.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
server
{
listen 80;
listen [::]:80;

server_name staging.interflux.com;

return 301 https://staging.interflux.com$request_uri;
}

server
{
listen 443 ssl http2;
listen [::]:443 ssl http2;

server_name staging.interflux.com;

root /var/www/staging.interflux.com/dist;
index index.html;

ssl_certificate /etc/letsencrypt/live/staging.interflux.com/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/staging.interflux.com/privkey.pem;
include /etc/letsencrypt/options-ssl-nginx.conf;
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;

# Ember without Fastboot
# location / {
# try_files $uri /index.html;
# }

location / {
try_files $uri @fastboot;
}

location @fastboot {
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_pass http://127.0.0.1:4700;
}
}

0 comments on commit 62b566f

Please sign in to comment.