diff --git a/INSTALL.debian b/INSTALL.debian index 64e842b0c..186140348 100644 --- a/INSTALL.debian +++ b/INSTALL.debian @@ -40,13 +40,17 @@ echo "* Installing packages..." if [ -n "$(uname -a | grep Ubuntu)" ] ; then LIBSSL_DEV_PKG=libssl-dev + LIBJPEG_TURBO_DEV_PKG=libjpeg-turbo8-dev else LIBSSL_DEV_PKG=$( verlt `lsb_release -sr` 9.0 && echo libssl-dev || echo libssl1.0-dev ) + LIBJPEG_TURBO_DEV_PKG=libjpeg62-turbo-dev fi apt-get update +apt-get -y install apt-transport-https +apt-get -y install zlib1g-dev libglib2.0-dev apt-get -y install $LIBSSL_DEV_PKG build-essential automake libxml2-dev libxslt-dev ncurses-dev sudo libreadline-dev flex bison ragel memcached libmemcached-dev git curl libcurl4-openssl-dev sendmail-bin sendmail nginx ssh coreutils ffmpeg mkvtoolnix apt-get -y install libpq-dev postgresql-client -apt-get -y install liblcms2-dev libjpeg-turbo8-dev libexpat1-dev libgif-dev libpng-dev libexif-dev +apt-get -y install liblcms2-dev $LIBJPEG_TURBO_DEV_PKG libexpat1-dev libgif-dev libpng-dev libexif-dev # vrack specific stuff if [ -n "$VLAN_IP_ADDR" ] ; then @@ -103,7 +107,7 @@ echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~danbooru/.bash_profile echo 'eval "$(rbenv init -)"' >> ~danbooru/.bash_profile sudo -u danbooru mkdir -p ~danbooru/.rbenv/plugins sudo -u danbooru git clone git://github.com/sstephenson/ruby-build.git ~danbooru/.rbenv/plugins/ruby-build -sudo -u danbooru bash -l -c "rbenv install $RUBY_VERSION" +sudo -u danbooru bash -l -c "RUBY_CONFIGURE_OPTS=--disable-install-doc rbenv install --verbose $RUBY_VERSION" sudo -u danbooru bash -l -c "rbenv global $RUBY_VERSION" # Generate secret token and secret key @@ -138,7 +142,10 @@ echo "* Enter a new password for the danbooru account" passwd danbooru echo "* Setting up SSH keys for the danbooru account" -sudo -u danbooru ssh-keygen +sudo -u danbooru ssh-keygen -t rsa -f ~danbooru/.ssh/id_rsa -N "" +sudo -u danbooru touch ~danbooru/.ssh/authorized_keys +sudo -u danbooru cat ~danbooru/.ssh/id_rsa.pub >> ~danbooru/.ssh/authorized_keys +sudo -u danbooru chmod 600 ~danbooru/.ssh/authorized_keys mkdir -p /var/www/danbooru2/shared/config mkdir -p /var/www/danbooru2/shared/data @@ -166,7 +173,7 @@ read -p "Press [enter] to continue..." echo "* Commit your changes and push them to your fork. You are now ready to" echo "* deploy with the following command:" echo "*" -echo "* bundle exec capistrano production deploy" +echo "* bundle exec cap production deploy" echo "*" echo "* You can also run a server locally without having to deal with deploys" echo "* by running the following command:" diff --git a/config/deploy.rb b/config/deploy.rb index 51a6a1679..f40d859a5 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -3,7 +3,7 @@ set :default_stage, "staging" set :application, "danbooru" set :repo_url, "git://github.com/r888888888/danbooru.git" set :scm, :git -set :deploy_to, "/var/www/danbooru" +set :deploy_to, "/var/www/danbooru2" set :rbenv_ruby, "2.5.1" set :linked_dirs, fetch(:linked_dirs, []).push('log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'vendor/bundle') -set :branch, ENV.fetch("branch", "master") \ No newline at end of file +set :branch, ENV.fetch("branch", "master") diff --git a/config/docker/danbooru-base b/config/docker/danbooru-base index e883a695c..bab4b0794 100644 --- a/config/docker/danbooru-base +++ b/config/docker/danbooru-base @@ -30,12 +30,12 @@ RUN apt-get update && \ mkdir -p /var/www/danbooru/shared/data && \ mkdir -p /var/www/danbooru/shared/data/preview && \ mkdir -p /var/www/danbooru/shared/data/crop && \ - mkdir -p /var/www/danbooru/shared/data/sample + mkdir -p /var/www/danbooru/shared/data/sample COPY . /app RUN chown -R danbooru:danbooru /app && \ chown -R danbooru:danbooru /var/www/danbooru && \ mkdir /var/run/danbooru && \ - chown danbooru:danbooru /var/run/danbooru + chown danbooru:danbooru /var/run/danbooru EXPOSE 3000 USER danbooru RUN echo 'gem: --no-document' > ~/.gemrc && \ @@ -46,4 +46,4 @@ RUN yarn install COPY script/install/database.yml.templ /app/config/database.yml COPY script/install/danbooru_local_config.rb.templ /app/config/danbooru_local_config.rb EXPOSE 3000 -CMD sleep 1d \ No newline at end of file +CMD sleep 1d diff --git a/config/unicorn/production.rb b/config/unicorn/production.rb index 60b20f868..b88aa8177 100644 --- a/config/unicorn/production.rb +++ b/config/unicorn/production.rb @@ -1,5 +1,5 @@ # Set your full path to application. -app_path = "/var/www/danbooru/current" +app_path = "/var/www/danbooru2/current" # Set unicorn options worker_processes 12 @@ -14,7 +14,7 @@ user 'danbooru', 'danbooru' # Fill path to your app working_directory app_path -# Should be 'production' by default, otherwise use other env +# Should be 'production' by default, otherwise use other env rails_env = ENV['RAILS_ENV'] || 'production' # Log everything to one file diff --git a/script/install/nginx.danbooru.conf b/script/install/nginx.danbooru.conf index 3c3a345d9..49a7eb820 100644 --- a/script/install/nginx.danbooru.conf +++ b/script/install/nginx.danbooru.conf @@ -1,7 +1,7 @@ server { listen 80; server_name __hostname__; - root /var/www/danbooru/current/public; + root /var/www/danbooru2/current/public; index index.html; access_log off; error_log off; @@ -47,11 +47,12 @@ server { location / { try_files $uri @app_server; } - + error_page 404 /404.html; error_page 500 502 503 504 /500.html; } upstream app_server { - server 127.0.0.1:9000; + # server 127.0.0.1:9000; + server unix:/tmp/.unicorn.sock }