diff --git a/debian/gitlab.install b/debian/gitlab.install index 4e8de59e50..cb82a5aefb 100644 --- a/debian/gitlab.install +++ b/debian/gitlab.install @@ -68,7 +68,7 @@ security.txt usr/share/gitlab sidekiq_cluster usr/share/gitlab storybook usr/share/gitlab tests.yml usr/share/gitlab -yarn.lock usr/share/gitlab +yarn.lock var/lib/gitlab tooling usr/share/gitlab vendor usr/share/gitlab VERSION usr/share/gitlab diff --git a/debian/gitlab.links b/debian/gitlab.links index 98bc3a053f..6ecaf719cf 100644 --- a/debian/gitlab.links +++ b/debian/gitlab.links @@ -4,7 +4,7 @@ var/lib/gitlab/db usr/share/gitlab/db var/lib/gitlab/node_modules usr/share/gitlab/node_modules usr/share/gitlab/package.json var/lib/gitlab/package.json var/lib/gitlab/yarn-error.log usr/share/gitlab/yarn-error.log -usr/share/gitlab/yarn.lock var/lib/gitlab/yarn.lock +var/lib/gitlab/yarn.lock usr/share/gitlab/yarn.lock var/lib/gitlab/.yarn usr/share/gitlab/.yarn var/lib/gitlab/.yarnrc.yml usr/share/gitlab/.yarnrc.yml var/lib/gitlab/.ssh usr/share/gitlab/.ssh diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst index 59eb0d3f9a..6edf6a32ac 100755 --- a/debian/gitlab.postinst +++ b/debian/gitlab.postinst @@ -170,6 +170,7 @@ case "$1" in # Make package.json writable for yarn 2 chown ${gitlab_user}: /var/lib/gitlab/package.json + chown ${gitlab_user}: /var/lib/gitlab/yarn.lock runuser -u ${gitlab_user} -- sh -c "chmod 700 ${gitlab_uploads_path}" runuser -u ${gitlab_user} -- sh -c 'git config --global core.autocrlf "input"' diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh index fe00503d6d..de111df136 100755 --- a/debian/rake-tasks.sh +++ b/debian/rake-tasks.sh @@ -43,7 +43,7 @@ cd /var/lib/gitlab runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/.cache' runuser -u ${gitlab_user} -- sh -c 'yarnpkg set version berry' runuser -u ${gitlab_user} -- sh -c 'if ! grep nodeLinker .yarnrc.yml >/dev/null; then echo "nodeLinker: \"node-modules\"" >>.yarnrc.yml; fi' -runuser -u ${gitlab_user} -- sh -c 'NODE_ENV=production yarnpkg install --immutable' +runuser -u ${gitlab_user} -- sh -c 'NODE_ENV=production yarnpkg install' # Remove write permissions of .yarn-metadata.json files runuser -u ${gitlab_user} -- sh -c 'test -d "/var/lib/gitlab/.cache/yarn/v6" && find /var/lib/gitlab/.cache/yarn/v6/ -name .yarn-metadata.json -perm -a=w -exec chmod 644 {} \;'