From 503eae6dda73f795195ece41cd5f00980a924976 Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Thu, 28 Jan 2021 21:24:24 +0100
Subject: [PATCH] Fix prettier wrong filename

---
 .prettier.yaml    |   5 --
 .prettierrc.yml   |   5 ++
 playbook.yml      |  22 ++++-----
 tasks/main.yml    | 115 ++++++++++++++++++++++------------------------
 tasks/poetry.yml  |  26 +++++------
 tasks/project.yml |  90 ++++++++++++++++++------------------
 tasks/setup.yml   |  16 +++----
 vars/app.yml      |  14 +++---
 vars/main.yml     |   6 +--
 vars/network.yml  |  12 ++---
 vars/postgres.yml |  16 +++----
 vars/reddit.yml   |   2 +-
 vars/twitter.yml  |   2 +-
 13 files changed, 164 insertions(+), 167 deletions(-)
 delete mode 100644 .prettier.yaml
 create mode 100644 .prettierrc.yml

diff --git a/.prettier.yaml b/.prettier.yaml
deleted file mode 100644
index f0dcb15..0000000
--- a/.prettier.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-singleQuote: true,
-printWidth: 90,
-tabWidth: 2,
-useTabs: false,
-bracketSpacing: true,
diff --git a/.prettierrc.yml b/.prettierrc.yml
new file mode 100644
index 0000000..0cb31e6
--- /dev/null
+++ b/.prettierrc.yml
@@ -0,0 +1,5 @@
+singleQuote: true
+printWidth: 90
+tabWidth: 2
+useTabs: false
+bracketSpacing: true
diff --git a/playbook.yml b/playbook.yml
index c91eed6..065bb54 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/tasks/main.yml b/tasks/main.yml
index 1c4a502..267c344 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,151 +1,148 @@
 - include_role:
     name: common
-    tasks_from: "network.yml"
+    tasks_from: 'network.yml'
 - include_role:
     name: common
-    tasks_from: "host.yml"
+    tasks_from: 'host.yml'
 - include_role:
     name: common
-    tasks_from: "sudoers.yml"
+    tasks_from: 'sudoers.yml'
   loop:
-    - {
-        src: "../../templates/sudoers.j2",
-        dest: "/etc/sudoers.d/30-ansible-extra",
-      }
+    - { src: '../../templates/sudoers.j2', dest: '/etc/sudoers.d/30-ansible-extra' }
 
 - name: install packages
   apt:
-    name: "{{ packages }}"
+    name: '{{ packages }}'
     state: present
   notify:
     - restart postfix
 
 - name: copy firewall templates
   template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
+    src: '{{ item.src }}'
+    dest: '{{ item.dest }}'
     owner: root
     group: root
-    mode: "0600"
+    mode: '0600'
   loop:
-    - { src: "templates/nftables.j2", dest: "/etc/nftables.conf" }
+    - { src: 'templates/nftables.j2', dest: '/etc/nftables.conf' }
   notify: restart nftables
 
 - name: copy memcached conf
   template:
-    src: "templates/memcached.j2"
-    dest: "/etc/memcached.conf"
+    src: 'templates/memcached.j2'
+    dest: '/etc/memcached.conf'
     owner: root
     group: root
-    mode: "0644"
+    mode: '0644'
   notify: restart memcached
 
 - name: add gitlab to known hosts
-  become_user: "{{ app_user }}"
+  become_user: '{{ app_user }}'
   known_hosts:
-    name: "{{ gitlab_domain }}"
-    key: "{{ gitlab_host_key }}"
+    name: '{{ gitlab_domain }}'
+    key: '{{ gitlab_host_key }}'
 
 - name: add gitlab pubkey
   authorized_key:
     user: ansible
     state: present
-    key: "{{ app_deploy_key }}"
+    key: '{{ app_deploy_key }}'
 
 - name: Add newsreader user
   user:
-    name: "{{ app_user }}"
+    name: '{{ app_user }}'
     create_home: yes
     shell: /bin/bash
 
 - name: create ssh dir
   file:
-    path: "/home/{{ app_user }}/.ssh"
+    path: '/home/{{ app_user }}/.ssh'
     state: directory
-    owner: "{{ app_user }}"
-    group: "{{ app_user }}"
+    owner: '{{ app_user }}'
+    group: '{{ app_user }}'
     mode: 0755
 
 - name: create rabbitmq service override dir
   file:
     path: /etc/systemd/system/rabbitmq-server.service.d/
     state: directory
-    mode: "0644"
+    mode: '0644'
 
 - name: copy rabbitmq configurations
   template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    owner: "{{ item.owner }}"
-    group: "{{ item.group }}"
-    mode: "{{ item.mode }}"
+    src: '{{ item.src }}'
+    dest: '{{ item.dest }}'
+    owner: '{{ item.owner }}'
+    group: '{{ item.group }}'
+    mode: '{{ item.mode }}'
   loop:
     - {
-        src: "templates/limits.j2",
-        dest: "/etc/systemd/system/rabbitmq-server.service.d/limits.conf",
-        mode: "0644",
-        group: "root",
-        owner: "root",
+        src: 'templates/limits.j2',
+        dest: '/etc/systemd/system/rabbitmq-server.service.d/limits.conf',
+        mode: '0644',
+        group: 'root',
+        owner: 'root',
       }
     - {
-        src: "rabbitmq.conf.j2",
-        dest: "/etc/rabbitmq/rabbitmq-env.conf",
-        mode: "0644",
-        group: "rabbitmq",
-        owner: "rabbitmq",
+        src: 'rabbitmq.conf.j2',
+        dest: '/etc/rabbitmq/rabbitmq-env.conf',
+        mode: '0644',
+        group: 'rabbitmq',
+        owner: 'rabbitmq',
       }
   notify: restart rabbitmq
 
 - include_role:
     name: common
-    tasks_from: "ssl.yml"
+    tasks_from: 'ssl.yml'
 - include_role:
     name: common
-    tasks_from: "nginx.yml"
+    tasks_from: 'nginx.yml'
 
 - name: copy nginx config
   template:
-    src: "templates/nginx.j2"
-    dest: "/etc/nginx/sites-available/newsreader"
+    src: 'templates/nginx.j2'
+    dest: '/etc/nginx/sites-available/newsreader'
     owner: root
     group: root
-    mode: "0644"
+    mode: '0644'
 
 - name: link nginx config
   file:
-    src: "/etc/nginx/sites-available/newsreader"
-    dest: "/etc/nginx/sites-enabled/newsreader"
+    src: '/etc/nginx/sites-available/newsreader'
+    dest: '/etc/nginx/sites-enabled/newsreader'
     owner: root
     group: root
-    mode: "0777"
+    mode: '0777'
     state: link
 
 - name: copy nftables config
   template:
-    src: "templates/nftables.j2"
-    dest: "/etc/nftables.conf"
+    src: 'templates/nftables.j2'
+    dest: '/etc/nftables.conf'
     owner: root
     group: root
-    mode: "0600"
+    mode: '0600'
   notify: restart nftables
 
 - name: copy pgbouncer config
   template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
+    src: '{{ item.src }}'
+    dest: '{{ item.dest }}'
     owner: postgres
     group: postgres
-    mode: "{{ item.mode }}"
+    mode: '{{ item.mode }}'
   loop:
     - {
-        src: "templates/pgbouncer.j2",
-        dest: "/etc/pgbouncer/pgbouncer.ini",
-        "mode": "0640",
+        src: 'templates/pgbouncer.j2',
+        dest: '/etc/pgbouncer/pgbouncer.ini',
+        'mode': '0640',
       }
     - {
-        src: "templates/pgbouncer-users.j2",
-        dest: "/etc/pgbouncer/userlist.txt",
-        "mode": "0640",
+        src: 'templates/pgbouncer-users.j2',
+        dest: '/etc/pgbouncer/userlist.txt',
+        'mode': '0640',
       }
 
 - name: ensure pgbouncer is restarted
diff --git a/tasks/poetry.yml b/tasks/poetry.yml
index 7dbb936..065bb88 100644
--- a/tasks/poetry.yml
+++ b/tasks/poetry.yml
@@ -1,32 +1,32 @@
 - name: include poetry tasks
   include_role:
     name: common
-    tasks_from: "poetry.yml"
+    tasks_from: 'poetry.yml'
   vars:
-    poetry_user: "{{ app_user }}"
-    poetry_dir: "/home/{{ app_user }}/.poetry"
+    poetry_user: '{{ app_user }}'
+    poetry_dir: '/home/{{ app_user }}/.poetry'
 
 - name: retrieve user $PATH
-  shell: "echo $PATH"
-  become_user: "{{ app_user }}"
+  shell: 'echo $PATH'
+  become_user: '{{ app_user }}'
   register: path_stats
 
 - name: set poetry user variables
   set_fact:
-    poetry_user_path: "{{ path_stats.stdout }}"
+    poetry_user_path: '{{ path_stats.stdout }}'
 
 - name: set default venv python version
-  become_user: "{{ app_user }}"
-  command: "poetry env use python3.7"
+  become_user: '{{ app_user }}'
+  command: 'poetry env use python3.7'
   args:
-    chdir: "{{ app_dir }}"
+    chdir: '{{ app_dir }}'
   environment:
-    PATH: "/home/{{ app_user }}/.local/bin:{{ poetry_user_path }}"
+    PATH: '/home/{{ app_user }}/.local/bin:{{ poetry_user_path }}'
 
 - name: install project dependencies
-  become_user: "{{ app_user }}"
+  become_user: '{{ app_user }}'
   command: 'poetry install --extras "sentry"'
   args:
-    chdir: "{{ app_dir }}"
+    chdir: '{{ app_dir }}'
   environment:
-    PATH: "/home/{{ app_user }}/.local/bin:{{ poetry_user_path }}"
+    PATH: '/home/{{ app_user }}/.local/bin:{{ poetry_user_path }}'
diff --git a/tasks/project.yml b/tasks/project.yml
index a39b577..e0bfea4 100644
--- a/tasks/project.yml
+++ b/tasks/project.yml
@@ -1,100 +1,100 @@
 - name: install npm packages
-  become_user: "{{ app_user }}"
+  become_user: '{{ app_user }}'
   command: /usr/bin/npm install
   args:
-    chdir: "{{ app_dir }}"
+    chdir: '{{ app_dir }}'
 
 - name: build static files
-  become_user: "{{ app_user }}"
+  become_user: '{{ app_user }}'
   command: /usr/bin/npm run build:prod
   args:
-    chdir: "{{ app_dir }}"
+    chdir: '{{ app_dir }}'
 
 - name: run migrations
-  become_user: "{{ app_user }}"
+  become_user: '{{ app_user }}'
   django_manage:
     command: migrate
-    app_path: "{{ app_dir }}/src/"
-    virtualenv: "{{ app_dir }}/.venv"
-    settings: "newsreader.conf.production"
+    app_path: '{{ app_dir }}/src/'
+    virtualenv: '{{ app_dir }}/.venv'
+    settings: 'newsreader.conf.production'
 
 - name: collect static files
-  become_user: "{{ app_user }}"
+  become_user: '{{ app_user }}'
   django_manage:
     command: collectstatic
-    app_path: "{{ app_dir }}/src/"
-    virtualenv: "{{ app_dir }}/.venv"
-    settings: "newsreader.conf.production"
+    app_path: '{{ app_dir }}/src/'
+    virtualenv: '{{ app_dir }}/.venv'
+    settings: 'newsreader.conf.production'
 
 - name: setup env file
   template:
-    src: "templates/env.j2"
-    dest: "{{ app_dir }}/.env"
-    owner: "{{ app_user }}"
-    group: "{{ app_user }}"
+    src: 'templates/env.j2'
+    dest: '{{ app_dir }}/.env'
+    owner: '{{ app_user }}'
+    group: '{{ app_user }}'
     mode: 0600
 
 - name: setup gunicorn service
   template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
+    src: '{{ item.src }}'
+    dest: '{{ item.dest }}'
     owner: root
     group: root
-    mode: "{{ item.mode }}"
+    mode: '{{ item.mode }}'
   loop:
     - {
-        src: "templates/gunicorn-socket.j2",
-        dest: "/etc/systemd/system/gunicorn.socket",
-        "mode": "0644",
+        src: 'templates/gunicorn-socket.j2',
+        dest: '/etc/systemd/system/gunicorn.socket',
+        'mode': '0644',
       }
     - {
-        src: "templates/gunicorn.j2",
-        dest: "/etc/systemd/system/gunicorn.service",
-        "mode": "0644",
+        src: 'templates/gunicorn.j2',
+        dest: '/etc/systemd/system/gunicorn.service',
+        'mode': '0644',
       }
   notify:
     - restart gunicorn socket
     - stop gunicorn service
 
 - name: create conf dir
-  become_user: "{{ app_user }}"
+  become_user: '{{ app_user }}'
   file:
-    path: "/home/{{ app_user }}/.config/conf.d"
+    path: '/home/{{ app_user }}/.config/conf.d'
     state: directory
-    owner: "{{ app_user }}"
-    group: "{{ app_user }}"
+    owner: '{{ app_user }}'
+    group: '{{ app_user }}'
     mode: 0750
 
 - name: create celery run dir
   file:
     path: /run/celery
     state: directory
-    owner: "{{ app_user }}"
-    group: "{{ app_user }}"
+    owner: '{{ app_user }}'
+    group: '{{ app_user }}'
     mode: 0755
 
 - name: copy celery config
   template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    owner: "{{ app_user }}"
-    group: "{{ app_user }}"
-    mode: "{{ item.mode }}"
+    src: '{{ item.src }}'
+    dest: '{{ item.dest }}'
+    owner: '{{ app_user }}'
+    group: '{{ app_user }}'
+    mode: '{{ item.mode }}'
   loop:
     - {
-        src: "templates/celery.j2",
-        dest: "/etc/systemd/system/celery.service",
-        "mode": "0644",
+        src: 'templates/celery.j2',
+        dest: '/etc/systemd/system/celery.service',
+        'mode': '0644',
       }
     - {
-        src: "templates/celerybeat.j2",
-        dest: "/etc/systemd/system/celerybeat.service",
-        "mode": "0644",
+        src: 'templates/celerybeat.j2',
+        dest: '/etc/systemd/system/celerybeat.service',
+        'mode': '0644',
       }
     - {
-        src: "templates/celery.env.j2",
-        dest: "/home/newsreader/.config/conf.d/celery",
-        "mode": "0640",
+        src: 'templates/celery.env.j2',
+        dest: '/home/newsreader/.config/conf.d/celery',
+        'mode': '0640',
       }
   notify:
     - restart celery
diff --git a/tasks/setup.yml b/tasks/setup.yml
index cbe5959..8d0047a 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -1,6 +1,6 @@
 - name: create sites dir
   file:
-    path: "/srv/sites"
+    path: '/srv/sites'
     state: directory
     owner: root
     group: root
@@ -8,17 +8,17 @@
 
 - name: create project dir
   file:
-    path: "{{ app_dir }}"
+    path: '{{ app_dir }}'
     state: directory
-    owner: "{{ app_user }}"
-    group: "{{ app_user }}"
+    owner: '{{ app_user }}'
+    group: '{{ app_user }}'
     mode: 0755
 
 - name: clone project
-  become_user: "{{ app_user }}"
+  become_user: '{{ app_user }}'
   git:
-    repo: "https://git.fudiggity.nl/sonny/newsreader.git"
-    dest: "{{ app_dir }}"
-    version: "{{ app_branch }}"
+    repo: 'https://git.fudiggity.nl/sonny/newsreader.git'
+    dest: '{{ app_dir }}'
+    version: '{{ app_branch }}'
     update: true
     force: true
diff --git a/vars/app.yml b/vars/app.yml
index 266ade4..41a077b 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 1b63526..591fbb2 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,4 +1,4 @@
-default_user: "sonny"
+default_user: 'sonny'
 
 packages:
   - memcached
@@ -16,8 +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 9985a99..7f309cf 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 8247e37..f980e05 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 222fc80..c3e7bfb 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 bc47204..ef62311 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/'