diff options
| author | Håkon Hallingstad <hakon@oath.com> | 2017-12-05 15:54:14 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@oath.com> | 2017-12-05 15:54:14 +0100 |
| commit | be7e101b46a75a92f28de4ed2e16c1bb0f405519 (patch) | |
| tree | 77b93feef5a39715499be6d254cca6823a280352 /node-admin | |
| parent | b9ca52f0a1fdde9c26e526b3d935c2a01711e1c2 (diff) | |
Fix review comments
- Rename *jdisc-container* to *standalone-container* (for files in this PR)
- Implement stop standalone-container command
- Avoid e.g. vespa user deletion on upgrade
Diffstat (limited to 'node-admin')
| -rwxr-xr-x | node-admin/src/main/sh/node-admin.sh (renamed from node-admin/src/main/sh/node-admin) | 4 | ||||
| -rw-r--r-- | node-admin/vespa-node-admin.spec | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/node-admin/src/main/sh/node-admin b/node-admin/src/main/sh/node-admin.sh index 8a8963eeed0..ff0ea492318 100755 --- a/node-admin/src/main/sh/node-admin +++ b/node-admin/src/main/sh/node-admin.sh @@ -73,10 +73,10 @@ fi case "$1" in start) - "$VESPA_HOME"/libexec/vespa/jdisc-container start -s node-admin -u root + "$VESPA_HOME"/libexec/vespa/standalone-container.sh start -s node-admin -u root ;; stop) - "$VESPA_HOME"/libexec/vespa/jdisc-container stop -s node-admin -u root + "$VESPA_HOME"/libexec/vespa/standalone-container.sh stop -s node-admin -u root ;; *) Usage ;; esac diff --git a/node-admin/vespa-node-admin.spec b/node-admin/vespa-node-admin.spec index 8c0eb23533c..ecdd9a02e95 100644 --- a/node-admin/vespa-node-admin.spec +++ b/node-admin/vespa-node-admin.spec @@ -17,7 +17,7 @@ URL: http://vespa.ai Requires: bash Requires: java-1.8.0-openjdk-headless -Requires: vespa-jdisc-container +Requires: vespa-standalone-container Conflicts: vespa |