diff --git a/.gitignore b/.gitignore index c962ed84..3bfe13d1 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ Thumbs.db .tmproj *.esproj nbproject +*.iml # Dreamweaver added files _notes @@ -46,4 +47,4 @@ node_modules composer.phar composer.lock atlassian-ide-plugin.xml -_ide_helper.php \ No newline at end of file +_ide_helper.php diff --git a/Vagrantfile b/Vagrantfile index cfaf0dc1..fe30e3cb 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -7,4 +7,5 @@ Vagrant.configure("2") do |config| config.vm.provision "shell", path: "vagrant/install.sh" config.vm.synced_folder "../pony.fm.files", "/vagrant-files" -end \ No newline at end of file + config.bindfs.bind_folder "/vagrant", "/vagrant" +end diff --git a/app/models/Entities/Track.php b/app/models/Entities/Track.php index af063b1e..7cd14329 100644 --- a/app/models/Entities/Track.php +++ b/app/models/Entities/Track.php @@ -352,7 +352,7 @@ umask(0); if (!is_dir($destination)) - mkdir($destination, 777); + mkdir($destination, 777, true); } public function hasCover() { diff --git a/app/views/home/index.blade.php b/app/views/home/index.blade.php index 47a568da..aa6e3cf7 100644 --- a/app/views/home/index.blade.php +++ b/app/views/home/index.blade.php @@ -2,11 +2,11 @@ @section('app_content')

Welcome to Pony.fm

-

The pony fan music site. By a brony, for bronies.

+

The pony fan music site. By bronies, for bronies.

We provide a comprehensive set of free tools to host, distribute, and catalogue your music, integrated with a rich community experience for artists and listeners alike.

- Features include unlimited downloads, unlimited uploads, lossless uploads and much more! Click here to get all of our features! + Features include unlimited downloads, unlimited uploads, lossless uploads and much more! Click here for more details!

@endsection \ No newline at end of file diff --git a/artisan b/artisan old mode 100644 new mode 100755 diff --git a/pony.fm.iml b/pony.fm.iml deleted file mode 100644 index 0a89f1ca..00000000 --- a/pony.fm.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/public/templates/home/index.html b/public/templates/home/index.html index 4fab2322..29291818 100644 --- a/public/templates/home/index.html +++ b/public/templates/home/index.html @@ -16,12 +16,12 @@

Welcome to Pony.fm

-

The pony fan music site. By a brony, for bronies.

+

The pony fan music site. By bronies, for bronies.

We provide a comprehensive set of free tools to host, distribute, and catalogue your music, integrated with a rich community experience for artists and listeners alike.

- Features include unlimited downloads, unlimited uploads, lossless uploads and much more! Click here to get all of our features! + Features include unlimited downloads, unlimited uploads, lossless uploads and much more! Click here for more details!

diff --git a/public/templates/pages/about.html b/public/templates/pages/about.html index cff4caed..a7aaf32c 100644 --- a/public/templates/pages/about.html +++ b/public/templates/pages/about.html @@ -13,13 +13,14 @@

Simply put, "Pony.fm is Pony.fm."

What makes Pony.fm special?

-

Pony.fm is a service created by a brony, for bronies. Every inch of the Pony.fm experience is crafted with ponies and bronies in mind. Some of the features necessarily resemble what you may find on other sites - lossless uploads, for example - but some features are specific to the pony fan music community.

+

Pony.fm is a service created by bronies, for bronies. Every inch of the Pony.fm experience is crafted with ponies and bronies in mind. Some of the features necessarily resemble what you may find on other sites - lossless uploads, for example - but some features are specific to the pony fan music community.

Created as a service for the fandom, Pony.fm aims to be the one-stop shop for all things pony music, for artists and listeners alike.

What does MLP Forums have to do with Pony.fm?

MLP Forums and Pony.fm share an owner, and each encompasses a different segment of the global My Little Pony: Friendship is Magic community. Put together, both sites are able to offer a richer "supercommunity" experience than either site could offer on its own.

Who is behind Pony.fm?

-

Pony.fm is built and owned by Feld0, a pony-loving teenager who heard the call of code. Recognizing the need for a true pony-specific music hosting site, and realizing that MLP Forums provided him with the resources he needed to make it happen, he created a blank text file and started pumping code into his computer.

+

Pony.fm was created by Feld0, a pony-loving teenager who heard the call of code. Recognizing the need for a true pony-specific music hosting site, and realizing that MLP Forums provided him with the resources he needed to make it happen, he created a blank text file and started pumping code into his computer.

+

The site is now maintained by him and Nelson LaQuet as part of the Poniverse network.

\ No newline at end of file diff --git a/readme.md b/readme.md index d8690152..a72db94c 100644 --- a/readme.md +++ b/readme.md @@ -1,10 +1,12 @@ # Starting a dev environment -To begin development, you must do two things: +To begin development, you must do three things: 1. Ensure that you have the following hosts entries: > 192.168.33.11 pony.fm.local > 192.168.33.11 api.pony.fm.local -2. Run "vagrant up" from the folder in which you cloned the repository +2. Install the "vagrant-bindfs" plugin: `vagrant plugin install vagrant-bindfs` + +3. Run `vagrant up` from the folder in which you cloned the repository Once everything is up and running, you'll be able to access the site at http://pony.fm.local. You can access the MySQL database by logging into **192.168.33.11:3306** with the username of **homestead** and the password of **secret**. The pony.fm database is named **homestead**. @@ -25,4 +27,4 @@ Pony.fm uses nginx, php-fpm, redis, and MySQL. You can modify the configuration If you need to change any other configuration file on the VM - copy the entire file over into the vagrant folder, make your changes, and update the "copy-and-restart-config.sh" script to copy the modified config back into the proper folder. All potential configuration requirements should be represented in the vagrant folder **and never only on the VM itself** as changes will not be preserved. -**NOTE:** currently, Redis's configuration is not reloaded by the "copy-and-restart-config.sh" \ No newline at end of file +**NOTE:** currently, Redis's configuration is not reloaded by the "copy-and-restart-config.sh" diff --git a/spa.pony.fm.iml b/spa.pony.fm.iml deleted file mode 100644 index a1427afa..00000000 --- a/spa.pony.fm.iml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vagrant/copy-and-restart-configs.sh b/vagrant/copy-and-restart-configs.sh old mode 100644 new mode 100755 diff --git a/vagrant/install.sh b/vagrant/install.sh old mode 100644 new mode 100755 index a98da884..85279fcc --- a/vagrant/install.sh +++ b/vagrant/install.sh @@ -1,7 +1,7 @@ sudo add-apt-repository -y ppa:kirillshkrogalev/ffmpeg-next sudo apt-get update sudo apt-get install -y ffmpeg -sudo apt-get install -y AtomicParsley +sudo apt-get install -y AtomicParsley flac vorbis-tools sudo add-apt-repository -y --remove ppa:kirillshkrogalev/ffmpeg-next mkdir /vagrant/logs diff --git a/vagrant/reload-config.sh b/vagrant/reload-config.sh old mode 100644 new mode 100755