From c5a8f20c0420d37f6781d0d9784276094db4719d Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Thu, 11 Jun 2020 14:13:07 +0200 Subject: [PATCH] scripts: move template files to "templates" directory --- scripts/build_deb.sh | 8 ++++---- scripts/build_freebsd.sh | 2 +- scripts/{ => templates}/config | 0 .../{logrotate-template.conf => templates/logrotate.conf} | 0 scripts/{rc.template => templates/rc.conf} | 0 scripts/{rsyslog-template.conf => templates/rsyslog.conf} | 0 scripts/{template.service => templates/sysunit.service} | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename scripts/{ => templates}/config (100%) rename scripts/{logrotate-template.conf => templates/logrotate.conf} (100%) rename scripts/{rc.template => templates/rc.conf} (100%) rename scripts/{rsyslog-template.conf => templates/rsyslog.conf} (100%) rename scripts/{template.service => templates/sysunit.service} (100%) diff --git a/scripts/build_deb.sh b/scripts/build_deb.sh index 28011d8..4a9bffd 100755 --- a/scripts/build_deb.sh +++ b/scripts/build_deb.sh @@ -37,7 +37,7 @@ cat ${BASE_DIR}/${PACKAGE_TMPDIR}/DEBIAN/control # Create service file mkdir -p ${BASE_DIR}/${PACKAGE_TMPDIR}/${PACKAGE_SYSUNITDIR} -cat ${BASE_DIR}/template.service \ +cat ${TEMPLATE_DIR}/sysunit.service \ | sed "s~{{ PACKAGE_NAME }}~${PACKAGE_NAME}~" \ | sed "s~{{ DESCRIPTION }}~${PACKAGE_DESCRIPTION}~" \ | sed "s~{{ PROGRAM }}~/${PACKAGE_PREFIX}/bin/${PACKAGE_NAME}~" \ @@ -45,21 +45,21 @@ cat ${BASE_DIR}/template.service \ # Create rsyslog file mkdir -p ${BASE_DIR}/${PACKAGE_TMPDIR}/${PACKAGE_RSYSLOGDIR} -cat ${BASE_DIR}/rsyslog-template.conf \ +cat ${TEMPLATE_DIR}/rsyslog.conf \ | sed "s~{{ PROGRAM }}~${PACKAGE_NAME}~" \ | sed "s~{{ LOG_FILE }}~${PACKAGE_LOGFILE}~" \ > ${BASE_DIR}/${PACKAGE_TMPDIR}/${PACKAGE_RSYSLOGDIR}/49-${PACKAGE_NAME}.conf # Create logrotate file mkdir -p ${BASE_DIR}/${PACKAGE_TMPDIR}/${PACKAGE_LOGROTATEDIR} -cat ${BASE_DIR}/logrotate-template.conf \ +cat ${TEMPLATE_DIR}/logrotate.conf \ | sed "s~{{ LOG_FILE }}~${PACKAGE_LOGFILE}~" \ > ${BASE_DIR}/${PACKAGE_TMPDIR}/${PACKAGE_LOGROTATEDIR}/${PACKAGE_NAME}.conf chmod 644 ${BASE_DIR}/${PACKAGE_TMPDIR}/${PACKAGE_LOGROTATEDIR}/${PACKAGE_NAME}.conf # Cerate config file mkdir -p ${BASE_DIR}/${PACKAGE_TMPDIR}/${PACKAGE_ETCDIR} -cat ${BASE_DIR}/config \ +cat ${TEMPLATE_DIR}/config \ | sed "s~{{ PACKAGE_NAME }}~${PACKAGE_NAME}~" \ > ${BASE_DIR}/${PACKAGE_TMPDIR}/${PACKAGE_ETCDIR}/env diff --git a/scripts/build_freebsd.sh b/scripts/build_freebsd.sh index 593d04e..637dbff 100755 --- a/scripts/build_freebsd.sh +++ b/scripts/build_freebsd.sh @@ -13,7 +13,7 @@ PACKAGE_NEWSYSLOGDIR=etc/newsyslog.conf.d RC_NAME=$(echo ${PACKAGE_NAME} | sed "s~-~_~g") mkdir -p ${BASE_DIR}/${PACKAGE_TMPDIR}/${PACKAGE_RCDIR} -cat ${BASE_DIR}/rc.template \ +cat ${TEMPLATE_DIR}/rc.conf \ | sed "s~{{ RC_NAME }}~${RC_NAME}~g" \ | sed "s~{{ DESCRIPTION }}~${PACKAGE_DESCRIPTION}~" \ | sed "s~{{ PROGRAM }}~/${PACKAGE_BINDIR}/${PACKAGE_NAME}~" \ diff --git a/scripts/config b/scripts/templates/config similarity index 100% rename from scripts/config rename to scripts/templates/config diff --git a/scripts/logrotate-template.conf b/scripts/templates/logrotate.conf similarity index 100% rename from scripts/logrotate-template.conf rename to scripts/templates/logrotate.conf diff --git a/scripts/rc.template b/scripts/templates/rc.conf similarity index 100% rename from scripts/rc.template rename to scripts/templates/rc.conf diff --git a/scripts/rsyslog-template.conf b/scripts/templates/rsyslog.conf similarity index 100% rename from scripts/rsyslog-template.conf rename to scripts/templates/rsyslog.conf diff --git a/scripts/template.service b/scripts/templates/sysunit.service similarity index 100% rename from scripts/template.service rename to scripts/templates/sysunit.service