diff --git a/configure/RULES_INSTALL b/configure/RULES_INSTALL index b801474..ad30475 100644 --- a/configure/RULES_INSTALL +++ b/configure/RULES_INSTALL @@ -15,28 +15,31 @@ reinstall.alarm-config-logger: uninstall.alarm-config-logger install.alarm-confi install: install.alarm-server install.alarm-logger install.alarm-config-logger -install.alarm-server: src_version src_preinst.alarm-server sd_install.alarm-server +install.alarm-server: src_version src_preinst.alarm-server +#install.alarm-server: src_version src_preinst.alarm-server sd_install.alarm-server $(if $(wildcard $(INSTALL_LOCATION_SERVER)), $(QUIET)$(SUDO) mv $(INSTALL_LOCATION_SERVER) $(INSTALL_LOCATION_SERVER)_backup_$$(date +%Y%m%d-%H%M%S)) $(QUIET)$(SUDO) $(INSTALL) -d $(INSTALL_LOCATION_SERVER) $(QUIET)$(SUDO) $(INSTALL_DATA) -b $(PS_SITE_TEMPLATE_PATH)/.versions $(INSTALL_LOCATION_SERVER)/ $(QUIET)$(SUDO) $(INSTALL) -m 744 $(SRC_PATH_SERVER)/target/service-*.jar $(INSTALL_SERVER) - $(QUIET)$(SUDO) cp -rp $(SRC_PATH_SERVER)/target/lib $(PS_SITE_TEMPLATE_PATH)/$(SERVER_SETTINGS) $(PS_SITE_TEMPLATE_PATH)/$(SERVER_LOGGING_PROPERTIES) $(INSTALL_LOCATION_SERVER)/ +# $(QUIET)$(SUDO) cp -rp $(SRC_PATH_SERVER)/target/lib $(PS_SITE_TEMPLATE_PATH)/$(SERVER_SETTINGS) $(PS_SITE_TEMPLATE_PATH)/$(SERVER_LOGGING_PROPERTIES) $(INSTALL_LOCATION_SERVER)/ $(QUIET)$(SUDO) chown -R $(AS_USERID):$(GROUPID) $(INSTALL_LOCATION_SERVER) -install.alarm-logger: src_version src_preinst.alarm-logger sd_install.alarm-logger +install.alarm-logger: src_version src_preinst.alarm-logger +#install.alarm-logger: src_version src_preinst.alarm-logger sd_install.alarm-logger $(if $(wildcard $(INSTALL_LOCATION_LOGGER)), $(QUIET)$(SUDO) mv $(INSTALL_LOCATION_LOGGER) $(INSTALL_LOCATION_LOGGER)_backup_$$(date +%Y%m%d-%H%M%S)) $(QUIET)$(SUDO) $(INSTALL) -d $(INSTALL_LOCATION_LOGGER) $(QUIET)$(SUDO) $(INSTALL_DATA) -b $(PS_SITE_TEMPLATE_PATH)/.versions $(INSTALL_LOCATION_LOGGER)/ $(QUIET)$(SUDO) $(INSTALL) -m 744 $(SRC_PATH_LOGGER)/target/service-*.jar $(INSTALL_LOGGER) - $(QUIET)$(SUDO) cp -rp $(PS_SITE_TEMPLATE_PATH)/$(LOGGER_PROPERTIES) $(PS_SITE_TEMPLATE_PATH)/$(LOGGER_LOGGING_PROPERTIES) $(INSTALL_LOCATION_LOGGER)/ +# $(QUIET)$(SUDO) cp -rp $(PS_SITE_TEMPLATE_PATH)/$(LOGGER_PROPERTIES) $(PS_SITE_TEMPLATE_PATH)/$(LOGGER_LOGGING_PROPERTIES) $(INSTALL_LOCATION_LOGGER)/ $(QUIET)$(SUDO) chown -R $(AL_USERID):$(GROUPID) $(INSTALL_LOCATION_LOGGER) -install.alarm-config-logger: src_version src_preinst.alarm-config-logger sd_install.alarm-config-logger +install.alarm-config-logger: src_version src_preinst.alarm-config-logger +#install.alarm-config-logger: src_version src_preinst.alarm-config-logger sd_install.alarm-config-logger $(if $(wildcard $(INSTALL_LOCATION_CONFIGLOGGER)), $(QUIET)$(SUDO) mv $(INSTALL_LOCATION_CONFIGLOGGER) $(INSTALL_LOCATION_CONFIGLOGGER)_backup_$$(date +%Y%m%d-%H%M%S)) $(QUIET)$(SUDO) $(INSTALL) -d $(INSTALL_LOCATION_CONFIGLOGGER) $(QUIET)$(SUDO) $(INSTALL_DATA) -b $(PS_SITE_TEMPLATE_PATH)/.versions $(INSTALL_LOCATION_CONFIGLOGGER)/ $(QUIET)$(SUDO) $(INSTALL) -m 744 $(SRC_PATH_CONFIGLOGGER)/target/service-*.jar $(INSTALL_CONFIGLOGGER) - $(QUIET)$(SUDO) cp -rp $(PS_SITE_TEMPLATE_PATH)/$(CONFIGLOGGER_PROPERTIES) $(PS_SITE_TEMPLATE_PATH)/$(CONFIGLOGGER_LOGGING_PROPERTIES) $(INSTALL_LOCATION_CONFIGLOGGER)/ +# $(QUIET)$(SUDO) cp -rp $(PS_SITE_TEMPLATE_PATH)/$(CONFIGLOGGER_PROPERTIES) $(PS_SITE_TEMPLATE_PATH)/$(CONFIGLOGGER_LOGGING_PROPERTIES) $(INSTALL_LOCATION_CONFIGLOGGER)/ $(QUIET)$(SUDO) chown -R $(ACL_USERID):$(GROUPID) $(INSTALL_LOCATION_CONFIGLOGGER) .PHONY: uninstall uninstall.alarm-server uninstall.alarm-logger uninstall.alarm-config-logger diff --git a/configure/RULES_SYSTEMD b/configure/RULES_SYSTEMD index f820d17..9bf98f7 100644 --- a/configure/RULES_SYSTEMD +++ b/configure/RULES_SYSTEMD @@ -3,11 +3,13 @@ .PHONY: sd_install sd_install.alarm-server sd_install.alarm-logger sd_install.alarm-config-logger +sd_install: + $(QUIET)echo "Currently, we disable the systemd configuration" +#sd_install: sd_install.alarm-server sd_install.alarm-logger sd_install.alarm-config-logger +# $(QUIET)$(SUDO) systemctl daemon-reload -sd_install: sd_install.alarm-server sd_install.alarm-logger sd_install.alarm-config-logger - $(QUIET)$(SUDO) systemctl daemon-reload - -sd_install.alarm-server: __sd_install.alarm-server sd_enable.alarm-server +sd_install.alarm-server: +#sd_install.alarm-server: __sd_install.alarm-server sd_enable.alarm-server __sd_install.alarm-server: $(patsubst %, __sd_install.%, $(AS_CONFIG_TOPICS)) @@ -16,14 +18,16 @@ $(patsubst %, __sd_install.%, $(AS_CONFIG_TOPICS)): __sd_install.%: % $(QUIET)$(SUDO) systemctl daemon-reload -sd_install.alarm-logger: __sd_install.alarm-logger sd_enable.alarm-logger +sd_install.alarm-logger: +#sd_install.alarm-logger: __sd_install.alarm-logger sd_enable.alarm-logger __sd_install.alarm-logger: $(QUIET)$(SUDO) install -b -m 644 $(PS_SITE_TEMPLATE_PATH)/$(TARGET_NAME_LOGGER).service $(SYSTEMD_PATH)/ $(QUIET)$(SUDO) systemctl daemon-reload -sd_install.alarm-config-logger: __sd_install.alarm-config-logger sd_enable.alarm-config-logger +sd_install.alarm-config-logger: +#sd_install.alarm-config-logger: __sd_install.alarm-config-logger sd_enable.alarm-config-logger __sd_install.alarm-config-logger: $(QUIET)$(SUDO) install -b -m 644 $(PS_SITE_TEMPLATE_PATH)/$(TARGET_NAME_CONFIGLOGGER).service $(SYSTEMD_PATH)/ @@ -32,16 +36,23 @@ __sd_install.alarm-config-logger: .PHONY: sd_clean sd_clean.alarm-server sd_clean.alarm-logger sd_clean.alarm-config-logger -sd_clean: sd_clean.alarm-server sd_clean.alarm-logger sd_clean.alarm-config-logger +sd_clean: +#sd_clean: sd_clean.alarm-server sd_clean.alarm-logger sd_clean.alarm-config-logger sd_clean.alarm-server: - rm -f $(PS_SITE_TEMPLATE_PATH)/$(TARGET_NAME_SERVER)*.service sd_clean.alarm-logger: - rm -f $(PS_SITE_TEMPLATE_PATH)/$(TARGET_NAME_LOGGER).service sd_clean.alarm-config-logger: - rm -f $(PS_SITE_TEMPLATE_PATH)/$(TARGET_NAME_CONFIGLOGGER).service + +#sd_clean.alarm-server: +# rm -f $(PS_SITE_TEMPLATE_PATH)/$(TARGET_NAME_SERVER)*.service + +#sd_clean.alarm-logger: +# rm -f $(PS_SITE_TEMPLATE_PATH)/$(TARGET_NAME_LOGGER).service + +#sd_clean.alarm-config-logger: +# rm -f $(PS_SITE_TEMPLATE_PATH)/$(TARGET_NAME_CONFIGLOGGER).service .PHONY: sd_config sd_config.alarm-server sd_config.alarm-logger sd_config.alarm-config-logger $(AS_CONFIG_TOPICS)