Moved the dev environment's datastore into the storage directory.

This commit is contained in:
Peter Deltchev 2016-02-02 18:39:09 -08:00
parent 09de55d14d
commit 989a6631ba
5 changed files with 10 additions and 14 deletions

View file

@ -42,13 +42,11 @@ To begin development, do the following:
3. Install the `vagrant-bindfs` plugin: `vagrant plugin install vagrant-bindfs` 3. Install the `vagrant-bindfs` plugin: `vagrant plugin install vagrant-bindfs`
4. Create the directory `pony.fm.files` in the repository's parent directory 4. Run `vagrant up` from the folder in which you cloned the repository
5. Run `vagrant up` from the folder in which you cloned the repository 5. Run `vagrant ssh`, `cd /vagrant`, and `php artisan poni:setup`.
6. Run `vagrant ssh`, `cd /vagrant`, and `php artisan poni:setup`. 6. Follow the instructions in the "Asset pipeline" section below to set that up.
7. Follow the instructions in the "Asset pipeline" section below to set that up.
Once everything is up and running, you'll be able to access the site at [http://ponyfm-dev.poni/](http://ponyfm-dev.poni/). You can access the MySQL database by logging into **ponyfm-dev.poni:3306** with the username **homestead** and the password **secret**. Pony.fm's database is named **homestead**. Once everything is up and running, you'll be able to access the site at [http://ponyfm-dev.poni/](http://ponyfm-dev.poni/). You can access the MySQL database by logging into **ponyfm-dev.poni:3306** with the username **homestead** and the password **secret**. Pony.fm's database is named **homestead**.

6
Vagrantfile vendored
View file

@ -5,6 +5,7 @@ Vagrant.configure("2") do |config|
config.vm.box = 'laravel/homestead-7' config.vm.box = 'laravel/homestead-7'
config.vm.box_version = '0.2.1' config.vm.box_version = '0.2.1'
config.vm.provider "virtualbox" do |v| config.vm.provider "virtualbox" do |v|
v.cpus = 4 v.cpus = 4
v.memory = 1024 v.memory = 1024
@ -17,11 +18,8 @@ Vagrant.configure("2") do |config|
end end
config.vm.synced_folder ".", "/vagrant", type: "nfs" config.vm.synced_folder ".", "/vagrant", type: "nfs"
config.bindfs.bind_folder "/vagrant", "/vagrant"
config.vm.provision "shell", path: "vagrant/install.sh" config.vm.provision "shell", path: "vagrant/install.sh"
config.vm.synced_folder "../pony.fm.files", "/vagrant-files", type: "nfs"
config.bindfs.bind_folder "/vagrant", "/vagrant"
config.vm.provision "shell", path: "vagrant/copy-and-restart-configs.sh", run: "always" config.vm.provision "shell", path: "vagrant/copy-and-restart-configs.sh", run: "always"
end end

View file

@ -21,6 +21,6 @@ MAIL_ENCRYPTION=null
PONI_CLIENT_ID=null PONI_CLIENT_ID=null
PONI_CLIENT_SECRET=null PONI_CLIENT_SECRET=null
PONYFM_DATASTORE=/vagrant-files PONYFM_DATASTORE=/vagrant/storage/app/datastore
GOOGLE_ANALYTICS_ID=null GOOGLE_ANALYTICS_ID=null

View file

@ -1,5 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
mkdir -p /vagrant/storage/app/datastore
sudo cp /vagrant/vagrant/pony.fm.nginx.config /etc/nginx/nginx.conf sudo cp /vagrant/vagrant/pony.fm.nginx.config /etc/nginx/nginx.conf
sudo cp /vagrant/vagrant/pony.fm.nginx.site.config /etc/nginx/sites-enabled/pony.fm sudo cp /vagrant/vagrant/pony.fm.nginx.site.config /etc/nginx/sites-enabled/pony.fm
@ -10,5 +12,3 @@ sudo cp /vagrant/vagrant/pony.fm.redis.config /etc/redis/redis.conf
sudo service elasticsearch restart sudo service elasticsearch restart
sudo service nginx restart sudo service nginx restart
sudo service php7.0-fpm restart sudo service php7.0-fpm restart
# todo: figure out how to restart redis

View file

@ -20,9 +20,9 @@ server {
expires off; expires off;
location /vagrant-files { location /vagrant/storage/app/datastore {
internal; internal;
alias /vagrant-files/; alias /vagrant/storage/app/datastore/;
} }
location ~* \.php$ { location ~* \.php$ {