From dd607f224d351d183418668bc090a53800484002 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 00:35:17 -0300 Subject: Creating multiple packages for boca Until now we had only one package for boca that contains all files. This approach is not correct since we may have multiple machines for some specific part of boca, eg, database and autojudge. This commit starts this new approach by updating Makefile, d/rules, d/*conffiles d/*postinst Signed-off-by: Bruno Cesar Ribas --- Makefile | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9246450..a0280ca 100644 --- a/Makefile +++ b/Makefile @@ -20,17 +20,26 @@ install-bocaapache: install-bocawww install-scripts: mkdir -p $(DESTDIR)/usr/sbin/ install tools/dump.sh $(DESTDIR)/usr/sbin/boca-dump - install tools/boca-createjail $(DESTDIR)/usr/sbin/boca-createjail + +install-bocadb: install tools/boca-createdb.sh $(DESTDIR)/usr/sbin/boca-createdb - install tools/boca-autojudge.sh $(DESTDIR)/usr/sbin/boca-autojudge + +install-bocacommon: + mkdir -p $(DESTDIR)/usr/sbin/ + mkdir -p $(DESTDIR)/etc/ + cp tools/boca.conf $(DESTDIR)/etc/ install tools/boca-config-dbhost.sh $(DESTDIR)/usr/sbin/boca-config-dbhost -install: install-bocawww install-bocaapache install-scripts tools/safeexec +install-bocaautojudge: tools/safeexec + mkdir -p $(DESTDIR)/usr/sbin/ mkdir -p $(DESTDIR)/usr/bin/ mkdir -p $(DESTDIR)/etc/ - cp tools/boca.conf $(DESTDIR)/etc/ install tools/safeexec $(DESTDIR)/usr/bin/safeexec chmod 4555 $(DESTDIR)/usr/bin/safeexec + install tools/boca-createjail $(DESTDIR)/usr/sbin/boca-createjail + install tools/boca-autojudge.sh $(DESTDIR)/usr/sbin/boca-autojudge + +install: install-bocawww install-bocaapache install-bocadb install-bocacommon install-bocaautojudge install-scripts install-submission-tools: tools/boca-submit-run-root-wrapper mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/sbin $(DESTDIR)/etc/cron.d -- cgit v1.2.3 From 3195e008a2ce7e0fa92766bb8cefdd182b98df9e Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 15:21:23 -0300 Subject: Makefile: Fix install-bocadb Signed-off-by: Bruno Cesar Ribas --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a0280ca..683bf37 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,7 @@ install-scripts: install tools/dump.sh $(DESTDIR)/usr/sbin/boca-dump install-bocadb: + mkdir -p $(DESTDIR)/usr/sbin/ install tools/boca-createdb.sh $(DESTDIR)/usr/sbin/boca-createdb install-bocacommon: -- cgit v1.2.3 From e9f46cd4aa43ee1b76faeed55f0eaf6945c237b7 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 21:06:07 -0300 Subject: boca-common now holds all /var/www/boca files Files are too tightened to be separated for now. In a future release we will work to make things more independent. Signed-off-by: Bruno Cesar Ribas --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 683bf37..ae49c78 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ install-bocawww: cp -r src $(DESTDIR)/var/www/boca/ cp -r doc $(DESTDIR)/var/www/boca/ -install-bocaapache: install-bocawww +install-bocaapache: mkdir -p $(DESTDIR)/etc/apache2/sites-enabled/ cp tools/000-boca.conf $(DESTDIR)/etc/apache2/sites-enabled/000-boca.conf a2ensite default-ssl || echo a2ensite default-ssl FAILED @@ -25,7 +25,7 @@ install-bocadb: mkdir -p $(DESTDIR)/usr/sbin/ install tools/boca-createdb.sh $(DESTDIR)/usr/sbin/boca-createdb -install-bocacommon: +install-bocacommon: install-bocawww mkdir -p $(DESTDIR)/usr/sbin/ mkdir -p $(DESTDIR)/etc/ cp tools/boca.conf $(DESTDIR)/etc/ -- cgit v1.2.3 From 2b3a3f47808b4024c703d4a4458f06483a8c40cb Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Thu, 23 Aug 2018 10:11:09 -0300 Subject: install-bocadb: Installs files to postgresql Config files to postgresql are simply copied. When installing from Debian package it will prompt the user what to do with the pg_hba.conf Signed-off-by: Bruno Cesar Ribas --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ae49c78..db7c68c 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,8 @@ install-scripts: install-bocadb: mkdir -p $(DESTDIR)/usr/sbin/ + mkdir -p $(DESTDIR)/etc + cp -r tools/postgresql $(DESTDIR)/etc install tools/boca-createdb.sh $(DESTDIR)/usr/sbin/boca-createdb install-bocacommon: install-bocawww -- cgit v1.2.3