Database name changes, BOINC_KEY from env variable, BOINC_UPLOAD_URL from env variable, make install copies cgi files into home directory

svn path=/trunk/boinc/; revision=179
This commit is contained in:
Barry Luong 2002-07-11 20:41:24 +00:00
parent 192249fcda
commit 558dd209ac
5 changed files with 14 additions and 10 deletions

View File

@ -12,11 +12,15 @@ endif
CFLAGS = -g -Wall @DEFS@ \ CFLAGS = -g -Wall @DEFS@ \
-I@top_srcdir@/db \ -I@top_srcdir@/db \
-I@top_srcdir@/lib \ -I@top_srcdir@/lib \
-I@top_srcdir@/RSAEuro/source \
-I@top_srcdir@/tools \ -I@top_srcdir@/tools \
-DBOINC_DB_NAME=\"$(BOINC_DB_NAME)\" \
-DBOINC_KEY=$(BOINC_KEY) \
-DBOINC_PUBLIC_KEY_PATH=\"$(BOINC_PUBLIC_KEY_PATH)\" \
-I/usr/local/mysql/include \ -I/usr/local/mysql/include \
-I@top_srcdir@/RSAEuro/source \
-DBOINC_KEY_DIR=\"$(BOINC_KEY_DIR)\" \ -DBOINC_KEY_DIR=\"$(BOINC_KEY_DIR)\" \
-DBOINC_KEY=$(BOINC_KEY) -DBOINC_KEY=$(BOINC_KEY) \
-DBOINC_UPLOAD_DIR=\"$(BOINC_UPLOAD_DIR)\"
CC = g++ $(CFLAGS) CC = g++ $(CFLAGS)
@ -123,3 +127,6 @@ install: $(PROGS)
cp cgi /usr/local/boinc/sched/cgi cp cgi /usr/local/boinc/sched/cgi
cp feeder /usr/local/boinc/sched/feeder cp feeder /usr/local/boinc/sched/feeder
cp show_shmem /usr/local/boinc/sched/show_shmem cp show_shmem /usr/local/boinc/sched/show_shmem
rm -rR -f ~barry/
cp cgi ../../../boinc_server/cgi/cgi
cp file_upload_handler ../../../boinc_server/cgi/file_upload_handler

View File

@ -42,6 +42,7 @@
// has completed the request. // has completed the request.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <assert.h> #include <assert.h>
#if HAVE_UNISTD_H #if HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
@ -190,7 +191,7 @@ int main(int argc, char** argv) {
} }
ssp = (SCHED_SHMEM*)p; ssp = (SCHED_SHMEM*)p;
ssp->init(); ssp->init();
retval = db_open("boinc"); retval = db_open(BOINC_DB_NAME);
if (retval) { if (retval) {
fprintf(stderr, "feeder: db_open: %d\n", retval); fprintf(stderr, "feeder: db_open: %d\n", retval);
exit(1); exit(1);

View File

@ -25,8 +25,8 @@
#include "parse.h" #include "parse.h"
#include "crypt.h" #include "crypt.h"
#define BOINC_UPLOAD_DIR "/home/david/html/upload" /* #define BOINC_UPLOAD_DIR "/home/david/html/upload" */
#define BOINC_PUBLIC_KEY_PATH "/home/david/boinc_keys/upload_public" /* #define BOINC_PUBLIC_KEY_PATH "/home/david/boinc_keys/upload_public" */
#define MAX_FILES 32 #define MAX_FILES 32

View File

@ -84,7 +84,7 @@ int main() {
exit(1); exit(1);
} }
//fprintf(stderr, "got ready flag\n"); //fprintf(stderr, "got ready flag\n");
retval = db_open("boinc"); retval = db_open(BOINC_DB_NAME);
if (retval) { if (retval) {
exit(return_error("BOINC scheduler: can't open database")); exit(return_error("BOINC scheduler: can't open database"));
} }

View File

@ -1,9 +1,5 @@
#include "db.h" #include "db.h"
#ifndef BOINC_KEY
#define BOINC_KEY 0xdadacafe
#endif
#define MAX_PLATFORMS 50 #define MAX_PLATFORMS 50
#define MAX_APPS 10 #define MAX_APPS 10
#define MAX_APP_VERSIONS 100 #define MAX_APP_VERSIONS 100