Skip to content
This repository has been archived by the owner on Oct 30, 2018. It is now read-only.

Closes #99 and #100 #101

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Closes #99 and #100 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
681c0d8
Replace puppet reference to removed commit with the correct one
antitoxic Oct 2, 2015
981be6b
Prevent npm of creating symlinks on shared folder (network drive)
antitoxic Oct 2, 2015
37d8729
Pick python puppet exact reference, not parent
antitoxic Oct 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions puppet/Puppetfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ mod "example42/monitor", '2.0.1'
mod "datagovuk/solr", '2.0.7',
:git => "https://github.com/example42/puppet-solr"

# commit e92de3dee9c55d5 is actually v1.9.5
# commit eb52429 is actually v1.9.5
mod "datagovuk/python",
:git => "https://github.com/stankevich/puppet-python",
:ref => 'e92de3dee9c55d5'
:ref => 'eb52429'

mod "datagovuk/dgu_ckan",
:path => "/vagrant/puppet/modules/dgu_ckan"
4 changes: 2 additions & 2 deletions puppet/modules/dgu_ckan/manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@
# I can replicate this on the command-line when logged in as vagrant and using sudo,
# but it works if you do 'sudo su' or 'sudo su co' and then do 'sudo npm install'.
exec { 'npm_deps_dgu':
command => 'sudo npm install',
command => 'sudo npm install --no-bin-links',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the links causing a problem?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, symlinking on network drive is not possible thus the npm install fails.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the docs:

The --no-bin-links argument will prevent npm from creating symlinks for any binaries the package might contain.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a Windows thing? Are you running the whole VM off a network drive? Isn't the performance really bad?

I'm concerned that some of those symbolic links may be needed.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not a windows thing. My host machine is linux. Is it working with you guys?

This command is executed in a symlinked directory of /vagrant which is the shared folder, i.e. the network drive.

cwd => '/src/ckanext-dgu',
user => 'co',
require => [
Expand All @@ -605,7 +605,7 @@
path => "/usr/bin:/bin:/usr/sbin",
}
exec { 'npm_deps_shared':
command => 'sudo npm install',
command => 'sudo npm install --no-bin-links',
cwd => '/src/shared_dguk_assets',
user => 'co',
require => Package['grunt-cli'],
Expand Down