Skip to content

Commit 22dfac7

Browse files
committed
Removed the client
1 parent 2f0ad71 commit 22dfac7

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

scripts/blackfire.sh

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!/usr/bin/env bash
22

3-
xdebug="/etc/php5/fpm/conf.d/20-xdebug.ini"
4-
53
agent="[blackfire]
64
ca-cert=
75
collector=https://blackfire.io
@@ -24,11 +22,8 @@ timeout=15s
2422
echo "$agent" > "/etc/blackfire/agent"
2523
echo "$client" > "/home/vagrant/.blackfire.ini"
2624

27-
# Disable xdebug
28-
if [ -f $xdebug ]; then
29-
rm $xdebug
30-
service hhvm restart
31-
service php5-fpm restart
32-
fi
33-
25+
# Disable xdebug to prevent conflict
26+
php5dismod xdebug
27+
service hhvm restart
28+
service php5-fpm restart
3429
service blackfire-agent restart

scripts/homestead.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def Homestead.configure(config, settings)
104104
if settings.has_key?("blackfire")
105105
config.vm.provision "shell" do |s|
106106
s.path = "./scripts/blackfire.sh"
107-
s.args = [settings["blackfire"]["server"]["id"], settings["blackfire"]["server"]["token"], settings["blackfire"]["client"]["id"], settings["blackfire"]["client"]["token"]]
107+
s.args = [settings["blackfire"]["id"], settings["blackfire"]["token"]]
108108
end
109109
end
110110
end

src/stubs/Homestead.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,5 @@ variables:
2424
value: local
2525

2626
# blackfire:
27-
# server:
28-
# id: id
29-
# token: token
30-
# client:
31-
# id: id
32-
# token: token
27+
# id: id
28+
# token: id

0 commit comments

Comments
 (0)