You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by el...@apache.org on 2017/01/11 21:34:28 UTC
[4/8] incubator-trafficcontrol git commit: move index.html and
sorttable.js to static dir
move index.html and sorttable.js to static dir
(cherry picked from commit 7afbf26f95a73e0d71e28a438bf2d015a0f0bc63)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c2a2d049
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c2a2d049
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c2a2d049
Branch: refs/heads/master
Commit: c2a2d04912ffc848fb62e63b2c3af4bcc7588784
Parents: fcf2642
Author: David Neuman <da...@gmail.com>
Authored: Mon Jan 9 21:40:54 2017 +0000
Committer: David Neuman <da...@gmail.com>
Committed: Wed Jan 11 16:01:49 2017 +0000
----------------------------------------------------------------------
traffic_monitor/experimental/build/traffic_monitor.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c2a2d049/traffic_monitor/experimental/build/traffic_monitor.spec
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/build/traffic_monitor.spec b/traffic_monitor/experimental/build/traffic_monitor.spec
index 181394b..2351379 100644
--- a/traffic_monitor/experimental/build/traffic_monitor.spec
+++ b/traffic_monitor/experimental/build/traffic_monitor.spec
@@ -73,6 +73,7 @@ mkdir -p "${RPM_BUILD_ROOT}"/opt/traffic_monitor
mkdir -p "${RPM_BUILD_ROOT}"/opt/traffic_monitor/bin
mkdir -p "${RPM_BUILD_ROOT}"/opt/traffic_monitor/conf
mkdir -p "${RPM_BUILD_ROOT}"/opt/traffic_monitor/backup
+mkdir -p "${RPM_BUILD_ROOT}"/opt/traffic_monitor/static
mkdir -p "${RPM_BUILD_ROOT}"/opt/traffic_monitor/var/run
mkdir -p "${RPM_BUILD_ROOT}"/opt/traffic_monitor/var/log
mkdir -p "${RPM_BUILD_ROOT}"/etc/init.d
@@ -80,8 +81,8 @@ mkdir -p "${RPM_BUILD_ROOT}"/etc/logrotate.d
src=src/github.com/apache/incubator-trafficcontrol/traffic_monitor/experimental
cp -p "$src"/traffic_monitor/traffic_monitor "${RPM_BUILD_ROOT}"/opt/traffic_monitor/bin/traffic_monitor
-cp "$src"/traffic_monitor/index.html "${RPM_BUILD_ROOT}"/opt/traffic_monitor/bin/index.html
-cp "$src"/traffic_monitor/sorttable.js "${RPM_BUILD_ROOT}"/opt/traffic_monitor/bin/sorttable.js
+cp "$src"/traffic_monitor/index.html "${RPM_BUILD_ROOT}"/opt/traffic_monitor/static/index.html
+cp "$src"/traffic_monitor/sorttable.js "${RPM_BUILD_ROOT}"/opt/traffic_monitor/static/sorttable.js
cp "$src"/conf/traffic_ops.cfg "${RPM_BUILD_ROOT}"/opt/traffic_monitor/conf/traffic_ops.cfg
cp "$src"/conf/traffic_monitor.cfg "${RPM_BUILD_ROOT}"/opt/traffic_monitor/conf/traffic_monitor.cfg
cp "$src"/build/traffic_monitor.init "${RPM_BUILD_ROOT}"/etc/init.d/traffic_monitor
@@ -125,11 +126,13 @@ fi
%dir /opt/traffic_monitor/bin
%dir /opt/traffic_monitor/conf
%dir /opt/traffic_monitor/backup
+%dir /opt/traffic_monitor/static
%dir /opt/traffic_monitor/var
%dir /opt/traffic_monitor/var/log
%dir /opt/traffic_monitor/var/run
%attr(600, traffic_monitor, traffic_monitor) /opt/traffic_monitor/conf/*
+%attr(600, traffic_monitor, traffic_monitor) /opt/traffic_monitor/static/*
%attr(755, traffic_monitor, traffic_monitor) /opt/traffic_monitor/bin/*
%attr(755, traffic_monitor, traffic_monitor) /etc/init.d/traffic_monitor