YunoHost-Apps/mastodon_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/mastodon_ynh.git synced 2024-09-03 19:46:02 +02:00
Code Issues Activity Actions

Update install

Browse source
This commit is contained in:
magikcypress 2017-04-09 16:32:12 +02:00
parent dbd92b090a
commit 56c48a4732
5 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
conf/mastodon-sidekiq.service
View file

@ -11,6 +11,7 @@
ExecStart=/opt/mastodon/.rbenv/shims/bundle exec sidekiq -c 5 -q default -q mailers -q pull -q push ExecStart=/opt/mastodon/.rbenv/shims/bundle exec sidekiq -c 5 -q default -q mailers -q pull -q push
TimeoutSec=15 TimeoutSec=15
Restart=always Restart=always
StandardError=syslog
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

1
conf/mastodon-streaming.service
View file

@ -11,6 +11,7 @@
ExecStart=/usr/bin/npm run start ExecStart=/usr/bin/npm run start
TimeoutSec=15 TimeoutSec=15
Restart=always Restart=always
StandardError=syslog
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

1
conf/mastodon-web.service
View file

@ -11,6 +11,7 @@
ExecStart=/opt/mastodon/.rbenv/shims/bundle exec puma -C config/puma.rb ExecStart=/opt/mastodon/.rbenv/shims/bundle exec puma -C config/puma.rb
TimeoutSec=15 TimeoutSec=15
Restart=always Restart=always
StandardError=syslog
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

7
conf/nginx.conf
View file

@ -13,7 +13,7 @@
proxy_redirect off; proxy_redirect off;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade; proxy_set_header Connection "upgrade";
tcp_nodelay on; tcp_nodelay on;
} }
@ -27,9 +27,6 @@
proxy_redirect off; proxy_redirect off;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade; proxy_set_header Connection "upgrade";
tcp_nodelay on; tcp_nodelay on;
}
error_page 500 501 502 503 504 /500.html;
} }

23
scripts/install
View file

@ -72,13 +72,12 @@ dbuser=$app
# Generate random password # Generate random password
dbpass=$(ynh_string_random) dbpass=$(ynh_string_random)
ynh_psql_create_db "$dbname" "$dbuser" "$dbpass" ynh_psql_create_db "$dbname" "$dbuser" "$dbpass"
# sudo su -c "psql" postgres <<< \
# "CREATE EXTENSION mastodon;"
# Download all Ruby source # Download all Ruby source
sudo git clone https://github.com/rbenv/rbenv.git $final_path/.rbenv sudo git clone https://github.com/rbenv/rbenv.git $final_path/.rbenv
git clone https://github.com/rbenv/ruby-build.git $final_path/.rbenv/plugins/ruby-build git clone https://github.com/rbenv/ruby-build.git $final_path/.rbenv/plugins/ruby-build
git clone https://github.com/tootsuite/mastodon.git $final_path/live git clone https://github.com/tootsuite/mastodon.git $final_path/live
git clone git://github.com/dcarley/rbenv-sudo.git $final_path/.rbenv/plugins/rbenv-sudo
sudo chown -R $app: "${final_path}" sudo chown -R $app: "${final_path}"
# Install de rbenv # Install de rbenv
@ -96,11 +95,14 @@ sudo su - $app <<RCOMMANDS
/opt/mastodon/.rbenv/versions/2.3.1/bin/ruby -v /opt/mastodon/.rbenv/versions/2.3.1/bin/ruby -v
RCOMMANDS RCOMMANDS
# Install Mastodon # Create symlink for ruby
sudo ln -s /opt/mastodon/.rbenv/versions/2.3.1/bin/ruby /usr/bin/ruby || true
# # Install Mastodon
sudo su - $app <<MCOMMANDS sudo su - $app <<MCOMMANDS
pushd ~/live pushd ~/live
/opt/mastodon/.rbenv/versions/2.3.1/bin/gem install bundler /opt/mastodon/.rbenv/versions/2.3.1/bin/gem install bundler
/opt/mastodon/live/bin/bundle install --deployment --without development test bin/bundle install --deployment --without development test
yarn install yarn install
MCOMMANDS MCOMMANDS
@ -123,9 +125,9 @@ sudo sed -i 's,SMTP_FROM_ADDRESS=notifications@example.com,SMTP_FROM_ADDRESS='${
# Create database # Create database
# Preconfig CSS & JS # Preconfig CSS & JS
sudo su - $app <<ENDCOMMANDS sudo su - $app <<ENDCOMMANDS
pushd ~ pushd ~/live
RAILS_ENV=production bundle exec rails db:setup RAILS_ENV=production bin/bundle exec rails db:setup
RAILS_ENV=production bundle exec rails assets:precompile RAILS_ENV=production bin/bundle exec rails assets:precompile
ENDCOMMANDS ENDCOMMANDS
# Add Services # Add Services
@ -139,8 +141,9 @@ sudo cp ../conf/mastodon-web.service /etc/systemd/system/mastodon-streaming.serv
sudo chown root: /etc/systemd/system/mastodon-streaming.service sudo chown root: /etc/systemd/system/mastodon-streaming.service
sudo systemctl enable /etc/systemd/system/mastodon-*.service sudo systemctl enable /etc/systemd/system/mastodon-*.service
sudo systemctl daemon-reload
sudo systemctl start mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service sudo systemctl start mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service
# debug # # debug
sudo systemctl status mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service sudo systemctl status mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service
# Add service YunoHost # Add service YunoHost
@ -173,7 +176,9 @@ fi
sudo yunohost app ssowatconf sudo yunohost app ssowatconf
# Reload Nginx and regenerate SSOwat conf # Reload Nginx and regenerate SSOwat conf
sudo systemctl reload nginx sudo systemctl reload nginx || true
# debug
sudo systemctl status nginx
# Nettoyer hosts # Nettoyer hosts
sudo sed -i '/#MASTODON/d' /etc/hosts sudo sed -i '/#MASTODON/d' /etc/hosts