rayelliott
/
marc-leopold
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: rayelliott:production
Branches Tags
rayelliott:production
rayelliott:dev
...
pull from: rayelliott:dev
Branches Tags
rayelliott:dev
rayelliott:production

2 Commits
production ... dev

Author SHA1 Message Date
ray af5d61ac00 replace owa with google analytics 2020-10-20 20:57:38 +03:00
ray 0df33a8626 use traefik network 2020-09-26 03:53:17 +03:00
4 changed files with 39 additions and 28 deletions
Show Stats Expand all files Collapse all files

22
app/app.html
View File

@ -1,23 +1,17 @@
<!DOCTYPE html> <!DOCTYPE html>
<html {{ HTML_ATTRS }}> <html {{ HTML_ATTRS }}>
<head> <head>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-XCR12ZM2L1"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-XCR12ZM2L1', { 'anonymize_ip': true });
</script>
{{ HEAD }} {{ HEAD }}
</head> </head>
<body {{ BODY_ATTRS }}> <body {{ BODY_ATTRS }}>
{{ APP }} {{ APP }}
</body> </body>
<script type="text/javascript">
var owa_baseUrl = 'https://owa.isnet.uk/';
var owa_cmds = owa_cmds || [];
owa_cmds.push(['setSiteId', '0c3a9f11563be70da80f493a590b46d1']);
owa_cmds.push(['trackPageView']);
owa_cmds.push(['trackClicks']);
(function() {
var _owa = document.createElement('script'); _owa.type = 'text/javascript'; _owa.async = true;
owa_baseUrl = ('https:' == document.location.protocol ? window.owa_baseSecUrl || owa_baseUrl.replace(/http:/, 'https:') : owa_baseUrl );
_owa.src = owa_baseUrl + 'modules/base/js/owa.tracker-combined-min.js';
var _owa_s = document.getElementsByTagName('script')[0]; _owa_s.parentNode.insertBefore(_owa, _owa_s);
}());
</script>
</html> </html>

1
app/nuxt.config.js
View File

@ -69,7 +69,6 @@ module.exports = {
*/ */
plugins: [ plugins: [
{ src: '~/plugins/Vuelidate' }, { src: '~/plugins/Vuelidate' },
// { src: '~/plugins/owa.js', mode: 'client' }
], ],
/* /*

12
app/plugins/owa.js
View File

@ -1,12 +0,0 @@
/* eslint-disable */
export default ({ app }) => {
if (process.env.NODE_ENV !== 'production') return
app.router.afterEach((to, from) => {
if (window.owa_cmds) {
window.owa_cmds.push(['trackPageView']);
window.owa_cmds.push(['trackClicks']);
}
})
}

32
docker-compose.yml
View File

@ -1,5 +1,9 @@
version: "3" version: "3"
networks:
traefik-proxy:
external: true
services: services:
nuxt: nuxt:
build: ./app/ build: ./app/
@ -7,6 +11,8 @@ services:
restart: unless-stopped restart: unless-stopped
ports: ports:
- ${URL_INTERNAL}:3013:3013 - ${URL_INTERNAL}:3013:3013
networks:
- traefik-proxy
environment: environment:
- URL_INTERNAL=${URL_INTERNAL} - URL_INTERNAL=${URL_INTERNAL}
- URL_CMS=${URL_CMS} - URL_CMS=${URL_CMS}
@ -15,19 +21,43 @@ services:
- PORT_CMS=${PORT_CMS} - PORT_CMS=${PORT_CMS}
command: command:
"npm run start" "npm run start"
labels:
- "traefik.enable=true"
- "traefik.http.routers.leopold-app.entrypoints=http"
- "traefik.http.routers.leopold-app.rule=Host(`leopold.rayelliott.dev`)"
- "traefik.http.middlewares.leopold-app-https-redirect.redirectscheme.scheme=https"
- "traefik.http.routers.leopold-app.middlewares=traefik-https-redirect"
- "traefik.http.routers.leopold-app-secure.entrypoints=https"
- "traefik.http.routers.leopold-app-secure.rule=Host(`leopold.rayelliott.dev`)"
- "traefik.http.routers.leopold-app-secure.tls=true"
- "traefik.http.routers.leopold-app-secure.tls.certresolver=http"
- "traefik.docker.network=traefik-proxy"
octobercms: octobercms:
image: aspendigital/octobercms:latest image: aspendigital/octobercms:latest
build: ./cms/ build: ./cms/
restart: always restart: unless-stopped
ports: ports:
- ${URL_INTERNAL}:3014:80 - ${URL_INTERNAL}:3014:80
networks:
- traefik-proxy
environment: environment:
- ENABLE_CRON=true - ENABLE_CRON=true
- APP_DEBUG=false - APP_DEBUG=false
- INIT_PLUGINS=true - INIT_PLUGINS=true
- APP_URL=${URL_CMS} - APP_URL=${URL_CMS}
- CMS_LINK_POLICY=force - CMS_LINK_POLICY=force
labels:
- "traefik.enable=true"
- "traefik.http.routers.leopold-cms.entrypoints=http"
- "traefik.http.routers.leopold-cms.rule=Host(`cms.leopold.rayelliott.dev`)"
- "traefik.http.middlewares.leopold-cms-https-redirect.redirectscheme.scheme=https"
- "traefik.http.routers.leopold-cms.middlewares=traefik-https-redirect"
- "traefik.http.routers.leopold-cms-secure.entrypoints=https"
- "traefik.http.routers.leopold-cms-secure.rule=Host(`cms.leopold.rayelliott.dev`)"
- "traefik.http.routers.leopold-cms-secure.tls=true"
- "traefik.http.routers.leopold-cms-secure.tls.certresolver=http"
- "traefik.docker.network=traefik-proxy"
volumes: volumes:
- ./cms/plugins:/var/www/html/plugins - ./cms/plugins:/var/www/html/plugins
- ./cms/storage/app:/var/www/html/storage/app - ./cms/storage/app:/var/www/html/storage/app