@florianpat/lando-core 3.26.3-1florianPat.0 → 3.26.3-1florianPat.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/compose.js +1 -1
- package/package.json +5 -2
- package/scripts/user-perm-helpers.sh +4 -6
- package/scripts/user-perms.sh +1 -1
package/lib/compose.js
CHANGED
|
@@ -45,7 +45,7 @@ const defaultOptions = {
|
|
|
45
45
|
kill: {},
|
|
46
46
|
logs: {follow: false, timestamps: false},
|
|
47
47
|
ps: {q: true},
|
|
48
|
-
pull: {ignoreBuildable: true
|
|
48
|
+
pull: {ignoreBuildable: true},
|
|
49
49
|
rm: {force: true, volumes: true},
|
|
50
50
|
up: {background: true, noRecreate: true, recreate: false, removeOrphans: true},
|
|
51
51
|
config: {},
|
package/package.json
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@florianpat/lando-core",
|
|
3
3
|
"description": "The libraries that power all of Lando.",
|
|
4
|
-
"version": "3.26.3-1florianPat.
|
|
4
|
+
"version": "3.26.3-1florianPat.1",
|
|
5
5
|
"author": "Florian Patruck @florianPat",
|
|
6
6
|
"license": "MIT",
|
|
7
|
-
"repository":
|
|
7
|
+
"repository": {
|
|
8
|
+
"type": "git",
|
|
9
|
+
"url": "git+https://github.com/HDNET/lando-core.git"
|
|
10
|
+
},
|
|
8
11
|
"bugs": "https://github.com/HDNET/lando-core/issues/new/choose",
|
|
9
12
|
"homepage": "https://github.com/HDNET/lando-core",
|
|
10
13
|
"keywords": [
|
|
@@ -71,8 +71,8 @@ reset_user() {
|
|
|
71
71
|
perm_sweep() {
|
|
72
72
|
local USER=$1
|
|
73
73
|
local GROUP=$2
|
|
74
|
-
local
|
|
75
|
-
local
|
|
74
|
+
local USER_HOME=$3
|
|
75
|
+
local OTHER_DIR=$4
|
|
76
76
|
|
|
77
77
|
# Do other dirs first if we have them
|
|
78
78
|
if [ ! -z "$OTHER_DIR" ]; then
|
|
@@ -90,10 +90,8 @@ perm_sweep() {
|
|
|
90
90
|
lando_info "chowned /var/www"
|
|
91
91
|
chmod 755 /var/www
|
|
92
92
|
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
nohup find /usr/local/share -not -user $USER -execdir chown $USER:$GROUP {} \+ > /tmp/perms.out 2> /tmp/perms.err &
|
|
96
|
-
nohup find /usr/local -not -user $USER -execdir chown $USER:$GROUP {} \+ > /tmp/perms.out 2> /tmp/perms.err &
|
|
93
|
+
chown -R $USER:$GROUP /usr/local > /tmp/perms.out 2> /tmp/perms.err || true
|
|
94
|
+
lando_info "chowned /usr/local"
|
|
97
95
|
|
|
98
96
|
# Make sure we chown the $USER home directory
|
|
99
97
|
[ -d "$USER_HOME" ] && chown -R $USER:$GROUP "$USER_HOME" > /tmp/perms.out 2> /tmp/perms.err || true
|
package/scripts/user-perms.sh
CHANGED
|
@@ -109,4 +109,4 @@ lando_info "$LANDO_WEBROOT_USER:$LANDO_WEBROOT_GROUP is now running as $(id $LAN
|
|
|
109
109
|
# Make sure we set the ownership of the mount and HOME when we start a service
|
|
110
110
|
lando_info "And here. we. go."
|
|
111
111
|
lando_info "Doing the permission sweep."
|
|
112
|
-
perm_sweep $LANDO_WEBROOT_USER $(getent group "$LANDO_HOST_GID" | cut -d: -f1) $
|
|
112
|
+
perm_sweep $LANDO_WEBROOT_USER $(getent group "$LANDO_HOST_GID" | cut -d: -f1) $WEBROOT_HOME $LANDO_RESET_DIR
|