Skip to content

Commit 4214ccb

Browse files
committed
Merge branch 'master' into 1227-simplify
2 parents d5f8f39 + b56dffd commit 4214ccb

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/Puphpet/Extension/VagrantfileLocalBundle/Resources/config/available.yml

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ empty_synced_folder:
33
target: ~
44
id: vagrant-root
55
sync_type: 'default'
6+
owner: 'www-data'
7+
group: 'www-data'
68
rsync:
79
args: { }
810
exclude: { }

src/Puphpet/Extension/VagrantfileLocalBundle/Resources/views/form/sections/SyncedFolder.html.twig

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<div class="panel-body">
1111
<input type="hidden" id="vagrantfile-local-vm-synced_folder-{{ uniqid }}-owner"
1212
name="vagrantfile-local[vm][synced_folder][{{ uniqid }}][owner]"
13-
value="{{ synced_folder.owner }}" />
13+
value="{{ synced_folder.owner is defined ? synced_folder.owner : '' }}" />
1414

1515
<input type="hidden" id="vagrantfile-local-vm-synced_folder-{{ uniqid }}-group"
1616
name="vagrantfile-local[vm][synced_folder][{{ uniqid }}][group]"
17-
value="{{ synced_folder.group }}" />
17+
value="{{ synced_folder.group is defined ? synced_folder.group : '' }}" />
1818

1919
<div class="row form-group">
2020
<div class="col-md-6">

0 commit comments

Comments
 (0)