diff --git a/services/wipe/config/.env b/services/wipe/config/.env index 3c550a8..4020182 100644 --- a/services/wipe/config/.env +++ b/services/wipe/config/.env @@ -1,7 +1,7 @@ APP_ENV=prod APP_KEY={{ wipe_app_key }} APP_DEBUG=false -APP_URL=https://wipe.kadet.net +APP_URL=https://wipozaekranem.pl APP_DATABASE=mysql://{{ wipe_database.user }}:{{ wipe_database.password }}@{{ database_mysql_host }}/{{ wipe_database.name }} BROADCAST_DRIVER=log @@ -18,3 +18,8 @@ MAIL_PASSWORD={{ wipe_mail.password }} MAIL_ENCRYPTION={{ wipe_mail.encryption|default("tls") }} STEAM_API_KEY={{ wipe_steam_key }} + +{% if wipe_sentry is defined %} +SENTRY_LARAVEL_DSN={{ wipe_sentry.dsn }} +SENTRY_TRACES_SAMPLE_RATE={{ wipe_sentry.rate }} +{% endif %} diff --git a/services/wipe/stack.yml b/services/wipe/stack.yml index 7b5f091..e79fe4b 100644 --- a/services/wipe/stack.yml +++ b/services/wipe/stack.yml @@ -1,10 +1,10 @@ -version: '{{ compose_version }}' +version: "{{ compose_version }}" services: site: image: registry.kadet.net/podlike command: -logs -ipc=false -pull - networks: ['{{ ingress_network }}'] + networks: ["{{ ingress_network }}"] deploy: mode: replicated replicas: 1 @@ -13,10 +13,10 @@ services: order: start-first labels: - traefik.enable=true - - traefik.http.routers.{{ service }}.rule=Host(`{{ wipe_host }}`) + - traefik.http.routers.{{ service }}.rule={{ wipe_rule }} - traefik.http.routers.{{ service }}.priority=100 - traefik.http.routers.{{ service }}.tls=true - - traefik.http.routers.{{ service }}.tls.certresolver=lets-encrypt + - traefik.http.routers.{{ service }}.tls.certresolver=lets-encrypt-tls - traefik.http.services.{{ service }}.loadbalancer.server.port=80 restart_policy: condition: any @@ -73,14 +73,14 @@ configs: volumes: nginx-config: - name: {{'nginx-config.{{.Task.ID}}'}} + name: '{{ "nginx-config.{{.Task.ID}}" }}' labels: com.github.rycus86.podlike.volume-ref: nginx-config www-data: - name: {{'www-data.{{.Task.ID}}'}} + name: '{{ "www-data.{{.Task.ID}}" }}' labels: com.github.rycus86.podlike.volume-ref: www-data storage-data: - name: {{'www-data.{{.Task.ID}}'}} + name: '{{ "www-data.{{.Task.ID}}" }}' labels: com.github.rycus86.podlike.volume-ref: storage-data diff --git a/services/wipe/vars/main.yml b/services/wipe/vars/main.yml index d9f18ef..c13abf0 100644 --- a/services/wipe/vars/main.yml +++ b/services/wipe/vars/main.yml @@ -1,28 +1,29 @@ --- wipe_host: https://wipe.kadet.net wipe_version: latest +wipe_rule: "Host(`{{ wipe_host }}`)" wipe_database: name: wipe user: wipe password: "{{ mysql_user_passwords['wipe'] }}" wipe_steam_key: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 39346630373366616136343766616630323439383333653431633462633537326161646234626263 - 6333363737653234653565313635373966373161346337390a313437616633303632323236623230 - 36396432356538353565313734376166336534393063613631653861636139366664303332383637 - 3630326566313239320a653634383431613333636138313330306634626139333830643135373331 - 37303233613065646638303535643535386162316330316161383537313132626261356465313065 - 6134633232366434643833333762316462363639653034636438 + $ANSIBLE_VAULT;1.1;AES256 + 39346630373366616136343766616630323439383333653431633462633537326161646234626263 + 6333363737653234653565313635373966373161346337390a313437616633303632323236623230 + 36396432356538353565313734376166336534393063613631653861636139366664303332383637 + 3630326566313239320a653634383431613333636138313330306634626139333830643135373331 + 37303233613065646638303535643535386162316330316161383537313132626261356465313065 + 6134633232366434643833333762316462363639653034636438 wipe_mail: host: smtp.zoho.com user: wipe@kadet.net from: "WIPE #7 " - encryption: 'ssl' + encryption: "ssl" port: 465 password: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 31316133303937316531303931313766366230323862343038616465663865323233616466313865 - 6366376233333032313832646461353865663463623732370a393435663334306161636362663238 - 34353431356132353464643662643531333961323938316638643734323035336164356630306635 - 3730396332633166380a626538623530353261333964663665393231356238316132643133383233 - 39656463623665646465383361666537333639613263393634313432323561393166 + $ANSIBLE_VAULT;1.1;AES256 + 31316133303937316531303931313766366230323862343038616465663865323233616466313865 + 6366376233333032313832646461353865663463623732370a393435663334306161636362663238 + 34353431356132353464643662643531333961323938316638643734323035336164356630306635 + 3730396332633166380a626538623530353261333964663665393231356238316132643133383233 + 39656463623665646465383361666537333639613263393634313432323561393166 diff --git a/vars/services.yml b/vars/services.yml index 7880bdb..3079792 100644 --- a/vars/services.yml +++ b/vars/services.yml @@ -70,36 +70,83 @@ service_config: wipe-stg: template: wipe + wipe_sentry: + dsn: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 37373037643735313937633061623864653063363563623636373466363161353963373037633432 + 3432336433623437643432616134333362333337636634340a336435383133336361353963636364 + 61666665383165386437646566316463326361373733303033383861363935363630313962376561 + 6339366132633866320a386561303865663864643135383134653831636434643366333761643937 + 38383630303562633265646436376135323632333965393031653662386363656439323434666335 + 30306436383137663066376130646465333634353064393465666466353266616239616465303464 + 31373063316264646437663433386331353130363733373432383031306130333639336462373363 + 63396139383038626335383239363364313439663462633632396532623637613461313036356164 + 3533 + rate: 0.5 wipe_host: wipe.stg.kadet.net wipe_database: name: wipe-stg user: wipe-stg password: "{{ mysql_user_passwords['wipe-stg'] }}" wipe_app_key: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 30306566363866333062336664383663643432386536396630363136636464643831633966333839 - 6538383236363132346639363634366164353231636163320a633136336434386230323962356132 - 34313763633238333132396264613836646632613438366666393038393836633231663666353635 - 3164633461356431370a383834626262613838363961346132316330663838366335666565333739 - 33323335636233376563383331663732303863383761343739393039633662386565613962663165 - 62643132313336356365313465353263626565616434633963343764653330316566613633633638 - 623838613832393239343036396439383561 + $ANSIBLE_VAULT;1.1;AES256 + 30306566363866333062336664383663643432386536396630363136636464643831633966333839 + 6538383236363132346639363634366164353231636163320a633136336434386230323962356132 + 34313763633238333132396264613836646632613438366666393038393836633231663666353635 + 3164633461356431370a383834626262613838363961346132316330663838366335666565333739 + 33323335636233376563383331663732303863383761343739393039633662386565613962663165 + 62643132313336356365313465353263626565616434633963343764653330316566613633633638 + 623838613832393239343036396439383561 wipe: - wipe_host: wipe.kadet.net - wipe_version: 2022.1.0-dev + wipe_rule: Host(`wipe.kadet.net`, `wipozaekranem.pl`) + wipe_version: "2023.1.3" + wipe_mail: + host: email-smtp.eu-north-1.amazonaws.com + from: "WIPE #7 " + encryption: "ssl" + port: 465 + user: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 35653139656238636639306433643664643666646138373936383333346635363534633139383566 + 6435313461643962393065303561653462613234343661660a633437333762356466323663333364 + 63663262643633343766356266646264323266363232333434323564306362303265326464393334 + 3366663433353237370a656265643735616333383266643563663166353836383531633264613339 + 31613538386266656232306234636330396438666231333134663664643031663363 + password: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 31336564626238616639653164363764643239643231336531333632363061663564303539336530 + 3930613638303833343663666139306534656635643234620a313163663130333962333638306430 + 35316131363938623266656137373363653432303332666430326165353937346439633161353336 + 3132313431613938360a343731353134366666316161393431356335326635353335393032663930 + 63303132333565363364363731393064373530386135343264646131666462343631643136636533 + 3531333236373430353538666337626332373836376632393561 wipe_database: name: wipe user: wipe password: "{{ mysql_user_passwords['wipe'] }}" + wipe_sentry: + dsn: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 37373037643735313937633061623864653063363563623636373466363161353963373037633432 + 3432336433623437643432616134333362333337636634340a336435383133336361353963636364 + 61666665383165386437646566316463326361373733303033383861363935363630313962376561 + 6339366132633866320a386561303865663864643135383134653831636434643366333761643937 + 38383630303562633265646436376135323632333965393031653662386363656439323434666335 + 30306436383137663066376130646465333634353064393465666466353266616239616465303464 + 31373063316264646437663433386331353130363733373432383031306130333639336462373363 + 63396139383038626335383239363364313439663462633632396532623637613461313036356164 + 3533 + rate: 0.05 + wipe_app_key: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 30306566363866333062336664383663643432386536396630363136636464643831633966333839 - 6538383236363132346639363634366164353231636163320a633136336434386230323962356132 - 34313763633238333132396264613836646632613438366666393038393836633231663666353635 - 3164633461356431370a383834626262613838363961346132316330663838366335666565333739 - 33323335636233376563383331663732303863383761343739393039633662386565613962663165 - 62643132313336356365313465353263626565616434633963343764653330316566613633633638 - 623838613832393239343036396439383561 + $ANSIBLE_VAULT;1.1;AES256 + 30306566363866333062336664383663643432386536396630363136636464643831633966333839 + 6538383236363132346639363634366164353231636163320a633136336434386230323962356132 + 34313763633238333132396264613836646632613438366666393038393836633231663666353635 + 3164633461356431370a383834626262613838363961346132316330663838366335666565333739 + 33323335636233376563383331663732303863383761343739393039633662386565613962663165 + 62643132313336356365313465353263626565616434633963343764653330316566613633633638 + 623838613832393239343036396439383561 cojedzie: cojedzie_version: '2022.3.1' cojedzie_gtm: GTM-TQNX386