WIP vagrant init

SETUP.md

@@ -39,13 +39,9 @@ On Arch, you will need:
 - `ruby`
 - `ruby-bundler`
 - `ruby-irb`
-- `ruby-foreman` (AUR)
+- `ruby-foreman`
 - `redis`
 - `postgresql`
-- `yarn`
-- `gmp` # for nio4r
-- `libidn` # for extconf
-- `base-devel` # catch all, TODO install specific packages
 
 ### Windows
 
@@ -84,7 +80,7 @@ mkdir -p data/redis
 redis-server ./redis-dev.conf
 
 # [Optional] Stop Redis
-# kill "$(cat ./data/redis/redis-dev.pid)"
+kill "$(cat ./data/redis/redis-dev.pid)"
 ```
 
 ## Ruby

Vagrantfile

@@ -14,11 +14,12 @@ $provision = <<SCRIPT
 # see SETUP.md for details
 
 # 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
-all | sudo pacman -Syu --noconfirm base-devel git libidn
 git clone https://aur.archlinux.org/ruby-foreman.git
 cd ruby-foreman
-yes | sudo -u vagrant makepkg -si 
+yes | sudo -u vagrant makepkg -si
 
 # treehouse mastodon files are synced here
 cd /vagrant
@@ -33,7 +34,6 @@ pg_ctl -D data/postgres start --silent
 # redis
 mkdir -p data/redis
 redis-server ./redis-dev.conf
-kill "$(cat ./data/redis/redis-dev.pid)"
 
 # ruby
 export RAILS_ENV=development
@@ -43,54 +43,46 @@ bundle install
 yarn install
 bundle exec rake db:setup
 
-# TODO rest of setup and make Vagrantfile nice
+# run mastodon
-# currently gets jammed seeding db/seeds/04_admin.rb
+export NODE_ENV=development
-
+bundle exec rake assets:precompile
-## run mastodon
+foreman start
-#export NODE_ENV=development
-#bundle exec rake assets:precompile
-#bundle exec rake assets:clobber
-#bundle exec rake assets:precompile
-#foreman start
 
 SCRIPT
 
 $start = <<SCRIPT
 
-#TODO
+export NODE_ENV=development
-touch foo
+export RAILS_ENV=development
-# run mastodon
+cd /vagrant
-#cd /vagrant
+pg_ctl -D data/postgres start --silent
-#export NODE_ENV=development
+redis-server ./redis-dev.conf
-#bundle exec rake assets:precompile
+foreman start
-#bundle exec rake assets:clobber
-#bundle exec rake assets:precompile
-#foreman start
 
 SCRIPT
 
-VAGRANTFILE_API_VERSION = "2"
-
 Vagrant.configure("2") do |config|
+
   config.vagrant.plugins = "vagrant-libvirt"
 
+  config.vm.box = "archlinux/archlinux"
+  config.vm.hostname = "mastodon.local"
+
+  # vagrant ssh -- -R 3000:localhost:3000  (:
+  #config.vm.network :forwarded_port, guest: 3000, host: 3000
+
+  config.vm.synced_folder ".", "/vagrant",
+    type: "rsync",
+    rsync__args: ["--verbose", "--archive", "--delete", "-z"],
+    rsync__exclide: ".git/"
+
+  config.vm.provision :shell, inline: $provision, 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
 
-  config.vm.box = "archlinux/archlinux"
-  config.vm.network "forwarded_port", guest: 80, host: 8080,
-    host_ip: "127.0.0.1"
-  config.vm.hostname = "mastodon.local"
-  config.vm.synced_folder ".", "/vagrant",
-    type: "rsync",
-    rsync__args: ["--verbose", "--archive", "--delete", "-z"],
-    rsync__exclide: ".git/"
-
-  config.vm.provision :shell, inline: $provision, privileged: false
-
-  config.vm.provision :shell, inline: $start, run: 'always', privileged: false
-
 end