Skip to content

Commit f64da6f

Browse files
committed
fixed creating example static content
1 parent 5ade61e commit f64da6f

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

script/append.make

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ local_install: local_patches
5050
mkdir -p ${DESTDIR}${SYSCONFDIR}/plugins/plugins-enabled
5151
mkdir -p ${DESTDIR}${SYSCONFDIR}/ssi
5252
cp -p thruk.conf ${DESTDIR}${SYSCONFDIR}/thruk.conf
53-
mkdir -p ${DESTDIR}${SYSCONFDIR}/usercontent/images
54-
rm -rf ${DESTDIR}${DATADIR}/root/thruk/usercontent
55-
ln -fs ${SYSCONFDIR}/usercontent ${DESTDIR}${DATADIR}/root/thruk/usercontent
56-
cp root/thruk/usercontent/images/* ${DESTDIR}${DATADIR}/root/thruk/usercontent/images/
5753
echo "do '${DATADIR}/menu.conf';" > ${DESTDIR}${SYSCONFDIR}/menu_local.conf
5854
cp -p support/thruk_local.conf.example ${DESTDIR}${SYSCONFDIR}/thruk_local.conf
5955
cp -p cgi.cfg ${DESTDIR}${SYSCONFDIR}/cgi.cfg
@@ -75,6 +71,10 @@ local_install: local_patches
7571
mkdir -p ${DESTDIR}${DATADIR}/script
7672
cp -rp lib root templates ${DESTDIR}${DATADIR}/
7773
rm -f ${DESTDIR}${DATADIR}/root/thruk/themes
74+
mkdir -p ${DESTDIR}${SYSCONFDIR}/usercontent/
75+
rm -rf ${DESTDIR}${DATADIR}/root/thruk/usercontent
76+
ln -fs ${SYSCONFDIR}/usercontent ${DESTDIR}${DATADIR}/root/thruk/
77+
cp -rp root/thruk/usercontent/* ${DESTDIR}${SYSCONFDIR}/usercontent/
7878
cp -rp support/fcgid_env.sh ${DESTDIR}${DATADIR}/
7979
chmod 755 ${DESTDIR}${DATADIR}/fcgid_env.sh
8080
cp -rp menu.conf ${DESTDIR}${DATADIR}/

support/thruk.spec

+1
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ exit 0
203203
%config(noreplace) %{_sysconfdir}/thruk/plugins
204204
%config(noreplace) %{_sysconfdir}/thruk/themes
205205
%config(noreplace) %{_sysconfdir}/thruk/menu_local.conf
206+
%config(noreplace) %{_sysconfdir}/thruk/usercontent/
206207
%attr(0755,root,root) %{_datadir}/thruk/thruk_auth
207208
%attr(0755,root,root) %{_datadir}/thruk/script/thruk_fastcgi.pl
208209
%attr(0755,root,root) %{_datadir}/thruk/script/wkhtmltopdf

0 commit comments

Comments
 (0)