aboutsummaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/cron7
-rw-r--r--conf/mastodon-sidekiq.service2
-rw-r--r--conf/mastodon-web.service2
-rw-r--r--conf/nginx.conf4
4 files changed, 9 insertions, 6 deletions
diff --git a/conf/cron b/conf/cron
index 9a984a3..776808b 100644
--- a/conf/cron
+++ b/conf/cron
@@ -1,2 +1,5 @@
-RAILS_ENV=production
-@daily cd __FINAL__PATH__/live && /opt/rbenv/versions/2.6.5/bin/bundle exec rake __USER__:media:remove_remote
+@daily cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl media remove
+@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl media remove-orphans
+@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl accounts cull
+@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl statuses remove
+@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl preview_cards remove
diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service
index d5fc7e1..73f29e5 100644
--- a/conf/mastodon-sidekiq.service
+++ b/conf/mastodon-sidekiq.service
@@ -9,7 +9,7 @@
Environment="RAILS_ENV=production"
Environment="DB_POOL=25"
Environment="MALLOC_ARENA_MAX=2"
- ExecStart=/opt/rbenv/versions/2.6.5/bin/bundle exec sidekiq -c 25
+ ExecStart=__RBENVROOT__/shims/bundle exec sidekiq -c 25
TimeoutSec=15
Restart=always
StandardError=syslog
diff --git a/conf/mastodon-web.service b/conf/mastodon-web.service
index bb65afe..14d1260 100644
--- a/conf/mastodon-web.service
+++ b/conf/mastodon-web.service
@@ -8,7 +8,7 @@
WorkingDirectory=__FINALPATH__/live
Environment="RAILS_ENV=production"
Environment="PORT=__PORT_WEB__"
- ExecStart=/opt/rbenv/versions/2.6.5/bin/bundle exec puma -C config/puma.rb
+ ExecStart=__RBENVROOT__/shims/bundle exec puma -C config/puma.rb
ExecReload=/bin/kill -SIGUSR1 $MAINPID
TimeoutSec=15
Restart=always
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 7fa7b87..d348613 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -38,7 +38,7 @@ location @proxy {
proxy_set_header Proxy "";
proxy_pass_header Server;
- proxy_pass http://127.0.0.1:3000;
+ proxy_pass http://127.0.0.1:__PORT_WEB__;
proxy_buffering on;
proxy_redirect off;
proxy_http_version 1.1;
@@ -62,7 +62,7 @@ location /api/v1/streaming {
proxy_set_header X-Forwarded-Proto https;
proxy_set_header Proxy "";
- proxy_pass http://127.0.0.1:4000;
+ proxy_pass http://127.0.0.1:__PORT_STREAM__;
proxy_buffering off;
proxy_redirect off;
proxy_http_version 1.1;