Merge branch 'testing-2.4' into master

And Stay on 2.4.1

9 files changed, 32 insertions, 23 deletions

diff --git a/conf/app-mastodon.src b/conf/app-mastodon.src
new file mode 100644
index 0000000..61c7260
--- /dev/null
+++ b/conf/app-mastodon.src
@@ -0,0 +1,6 @@
+SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.4.1.tar.gz
+SOURCE_SUM=d90b573e16359f63f7b2834f1078ecfdd7d78cd5a26acd8293a314dd2b6ff1ec
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=tar.gz
+SOURCE_IN_SUBDIR=true
+SOURCE_FILENAME=
diff --git a/conf/app-rbenv.src b/conf/app-rbenv.src
new file mode 100644
index 0000000..d60155b
--- /dev/null
+++ b/conf/app-rbenv.src
@@ -0,0 +1,6 @@
+SOURCE_URL=https://github.com/rbenv/rbenv/archive/v1.1.1.tar.gz
+SOURCE_SUM=41f1a60714c55eceb21d692a469aee1ec4f46bba351d0dfcb0c660ff9cf1a1c9
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=tar.gz
+SOURCE_IN_SUBDIR=true
+SOURCE_FILENAME=
diff --git a/conf/app-ruby-build.src b/conf/app-ruby-build.src
new file mode 100644
index 0000000..3041556
--- /dev/null
+++ b/conf/app-ruby-build.src
@@ -0,0 +1,6 @@
+SOURCE_URL=https://github.com/rbenv/ruby-build/archive/v20180424.tar.gz
+SOURCE_SUM=71dbaf87081369c1f5d27b6a94a927c1eeeb1f36bdffe7851f0a9c1ec87b9373
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=tar.gz
+SOURCE_IN_SUBDIR=true
+SOURCE_FILENAME=
diff --git a/conf/backports.list b/conf/backports.list
deleted file mode 100644
index b8c3f51..0000000
--- a/conf/backports.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://httpredir.debian.org/debian jessie-backports main
\ No newline at end of file
diff --git a/conf/crontab_mastodon b/conf/crontab_mastodon
deleted file mode 100644
index 62caff0..0000000
--- a/conf/crontab_mastodon
+++ /dev/null
@@ -1,7 +0,0 @@
-@daily __APP__ cd /opt/__APP__/live && RAILS_ENV=production /opt/__APP__/.rbenv/shims/bundle exec rake mastodon:media:clear
-
-@daily __APP__ cd /opt/__APP__/live && RAILS_ENV=production /opt/__APP__/.rbenv/shims/bundle exec rake mastodon:push:refresh
-
-@daily __APP__ cd /opt/__APP__/live && RAILS_ENV=production /opt/__APP__/.rbenv/shims/bundle exec rake mastodon:feeds:clear
-
-@daily __APP__ cd /opt/__APP__/live && RAILS_ENV=production /opt/__APP__/.rbenv/shims/bundle exec rake mastodon:users:clear
diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service
index 34074ed..f788332 100644
--- a/conf/mastodon-sidekiq.service
+++ b/conf/mastodon-sidekiq.service
@@ -1,17 +1,17 @@
 [Unit]
- Description=mastodon-sidekiq
+ Description=__APP__-sidekiq
  After=network.target
 
 [Service]
  Type=simple
- User=mastodon
- WorkingDirectory=/opt/mastodon/live
+ User=__APP__
+ WorkingDirectory=__FINALPATH__/live
  Environment="RAILS_ENV=production"
  Environment="DB_POOL=20"
- ExecStart=/opt/mastodon/.rbenv/shims/bundle exec sidekiq -c 20 -q default -q mailers -q pull -q push
+ ExecStart=__FINALPATH__/live/bin/bundle exec sidekiq -c 20 -q default -q mailers -q pull -q push
  TimeoutSec=15
  Restart=always
  StandardError=syslog
 
 [Install]
- WantedBy=multi-user.target
\ No newline at end of file
+ WantedBy=multi-user.target
diff --git a/conf/mastodon-streaming.service b/conf/mastodon-streaming.service
index 1716b00..443cac0 100644
--- a/conf/mastodon-streaming.service
+++ b/conf/mastodon-streaming.service
@@ -1,11 +1,11 @@
 [Unit]
- Description=mastodon-streaming
+ Description=__APP__-streaming
  After=network.target
 
 [Service]
  Type=simple
- User=mastodon
- WorkingDirectory=/opt/mastodon/live
+ User=__APP__
+ WorkingDirectory=__FINALPATH__/live
  Environment="NODE_ENV=production"
  Environment="PORT=4000"
  ExecStart=/usr/bin/npm run start
@@ -14,4 +14,4 @@
  StandardError=syslog
 
 [Install]
- WantedBy=multi-user.target
\ No newline at end of file
+ WantedBy=multi-user.target
diff --git a/conf/mastodon-web.service b/conf/mastodon-web.service
index 4632031..06069f1 100644
--- a/conf/mastodon-web.service
+++ b/conf/mastodon-web.service
@@ -1,17 +1,17 @@
 [Unit]
- Description=mastodon-web
+ Description=__APP__-web
  After=network.target
 
 [Service]
  Type=simple
- User=mastodon
- WorkingDirectory=/opt/mastodon/live
+ User=__APP__
+ WorkingDirectory=__FINALPATH__/live
  Environment="RAILS_ENV=production"
  Environment="PORT=3000"
- ExecStart=/opt/mastodon/.rbenv/shims/bundle exec puma -C config/puma.rb
+ ExecStart=__FINALPATH__/live/bin/bundle exec puma -C config/puma.rb
  TimeoutSec=15
  Restart=always
  StandardError=syslog
 
 [Install]
- WantedBy=multi-user.target
\ No newline at end of file
+ WantedBy=multi-user.target
diff --git a/conf/yarn.list b/conf/yarn.list
deleted file mode 100644
index 842ebb9..0000000
--- a/conf/yarn.list
+++ /dev/null
@@ -1 +0,0 @@
-deb https://dl.yarnpkg.com/debian/ stable main
\ No newline at end of file