From f4264162c93cdc7d1b3bfeb2a08aff32044eb6f6 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Wed, 27 Jan 2021 22:56:59 +0100 Subject: [PATCH] Rerun prettier & fix fluff up --- .gitlab-ci.yml | 2 +- handlers.yml | 8 ++++---- playbook.yml | 22 +++++++++++----------- vars/app.yml | 14 +++++++------- vars/main.yml | 7 +++---- vars/network.yml | 12 ++++++------ vars/postgres.yml | 16 ++++++++-------- vars/reddit.yml | 2 +- vars/twitter.yml | 2 +- 9 files changed, 42 insertions(+), 43 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 777b06f..37e2ba3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ lint: stage: lint image: node:12 before_script: - - npm install + - npm install prettier --no-save script: - npx prettier "**/*.yml" --check diff --git a/handlers.yml b/handlers.yml index 41a6078..6a926e7 100644 --- a/handlers.yml +++ b/handlers.yml @@ -1,9 +1,9 @@ - name: restart gunicorn socket systemd: - daemon-reload: true - name: gunicorn.socket - state: restarted - enabled: true + daemon-reload: true + name: gunicorn.socket + state: restarted + enabled: true - name: stop gunicorn service systemd: diff --git a/playbook.yml b/playbook.yml index 065bb54..c91eed6 100644 --- a/playbook.yml +++ b/playbook.yml @@ -2,16 +2,16 @@ become: yes become_method: sudo tasks: - - import_tasks: 'tasks/main.yml' - - import_tasks: 'tasks/setup.yml' - - import_tasks: 'tasks/poetry.yml' - - import_tasks: 'tasks/project.yml' + - import_tasks: "tasks/main.yml" + - import_tasks: "tasks/setup.yml" + - import_tasks: "tasks/poetry.yml" + - import_tasks: "tasks/project.yml" handlers: - - import_tasks: 'handlers.yml' + - import_tasks: "handlers.yml" vars_files: - - 'vars/app.yml' - - 'vars/main.yml' - - 'vars/network.yml' - - 'vars/postgres.yml' - - 'vars/reddit.yml' - - 'vars/twitter.yml' + - "vars/app.yml" + - "vars/main.yml" + - "vars/network.yml" + - "vars/postgres.yml" + - "vars/reddit.yml" + - "vars/twitter.yml" diff --git a/vars/app.yml b/vars/app.yml index 41a077b..266ade4 100644 --- a/vars/app.yml +++ b/vars/app.yml @@ -1,10 +1,10 @@ -app_name: 'newsreader' -app_user: 'newsreader' -app_branch: 'master' -app_dir: '/srv/sites/newsreader' -app_deploy_key: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICq4U2MKiufVeM8fVzpfoA/rhiWTMnrJr9usAZAG6kfb Key for deploying to newsreader app' +app_name: "newsreader" +app_user: "newsreader" +app_branch: "master" +app_dir: "/srv/sites/newsreader" +app_deploy_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICq4U2MKiufVeM8fVzpfoA/rhiWTMnrJr9usAZAG6kfb Key for deploying to newsreader app" -django_settings_module: 'newsreader.conf.production' +django_settings_module: "newsreader.conf.production" django_secret_key: !vault | $ANSIBLE_VAULT;1.1;AES256 37383464313435333061393165373731303161343236666138313566333631303839393163313038 @@ -15,4 +15,4 @@ django_secret_key: !vault | 35626539383762383462646632616334633737623035643034643433623237323932373334316639 356533316361653939303165313766633666 -admins: '' +admins: "" diff --git a/vars/main.yml b/vars/main.yml index 04e965e..1b63526 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,4 +1,4 @@ -default_user: 'sonny' +default_user: "sonny" packages: - memcached @@ -16,9 +16,8 @@ packages: - python-virtualenv - rabbitmq-server - -gitlab_host_key: 'git.fudiggity.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICNmvcxza79T7JZMkifmquwXH/kMUqDnKs9Oob+JrRvn' -gitlab_domain: 'git.fudiggity.nl' +gitlab_host_key: "git.fudiggity.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICNmvcxza79T7JZMkifmquwXH/kMUqDnKs9Oob+JrRvn" +gitlab_domain: "git.fudiggity.nl" sentry_dsn: !vault | $ANSIBLE_VAULT;1.1;AES256 diff --git a/vars/network.yml b/vars/network.yml index 7f309cf..9985a99 100644 --- a/vars/network.yml +++ b/vars/network.yml @@ -1,6 +1,6 @@ -hostname: 'rss.fudiggity.nl' -host_interface: 'en*' -host_ip: '192.168.178.63' -host_subnet: '24' -host_gateway: '192.168.178.1' -host_dns: '192.168.178.1' +hostname: "rss.fudiggity.nl" +host_interface: "en*" +host_ip: "192.168.178.63" +host_subnet: "24" +host_gateway: "192.168.178.1" +host_dns: "192.168.178.1" diff --git a/vars/postgres.yml b/vars/postgres.yml index f980e05..8247e37 100644 --- a/vars/postgres.yml +++ b/vars/postgres.yml @@ -1,7 +1,7 @@ -postgres_host: '192.168.178.165' -postgres_port: '5432' -postgres_db: 'newsreader' -postgres_user: 'newsreader' +postgres_host: "192.168.178.165" +postgres_port: "5432" +postgres_db: "newsreader" +postgres_user: "newsreader" postgres_password: !vault | $ANSIBLE_VAULT;1.1;AES256 32613132353864633832306363626432343063616433343830623064326166653231313334636463 @@ -11,10 +11,10 @@ postgres_password: !vault | 38623566363265373230386535303332363564393234636561663761353235303132373865353530 6138663238346363383737633133383638383962386236343565 -pgbouncer_listen_address: '127.0.0.1' -pgbouncer_port: '6432' -pgbouncer_name: 'newsreader' -pgbouncer_user: 'newsreader' +pgbouncer_listen_address: "127.0.0.1" +pgbouncer_port: "6432" +pgbouncer_name: "newsreader" +pgbouncer_user: "newsreader" pgbouncer_password: !vault | $ANSIBLE_VAULT;1.1;AES256 38613333336663643735396637373664363432343633653161633463373536653964656266356564 diff --git a/vars/reddit.yml b/vars/reddit.yml index c3e7bfb..222fc80 100644 --- a/vars/reddit.yml +++ b/vars/reddit.yml @@ -12,4 +12,4 @@ reddit_client_secret: !vault | 36636464353761383464343634323035666163353561383231623337343732326263353535656165 3738633565396265320a343330623938356631376664326562353437333263386538356438653336 64326363666638306337386266653331633938316639383034376464306238613839 -reddit_callback_url: 'https://rss.fudiggity.nl/accounts/settings/integrations/reddit/callback/' +reddit_callback_url: "https://rss.fudiggity.nl/accounts/settings/integrations/reddit/callback/" diff --git a/vars/twitter.yml b/vars/twitter.yml index ef62311..bc47204 100644 --- a/vars/twitter.yml +++ b/vars/twitter.yml @@ -14,4 +14,4 @@ twitter_client_secret: !vault | 32613037316134643965353138643236636632623865636632363964666161303330336136626264 63366438343633653566313231633739343036663736333037353465353439346135663733363137 386165313662356630643164396563316562 -twitter_redirect_url: 'https://rss.fudiggity.nl/accounts/settings/integrations/twitter/callback/' +twitter_redirect_url: "https://rss.fudiggity.nl/accounts/settings/integrations/twitter/callback/"