Skip to content

Commit b8dcb12

Browse files
committed
packaging: updated config files
1 parent b5c0ba1 commit b8dcb12

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Diff for: packaging/conf/dump.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
require 'nokogiri'; data = File.read('template.xml'); doc = Nokogiri::XML(data); doc.xpath('//item').each {|e| item_doc = Nokogiri::XML(e.to_s); name = item_doc.xpath('//name').to_s; key = item_doc.xpath('//key').to_s; puts "'#{name}': #{key}".sub('<key>', '').sub('</key>','').sub('<name>','').sub('</name>', '').sub('<name>Mamonsu PostgreSQL Linux</name>','') if name != "" }
1+
require 'nokogiri'; data = File.read('template_linux.xml'); doc = Nokogiri::XML(data); doc.xpath('//item').each {|e| item_doc = Nokogiri::XML(e.to_s); name = item_doc.xpath('//name').to_s; key = item_doc.xpath('//key').to_s; puts "'#{name}': #{key}".sub('<key>', '').sub('</key>','').sub('<name>','').sub('</name>', '').sub('<name>Mamonsu PostgreSQL Linux</name>','') if name != "" }

Diff for: packaging/debian/postinst

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if [ "$1" = "configure" ]; then
1818

1919
mkdir -p /etc/mamonsu/plugins
2020
touch /etc/mamonsu/plugins/__init__.py
21-
[ -f /etc/mamonsu/agent.conf ] || cp /usr/share/mamonsu/example.conf /etc/mamonsu/agent.conf
21+
[ -f /etc/mamonsu/agent.conf ] || cp /usr/share/mamonsu/example_linux.conf /etc/mamonsu/agent.conf
2222

2323
chown mamonsu:mamonsu /var/log/mamonsu
2424
chown mamonsu:mamonsu /var/lib/mamonsu

Diff for: packaging/debian/rules

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ install: build
2727
binary-indep: build install
2828
dh_testdir -i
2929
dh_testroot -i
30-
install -m 0644 packaging/conf/example.conf debian/mamonsu/usr/share/mamonsu
30+
install -m 0644 packaging/conf/example_linux.conf debian/mamonsu/usr/share/mamonsu
3131
dh_installchangelogs -i
3232
dh_installinit -i
3333
dh_installdebconf -i

Diff for: packaging/rpm/SPECS/mamonsu.spec

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ export PYTHONPATH=%{buildroot}%{python3_sitelib}
3030
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/logrotate.d
3131
%{__mkdir} -p %{buildroot}/%{_datarootdir}/%{name}
3232

33-
%{__install} -m 0644 -p packaging/conf/example.conf %{buildroot}/%{_sysconfdir}/%{name}/agent.conf
34-
%{__install} -m 0644 -p packaging/conf/template.xml %{buildroot}/%{_datarootdir}/%{name}/template.xml
33+
%{__install} -m 0644 -p packaging/conf/example_linux.conf %{buildroot}/%{_sysconfdir}/%{name}/agent.conf
34+
%{__install} -m 0644 -p packaging/conf/template_linux.xml %{buildroot}/%{_datarootdir}/%{name}/template.xml
3535
%{__install} -m 0644 -p examples/*.py %{buildroot}/%{_datarootdir}/%{name}/
3636
%{__install} -m 0755 -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/init.d/%{name}
3737
%{__install} -m 0644 -p %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}

0 commit comments

Comments
 (0)