Compare commits

...

5 Commits

Author SHA1 Message Date
fox 4ccd937aa9 WIP vagrant init
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-12-09 23:25:28 -06:00
Rin aa24b2d072
make glitch style consistent
ci/woodpecker/pr/woodpecker Pipeline was successful Details
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-12-08 18:26:32 +11:00
Rin 0cd76aa22a
make default masto style consistent 2022-12-08 18:24:41 +11:00
Rin 06a2259577
fix default masto style too 2022-12-08 16:58:48 +11:00
Rin 7bf26a1094
fix missing link style in admin.scss - actually this time
ci/woodpecker/push/woodpecker Pipeline was successful Details
ci/woodpecker/pr/woodpecker Pipeline was successful Details
2022-12-08 16:31:42 +11:00
3 changed files with 75 additions and 117 deletions

163
Vagrantfile vendored
View File

@ -1,137 +1,88 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=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 $provision = <<SCRIPT
# see SETUP.md for details
cd /vagrant # This is where the host folder/repo is mounted # packages
#all | sudo pacman -Syu --noconfirm base-devel
sudo pacman -Syu --noconfirm base-devel git libidn
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 the yarn repo + yarn repo keys # treehouse mastodon files are synced here
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - cd /vagrant
sudo apt-add-repository 'deb https://dl.yarnpkg.com/debian/ stable main'
# Add repo for NodeJS ## database
curl -sL https://deb.nodesource.com/setup_14.x | sudo bash - if [ -d "data/" ]; then rm -rf data/; fi
mkdir -p data/
pg_ctl -D data/postgres initdb -o '-U mastodon --auth-host=trust'
echo 'unix_socket_directories = .' >> data/postgres/postgresql.conf
pg_ctl -D data/postgres start --silent
# Add firewall rule to redirect 80 to PORT and save # redis
sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port #{ENV["PORT"]} mkdir -p data/redis
echo iptables-persistent iptables-persistent/autosave_v4 boolean true | sudo debconf-set-selections redis-server ./redis-dev.conf
echo iptables-persistent iptables-persistent/autosave_v6 boolean true | sudo debconf-set-selections
sudo apt-get install iptables-persistent -y
# Add packages to build and run Mastodon # ruby
sudo apt-get install \ export RAILS_ENV=development
git-core \ if [ -d "vendor/bundle/" ]; then rm -rf vendor/bundle/; fi
g++ \ bundle config set --local path 'vendor/bundle/'
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
read RUBY_VERSION < .ruby-version
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 bundle install
yarn install yarn install
bundle exec rake db:setup
# Build Mastodon # run mastodon
export RAILS_ENV=development export NODE_ENV=development
export $(cat ".env.vagrant" | xargs) bundle exec rake assets:precompile
bundle exec rails db:setup foreman start
# Configure automatic loading of environment variable
echo 'export RAILS_ENV=development' >> ~/.bash_profile
echo 'export $(cat "/vagrant/.env.vagrant" | xargs)' >> ~/.bash_profile
SCRIPT SCRIPT
$start = <<SCRIPT $start = <<SCRIPT
echo 'To start server' export NODE_ENV=development
echo ' $ vagrant ssh -c "cd /vagrant && foreman start"' export RAILS_ENV=development
cd /vagrant
pg_ctl -D data/postgres start --silent
redis-server ./redis-dev.conf
foreman start
SCRIPT SCRIPT
VAGRANTFILE_API_VERSION = "2" Vagrant.configure("2") do |config|
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vagrant.plugins = "vagrant-libvirt"
config.vm.box = "ubuntu/bionic64" config.vm.box = "archlinux/archlinux"
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" config.vm.hostname = "mastodon.local"
if defined?(VagrantPlugins::HostsUpdater) # vagrant ssh -- -R 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: $provision, privileged: false
# Start up script, runs on every 'vagrant up'
config.vm.provision :shell, inline: $start, run: 'always', privileged: false config.vm.provision :shell, inline: $start, run: 'always', privileged: false
config.vm.provider :libvirt do |libvirt|
libvirt.driver = "kvm"
libvirt.memory = 4096
libvirt.cpus = 4
end
end end

View File

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

View File

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