From d73e72aad0854054eeea117dba11be0eb8cfe7e7 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 7 Jun 2023 16:45:24 -0400 Subject: [PATCH] Add prettier to ci (#80) * Add prettier to CI. * Running prettier. --- .woodpecker.yml | 4 + README.md | 2 - lemmy.yml | 268 ++++++++++++++++++++++++------------------------ uninstall.yml | 44 ++++---- 4 files changed, 159 insertions(+), 159 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 796fa8a..678e0fe 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,4 +1,8 @@ pipeline: + prettier_markdown_check: + image: tmknom/prettier + commands: + - prettier -c "*.md" "*.yml" check_ansible_format: image: alpine:3 commands: diff --git a/README.md b/README.md index a98a2bd..c83bcd5 100644 --- a/README.md +++ b/README.md @@ -64,8 +64,6 @@ To run this ansible playbook, you need to: [^1]: To create an ssh key pair with your host environment, you can follow the [instructions here](https://www.ssh.com/academy/ssh/keygen#copying-the-public-key-to-the-server), and then copy the key to your host server. - - ## Upgrading - Run `git pull` diff --git a/lemmy.yml b/lemmy.yml index 67da53a..2c6a7aa 100644 --- a/lemmy.yml +++ b/lemmy.yml @@ -21,157 +21,157 @@ - setup: # gather facts tasks: - - name: Install aptitude - apt: - name: aptitude - state: latest - update_cache: true + - name: Install aptitude + apt: + name: aptitude + state: latest + update_cache: true - - name: install dependencies - apt: - state: latest - update_cache: true - pkg: - - 'nginx' - - 'certbot' - - 'python3-certbot-nginx' - - 'apt-transport-https' - - 'ca-certificates' - - 'curl' - - 'software-properties-common' - - 'python3-pip' - - 'virtualenv' - - 'python3-setuptools' + - name: install dependencies + apt: + state: latest + update_cache: true + pkg: + - "nginx" + - "certbot" + - "python3-certbot-nginx" + - "apt-transport-https" + - "ca-certificates" + - "curl" + - "software-properties-common" + - "python3-pip" + - "virtualenv" + - "python3-setuptools" - - name: Add Docker GPG apt Key - apt_key: - url: https://download.docker.com/linux/ubuntu/gpg - state: present + - name: Add Docker GPG apt Key + apt_key: + url: https://download.docker.com/linux/ubuntu/gpg + state: present - - name: Add Docker Repository - apt_repository: - repo: deb https://download.docker.com/linux/ubuntu focal stable - state: present + - name: Add Docker Repository + apt_repository: + repo: deb https://download.docker.com/linux/ubuntu focal stable + state: present - - name: Update apt and install docker-ce - apt: - name: docker-ce - state: latest - update_cache: true + - name: Update apt and install docker-ce + apt: + name: docker-ce + state: latest + update_cache: true - - name: Install Docker Module and docker-compose for Python - pip: - name: - - docker - - docker-compose - state: latest + - name: Install Docker Module and docker-compose for Python + pip: + name: + - docker + - docker-compose + state: latest - - name: copy docker config - copy: src='../files/docker-daemon.json' dest='/etc/docker/daemon.json' mode='0644' + - name: copy docker config + copy: src='../files/docker-daemon.json' dest='/etc/docker/daemon.json' mode='0644' - - name: request initial letsencrypt certificate - command: certbot certonly --nginx --agree-tos --cert-name '{{ domain }}' -d '{{ domain }}' -m '{{ letsencrypt_contact_email }}' - args: - creates: '/etc/letsencrypt/live/{{domain}}/privkey.pem' + - name: request initial letsencrypt certificate + command: certbot certonly --nginx --agree-tos --cert-name '{{ domain }}' -d '{{ domain }}' -m '{{ letsencrypt_contact_email }}' + args: + creates: "/etc/letsencrypt/live/{{domain}}/privkey.pem" - - name: create lemmy folder - file: - path: '{{item.path}}' - owner: '{{item.owner}}' - state: directory - with_items: - - path: '{{lemmy_base_dir}}/{{domain}}/' - owner: 'root' - - path: '{{lemmy_base_dir}}/{{domain}}/volumes/' - owner: 'root' - - path: '{{lemmy_base_dir}}/{{domain}}/volumes/pictrs/' - owner: '991' - - - block: - - set_fact: - lemmy_port: "{{ 32767 |random(start=1024) }}" - lemmy_ui_port: "{{ 32767 |random(start=1024) }}" - pictrs_port: "{{ 32767 |random(start=1024) }}" - - - name: add template files - template: - src: '{{item.src}}' - dest: '{{item.dest}}' - mode: '{{item.mode}}' + - name: create lemmy folder + file: + path: "{{item.path}}" + owner: "{{item.owner}}" + state: directory with_items: - - src: 'templates/docker-compose.yml' - dest: '{{lemmy_base_dir}}/{{domain}}/docker-compose.yml' - mode: '0600' - - src: 'templates/nginx.conf' - dest: '/etc/nginx/sites-available/{{domain}}.conf' - mode: '0644' - vars: - lemmy_docker_image: "dessalines/lemmy:{{ lemmy_version | default( lookup('file', 'VERSION') )}}" - lemmy_docker_ui_image: "dessalines/lemmy-ui:{{ lemmy_ui_version | default(lemmy_version | default(lookup('file', 'VERSION')))}}" + - path: "{{lemmy_base_dir}}/{{domain}}/" + owner: "root" + - path: "{{lemmy_base_dir}}/{{domain}}/volumes/" + owner: "root" + - path: "{{lemmy_base_dir}}/{{domain}}/volumes/pictrs/" + owner: "991" - block: - - name: gather stats on site enabled config - stat: - path: "/etc/nginx/sites-enabled/{{domain}}.conf" - register: reg_enabled + - set_fact: + lemmy_port: "{{ 32767 |random(start=1024) }}" + lemmy_ui_port: "{{ 32767 |random(start=1024) }}" + pictrs_port: "{{ 32767 |random(start=1024) }}" - - name: remove if regular file (legacy) instead of symlink - file: - path: "/etc/nginx/sites-enabled/{{domain}}.conf" - state: absent - when: reg_enabled.stat.exists and reg_enabled.stat.isreg + - name: add template files + template: + src: "{{item.src}}" + dest: "{{item.dest}}" + mode: "{{item.mode}}" + with_items: + - src: "templates/docker-compose.yml" + dest: "{{lemmy_base_dir}}/{{domain}}/docker-compose.yml" + mode: "0600" + - src: "templates/nginx.conf" + dest: "/etc/nginx/sites-available/{{domain}}.conf" + mode: "0644" + vars: + lemmy_docker_image: "dessalines/lemmy:{{ lemmy_version | default( lookup('file', 'VERSION') )}}" + lemmy_docker_ui_image: "dessalines/lemmy-ui:{{ lemmy_ui_version | default(lemmy_version | default(lookup('file', 'VERSION')))}}" - - name: enable nginx site - file: - src: '../sites-available/{{domain}}.conf' - dest: "/etc/nginx/sites-enabled/{{domain}}.conf" - state: link - - - name: add the config.hjson - template: - src: 'inventory/host_vars/{{domain}}/config.hjson' - dest: '{{lemmy_base_dir}}/{{domain}}/lemmy.hjson' - mode: '0600' - owner: '1000' - group: '1000' + - block: + - name: gather stats on site enabled config + stat: + path: "/etc/nginx/sites-enabled/{{domain}}.conf" + register: reg_enabled - - name: add the customPostgresql.conf - template: - src: 'inventory/host_vars/{{domain}}/customPostgresql.conf' - dest: '{{lemmy_base_dir}}/{{domain}}/customPostgresql.conf' - mode: '0600' - owner: '1000' - group: '1000' + - name: remove if regular file (legacy) instead of symlink + file: + path: "/etc/nginx/sites-enabled/{{domain}}.conf" + state: absent + when: reg_enabled.stat.exists and reg_enabled.stat.isreg - vars: - postgres_password: "{{ lookup('password', 'inventory/host_vars/{{domain}}/passwords/postgres chars=ascii_letters,digits') }}" + - name: enable nginx site + file: + src: "../sites-available/{{domain}}.conf" + dest: "/etc/nginx/sites-enabled/{{domain}}.conf" + state: link - - name: enable and start docker service - systemd: - name: docker - enabled: yes - state: started + - name: add the config.hjson + template: + src: "inventory/host_vars/{{domain}}/config.hjson" + dest: "{{lemmy_base_dir}}/{{domain}}/lemmy.hjson" + mode: "0600" + owner: "1000" + group: "1000" - # - name: Change the working directory to /opt - # ansible.builtin.shell: - # cmd: find . # To list files under /opt directory - # chdir: /opt # changes to /opt directory - # register: shell_output - # - debug: var=shell_output + - name: add the customPostgresql.conf + template: + src: "inventory/host_vars/{{domain}}/customPostgresql.conf" + dest: "{{lemmy_base_dir}}/{{domain}}/customPostgresql.conf" + mode: "0600" + owner: "1000" + group: "1000" - - name: start docker-compose - docker_compose: - project_src: '{{lemmy_base_dir}}/{{domain}}' - state: present - pull: yes - remove_orphans: yes + vars: + postgres_password: "{{ lookup('password', 'inventory/host_vars/{{domain}}/passwords/postgres chars=ascii_letters,digits') }}" - - name: reload nginx with new config - shell: nginx -s reload + - name: enable and start docker service + systemd: + name: docker + enabled: yes + state: started - - name: certbot renewal cronjob - cron: - special_time: daily - name: certbot-renew-lemmy - user: root - job: "certbot certonly --nginx --cert-name '{{ domain }}' -d '{{ domain }}' --deploy-hook 'nginx -s reload'" + # - name: Change the working directory to /opt + # ansible.builtin.shell: + # cmd: find . # To list files under /opt directory + # chdir: /opt # changes to /opt directory + # register: shell_output + # - debug: var=shell_output + + - name: start docker-compose + docker_compose: + project_src: "{{lemmy_base_dir}}/{{domain}}" + state: present + pull: yes + remove_orphans: yes + + - name: reload nginx with new config + shell: nginx -s reload + + - name: certbot renewal cronjob + cron: + special_time: daily + name: certbot-renew-lemmy + user: root + job: "certbot certonly --nginx --cert-name '{{ domain }}' -d '{{ domain }}' --deploy-hook 'nginx -s reload'" diff --git a/uninstall.yml b/uninstall.yml index 58b727d..1779c0c 100644 --- a/uninstall.yml +++ b/uninstall.yml @@ -2,7 +2,6 @@ - hosts: all vars_prompt: - - name: confirm_uninstall prompt: "Do you really want to uninstall Lemmy? This will delete all data and can not be reverted [yes/no]" private: no @@ -12,29 +11,28 @@ private: no tasks: - - name: end play if no confirmation was given - debug: - msg: "Uninstall cancelled, doing nothing" - when: not confirm_uninstall|bool + - name: end play if no confirmation was given + debug: + msg: "Uninstall cancelled, doing nothing" + when: not confirm_uninstall|bool - - meta: end_play - when: not confirm_uninstall|bool + - meta: end_play + when: not confirm_uninstall|bool - - name: stop docker-compose - docker_compose: - project_src: '{{lemmy_base_dir}}/{{domain}}' - state: absent + - name: stop docker-compose + docker_compose: + project_src: "{{lemmy_base_dir}}/{{domain}}" + state: absent - - name: delete data - file: - path: '{{item.path}}' - state: absent - with_items: - - path: '{{lemmy_base_dir}}/{{domain}}' - - path: '/etc/nginx/sites-enabled/{{domain}}.conf' - - - name: remove certbot cronjob - cron: - name: certbot-renew-lemmy - state: absent + - name: delete data + file: + path: "{{item.path}}" + state: absent + with_items: + - path: "{{lemmy_base_dir}}/{{domain}}" + - path: "/etc/nginx/sites-enabled/{{domain}}.conf" + - name: remove certbot cronjob + cron: + name: certbot-renew-lemmy + state: absent