git://git.onelab.eu
/
nodeconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Branch 5.0 for module nodeconfig created (as new trunk) from tag nodeconfig-4.3-7
[nodeconfig.git]
/
nodeconfig.spec
diff --git
a/nodeconfig.spec
b/nodeconfig.spec
index
bb797fb
..
49ddcef
100644
(file)
--- a/
nodeconfig.spec
+++ b/
nodeconfig.spec
@@
-4,8
+4,8
@@
%define url $URL: svn+ssh://thierry@svn.planet-lab.org/svn/WWW/trunk/PLCWWW.spec $
%define name nodeconfig
%define url $URL: svn+ssh://thierry@svn.planet-lab.org/svn/WWW/trunk/PLCWWW.spec $
%define name nodeconfig
-%define version
4.3
-%define taglevel
7
+%define version
5.0
+%define taglevel
0
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@
-77,7
+77,7
@@
for dir in PlanetLabConf PLCAPI ; do
rsync -a --exclude .svn ./$dir/ $RPM_BUILD_ROOT/var/www/html/$dir/
done
rsync -a --exclude .svn ./$dir/ $RPM_BUILD_ROOT/var/www/html/$dir/
done
-# the yum area -- se db-config
+# the yum area -- se
e
db-config
# expose (fixed) myplc.repo.php as https://<plc>/yum/myplc.repo.php
install -D -m 644 ./yum/myplc.repo.php $RPM_BUILD_ROOT/var/www/html/yum/myplc.repo.php
# expose the fcdistro-dependant yum.conf as https://<plc>/yum/yum.conf
# expose (fixed) myplc.repo.php as https://<plc>/yum/myplc.repo.php
install -D -m 644 ./yum/myplc.repo.php $RPM_BUILD_ROOT/var/www/html/yum/myplc.repo.php
# expose the fcdistro-dependant yum.conf as https://<plc>/yum/yum.conf
@@
-85,6
+85,12
@@
install -D -m 644 ./yum/%{distroname}/yum.conf $RPM_BUILD_ROOT/var/www/htm
# expose the (fcdistro-dependant) stock.repo as https://<plc>/yum/stock.repo
install -D -m 644 ./yum/%{distroname}/yum.myplc.d/stock.repo $RPM_BUILD_ROOT/var/www/html/yum/stock.repo
# expose the (fcdistro-dependant) stock.repo as https://<plc>/yum/stock.repo
install -D -m 644 ./yum/%{distroname}/yum.myplc.d/stock.repo $RPM_BUILD_ROOT/var/www/html/yum/stock.repo
+# Install db-config.d files
+echo "* Installing db-config.d files"
+mkdir -p ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d
+cp db-config.d/* ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d
+chmod 444 ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d/*
+
popd
%clean
popd
%clean
@@
-101,6
+107,7
@@
chmod 700 /var/log/bm
/var/www/html/PlanetLabConf
/var/www/html/PLCAPI
/var/www/html/yum
/var/www/html/PlanetLabConf
/var/www/html/PLCAPI
/var/www/html/yum
+/etc/planetlab/db-config.d
%changelog
* Wed Dec 23 2009 Marc Fiuczynski <mef@cs.princeton.edu> - nodeconfig-4.3-7
%changelog
* Wed Dec 23 2009 Marc Fiuczynski <mef@cs.princeton.edu> - nodeconfig-4.3-7
@@
-152,4
+159,4
@@
chmod 700 /var/log/bm
- former content has moved down into PlanetLabConf
- former content has moved down into PlanetLabConf
-%define module_current_branch 4.
2
+%define module_current_branch 4.
3