prepare packaging

centreon · Nov 16, 2021 · 8cb5242 · 8cb5242
1 parent 5a9de3e
commit 8cb5242
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/connector.as400.install/etc/log4j.xml b/connector.as400.install/etc/log4j.xml
@@ -23,7 +23,7 @@
     </appender>
 
     <appender name="rollingsize" class="org.apache.log4j.RollingFileAppender">
-        <param name="File" value="${CONNECTOR_LOG}/centreon-as400" />
+        <param name="File" value="${CONNECTOR_LOG}/connector.log" />
         <param name="MaxFileSize" value="5MB" />
         <param name="MaxBackupIndex" value="10" />
 

diff --git a/rpm/centreon-plugin-Operatingsystems-AS400-daemon.spectemplate b/rpm/centreon-plugin-Operatingsystems-AS400-daemon.spectemplate
@@ -22,14 +22,14 @@ Centreon Connector Server for AS400
 
 find .     \
     -type f \
-    -exec %{__grep} -E '(@@CONNECTOR_HOME@@)|(@@CONNECTOR_ETC@@)|(@@CONNECTOR_LOG@@)|(@@CONNECTOR_USER@@)' {} ';'   \
+    -exec %{__grep} -E '(@CONNECTOR_VERSION@)|(@CONNECTOR_HOME@)|(@CONNECTOR_ETC@)|(@CONNECTOR_LOG@)|(@CONNECTOR_USER@)|(@JAVA_BIN@)' {} ';'   \
     -exec %{__sed} -i \
-    -e 's|@@CONNECTOR_VERSION@@|'"%{version}"'|g' \
-	-e 's|@@CONNECTOR_HOME@@|'"%{_datadir}/centreon-as400"'|g' \
-	-e 's|@@CONNECTOR_ETC@@|'"/etc/centreon-as400/"'|g' \
-	-e 's|@@CONNECTOR_LOG@@|'"/var/log/centreon-as400/"'|g' \
-	-e 's|@@CONNECTOR_USER@@|'"centreon-as400"'|g' \
-    -e 's|@@JAVA_BIN@@|'"/usr/bin/java"'|g' \
+    -e 's|@CONNECTOR_VERSION@|'"%{version}"'|g' \
+	-e 's|@CONNECTOR_HOME@|'"%{_datadir}/centreon-as400"'|g' \
+	-e 's|@CONNECTOR_ETC@|'"/etc/centreon-as400/"'|g' \
+	-e 's|@CONNECTOR_LOG@|'"/var/log/centreon-as400/"'|g' \
+	-e 's|@CONNECTOR_USER@|'"centreon-as400"'|g' \
+    -e 's|@JAVA_BIN@|'"/usr/bin/java"'|g' \
     {} ';'
 
 %build
@@ -39,16 +39,17 @@ mvn -f connector.as400/pom.xml clean install
 rm -rf %{buildroot}
 
 %{__install} -d %{buildroot}%{_datadir}/centreon-as400/bin
-%{__cp} connector.as400/target/centreon-as400-%{version}-jar-with-dependencies.jar $RPM_BUILD_ROOT%{_datadir}/centreon-as400/bin
+%{__cp} connector.as400/target/centreon-as400-%{version}-jar-with-dependencies.jar %{buildroot}%{_datadir}/centreon-as400/bin
 
+%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/systemd/system/
 %{__cp} connector.as400.install/init-script/centreon-as400.service %{buildroot}%{_sysconfdir}/systemd/system/
 
 %{__install} -d %{buildroot}%{_sysconfdir}/sysconfig
 %{__cp} connector.as400.install/init-script/centreon-as400-sysconfig %{buildroot}%{_sysconfdir}/sysconfig/centreon-as400
 
 %{__install} -d %{buildroot}%{_sysconfdir}/centreon-as400
-%{__cp} connector.as400.install/init-script/etc/config.properties %{buildroot}%{_sysconfdir}/centreon-as400
-%{__cp} connector.as400.install/init-script/etc/log4j.xml %{buildroot}%{_sysconfdir}/centreon-as400
+%{__cp} connector.as400.install/etc/config.properties %{buildroot}%{_sysconfdir}/centreon-as400
+%{__cp} connector.as400.install/etc/log4j.xml %{buildroot}%{_sysconfdir}/centreon-as400
 
 %clean
 rm -rf %{buildroot}