diff --git a/group_vars/mastodonservers.yml b/group_vars/mastodonservers.yml new file mode 100644 index 0000000..1ee2aa4 --- /dev/null +++ b/group_vars/mastodonservers.yml @@ -0,0 +1,3 @@ +--- + +mastodon_home: "/srv/mastodon" diff --git a/roles/mastodon/tasks/mastodon.yml b/roles/mastodon/tasks/mastodon.yml index 7ae4d2e..55c57ba 100644 --- a/roles/mastodon/tasks/mastodon.yml +++ b/roles/mastodon/tasks/mastodon.yml @@ -29,6 +29,23 @@ args: chdir: "{{ mastodon_home }}/live" +- name: create bin dir + remote_user: mastodon + file: + path: "{{ mastodon_home }}/bin" + state: directory + mode: '0750' + +- name: template scripts + remote_user: mastodon + template: + src: "{{ item }}.j2" + dest: "{{ mastodon_home }}/bin/{{ item }}" + mode: '0750' + loop: + - remove_media.sh + - remove_preview_cards.sh + - name: install services template: src: "{{ item }}.j2" diff --git a/roles/mastodon/tasks/rbenv.yml b/roles/mastodon/tasks/rbenv.yml index ad2a5d6..20e70c7 100644 --- a/roles/mastodon/tasks/rbenv.yml +++ b/roles/mastodon/tasks/rbenv.yml @@ -20,7 +20,7 @@ remote_user: mastodon lineinfile: path: "{{ mastodon_home }}/.bashrc" - line: "eval \"$(~/.rbenv/bin/rbenv init - bash)\"" + line: "eval \"$({{ mastodon_home }}/.rbenv/bin/rbenv init - bash)\"" - name: install ruby version remote_user: mastodon diff --git a/roles/mastodon/templates/remove_media.sh.j2 b/roles/mastodon/templates/remove_media.sh.j2 new file mode 100644 index 0000000..d3310bf --- /dev/null +++ b/roles/mastodon/templates/remove_media.sh.j2 @@ -0,0 +1,4 @@ +#!/bin/bash +cd {{ mastodon_home }}/live +PATH={{ mastodon_home }}/bin:{{ mastodon_home }}/.local/bin:{{ mastodon_home }}/.rbenv/plugins/ruby-build/bin:{{ mastodon_home }}/.rbenv/shims:{{ mastodon_home }}/.rbenv/bin:/usr/bin:/bin +RAILS_ENV=production bin/tootctl media remove diff --git a/roles/mastodon/templates/remove_preview_cards.sh.j2 b/roles/mastodon/templates/remove_preview_cards.sh.j2 new file mode 100644 index 0000000..3fb7c0a --- /dev/null +++ b/roles/mastodon/templates/remove_preview_cards.sh.j2 @@ -0,0 +1,4 @@ +#!/bin/bash +cd {{ mastodon_home }}/live +PATH={{ mastodon_home }}/bin:{{ mastodon_home }}/.local/bin:{{ mastodon_home }}/.rbenv/plugins/ruby-build/bin:{{ mastodon_home }}/.rbenv/shims:{{ mastodon_home }}/.rbenv/bin:/usr/bin:/bin +RAILS_ENV=production bin/tootctl preview_cards remove diff --git a/roles/mastodon/vars/main.yml b/roles/mastodon/vars/main.yml index bcce1e0..f6281fb 100644 --- a/roles/mastodon/vars/main.yml +++ b/roles/mastodon/vars/main.yml @@ -1,7 +1,5 @@ --- -mastodon_home: "/srv/mastodon" - mastodon_version: "4.0.2" mastodon_nodejs_key_url: "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" diff --git a/roles/webapps/tasks/tootctl_nodocker.yml b/roles/webapps/tasks/tootctl_nodocker.yml index 073e3a8..0604cef 100644 --- a/roles/webapps/tasks/tootctl_nodocker.yml +++ b/roles/webapps/tasks/tootctl_nodocker.yml @@ -7,7 +7,7 @@ minute: "0" hour: "19" weekday: "5" - job: "cd live && RAILS_ENV=production bin/tootctl media remove" + job: "{{ mastodon_home }}/bin/remove_media.sh" - name: cron for preview_cards tootctl cron: @@ -16,4 +16,4 @@ minute: "30" hour: "19" weekday: "5" - job: "cd live && RAILS_ENV=production bin/tootctl preview_cards remove" + job: "{{ mastodon_home }}/bin/remove_preview_cards.sh"