From 0352d047fa015fe4aab3f8b6dfb7ba5a554b0316 Mon Sep 17 00:00:00 2001 From: Pavel Mineev Date: Sun, 1 Aug 2021 19:59:51 +0300 Subject: [PATCH] use 2 space indentation for yml --- .editorconfig | 7 ++- compose-dev-backend.yml | 118 +++++++++++++++++++-------------------- compose-dev-frontend.yml | 68 +++++++++++----------- docker-compose.yml | 64 ++++++++++----------- 4 files changed, 130 insertions(+), 127 deletions(-) diff --git a/.editorconfig b/.editorconfig index 2fc107f9..8d2048b9 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,9 +1,12 @@ [*] +indent_style = tab insert_final_newline = true [*.md] indent_style = space trim_trailing_whitespace = false -[*.njk] -indent_style = tab +[*.yml] +indent_size = 2 +indent_style = space + diff --git a/compose-dev-backend.yml b/compose-dev-backend.yml index 17f0283c..85824d25 100644 --- a/compose-dev-backend.yml +++ b/compose-dev-backend.yml @@ -4,68 +4,68 @@ # # build remark42 docker image - docker-compose -f compose-dev-backend.yml build # start remark42 service - docker-compose -f compose-dev-backend.yml up -version: '2' +version: "2" services: - remark42: - build: - context: . - dockerfile: Dockerfile - args: - - SKIP_BACKEND_TEST - - BACKEND_TEST_TIMEOUT - - SKIP_FRONTEND_TEST=true + remark42: + build: + context: . + dockerfile: Dockerfile + args: + - SKIP_BACKEND_TEST + - BACKEND_TEST_TIMEOUT + - SKIP_FRONTEND_TEST=true - image: umputun/remark42:dev - container_name: "remark42-dev" - hostname: "remark42-dev" + image: umputun/remark42:dev + container_name: "remark42-dev" + hostname: "remark42-dev" - logging: - driver: json-file - options: - max-size: "10m" - max-file: "5" + logging: + driver: json-file + options: + max-size: "10m" + max-file: "5" - ports: - - "8080:8080" # primary rest server - - "8084:8084" # local oauth2 server + ports: + - "8080:8080" # primary rest server + - "8084:8084" # local oauth2 server - environment: - # - APP_UID=1000 - # - TIME_ZONE=GMT - - REMARK_URL=http://127.0.0.1:8080 - - SECRET=12345 - - STORE_BOLT_PATH=/srv/var/db - - BACKUP_PATH=/srv/var/backup - - DEBUG=true - - ADMIN_PASSWD=password - - AUTH_DEV=true # activate local oauth "dev" - - ADMIN_SHARED_ID=dev_user # set admin flag for default user on local ouath2 - - NOTIFY_USERS - - NOTIFY_ADMINS - - TELEGRAM_TOKEN - - NOTIFY_TELEGRAM_CHAN - - NOTIFY_EMAIL_FROM - - ADMIN_SHARED_EMAIL - - NOTIFY_EMAIL_ADMIN - - SMTP_HOST - - SMTP_USERNAME - - SMTP_PASSWORD - - SMTP_PORT - - SMTP_TLS - - EMOJI=true - - ANON_VOTE=true - - VOTES_IP=true - - AUTH_EMAIL_ENABLE=true - - AUTH_TELEGRAM=true - - AUTH_ANON=true - - AUTH_GOOGLE_CID=1111 - - AUTH_GOOGLE_CSEC=1111 - - AUTH_GITHUB_CID=1111 - - AUTH_GITHUB_CSEC=1111 - - AUTH_FACEBOOK_CID=1111 - - AUTH_FACEBOOK_CSEC=1111 - - AUTH_TWITTER_CID=1111 - - AUTH_TWITTER_CSEC=1111 - volumes: - - ./var:/srv/var + environment: + # - APP_UID=1000 + # - TIME_ZONE=GMT + - REMARK_URL=http://127.0.0.1:8080 + - SECRET=12345 + - STORE_BOLT_PATH=/srv/var/db + - BACKUP_PATH=/srv/var/backup + - DEBUG=true + - ADMIN_PASSWD=password + - AUTH_DEV=true # activate local oauth "dev" + - ADMIN_SHARED_ID=dev_user # set admin flag for default user on local ouath2 + - NOTIFY_USERS + - NOTIFY_ADMINS + - TELEGRAM_TOKEN + - NOTIFY_TELEGRAM_CHAN + - NOTIFY_EMAIL_FROM + - ADMIN_SHARED_EMAIL + - NOTIFY_EMAIL_ADMIN + - SMTP_HOST + - SMTP_USERNAME + - SMTP_PASSWORD + - SMTP_PORT + - SMTP_TLS + - EMOJI=true + - ANON_VOTE=true + - VOTES_IP=true + - AUTH_EMAIL_ENABLE=true + - AUTH_TELEGRAM=true + - AUTH_ANON=true + - AUTH_GOOGLE_CID=1111 + - AUTH_GOOGLE_CSEC=1111 + - AUTH_GITHUB_CID=1111 + - AUTH_GITHUB_CSEC=1111 + - AUTH_FACEBOOK_CID=1111 + - AUTH_FACEBOOK_CSEC=1111 + - AUTH_TWITTER_CID=1111 + - AUTH_TWITTER_CSEC=1111 + volumes: + - ./var:/srv/var diff --git a/compose-dev-frontend.yml b/compose-dev-frontend.yml index 7a7dbd25..c181781f 100644 --- a/compose-dev-frontend.yml +++ b/compose-dev-frontend.yml @@ -4,43 +4,43 @@ # # build remark42 docker image - docker-compose -f compose-dev-frontend.yml build # start remark42 service - docker-compose -f compose-dev-frontend.yml up -version: '2' +version: "2" services: - remark42: - build: - context: . - dockerfile: Dockerfile - args: - - SKIP_BACKEND_TEST=true - # - NODE_ENV=development + remark42: + build: + context: . + dockerfile: Dockerfile + args: + - SKIP_BACKEND_TEST=true + # - NODE_ENV=development - image: umputun/remark42:dev - container_name: "remark42-dev" - hostname: "remark42-dev" + image: umputun/remark42:dev + container_name: "remark42-dev" + hostname: "remark42-dev" - logging: - driver: json-file - options: - max-size: "10m" - max-file: "5" + logging: + driver: json-file + options: + max-size: "10m" + max-file: "5" - ports: - - "8080:8080" # primary rest server - - "8084:8084" # local oauth2 server + ports: + - "8080:8080" # primary rest server + - "8084:8084" # local oauth2 server - environment: - - REMARK_URL=http://127.0.0.1:8080 - - SECRET=12345 - - STORE_BOLT_PATH=/srv/var/db - - BACKUP_PATH=/srv/var/backupang - - DEBUG=true - - ADMIN_PASSWD=password - - AUTH_DEV=true # activate local oauth "dev" - - ADMIN_SHARED_ID=dev_user # set admin flag for default user on local ouath2 - - POSITIVE_SCORE=false # restricts comment's score to be only positive - - EDIT_TIME=5m # edit window - - AUTH_ANON=true - - AUTH_EMAIL_ENABLE=true - volumes: - - ./var:/srv/var + environment: + - REMARK_URL=http://127.0.0.1:8080 + - SECRET=12345 + - STORE_BOLT_PATH=/srv/var/db + - BACKUP_PATH=/srv/var/backupang + - DEBUG=true + - ADMIN_PASSWD=password + - AUTH_DEV=true # activate local oauth "dev" + - ADMIN_SHARED_ID=dev_user # set admin flag for default user on local ouath2 + - POSITIVE_SCORE=false # restricts comment's score to be only positive + - EDIT_TIME=5m # edit window + - AUTH_ANON=true + - AUTH_EMAIL_ENABLE=true + volumes: + - ./var:/srv/var diff --git a/docker-compose.yml b/docker-compose.yml index c46ca1e3..ae1a52b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,37 +1,37 @@ -version: '2' +version: "2" services: - remark: - build: . - image: umputun/remark42:latest - container_name: "remark42" - hostname: "remark42" - restart: always + remark: + build: . + image: umputun/remark42:latest + container_name: "remark42" + hostname: "remark42" + restart: always - logging: - driver: json-file - options: - max-size: "10m" - max-file: "5" + logging: + driver: json-file + options: + max-size: "10m" + max-file: "5" - # uncomment to expose directly (no proxy) - #ports: - # - "80:8080" + # uncomment to expose directly (no proxy) + #ports: + # - "80:8080" - environment: - - REMARK_URL - - SECRET - - STORE_BOLT_PATH=/srv/var/db - - BACKUP_PATH=/srv/var/backup - - DEBUG=true - - AUTH_GOOGLE_CID - - AUTH_GOOGLE_CSEC - - AUTH_GITHUB_CID - - AUTH_GITHUB_CSEC - - AUTH_FACEBOOK_CID - - AUTH_FACEBOOK_CSEC - - AUTH_DISQUS_CID - - AUTH_DISQUS_CSEC - # - ADMIN_PASSWD=password - volumes: - - ./var:/srv/var + environment: + - REMARK_URL + - SECRET + - STORE_BOLT_PATH=/srv/var/db + - BACKUP_PATH=/srv/var/backup + - DEBUG=true + - AUTH_GOOGLE_CID + - AUTH_GOOGLE_CSEC + - AUTH_GITHUB_CID + - AUTH_GITHUB_CSEC + - AUTH_FACEBOOK_CID + - AUTH_FACEBOOK_CSEC + - AUTH_DISQUS_CID + - AUTH_DISQUS_CSEC + # - ADMIN_PASSWD=password + volumes: + - ./var:/srv/var