Skip to content

Commit 0f2e387

Browse files
derickrderickr
committed
Add 4.0 to Vagrant test set-up
1 parent 96dfb06 commit 0f2e387

12 files changed

+23
-44
lines changed

‎Vagrantfile‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -39,48 +39,5 @@ Vagrant.configure(2) do |config|
3939
ldap.vm.provision "shell", path: "scripts/centos/essentials.sh", privileged: true
4040
ldap.vm.provision "shell", path: "scripts/centos/ldap/install.sh", privileged: true
4141
end
42-
43-
config.vm.define "freebsd", autostart: false do |bsd|
44-
bsd.vm.network "private_network", ip: "192.168.112.30"
45-
46-
bsd.vm.box = "geoffgarside/freebsd-10.0"
47-
48-
bsd.vm.provision "shell", path: "scripts/freebsd/essentials.sh", privileged: true
49-
bsd.vm.provision "file", source: "/tmp/PHONGO-SERVERS.json", destination: "/tmp/PHONGO-SERVERS.json"
50-
bsd.vm.provision "file", source: "scripts/configs/.gdbinit", destination: "/home/vagrant/.gdbinit"
51-
bsd.vm.provision "shell", path: "scripts/freebsd/phongo.sh", privileged: true
52-
bsd.vm.synced_folder ".", "/phongo", :nfs => true, id: "vagrant-root"
53-
end
54-
55-
config.vm.define "precise64" do |linux|
56-
linux.vm.network "private_network", ip: "192.168.112.40"
57-
58-
linux.vm.box = "http://files.vagrantup.com/precise64.box"
59-
linux.vm.provider "vmware_workstation" do |vmware, override|
60-
override.vm.box_url = 'http://files.vagrantup.com/precise64_vmware.box'
61-
override.vm.provision "shell", path: "scripts/vmware/kernel.sh", privileged: true
62-
end
63-
64-
linux.vm.provision "shell", path: "scripts/ubuntu/essentials.sh", privileged: true
65-
linux.vm.provision "file", source: "/tmp/PHONGO-SERVERS.json", destination: "/tmp/PHONGO-SERVERS.json"
66-
linux.vm.provision "file", source: "scripts/configs/.gdbinit", destination: "/home/vagrant/.gdbinit"
67-
linux.vm.provision "shell", path: "scripts/ubuntu/phongo.sh", privileged: true
68-
end
69-
70-
config.vm.define "precise32" do |linux|
71-
linux.vm.network "private_network", ip: "192.168.112.50"
72-
73-
linux.vm.box = "bjori/precise32"
74-
linux.vm.provider "vmware_workstation" do |vmware, override|
75-
override.vm.box_url = "bjori/precise32"
76-
override.vm.provision "shell", path: "scripts/vmware/kernel.sh", privileged: true
77-
end
78-
79-
linux.vm.provision "shell", path: "scripts/ubuntu/essentials.sh", privileged: true
80-
linux.vm.provision "file", source: "/tmp/PHONGO-SERVERS.json", destination: "/tmp/PHONGO-SERVERS.json"
81-
linux.vm.provision "file", source: "scripts/configs/.gdbinit", destination: "/home/vagrant/.gdbinit"
82-
linux.vm.provision "shell", path: "scripts/ubuntu/phongo.sh", privileged: true
83-
end
84-
8542
end
8643

‎scripts/presets/replicaset-30.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"noprealloc": true,
1313
"nssize": 1,
1414
"port": 3100,
15+
"bind_ip": "0.0.0.0,::",
1516
"smallfiles": true,
1617
"setParameter": {"enableTestCommands": 1}
1718
},
@@ -34,6 +35,7 @@
3435
"noprealloc": true,
3536
"nssize": 1,
3637
"port": 3101,
38+
"bind_ip": "0.0.0.0,::",
3739
"smallfiles": true,
3840
"setParameter": {"enableTestCommands": 1}
3941
},
@@ -56,6 +58,7 @@
5658
"noprealloc": true,
5759
"nssize": 1,
5860
"port": 3102,
61+
"bind_ip": "0.0.0.0,::",
5962
"smallfiles": true,
6063
"setParameter": {"enableTestCommands": 1}
6164
},

‎scripts/presets/replicaset-dns.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"noprealloc": true,
1313
"nssize": 1,
1414
"port": 27017,
15+
"bind_ip_all": true,
1516
"smallfiles": true,
1617
"setParameter": {"enableTestCommands": 1}
1718
},
@@ -30,6 +31,7 @@
3031
"noprealloc": true,
3132
"nssize": 1,
3233
"port": 27018,
34+
"bind_ip_all": true,
3335
"smallfiles": true,
3436
"setParameter": {"enableTestCommands": 1}
3537
},
@@ -48,6 +50,7 @@
4850
"noprealloc": true,
4951
"nssize": 1,
5052
"port": 27019,
53+
"bind_ip_all": true,
5154
"smallfiles": true,
5255
"setParameter": {"enableTestCommands": 1}
5356
},

‎scripts/presets/replicaset.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"noprealloc": true,
1313
"nssize": 1,
1414
"port": 3000,
15+
"bind_ip_all": true,
1516
"smallfiles": true,
1617
"setParameter": {"enableTestCommands": 1}
1718
},
@@ -34,6 +35,7 @@
3435
"noprealloc": true,
3536
"nssize": 1,
3637
"port": 3001,
38+
"bind_ip_all": true,
3739
"smallfiles": true,
3840
"setParameter": {"enableTestCommands": 1}
3941
},
@@ -56,6 +58,7 @@
5658
"noprealloc": true,
5759
"nssize": 1,
5860
"port": 3002,
61+
"bind_ip_all": true,
5962
"smallfiles": true,
6063
"setParameter": {"enableTestCommands": 1}
6164
},

‎scripts/presets/standalone-30.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"logpath": "/tmp/standalone-30/mongod.log",
99
"journal": true,
1010
"port": 2700,
11+
"bind_ip_all": true,
1112
"setParameter": {"enableTestCommands": 1}
1213
},
1314
"version": "30-release"

‎scripts/presets/standalone-auth.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"logpath": "/tmp/standalone-auth/m.log",
1212
"journal": true,
1313
"port": 2200,
14+
"bind_ip_all": true,
1415
"setParameter": {"enableTestCommands": 1}
1516
}
1617
}

‎scripts/presets/standalone-plain.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"logpath": "/tmp/standalone-plain/m.log",
1212
"journal": true,
1313
"port": 2400,
14-
"setParameter": {"enableTestCommands": 1, "saslauthdPath": "/var/run/saslauthd/mux", "authenticationMechanisms": "MONGODB-CR,PLAIN"}
14+
"bind_ip_all": true,
15+
"setParameter": {"enableTestCommands": 1, "saslauthdPath": "/var/run/saslauthd/mux", "authenticationMechanisms": "SCRAM-SHA-1,PLAIN"}
1516
}
1617
}
1718

‎scripts/presets/standalone-ssl.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"logpath": "/tmp/standalone-ssl/m.log",
99
"journal": true,
1010
"port": 2100,
11+
"bind_ip_all": true,
1112
"setParameter": {"enableTestCommands": 1}
1213
},
1314
"sslParams": {

‎scripts/presets/standalone-x509.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"logpath": "/tmp/standalone-x509/m.log",
1111
"journal": true,
1212
"port": 2300,
13+
"bind_ip_all": true,
1314
"setParameter": {"enableTestCommands": 1, "authenticationMechanisms": "MONGODB-X509"}
1415
},
1516
"sslParams": {

‎scripts/presets/standalone.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"logpath": "/tmp/standalone/mongod.log",
99
"journal": true,
1010
"port": 2000,
11+
"bind_ip_all": true,
1112
"setParameter": {"enableTestCommands": 1}
1213
}
1314
}

0 commit comments

Comments
 (0)