Skip to content

Commit 6984151

Browse files
committed
Merge pull request 'fix: moved the Puppetfile into modules, since g10k will clone all the mod in puppetfile, which is not needed on puppetmaster' (#1357) from g10k_puppetfile into master
Reviewed-on: https://gitea.obmondo.com/EnableIT/LinuxAid/pulls/1357
2 parents 8d78c27 + fdac60a commit 6984151

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

bin/update_puppetfile.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ declare OPENVOX_UPSTREAM_MODULES_PATH
7777
declare PUPPETFILE
7878

7979
OPENVOX_UPSTREAM_MODULES_PATH="$(dirname "$(readlink -f "${SCRIPT_NAME}/..")")/modules/upstream"
80-
PUPPETFILE="$(dirname "$(readlink -f "${SCRIPT_NAME}/..")")/Puppetfile"
80+
PUPPETFILE="$(dirname "$(readlink -f "${SCRIPT_NAME}/..")")/modules/Puppetfile"
8181

8282
[ $# -eq 0 ] && { ARGFAIL; exit 1; }
8383

@@ -249,7 +249,7 @@ EOF
249249
echo "Added ${MODULE_NAME} at ${LATEST_TAG} to Puppetfile"
250250
fi
251251

252-
git add "$PUPPETFILE"
252+
git add "$PUPPETFILE"
253253
}
254254

255255
# Function to add new module in linuxaid
File renamed without changes.

0 commit comments

Comments
 (0)