disable gems better_errors and binding_of_caller

Gemfile

@@ -131,8 +131,9 @@ end
 group :development do
   gem 'active_record_query_trace', '~> 1.8'
   gem 'annotate', '~> 3.2'
-  gem 'better_errors', '~> 2.9'
+  # TODO: re-enable better_errors and binding_of_caller
-  gem 'binding_of_caller', '~> 1.0'
+  # gem 'better_errors', '~> 2.9'
+  # gem 'binding_of_caller', '~> 1.0'
   gem 'bullet', '~> 7.0'
   gem 'letter_opener', '~> 1.8'
   gem 'letter_opener_web', '~> 2.0'

Vagrantfile

@@ -1,137 +1,100 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-ENV["PORT"] ||= "3000"
+REQUIRED_PLUGINS = %w(vagrant-libvirt)
+exit unless REQUIRED_PLUGINS.all? do |plugin|
+  Vagrant.has_plugin?(plugin) || (
+    puts "The #{plugin} plugin is required. Please install it with:"
+    puts "$ vagrant plugin install #{plugin}"
+    false
+  )
+end
 
 $provision = <<SCRIPT
+# see SETUP.md for details
 
-cd /vagrant # This is where the host folder/repo is mounted
+export RAILS_ENV=development
+export NODE_ENV=development
+export NODE_OPTIONS=--openssl-legacy-provider
 
-# Add the yarn repo + yarn repo keys
+echo '[treehouse-vagrant] install packages'
-curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+sudo pacman -Syu --noconfirm base-devel git libidn
-sudo apt-add-repository 'deb https://dl.yarnpkg.com/debian/ stable main'
+sudo pacman -Syu --noconfirm ruby ruby-bundler ruby-irb redis postgresql yarn
+git clone https://aur.archlinux.org/ruby-foreman.git
+cd ruby-foreman
+yes | sudo -u vagrant makepkg -si
 
-# Add repo for NodeJS
+# treehouse mastodon files are synced here
-curl -sL https://deb.nodesource.com/setup_14.x | sudo bash -
+cd /vagrant
 
-# Add firewall rule to redirect 80 to PORT and save
+echo '[treehouse-vagrant] init database'
-sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port #{ENV["PORT"]}
+if [ -d "data/" ]; then rm -rf data/; fi
-echo iptables-persistent iptables-persistent/autosave_v4 boolean true | sudo debconf-set-selections
+mkdir -p data/
-echo iptables-persistent iptables-persistent/autosave_v6 boolean true | sudo debconf-set-selections
+pg_ctl -D data/postgres initdb -o '-U mastodon --auth-host=trust'
-sudo apt-get install iptables-persistent -y
+echo 'unix_socket_directories = .' >> data/postgres/postgresql.conf
+pg_ctl -D data/postgres start --silent
 
-# Add packages to build and run Mastodon
+echo '[treehouse-vagrant] start redis'
-sudo apt-get install \
+mkdir -p data/redis
-  git-core \
+redis-server ./redis-dev.conf
-  g++ \
-  libpq-dev \
-  libxml2-dev \
-  libxslt1-dev \
-  imagemagick \
-  nodejs \
-  redis-server \
-  redis-tools \
-  postgresql \
-  postgresql-contrib \
-  yarn \
-  libicu-dev \
-  libidn11-dev \
-  libreadline-dev \
-  libpam0g-dev \
-  -y
 
-# Install rvm
+echo '[treehouse-vagrant] bundle install'
-read RUBY_VERSION < .ruby-version
+if [ -d "vendor/bundle/" ]; then rm -rf vendor/bundle/; fi
-
+bundle config set --local path 'vendor/bundle/'
-curl -sSL https://rvm.io/mpapis.asc | gpg --import
-curl -sSL https://rvm.io/pkuczynski.asc | gpg --import
-
-curl -sSL https://raw.githubusercontent.com/rvm/rvm/stable/binscripts/rvm-installer | bash -s stable --ruby=$RUBY_VERSION
-source /home/vagrant/.rvm/scripts/rvm
-
-# Install Ruby
-rvm reinstall ruby-$RUBY_VERSION --disable-binary
-
-# Configure database
-sudo -u postgres createuser -U postgres vagrant -s
-sudo -u postgres createdb -U postgres mastodon_development
-
-# Install gems and node modules
-gem install bundler foreman
 bundle install
+
+echo '[treehouse-vagrant] yarn install'
+yarn add webpack
+git restore package.json yarn.lock
 yarn install
 
-# Build Mastodon
+echo '[treehouse-vagrant] bundle db'
-export RAILS_ENV=development 
+bundle exec rake db:setup || exit
-export $(cat ".env.vagrant" | xargs)
-bundle exec rails db:setup
 
-# Configure automatic loading of environment variable
+echo '[treehouse-vagrant] bundle assets'
-echo 'export RAILS_ENV=development' >> ~/.bash_profile
+bundle exec rake assets:precompile || exit
-echo 'export $(cat "/vagrant/.env.vagrant" | xargs)' >> ~/.bash_profile
+
+echo '[treehouse-vagrant] foreman start'
+foreman start
 
 SCRIPT
 
-$start = <<SCRIPT
+# TODO: allow `vagrant up`
+#       this requires persistent storage
+#       i.e., not saving data, assets, etc to /vagrant
+#$start = <<SCRIPT
+#
+#export NODE_ENV=development
+#export RAILS_ENV=development
+#cd /vagrant
+#pg_ctl -D data/postgres start --silent
+#redis-server ./redis-dev.conf
+#foreman start
+#
+#SCRIPT
 
-echo 'To start server'
+Vagrant.configure("2") do |config|
-echo '  $ vagrant ssh -c "cd /vagrant && foreman start"'
 
-SCRIPT
+  config.vagrant.plugins = "vagrant-libvirt"
 
-VAGRANTFILE_API_VERSION = "2"
+  config.vm.box = "archlinux/archlinux"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-
-  config.vm.box = "ubuntu/bionic64"
-
-  config.vm.provider :virtualbox do |vb|
-    vb.name = "mastodon"
-    vb.customize ["modifyvm", :id, "--memory", "4096"]
-    # Increase the number of CPUs. Uncomment and adjust to
-    # increase performance
-    # vb.customize ["modifyvm", :id, "--cpus", "3"]
-
-    # Disable VirtualBox DNS proxy to skip long-delay IPv6 resolutions.
-    # https://github.com/mitchellh/vagrant/issues/1172
-    vb.customize ["modifyvm", :id, "--natdnsproxy1", "off"]
-    vb.customize ["modifyvm", :id, "--natdnshostresolver1", "off"]
-
-    # Use "virtio" network interfaces for better performance.
-    vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
-    vb.customize ["modifyvm", :id, "--nictype2", "virtio"]
-
-  end
-
-  # This uses the vagrant-hostsupdater plugin, and lets you
-  # access the development site at http://mastodon.local.
-  # If you change it, also change it in .env.vagrant before provisioning
-  # the vagrant server to update the development build.
-  #
-  # To install:
-  #   $ vagrant plugin install vagrant-hostsupdater
   config.vm.hostname = "mastodon.local"
 
-  if defined?(VagrantPlugins::HostsUpdater)
+  # vagrant ssh -- -L 3000:localhost:3000  (:
-    config.vm.network :private_network, ip: "192.168.42.42", nictype: "virtio"
+  #config.vm.network :forwarded_port, guest: 3000, host: 3000
-    config.hostsupdater.remove_on_suspend = false
-  end
 
-  if config.vm.networks.any? { |type, options| type == :private_network }
+  config.vm.synced_folder ".", "/vagrant",
-    config.vm.synced_folder ".", "/vagrant", type: "nfs", mount_options: ['rw', 'vers=3', 'tcp', 'actimeo=1']
+    type: "rsync",
-  else
+    rsync__args: ["--verbose", "--archive", "--delete", "-z"],
-    config.vm.synced_folder ".", "/vagrant"
+    rsync__exclide: ".git/"
-  end
 
-  # Otherwise, you can access the site at http://localhost:3000 and http://localhost:4000 , http://localhost:8080
-  config.vm.network :forwarded_port, guest: 3000, host: 3000
-  config.vm.network :forwarded_port, guest: 4000, host: 4000
-  config.vm.network :forwarded_port, guest: 8080, host: 8080
-
-  # Full provisioning script, only runs on first 'vagrant up' or with 'vagrant provision'
   config.vm.provision :shell, inline: $provision, privileged: false
+  #config.vm.provision :shell, inline: $start, run: 'always', privileged: false
 
-  # Start up script, runs on every 'vagrant up'
+  config.vm.provider :libvirt do |libvirt|
-  config.vm.provision :shell, inline: $start, run: 'always', privileged: false
+    libvirt.driver = "kvm"
+    libvirt.memory = 4096
+    libvirt.cpus = 4
+  end
 
 end

app/javascript/flavours/glitch/styles/admin.scss

@@ -10,17 +10,6 @@ $content-width: 840px;
   width: 100%;
   min-height: 100vh;
 
-
-  a {
-    color: $highlight-text-color;
-
-    &:hover,
-    &:active,
-    &:focus {
-      text-decoration: none;
-    }
-  }
-
   .sidebar-wrapper {
     min-height: 100vh;
     overflow: hidden;
@@ -1692,6 +1681,15 @@ a.sparkline {
   box-sizing: border-box;
   min-height: 100%;
 
+  a {
+    color: $highlight-text-color;
+    text-decoration: none;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+
   p {
     margin-bottom: 20px;
     unicode-bidi: plaintext;

app/javascript/styles/mastodon/admin.scss

@@ -1681,6 +1681,15 @@ a.sparkline {
   box-sizing: border-box;
   min-height: 100%;
 
+  a {
+    color: $highlight-text-color;
+    text-decoration: none;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+
   p {
     margin-bottom: 20px;
     unicode-bidi: plaintext;