Changeset: f8fff5403988 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8fff5403988
Modified Files:
Branch: Jun2010
Log Message:
Merge heads.
diffs (92 lines):
diff -r 5343927ddb65 -r f8fff5403988 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Wed Jul 21 22:08:27 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Thu Jul 22 09:47:29 2010 +0200
@@ -136,7 +136,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB4
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB4/dbfarm
# insert example db here!
# cleanup stuff we don't want to install
@@ -190,8 +190,9 @@
%{_libdir}/MonetDB4/lib/*.so*
%{_libdir}/MonetDB4/*.mil
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB4
+%attr(750,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB4
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB4/dbfarm
%config(noreplace) %{_sysconfdir}/MonetDB.conf
diff -r 5343927ddb65 -r f8fff5403988 MonetDB4/debian/monetdb4-server.dirs
--- a/MonetDB4/debian/monetdb4-server.dirs Wed Jul 21 22:08:27 2010 +0200
+++ b/MonetDB4/debian/monetdb4-server.dirs Thu Jul 22 09:47:29 2010 +0200
@@ -1,1 +1,2 @@
/var/MonetDB4
+/var/MonetDB4/dbfarm
diff -r 5343927ddb65 -r f8fff5403988 MonetDB4/debian/monetdb4-server.postinst
--- a/MonetDB4/debian/monetdb4-server.postinst Wed Jul 21 22:08:27 2010 +0200
+++ b/MonetDB4/debian/monetdb4-server.postinst Thu Jul 22 09:47:29 2010 +0200
@@ -10,9 +10,9 @@
if ! getent passwd monetdb > /dev/null; then
adduser --system --ingroup monetdb --home /var/lib/monetdb
--disabled-password --shell /usr/sbin/nologin monetdb
fi
- mkdir -p /var/MonetDB4
- chown monetdb:monetdb /var/MonetDB4
- chmod ug=rwx,o= /var/MonetDB4
+ mkdir -p /var/MonetDB4/dbfarm
+ chown monetdb:monetdb /var/MonetDB4 /var/MonetDB4/dbfarm
+ chmod ug=rwx,g+s,o= /var/MonetDB4 /var/MonetDB4/dbfarm
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff -r 5343927ddb65 -r f8fff5403988 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Wed Jul 21 22:08:27 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Thu Jul 22 09:47:29 2010 +0200
@@ -133,7 +133,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB5
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB5/dbfarm
# insert example db here!
# cleanup stuff we don't want to install
@@ -184,8 +184,9 @@
%dir %{_libdir}/MonetDB5/autoload
%{_libdir}/MonetDB5/autoload/*xml*.mal
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5
+%attr(750,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5/dbfarm
%config(noreplace) %{_sysconfdir}/monetdb5.conf
%{_mandir}/man5/monetdb5.conf.5.gz
diff -r 5343927ddb65 -r f8fff5403988 MonetDB5/debian/monetdb5-server.dirs
--- a/MonetDB5/debian/monetdb5-server.dirs Wed Jul 21 22:08:27 2010 +0200
+++ b/MonetDB5/debian/monetdb5-server.dirs Thu Jul 22 09:47:29 2010 +0200
@@ -1,1 +1,2 @@
/var/MonetDB5
+/var/MonetDB5/dbfarm
diff -r 5343927ddb65 -r f8fff5403988 MonetDB5/debian/monetdb5-server.postinst
--- a/MonetDB5/debian/monetdb5-server.postinst Wed Jul 21 22:08:27 2010 +0200
+++ b/MonetDB5/debian/monetdb5-server.postinst Thu Jul 22 09:47:29 2010 +0200
@@ -10,9 +10,9 @@
if ! getent passwd monetdb > /dev/null; then
adduser --system --ingroup monetdb --home /var/lib/monetdb
--disabled-password --shell /usr/sbin/nologin monetdb
fi
- mkdir -p /var/MonetDB5
- chown monetdb:monetdb /var/MonetDB5
- chmod ug=rwx,o= /var/MonetDB5
+ mkdir -p /var/MonetDB5/dbfarm
+ chown monetdb:monetdb /var/MonetDB5 /var/MonetDB5/dbfarm
+ chmod ug=rwx,g+s,o= /var/MonetDB5 /var/MonetDB5/dbfarm
;;
abort-upgrade|abort-remove|abort-deconfigure)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
