Commit d84a6b21 by Ned Batchelder

Merge pull request #2379 from edx/ned/add-src-directory

Mount a src directory for ad-hoc use.
parents 1ded853e 6caca48e
...@@ -17,6 +17,7 @@ ecommerce_worker_mount_dir = "ecommerce-worker" ...@@ -17,6 +17,7 @@ ecommerce_worker_mount_dir = "ecommerce-worker"
programs_mount_dir = "programs" programs_mount_dir = "programs"
insights_mount_dir = "insights" insights_mount_dir = "insights"
analytics_api_mount_dir = "analytics_api" analytics_api_mount_dir = "analytics_api"
src_mount_dir = "src"
if ENV['VAGRANT_MOUNT_BASE'] if ENV['VAGRANT_MOUNT_BASE']
...@@ -29,6 +30,9 @@ if ENV['VAGRANT_MOUNT_BASE'] ...@@ -29,6 +30,9 @@ if ENV['VAGRANT_MOUNT_BASE']
programs_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + programs_mount_dir programs_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + programs_mount_dir
insights_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + insights_mount_dir insights_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + insights_mount_dir
analytics_api_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + analytics_api_mount_dir analytics_api_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + analytics_api_mount_dir
# This src directory won't have useful permissions. You can set them from the
# vagrant user in the guest OS. "sudo chmod 0777 /edx/src" is useful.
src_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + src_mount_dir
end end
...@@ -84,6 +88,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| ...@@ -84,6 +88,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
create: true, owner: "insights", group: "www-data" create: true, owner: "insights", group: "www-data"
config.vm.synced_folder "#{analytics_api_mount_dir}", "/edx/app/analytics_api/analytics_api", config.vm.synced_folder "#{analytics_api_mount_dir}", "/edx/app/analytics_api/analytics_api",
create: true, owner: "analytics_api", group: "www-data" create: true, owner: "analytics_api", group: "www-data"
config.vm.synced_folder "#{src_mount_dir}", "/edx/src",
create: true, owner: "root", group: "root"
else else
config.vm.synced_folder "#{edx_platform_mount_dir}", "/edx/app/edxapp/edx-platform", config.vm.synced_folder "#{edx_platform_mount_dir}", "/edx/app/edxapp/edx-platform",
create: true, nfs: true create: true, nfs: true
...@@ -107,6 +113,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| ...@@ -107,6 +113,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
create: true, nfs: true create: true, nfs: true
config.vm.synced_folder "#{analytics_api_mount_dir}", "/edx/app/analytics_api/analytics_api", config.vm.synced_folder "#{analytics_api_mount_dir}", "/edx/app/analytics_api/analytics_api",
create: true, nfs: true create: true, nfs: true
config.vm.synced_folder "#{src_mount_dir}", "/edx/src",
create: true, nfs: true
end end
......
...@@ -47,6 +47,7 @@ ora_mount_dir = "ora" ...@@ -47,6 +47,7 @@ ora_mount_dir = "ora"
ecommerce_mount_dir = "ecommerce" ecommerce_mount_dir = "ecommerce"
insights_mount_dir = "insights" insights_mount_dir = "insights"
analytics_api_mount_dir = "analytics_api" analytics_api_mount_dir = "analytics_api"
src_mount_dir = "src"
if ENV['VAGRANT_MOUNT_BASE'] if ENV['VAGRANT_MOUNT_BASE']
...@@ -57,6 +58,9 @@ if ENV['VAGRANT_MOUNT_BASE'] ...@@ -57,6 +58,9 @@ if ENV['VAGRANT_MOUNT_BASE']
ecommerce_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + ecommerce_mount_dir ecommerce_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + ecommerce_mount_dir
insights_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + insights_mount_dir insights_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + insights_mount_dir
analytics_api_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + analytics_api_mount_dir analytics_api_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + analytics_api_mount_dir
# This src directory won't have useful permissions. You can set them from the
# vagrant user in the guest OS. "sudo chmod 0777 /edx/src" is useful.
src_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + src_mount_dir
end end
...@@ -129,6 +133,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| ...@@ -129,6 +133,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
create: true, owner: "insights", group: "www-data" create: true, owner: "insights", group: "www-data"
config.vm.synced_folder "#{analytics_api_mount_dir}", "/edx/app/analytics_api/analytics_api", config.vm.synced_folder "#{analytics_api_mount_dir}", "/edx/app/analytics_api/analytics_api",
create: true, owner: "analytics_api", group: "www-data" create: true, owner: "analytics_api", group: "www-data"
config.vm.synced_folder "#{src_mount_dir}", "/edx/src",
create: true, owner: "root", group: "root"
else else
config.vm.synced_folder "#{edx_platform_mount_dir}", "/edx/app/edxapp/edx-platform", config.vm.synced_folder "#{edx_platform_mount_dir}", "/edx/app/edxapp/edx-platform",
create: true, nfs: true create: true, nfs: true
...@@ -144,6 +150,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| ...@@ -144,6 +150,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
create: true, nfs: true create: true, nfs: true
config.vm.synced_folder "#{analytics_api_mount_dir}", "/edx/app/analytics_api/analytics_api", config.vm.synced_folder "#{analytics_api_mount_dir}", "/edx/app/analytics_api/analytics_api",
create: true, nfs: true create: true, nfs: true
config.vm.synced_folder "#{src_mount_dir}", "/edx/src",
create: true, nfs: true
end end
config.vm.provider :virtualbox do |vb| config.vm.provider :virtualbox do |vb|
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment