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 --- debian/boca-web.conffiles | 1 + debian/boca-web.postinst | 11 +++++++++ debian/boca.conffiles | 1 - debian/boca.postinst | 11 --------- debian/compat | 2 +- debian/control | 59 +++++++++++++++++++++++++++++++++++++---------- debian/postinst | 6 ----- debian/rules | 6 +++-- 8 files changed, 64 insertions(+), 33 deletions(-) create mode 100644 debian/boca-web.conffiles create mode 100644 debian/boca-web.postinst delete mode 100644 debian/boca.conffiles delete mode 100644 debian/boca.postinst delete mode 100644 debian/postinst (limited to 'debian') diff --git a/debian/boca-web.conffiles b/debian/boca-web.conffiles new file mode 100644 index 0000000..b004c7a --- /dev/null +++ b/debian/boca-web.conffiles @@ -0,0 +1 @@ +/var/www/boca/src/private/conf.php diff --git a/debian/boca-web.postinst b/debian/boca-web.postinst new file mode 100644 index 0000000..18ce749 --- /dev/null +++ b/debian/boca-web.postinst @@ -0,0 +1,11 @@ +#!/bin/bash + +chown -R www-data.www-data /var/www/boca +chmod -R go-rwx /var/www/boca/src/private +chmod 4555 /usr/bin/safeexec + +a2ensite default-ssl +a2enmod ssl +a2enmod socache_shmcb + +service apache2 restart || true diff --git a/debian/boca.conffiles b/debian/boca.conffiles deleted file mode 100644 index b004c7a..0000000 --- a/debian/boca.conffiles +++ /dev/null @@ -1 +0,0 @@ -/var/www/boca/src/private/conf.php diff --git a/debian/boca.postinst b/debian/boca.postinst deleted file mode 100644 index 18ce749..0000000 --- a/debian/boca.postinst +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -chown -R www-data.www-data /var/www/boca -chmod -R go-rwx /var/www/boca/src/private -chmod 4555 /usr/bin/safeexec - -a2ensite default-ssl -a2enmod ssl -a2enmod socache_shmcb - -service apache2 restart || true diff --git a/debian/compat b/debian/compat index 7f8f011..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/debian/control b/debian/control index fbac1f3..f3fdd17 100644 --- a/debian/control +++ b/debian/control @@ -2,24 +2,59 @@ Source: boca Section: misc Priority: optional Maintainer: BOCA Development Team +Uploaders: Cassio Polpo de Campos , Bruno Cesar Ribas Build-Depends: debhelper, build-essential -Package: maratona-boca -Architecture: all -Depends: boca -Description: Virtual package that depends on BOCA - Package: boca -Architecture: amd64 -Depends: php-zip, debootstrap, schroot, quotatool, makepasswd, apache2, libapache2-mod-php, sharutils, wget, coreutils, php, php-cli, php-mcrypt, php-pgsql, php-gd, postgresql, postgresql-client, libany-uri-escape-perl, php-xml +Architecture: all +Depends: boca-common, boca-web, boca-db, boca-autojudge +Provides: maratona-boca Description: BOCA is a software created to control a contest with the ACM ICPC rules. BOCA is a software created to control a contest with the ACM International Collegiate Programming Contest rules. It has been developed in PHP and the interaction between judges and the system is done through a web browser. + . + This package install all boca related packages to run everything in one + single machine. + +Package: boca-db +Architecture: all +Pre-depends: postgresql +Depends: boca-common +Description: BOCA - database + BOCA is a software created to control a contest with the ACM International + Collegiate Programming Contest rules. It has been developed in PHP and the + interaction between judges and the system is done through a web browser. + . + This package provides a full database to run a contest on. + +Package: boca-web +Architecture: all +Depends: boca-common, apache2, php, php-fpm +Description: BOCA - WEB files + BOCA is a software created to control a contest with the ACM International + Collegiate Programming Contest rules. It has been developed in PHP and the + interaction between judges and the system is done through a web browser. + . + This package provides only web contents. -Package: boca-submission-tools +Package: boca-common +Architecture: all +Depends: php-zip, makepasswd, sharutils, wget, coreutils, php-cli, php-mcrypt, php-pgsql, php-gd, postgresql-client +Description: BOCA - Common files + BOCA is a software created to control a contest with the ACM International + Collegiate Programming Contest rules. It has been developed in PHP and the + interaction between judges and the system is done through a web browser. + . + This package contains shared files with all BOCA packages. + +Package: boca-autojudge Architecture: amd64 -Depends: sharutils, wget, coreutils, libany-uri-escape-perl, openssl, openssh-server -Description: BOCA submission tools. - This package provides tools to submit codes to a running boca server - without using the web interface. +Depends: boca-common, debootstrap, schroot, quotatool, makepasswd +Description: BOCA - AutoJudge + BOCA is a software created to control a contest with the ACM International + Collegiate Programming Contest rules. It has been developed in PHP and the + interaction between judges and the system is done through a web browser. + . + This package contains files to generate and run the autojudge system for + BOCA. diff --git a/debian/postinst b/debian/postinst deleted file mode 100644 index 65e238f..0000000 --- a/debian/postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -chown -R www-data.www-data /var/www/boca -chmod 4555 /usr/bin/safeexec - -service apache2 restart || true diff --git a/debian/rules b/debian/rules index 6c52a63..eedb9d1 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,10 @@ override_dh_auto_install: mkdir -p debian/boca-submission-tools make -j1 install-submission-tools DESTDIR=debian/boca-submission-tools - mkdir -p debian/boca - make -j1 install DESTDIR=debian/boca + mkdir -p debian/boca-web + make -j1 install-bocaapache DESTDIR=debian/boca-web + mkdir -p debian/boca-autojudge + make -j1 install-bocaautojudge DESTDIR=debian/boca-autojudge %: dh $@ -- cgit v1.2.3 From 46f35d10395eb6f4c3132379ea397448f8a6533c Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 10:49:13 -0300 Subject: d/control: Remove php-mcrypt dependency php-mcrypt is deprecated and another cryptographic library should be used. Signed-off-by: Bruno Cesar Ribas --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index f3fdd17..9235bdf 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,7 @@ Description: BOCA - WEB files Package: boca-common Architecture: all -Depends: php-zip, makepasswd, sharutils, wget, coreutils, php-cli, php-mcrypt, php-pgsql, php-gd, postgresql-client +Depends: php-zip, makepasswd, sharutils, wget, coreutils, php-cli, php-pgsql, php-gd, postgresql-client Description: BOCA - Common files BOCA is a software created to control a contest with the ACM International Collegiate Programming Contest rules. It has been developed in PHP and the -- cgit v1.2.3 From efa3a56d8f745c574ce66ddec52ea02fc2c64684 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 15:21:47 -0300 Subject: d/rules: Add bocadb and boca-common files Signed-off-by: Bruno Cesar Ribas --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/rules b/debian/rules index eedb9d1..3453dd0 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,10 @@ override_dh_auto_install: make -j1 install-bocaapache DESTDIR=debian/boca-web mkdir -p debian/boca-autojudge make -j1 install-bocaautojudge DESTDIR=debian/boca-autojudge + mkdir -p debian/boca-db + make -j1 install-bocadb DESTDIR=debian/boca-db + mkdir -p debian/boca-common + make -j1 install-bocacommon DESTDIR=debian/boca-common %: dh $@ -- cgit v1.2.3 From fec3098279220d067f72a3b386fd679c58e43899 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 15:27:10 -0300 Subject: d/boca-web.postinst: Add commands to enable php-fpm Signed-off-by: Bruno Cesar Ribas --- debian/boca-web.postinst | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/boca-web.postinst b/debian/boca-web.postinst index 18ce749..60899b7 100644 --- a/debian/boca-web.postinst +++ b/debian/boca-web.postinst @@ -7,5 +7,12 @@ chmod 4555 /usr/bin/safeexec a2ensite default-ssl a2enmod ssl a2enmod socache_shmcb +a2enmod proxy_fcgi + +# Make sure embedded apache php module is not loaded +a2dismod php7.2 || true + +#enable php fpm instead +a2enconf php7.2-fpm service apache2 restart || true -- cgit v1.2.3 From 2b7d34704dae513c2a1ff9a19ec7013d06913cd3 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 15:54:54 -0300 Subject: d/boca-autojudge.postinst: Adds suid to safeexec Signed-off-by: Bruno Cesar Ribas --- debian/boca-autojudge.postinst | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 debian/boca-autojudge.postinst (limited to 'debian') diff --git a/debian/boca-autojudge.postinst b/debian/boca-autojudge.postinst new file mode 100644 index 0000000..37b144c --- /dev/null +++ b/debian/boca-autojudge.postinst @@ -0,0 +1,5 @@ +#!/bin/bash + +chmod 4555 /usr/bin/safeexec + +exit 0 -- cgit v1.2.3 From 890961b390d76d45691a518bc1ff58b650af8c16 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 15:55:20 -0300 Subject: d/boca-web.postinst: Remove line regarding safeexec safeexec is now part of boca-autojudge package Signed-off-by: Bruno Cesar Ribas --- debian/boca-web.postinst | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/boca-web.postinst b/debian/boca-web.postinst index 60899b7..49061af 100644 --- a/debian/boca-web.postinst +++ b/debian/boca-web.postinst @@ -2,7 +2,6 @@ chown -R www-data.www-data /var/www/boca chmod -R go-rwx /var/www/boca/src/private -chmod 4555 /usr/bin/safeexec a2ensite default-ssl a2enmod ssl -- cgit v1.2.3 From 97b57f14dee0a6ffb8b5f3c3e3397c86858c50c5 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 15:56:08 -0300 Subject: d/control: Swap php and php-fpm dependency order This is done in order to avoid installation of libapache2-mod-php7.2. Signed-off-by: Bruno Cesar Ribas --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 9235bdf..a795ea3 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Description: BOCA - database Package: boca-web Architecture: all -Depends: boca-common, apache2, php, php-fpm +Depends: boca-common, apache2, php-fpm, php Description: BOCA - WEB files BOCA is a software created to control a contest with the ACM International Collegiate Programming Contest rules. It has been developed in PHP and the -- 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 --- debian/boca-common.conffiles | 1 + debian/boca-web.conffiles | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 debian/boca-common.conffiles delete mode 100644 debian/boca-web.conffiles (limited to 'debian') diff --git a/debian/boca-common.conffiles b/debian/boca-common.conffiles new file mode 100644 index 0000000..b004c7a --- /dev/null +++ b/debian/boca-common.conffiles @@ -0,0 +1 @@ +/var/www/boca/src/private/conf.php diff --git a/debian/boca-web.conffiles b/debian/boca-web.conffiles deleted file mode 100644 index b004c7a..0000000 --- a/debian/boca-web.conffiles +++ /dev/null @@ -1 +0,0 @@ -/var/www/boca/src/private/conf.php -- cgit v1.2.3 From 8e4d19dcd0b6d99e0e0f52f8b0a9bcd28a9de62a Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Thu, 23 Aug 2018 11:07:38 -0300 Subject: debconf, makepasswd, coreutils, sharutils are now pre-depends of boca-common Signed-off-by: Bruno Cesar Ribas --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index a795ea3..d0e61ff 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,8 @@ Description: BOCA - WEB files Package: boca-common Architecture: all -Depends: php-zip, makepasswd, sharutils, wget, coreutils, php-cli, php-pgsql, php-gd, postgresql-client +Pre-Depends: debconf, makepasswd, coreutils, sharutils +Depends: php-zip, wget, php-cli, php-pgsql, php-gd, postgresql-client Description: BOCA - Common files BOCA is a software created to control a contest with the ACM International Collegiate Programming Contest rules. It has been developed in PHP and the -- cgit v1.2.3 From 009899084bd9beb7f9a9f94925b60f194e0889a2 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Thu, 23 Aug 2018 11:30:54 -0300 Subject: d/control: Adds boca-submission-tools package Signed-off-by: Bruno Cesar Ribas --- debian/control | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/control b/debian/control index d0e61ff..3a5671b 100644 --- a/debian/control +++ b/debian/control @@ -59,3 +59,11 @@ Description: BOCA - AutoJudge . This package contains files to generate and run the autojudge system for BOCA. + +Package: boca-submission-tools +Architecture: amd64 +Depends: sharutils, wget, coreutils, libany-uri-escape-perl, openssl, openssh-server +Description: BOCA submission tools. + This package provides tools to submit codes to a running boca server + without using the web interface. + -- cgit v1.2.3 From 9afc0704ec837e6b3ef584ce0e66528b8a2cfa10 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Thu, 23 Aug 2018 11:31:42 -0300 Subject: d/boca-common.{postinst,templates}: Adds new postinst This version will prompt user for a DB hostname and password Signed-off-by: Bruno Cesar Ribas --- debian/boca-common.postinst | 43 +++++++++++++++++++++++++++++++++++++++++++ debian/boca-common.templates | 10 ++++++++++ 2 files changed, 53 insertions(+) create mode 100644 debian/boca-common.postinst create mode 100644 debian/boca-common.templates (limited to 'debian') diff --git a/debian/boca-common.postinst b/debian/boca-common.postinst new file mode 100644 index 0000000..f6c61cd --- /dev/null +++ b/debian/boca-common.postinst @@ -0,0 +1,43 @@ +#!/bin/bash + +set -e + +. /usr/share/debconf/confmodule + +priority=high + +case "$1" in + configure|reconfigure) + db_input high boca-common/dbhost || true + db_go || true + + db_get boca-common/dbhost || true + DBHOST="$RET" + + if [[ "x$DBHOST" == "x" ]]; then + DBHOST=localhost + fi + + db_input high boca-common/dbpassword || true + db_go || true + + db_get boca-common/dbpassword || true + PASSWORD="$RET" + + if [[ "x$PASSWORD" == "x" ]]; then + printf "Generating password with makepasswd" + PASSWORD="$(makepasswd --chars 20)" + echo . + fi + export PASSWD="$PASSWORD" + boca-config-dbhost $DBHOST + unset PASSWD + ;; + *) + ;; +esac + +chmod 600 /var/www/boca/src/private/conf.php +chown www-data.www-data /var/www/boca/src/private/conf.php + +exit 0 diff --git a/debian/boca-common.templates b/debian/boca-common.templates new file mode 100644 index 0000000..e993675 --- /dev/null +++ b/debian/boca-common.templates @@ -0,0 +1,10 @@ +Template: boca-common/dbhost +Type: string +Default: localhost +Description: Please provide a host within BOCA database: + +Template: boca-common/dbpassword +Type: password +Description: Please provide a password for BOCA database: + Please, do not forget this password. You will need it to provide it while + configuring boca-web and boca-autojudge. -- cgit v1.2.3 From 70299e4fea03568965e14026e3bf810e9ed2ef08 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Thu, 23 Aug 2018 11:32:31 -0300 Subject: d/boca-web.posinst: Resets stored password in debconf This is a security measure to avoid DB password in multiple files Signed-off-by: Bruno Cesar Ribas --- debian/boca-web.postinst | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/boca-web.postinst b/debian/boca-web.postinst index 49061af..52071f4 100644 --- a/debian/boca-web.postinst +++ b/debian/boca-web.postinst @@ -1,5 +1,7 @@ #!/bin/bash +. /usr/share/debconf/confmodule + chown -R www-data.www-data /var/www/boca chmod -R go-rwx /var/www/boca/src/private @@ -15,3 +17,8 @@ a2dismod php7.2 || true a2enconf php7.2-fpm service apache2 restart || true + +#remember to reset possible stored password from debconf +db_reset boca-common/dbpassword || true + +exit 0 -- cgit v1.2.3 From 59a32fa0c982c04d377be12d358c52bb08f1e421 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Thu, 23 Aug 2018 11:33:16 -0300 Subject: d/boca-db.{postinst,templates}: New postinst This postinst will prompt the user for a DB password and will configure postgresql accordingly Signed-off-by: Bruno Cesar Ribas --- debian/boca-db.postinst | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ debian/boca-db.templates | 11 ++++++++ 2 files changed, 77 insertions(+) create mode 100644 debian/boca-db.postinst create mode 100644 debian/boca-db.templates (limited to 'debian') diff --git a/debian/boca-db.postinst b/debian/boca-db.postinst new file mode 100644 index 0000000..8a36f55 --- /dev/null +++ b/debian/boca-db.postinst @@ -0,0 +1,66 @@ +#!/bin/bash + +set -e + +. /usr/share/debconf/confmodule + +priority=high + +case "$1" in + configure|reconfigure) + + #Assume DBHOST will be localhost, since this is the package that + #provides postgresql + #XXX future work make it work as a backup DB server + DBHOST=localhost + + db_get boca-common/dbpassword || true + PASSWORD="$RET" + + #If we don't have a password from boca-common 2 things could be + #happened + #1) dpkg cleaned the password already + #2) The user did not provide a password + #So we will ask for a password + if [[ "x$PASSWORD" == "x" ]]; then + db_input critical boca-db/dbpassword || true + db_go || true + db_get boca-db/dbpassword || true + PASSWORD="$RET" + db_reset boca-db/dbpassword + else + db_reset boca-common/dbpassword + fi + + if [[ "x$PASSWORD" == "x" ]]; then + printf "Generating password with makepasswd" + PASSWORD="$(makepasswd --chars 20)" + echo . + echo "Your DB password is '$PASSWORD' take care of it." + fi + export PASSWD="$PASSWORD" + boca-config-dbhost $DBHOST + unset PASSWD + postgresuser=postgres + su - $postgresuser -c "echo drop user bocauser | psql -d template1 >/dev/null 2>/dev/null" + su - $postgresuser -c "echo create user bocauser createdb password \'$PASSWORD\'| psql -d template1" + su - $postgresuser -c "echo alter user bocauser createdb password \'$PASSWORD\'| psql -d template1" + + db_input critical boca-db/createdb || true + db_go || true + + db_get boca-db/createdb || true + + if [[ "$RET" == "Yes" ]]; then + echo YES |php /var/www/boca/src/private/createdb.php + fi + db_reset boca-db/createdb + + ;; + *) + ;; +esac + +service postgresql restart || true + +exit 0 diff --git a/debian/boca-db.templates b/debian/boca-db.templates new file mode 100644 index 0000000..895098d --- /dev/null +++ b/debian/boca-db.templates @@ -0,0 +1,11 @@ +Template: boca-db/dbpassword +Type: password +Description: Please provide a password for BOCA database: + Please, do not forget this password. You will need it to provide it while + configuring boca-web and boca-autojudge. + +Template: boca-db/createdb +Type: select +Choices: Yes, No +Description: Should a new DB be created for BOCA? + Warning: This operation will erase any existing previously created BOCA DB -- cgit v1.2.3 From 9f05ae47d104864162f264fe6415d73797e039bd Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Thu, 23 Aug 2018 23:25:23 -0300 Subject: d/boca-{common,db}.postinst: Avoid asking same question on upgrade From now on the user must remove lines containing 'bdserver' or 'bdcreated in /etc/boca.conf in order to modify the DB password and the DB hostname. Signed-off-by: Bruno Cesar Ribas --- debian/boca-common.postinst | 7 +++++++ debian/boca-db.postinst | 9 +++++++++ 2 files changed, 16 insertions(+) (limited to 'debian') diff --git a/debian/boca-common.postinst b/debian/boca-common.postinst index f6c61cd..d28de8a 100644 --- a/debian/boca-common.postinst +++ b/debian/boca-common.postinst @@ -8,6 +8,13 @@ priority=high case "$1" in configure|reconfigure) + if [[ -e "/etc/boca.conf" ]]; then + . /etc/boca.conf + if [[ "$bdserver" != "" ]]; then + echo "If you want to reset DB configuration, please unset \"bdserver\" in /etc/boca.conf" + exit 0 + fi + fi db_input high boca-common/dbhost || true db_go || true diff --git a/debian/boca-db.postinst b/debian/boca-db.postinst index 8a36f55..c4215df 100644 --- a/debian/boca-db.postinst +++ b/debian/boca-db.postinst @@ -9,6 +9,14 @@ priority=high case "$1" in configure|reconfigure) + if [[ -e "/etc/boca.conf" ]]; then + . /etc/boca.conf + if [[ "$bdcreated" != "" ]]; then + echo "If you want to reset DB configuration, please unset \"bdcreated\" in /etc/boca.conf" + exit 0 + fi + fi + #Assume DBHOST will be localhost, since this is the package that #provides postgresql #XXX future work make it work as a backup DB server @@ -53,6 +61,7 @@ case "$1" in if [[ "$RET" == "Yes" ]]; then echo YES |php /var/www/boca/src/private/createdb.php + echo "bdcreated=y" >> /etc/boca.conf fi db_reset boca-db/createdb -- cgit v1.2.3