From d6d309c72e0a70b1d640dd0f3a1aec61b177afb5 Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Fri, 5 Nov 2021 11:41:48 -0500 Subject: [PATCH 1/4] Add pv scripts. --- .../workspace_template/bin/pv_remap.py | 73 +++++++++++++++++ .../workspace_template/bin/pv_to_csv.py | 79 +++++++++++++++++++ 2 files changed, 152 insertions(+) create mode 100644 core/base/tools/commander/workspace_template/bin/pv_remap.py create mode 100644 core/base/tools/commander/workspace_template/bin/pv_to_csv.py diff --git a/core/base/tools/commander/workspace_template/bin/pv_remap.py b/core/base/tools/commander/workspace_template/bin/pv_remap.py new file mode 100644 index 000000000..26a980c2a --- /dev/null +++ b/core/base/tools/commander/workspace_template/bin/pv_remap.py @@ -0,0 +1,73 @@ +""" +Usage: +python3 pv_remap.pv --csv_document /home/lgomez/Downloads/VIPER-to-Airliner_PV_Mapping_Sheet1.csv --old_col Airliner --new_col Viper --display_root_dir /home/lgomez/airliner/core/base/tools/commander/workspace_template/Displays +""" + +import argparse +import csv +import os + + +def parse_cli() -> argparse.Namespace: + """ + Parses cli arguments. + :return: The namespace that has all of the arguments that have been parsed. + """ + parser = argparse.ArgumentParser(description='Takes in path to sqlite database.') + + parser.add_argument('--csv_document', type=str, required=True, + help='The csv file to scan.') + parser.add_argument('--old_col', type=str, required=False, + help='The old column that has old pvs which will be replaced.') + parser.add_argument('--new_col', type=str, required=False, + help='The new column.') + + parser.add_argument('--display_root_dir', type=str, required=False, + help='The input directory to scan(recursively) for displays.') + + return parser.parse_args() + + +def replace_pv(old: str, new: str, display: str): + return display.replace(old, new) + + +def remap_display(csv_document, old_col, new_col, in_display, out_display): + rows = [] + old_display = '' + with open(csv_document, 'r+') as csvfile: + reader = csv.reader(csvfile, delimiter=",", dialect='excel') + rows = list(reader) + header = rows[0] + old_index = 0 + new_index = 1 + if header[1] == old_col: + old_index = 1 + new_index = 0 + with open(in_display, 'r') as old_display_file: + old_display = old_display_file.read() + with open(out_display, 'w+') as new_display_file: + new_display = str(old_display) + for row in rows[1:]: + if row[old_index] != '': + new_display = replace_pv(row[old_index], row[new_index], new_display) + + new_display_file.write(new_display) + + +def main(): + args = parse_cli() + opi_files = [] + + for (parent, subdirs, files) in os.walk(args.display_root_dir): + for name in files + subdirs: + filename, file_extension = os.path.splitext(os.path.join(parent, name)) + if file_extension == '.opi': + opi_files.append(os.path.join(parent, name)) + + for file in opi_files: + remap_display(args.csv_document, args.old_col, args.new_col, file, file) + + +if __name__ == '__main__': + main() diff --git a/core/base/tools/commander/workspace_template/bin/pv_to_csv.py b/core/base/tools/commander/workspace_template/bin/pv_to_csv.py new file mode 100644 index 000000000..287f1acec --- /dev/null +++ b/core/base/tools/commander/workspace_template/bin/pv_to_csv.py @@ -0,0 +1,79 @@ +""" +Gather all PV names from YAMCS server and dump them on a CSV file. +""" +import csv +import requests +from yamcs.client import YamcsClient + +INSTANCE = "viper" +SERVER = "http://192.168.2.96:8090" + +all_pvalues = f"{SERVER}/api/mdb/{INSTANCE}/parameters" + +# Could be useful, though beware that this returns not just PValue names but also the actual value as well. +pvalues_to_csv = f"{SERVER}/api/archive/{INSTANCE}:exportParameterValues" + +output_file = "PValues.csv" + +MEMBER_SEPARATOR = "." + + +def get_aggregate_qualified_names(parameter, param_qualified_name, out_names: [str]): + if 'member' in parameter['type']: + for member in parameter['type']['member']: + if member['type']['engType'] == 'aggregate': + get_aggregate_qualified_names(member, param_qualified_name + MEMBER_SEPARATOR + member['name'], + out_names) + else: + out_names.append(param_qualified_name + MEMBER_SEPARATOR + member['name']) + + +def get_params_from_aggregates(): + response = requests.get(all_pvalues) + parameters = response.json()['parameters'] + parameter_count = 0 + + for p in parameters: + # Avoid params that are not part of XTCE such YAMCS internal command counters + if 'type' in p: + if p['type']['engType'] == 'aggregate' and 'member' in p['type']: + out_list = [] + get_aggregate_qualified_names(p, p['qualifiedName'], out_list) + with open(output_file, 'a+') as csvfile: + parameter_count = len(out_list) + parameter_count + writer = csv.writer(csvfile, delimiter=",", dialect='excel') + writer.writerows((pv,) for pv in out_list) + else: + out_list = [p['qualifiedName']] + with open(output_file, 'a+') as csvfile: + writer = csv.writer(csvfile, delimiter=",", dialect='excel') + parameter_count = len(out_list) + parameter_count + writer.writerows((pv,) for pv in out_list) + + print(f'Loaded {parameter_count} parameters from YAMCS') + + +def get_params_from_api(): + response = requests.get(pvalues_to_csv) + with open(output_file, 'wb') as csvfile: + csvfile.write(response.content) + + +def get_params_from_python_api(): + client = YamcsClient(SERVER[7:]) + mdb = client.get_mdb(instance=INSTANCE) + parameter_count = 0 + for parameter in mdb.list_parameters(): + out_list = [parameter] + with open(output_file, 'a+') as csvfile: + writer = csv.writer(csvfile, delimiter=",", dialect='excel') + parameter_count = len(out_list) + parameter_count + writer.writerows((pv,) for pv in out_list) + print(f'Loaded {parameter_count} parameters from YAMCS') + +def main(): + get_params_from_python_api() + + +if __name__ == '__main__': + main() From bf8342fc0f177c407f23812e580cd2f4172b5494 Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Fri, 5 Nov 2021 18:31:54 -0500 Subject: [PATCH 2/4] -Add docker scripts --- .../workspace_template/bin/yamcs/Dockerfile | 17 +++++ .../workspace_template/bin/yamcs/Makefile | 72 +++++++++++++++++++ .../bin/yamcs/supervisord.conf | 11 +++ 3 files changed, 100 insertions(+) create mode 100644 core/base/tools/commander/workspace_template/bin/yamcs/Dockerfile create mode 100644 core/base/tools/commander/workspace_template/bin/yamcs/Makefile create mode 100644 core/base/tools/commander/workspace_template/bin/yamcs/supervisord.conf diff --git a/core/base/tools/commander/workspace_template/bin/yamcs/Dockerfile b/core/base/tools/commander/workspace_template/bin/yamcs/Dockerfile new file mode 100644 index 000000000..0f466d567 --- /dev/null +++ b/core/base/tools/commander/workspace_template/bin/yamcs/Dockerfile @@ -0,0 +1,17 @@ +FROM ubuntu:focal + +MAINTAINER Mathew Benson + +RUN apt-get update && apt-get install -y --no-install-recommends apt-utils +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends dialog apt-utils +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections +RUN apt-get install -y -q +RUN apt-get install -y openjdk-8-jdk +RUN apt-get install -y default-jre +RUN apt-get install -y supervisor +RUN apt-get install -y apache2 +#RUN apt-get install maven + +COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf + +CMD ["/usr/bin/supervisord"] \ No newline at end of file diff --git a/core/base/tools/commander/workspace_template/bin/yamcs/Makefile b/core/base/tools/commander/workspace_template/bin/yamcs/Makefile new file mode 100644 index 000000000..6563f8580 --- /dev/null +++ b/core/base/tools/commander/workspace_template/bin/yamcs/Makefile @@ -0,0 +1,72 @@ +.PHONE: deploy remove show-images + +image: + @if [ -z ${IMAGE_NAME}]; then echo "IMAGE_NAME is not set. Aborting."; exit 1; fi + @echo "Creating image '${IMAGE_NAME}'" + @docker build --force-rm -t "${IMAGE_NAME}" . + +remove-image: + @if [ -z ${IMAGE_NAME}]; then echo "IMAGE_NAME is not set. Aborting."; exit 1; fi + @docker rmi ${IMAGE_NAME} + @docker image prune -f + +remove-container: + @if [ -z ${CONTAINER_NAME}]; then echo "CONTAINER_NAME is not set. Aborting."; exit 1; fi + @docker container rm ${CONTAINER_NAME} + + +show-images: + @docker container ls -all + +container: + @if [-z ${IMAGE_NAME}]; then echo "IMAGE_NAME is not set. Aborting."; exit 1; fi + @if [-z ${YAMCS_INSTALL_DIR}]; then echo "YAMCS_INSTALL_DIR is not set. Aborting."; exit 1; fi + @if [-z ${CONTAINER_NAME}]; then echo "CONTAINER}_NAME is not set. Aborting."; exit 1; fi + @if [-z ${YAMCS_WORKSPACE_DIR}]; then echo "YAMCS_WORKSPACE_DIR is not set. Aborting."; exit 1; fi + @if [-z ${YAMCS_PORT}]; then echo "YAMCS_PORT is not set. Aborting."; exit 1; fi + @if [-z ${TLM_PORT}]; then echo "TLM_PORT is not set. Aborting."; exit 1; fi + + @docker run \ + -d \ + --restart unless-stopped \ + -p ${YAMCS_PORT}:8090 \ + -p ${TLM_PORT}:1235/udp \ + --volume ${YAMCS_INSTALL_DIR}:/opt/yamcs \ + --volume ${YAMCS_WORKSPACE_DIR}:/opt/yamcs_workspace \ + --name ${CONTAINER_NAME} \ + -t -i \ + ${IMAGE_NAME} + +deploy-viper: + @make image IMAGE_NAME=yamcs-viper:1.0.0 + #@make container IMAGE_NAME=yamcs-viper:1.0.0 CONTAINER_NAME=rig1 YAMCS_INSTALL_DIR=/opt/yamcs/GDS-3.0.0 YAMCS_WORKSPACE_DIR=/opt/yamcs/workspaces/rig1 YAMCS_PORT=8091 TLM_PORT=1235 + #@make container IMAGE_NAME=yamcs-viper:1.0.0 CONTAINER_NAME=rig2 YAMCS_INSTALL_DIR=/opt/yamcs/GDS-3.0.0 YAMCS_WORKSPACE_DIR=/opt/yamcs/workspaces/rig2 YAMCS_PORT=8092 TLM_PORT=2232 + @make container IMAGE_NAME=yamcs-viper:1.0.0 CONTAINER_NAME=rig3 YAMCS_INSTALL_DIR=/opt/yamcs/5.4.3 YAMCS_WORKSPACE_DIR=/etc/yamcs/workspaces/rig3 YAMCS_PORT=8093 TLM_PORT=2233 + @make container IMAGE_NAME=yamcs-viper:1.0.0 CONTAINER_NAME=rig4 YAMCS_INSTALL_DIR=/opt/yamcs/5.4.3 YAMCS_WORKSPACE_DIR=/etc/yamcs/workspaces/rig4 YAMCS_PORT=8094 TLM_PORT=2234 + @make container IMAGE_NAME=yamcs-viper:1.0.0 CONTAINER_NAME=rig5 YAMCS_INSTALL_DIR=/opt/yamcs/5.4.3 YAMCS_WORKSPACE_DIR=/etc/yamcs/workspaces/rig5 YAMCS_PORT=8095 TLM_PORT=2235 + +deploy-airliner: + @make image IMAGE_NAME=yamcs-airliner:5.5.4 + @make container YAMCS_PORT=8090 YAMCS_INSTALL_DIR=/opt/yamcs-develop/ YAMCS_WORKSPACE_DIR=/etc/yamcs/workspaces/develop TLM_PORT=5011 CONTAINER_NAME=airliner-develop IMAGE_NAME=yamcs-airliner:5.5.4 + +destroy: + @docker container stop rig1 || true + @docker container stop rig1 || true + @docker container stop rig1 || true + @docker container stop rig1 || true + @docker container stop rig1 || true + @make remove-container CONTAINER_NAME=rig1 || true + @make remove-container CONTAINER_NAME=rig2 || true + @make remove-container CONTAINER_NAME=rig3 || true + @make remove-container CONTAINER_NAME=rig4 || true + @make remove-container CONTAINER_NAME=rig5 || true + @rm -Rf /opt/yamcs/worksapces/rig1/cache + @rm -Rf /opt/yamcs/worksapces/rig2/cache + @rm -Rf /opt/yamcs/worksapces/rig3/cache + @rm -Rf /opt/yamcs/worksapces/rig4/cache + @rm -Rf /opt/yamcs/worksapces/rig5/cache + @rm -Rf /opt/yamcs/worksapces/rig1/yamcs-data + @rm -Rf /opt/yamcs/worksapces/rig2/yamcs-data + @rm -Rf /opt/yamcs/worksapces/rig3/yamcs-data + @rm -Rf /opt/yamcs/worksapces/rig4/yamcs-data + @rm -Rf /opt/yamcs/worksapces/rig5/yamcs-data diff --git a/core/base/tools/commander/workspace_template/bin/yamcs/supervisord.conf b/core/base/tools/commander/workspace_template/bin/yamcs/supervisord.conf new file mode 100644 index 000000000..4d96ebfdb --- /dev/null +++ b/core/base/tools/commander/workspace_template/bin/yamcs/supervisord.conf @@ -0,0 +1,11 @@ +[supervisord] +nodaemon=true + +#[program:apache3] +#command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/bin/apache2 -DFOREGROUND" + +[program:yamcsd] +command=/bin/bash -c "/opt/yamcs_workspace/bin/yamcs-start /opt/yamcs /opt/yamcs_workspace" +stdout_logfile=/tmp/yamcs.log +stdout_logfile_maxbytes=10000000 +redirect_stderr=true From bbf996ce8384f926f5ead5fc6c1472e631edcffd Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Mon, 8 Nov 2021 12:46:28 -0600 Subject: [PATCH 3/4] -Cleanup --- .../commander/workspace_template/bin/yamcs/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/core/base/tools/commander/workspace_template/bin/yamcs/Makefile b/core/base/tools/commander/workspace_template/bin/yamcs/Makefile index 6563f8580..7ef3558c1 100644 --- a/core/base/tools/commander/workspace_template/bin/yamcs/Makefile +++ b/core/base/tools/commander/workspace_template/bin/yamcs/Makefile @@ -37,13 +37,11 @@ container: -t -i \ ${IMAGE_NAME} -deploy-viper: - @make image IMAGE_NAME=yamcs-viper:1.0.0 - #@make container IMAGE_NAME=yamcs-viper:1.0.0 CONTAINER_NAME=rig1 YAMCS_INSTALL_DIR=/opt/yamcs/GDS-3.0.0 YAMCS_WORKSPACE_DIR=/opt/yamcs/workspaces/rig1 YAMCS_PORT=8091 TLM_PORT=1235 - #@make container IMAGE_NAME=yamcs-viper:1.0.0 CONTAINER_NAME=rig2 YAMCS_INSTALL_DIR=/opt/yamcs/GDS-3.0.0 YAMCS_WORKSPACE_DIR=/opt/yamcs/workspaces/rig2 YAMCS_PORT=8092 TLM_PORT=2232 - @make container IMAGE_NAME=yamcs-viper:1.0.0 CONTAINER_NAME=rig3 YAMCS_INSTALL_DIR=/opt/yamcs/5.4.3 YAMCS_WORKSPACE_DIR=/etc/yamcs/workspaces/rig3 YAMCS_PORT=8093 TLM_PORT=2233 - @make container IMAGE_NAME=yamcs-viper:1.0.0 CONTAINER_NAME=rig4 YAMCS_INSTALL_DIR=/opt/yamcs/5.4.3 YAMCS_WORKSPACE_DIR=/etc/yamcs/workspaces/rig4 YAMCS_PORT=8094 TLM_PORT=2234 - @make container IMAGE_NAME=yamcs-viper:1.0.0 CONTAINER_NAME=rig5 YAMCS_INSTALL_DIR=/opt/yamcs/5.4.3 YAMCS_WORKSPACE_DIR=/etc/yamcs/workspaces/rig5 YAMCS_PORT=8095 TLM_PORT=2235 +deploy-example: + @make image IMAGE_NAME=yamcs-example:1.0.0 + @make container IMAGE_NAME=yamcs-example:1.0.0 CONTAINER_NAME=rig3 YAMCS_INSTALL_DIR=/opt/yamcs/5.4.3 YAMCS_WORKSPACE_DIR=/etc/yamcs/workspaces/rig3 YAMCS_PORT=8093 TLM_PORT=2233 + @make container IMAGE_NAME=yamcs-example:1.0.0 CONTAINER_NAME=rig4 YAMCS_INSTALL_DIR=/opt/yamcs/5.4.3 YAMCS_WORKSPACE_DIR=/etc/yamcs/workspaces/rig4 YAMCS_PORT=8094 TLM_PORT=2234 + @make container IMAGE_NAME=yamcs-example:1.0.0 CONTAINER_NAME=rig5 YAMCS_INSTALL_DIR=/opt/yamcs/5.4.3 YAMCS_WORKSPACE_DIR=/etc/yamcs/workspaces/rig5 YAMCS_PORT=8095 TLM_PORT=2235 deploy-airliner: @make image IMAGE_NAME=yamcs-airliner:5.5.4 From ecbc5213900f0fa431a110fcf69034e35bc8978f Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Mon, 15 Nov 2021 16:10:29 -0600 Subject: [PATCH 4/4] -Remove docker files. --- .../workspace_template/bin/yamcs/Dockerfile | 17 ----- .../workspace_template/bin/yamcs/Makefile | 70 ------------------- .../bin/yamcs/supervisord.conf | 11 --- 3 files changed, 98 deletions(-) delete mode 100644 core/base/tools/commander/workspace_template/bin/yamcs/Dockerfile delete mode 100644 core/base/tools/commander/workspace_template/bin/yamcs/Makefile delete mode 100644 core/base/tools/commander/workspace_template/bin/yamcs/supervisord.conf diff --git a/core/base/tools/commander/workspace_template/bin/yamcs/Dockerfile b/core/base/tools/commander/workspace_template/bin/yamcs/Dockerfile deleted file mode 100644 index 0f466d567..000000000 --- a/core/base/tools/commander/workspace_template/bin/yamcs/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM ubuntu:focal - -MAINTAINER Mathew Benson - -RUN apt-get update && apt-get install -y --no-install-recommends apt-utils -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends dialog apt-utils -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get install -y -q -RUN apt-get install -y openjdk-8-jdk -RUN apt-get install -y default-jre -RUN apt-get install -y supervisor -RUN apt-get install -y apache2 -#RUN apt-get install maven - -COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf - -CMD ["/usr/bin/supervisord"] \ No newline at end of file diff --git a/core/base/tools/commander/workspace_template/bin/yamcs/Makefile b/core/base/tools/commander/workspace_template/bin/yamcs/Makefile deleted file mode 100644 index 7ef3558c1..000000000 --- a/core/base/tools/commander/workspace_template/bin/yamcs/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -.PHONE: deploy remove show-images - -image: - @if [ -z ${IMAGE_NAME}]; then echo "IMAGE_NAME is not set. Aborting."; exit 1; fi - @echo "Creating image '${IMAGE_NAME}'" - @docker build --force-rm -t "${IMAGE_NAME}" . - -remove-image: - @if [ -z ${IMAGE_NAME}]; then echo "IMAGE_NAME is not set. Aborting."; exit 1; fi - @docker rmi ${IMAGE_NAME} - @docker image prune -f - -remove-container: - @if [ -z ${CONTAINER_NAME}]; then echo "CONTAINER_NAME is not set. Aborting."; exit 1; fi - @docker container rm ${CONTAINER_NAME} - - -show-images: - @docker container ls -all - -container: - @if [-z ${IMAGE_NAME}]; then echo "IMAGE_NAME is not set. Aborting."; exit 1; fi - @if [-z ${YAMCS_INSTALL_DIR}]; then echo "YAMCS_INSTALL_DIR is not set. Aborting."; exit 1; fi - @if [-z ${CONTAINER_NAME}]; then echo "CONTAINER}_NAME is not set. Aborting."; exit 1; fi - @if [-z ${YAMCS_WORKSPACE_DIR}]; then echo "YAMCS_WORKSPACE_DIR is not set. Aborting."; exit 1; fi - @if [-z ${YAMCS_PORT}]; then echo "YAMCS_PORT is not set. Aborting."; exit 1; fi - @if [-z ${TLM_PORT}]; then echo "TLM_PORT is not set. Aborting."; exit 1; fi - - @docker run \ - -d \ - --restart unless-stopped \ - -p ${YAMCS_PORT}:8090 \ - -p ${TLM_PORT}:1235/udp \ - --volume ${YAMCS_INSTALL_DIR}:/opt/yamcs \ - --volume ${YAMCS_WORKSPACE_DIR}:/opt/yamcs_workspace \ - --name ${CONTAINER_NAME} \ - -t -i \ - ${IMAGE_NAME} - -deploy-example: - @make image IMAGE_NAME=yamcs-example:1.0.0 - @make container IMAGE_NAME=yamcs-example:1.0.0 CONTAINER_NAME=rig3 YAMCS_INSTALL_DIR=/opt/yamcs/5.4.3 YAMCS_WORKSPACE_DIR=/etc/yamcs/workspaces/rig3 YAMCS_PORT=8093 TLM_PORT=2233 - @make container IMAGE_NAME=yamcs-example:1.0.0 CONTAINER_NAME=rig4 YAMCS_INSTALL_DIR=/opt/yamcs/5.4.3 YAMCS_WORKSPACE_DIR=/etc/yamcs/workspaces/rig4 YAMCS_PORT=8094 TLM_PORT=2234 - @make container IMAGE_NAME=yamcs-example:1.0.0 CONTAINER_NAME=rig5 YAMCS_INSTALL_DIR=/opt/yamcs/5.4.3 YAMCS_WORKSPACE_DIR=/etc/yamcs/workspaces/rig5 YAMCS_PORT=8095 TLM_PORT=2235 - -deploy-airliner: - @make image IMAGE_NAME=yamcs-airliner:5.5.4 - @make container YAMCS_PORT=8090 YAMCS_INSTALL_DIR=/opt/yamcs-develop/ YAMCS_WORKSPACE_DIR=/etc/yamcs/workspaces/develop TLM_PORT=5011 CONTAINER_NAME=airliner-develop IMAGE_NAME=yamcs-airliner:5.5.4 - -destroy: - @docker container stop rig1 || true - @docker container stop rig1 || true - @docker container stop rig1 || true - @docker container stop rig1 || true - @docker container stop rig1 || true - @make remove-container CONTAINER_NAME=rig1 || true - @make remove-container CONTAINER_NAME=rig2 || true - @make remove-container CONTAINER_NAME=rig3 || true - @make remove-container CONTAINER_NAME=rig4 || true - @make remove-container CONTAINER_NAME=rig5 || true - @rm -Rf /opt/yamcs/worksapces/rig1/cache - @rm -Rf /opt/yamcs/worksapces/rig2/cache - @rm -Rf /opt/yamcs/worksapces/rig3/cache - @rm -Rf /opt/yamcs/worksapces/rig4/cache - @rm -Rf /opt/yamcs/worksapces/rig5/cache - @rm -Rf /opt/yamcs/worksapces/rig1/yamcs-data - @rm -Rf /opt/yamcs/worksapces/rig2/yamcs-data - @rm -Rf /opt/yamcs/worksapces/rig3/yamcs-data - @rm -Rf /opt/yamcs/worksapces/rig4/yamcs-data - @rm -Rf /opt/yamcs/worksapces/rig5/yamcs-data diff --git a/core/base/tools/commander/workspace_template/bin/yamcs/supervisord.conf b/core/base/tools/commander/workspace_template/bin/yamcs/supervisord.conf deleted file mode 100644 index 4d96ebfdb..000000000 --- a/core/base/tools/commander/workspace_template/bin/yamcs/supervisord.conf +++ /dev/null @@ -1,11 +0,0 @@ -[supervisord] -nodaemon=true - -#[program:apache3] -#command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/bin/apache2 -DFOREGROUND" - -[program:yamcsd] -command=/bin/bash -c "/opt/yamcs_workspace/bin/yamcs-start /opt/yamcs /opt/yamcs_workspace" -stdout_logfile=/tmp/yamcs.log -stdout_logfile_maxbytes=10000000 -redirect_stderr=true