Skip to content

Commit

Permalink
Update urls to external urls.
Browse files Browse the repository at this point in the history
  • Loading branch information
Bart Arickx committed Jan 18, 2016
1 parent 0bde12d commit 0f6c9d8
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 16 deletions.
9 changes: 2 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ info:
@echo ""

help:
@echo "todo ..."
@echo "/giphy boobies"

install: check-environment download-chef-cookbooks vagrant-up

Expand All @@ -51,12 +51,6 @@ vagrant-destroy:
vagrant destroy -f
fi; \

vagrant-export-base:
vagrant destroy -f
vagrant up
vagrant package --base 'trusty64' --output 'trusty64-base.box'
vagrant package --base 'precise64' --output 'precise64-base.box'

check-environment: check-environment-virtualbox check-environment-vagrant check-environment-librarian check-vagrant-plugins

check-environment-virtualbox:
Expand All @@ -70,6 +64,7 @@ endif
check-environment-vagrant:
ifndef BIN_VAGRANT
@echo "Vagrant has not been installed yet."
@echo "Please install the version 1.7.1 from http://www.vagrantup.com/download-archive/v1.7.1.html."
exit 2;
endif
@echo "Vagrant: OK"
Expand Down
14 changes: 11 additions & 3 deletions default.vagrant.settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
"vagrant_debugging": false,

"box_type": "oa/drupical-trusty64-base",
"box_url": "http://192.168.13.241/one-agency/drupical/trusty64/drupical-trusty64-base.php",
"box_url": "http://drupical.staging5.dotprojects.be/drupical/trusty64/drupical-trusty64-base.php",

//"box_type": "oa/drupical-precise64-base",
//"box_url": "http://drupical.staging5.dotprojects.be/drupical/precise64/drupical-precise64-base.php",

//"box_type": "oa/drupical-trusty64-base",
//"box_url": "http://192.168.13.241/one-agency/drupical/trusty64/drupical-trusty64-base.php",

//"box_type": "oa/drupical-precise64-base",
//"box_url": "http://192.168.13.241/one-agency/drupical/precise64/drupical-precise64-base.php",
Expand All @@ -27,8 +33,10 @@
"4.10.4": "ac3543880f1b591bcaa962d7508b528d7b42e2b5548386197940b704629ae851"
},
"solr_links": {
"3.6.2": "http://192.168.13.241/one-agency/solr/3.6.2/solr-3.6.2.tgz",
"4.10.4": "http://192.168.13.241/one-agency/solr/4.10.4/solr-4.10.4.tgz"
"3.6.2": "https://archive.apache.org/dist/lucene/solr/3.6.2/apache-solr-3.6.2.tgz",
"4.10.4": "https://archive.apache.org/dist/lucene/solr/4.10.4/solr-4.10.4.tgz"
//"3.6.2": "http://192.168.13.241/one-agency/solr/3.6.2/solr-3.6.2.tgz",
//"4.10.4": "http://192.168.13.241/one-agency/solr/4.10.4/solr-4.10.4.tgz"
}
},
"web_tools": {
Expand Down
1 change: 1 addition & 0 deletions example.vagrant.settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"config": {
"box_type": "drupical-precise64-base",
"box_url": "http://drupical.staging5.dotprojects.be/drupical/precise64/drupical-precise64-base.php",
"box_name": "PROJECT_NAME",
"box_hostname": "SITE_HOST",
"vagrant_synced_folders": {
Expand Down
7 changes: 1 addition & 6 deletions local.vagrant.settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,9 @@
"box_name": "mytest",
"box_hostname": "mytest",
"vagrant_synced_folders": {
"build": {
"source": "..",
"target": "/vagrant",
"type": "rsync"
},
"build_nfs": {
"source": "..",
"target": "/vagrant_nfs",
"target": "/vagrant",
"type": "nfs",
"mount_options": [
"rw",
Expand Down

0 comments on commit 0f6c9d8

Please sign in to comment.