From: Maxim Mamontov Date: Wed, 12 Oct 2011 14:24:56 +0000 (+0300) Subject: Disable installing db structure for Firebird X-Git-Tag: 2.408~59 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/d76b6138e72d2af01c789a3aaf4b3715d23d440f?ds=sidebyside Disable installing db structure for Firebird --- diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile index 8d7318f5..86783e1b 100644 --- a/projects/stargazer/Makefile +++ b/projects/stargazer/Makefile @@ -111,19 +111,6 @@ endif install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/tariffs/tariff.tf $(PREFIX)/var/stargazer/tariffs/tariff.tf install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/users/test/conf $(PREFIX)/var/stargazer/users/test/conf install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/users/test/stat $(PREFIX)/var/stargazer/users/test/stat - -ifeq ($(CHECK_FBCLIENT),yes) - # Install firebird db - mkdir -p $(PREFIX)/var/stargazer - chown $(OWNER):$(FIREBIRD_GROUP) $(PREFIX)/var/stargazer - chmod g+rw $(PREFIX)/var/stargazer - echo "connect '$(DB_ADDRESS)' user '$(DB_USER)' password '$(DB_PASSWORD)';" > .db.sql - echo "drop database;" >> .db.sql - echo "create database '$(DB_ADDRESS)' user '$(DB_USER)' password '$(DB_PASSWORD)' default character set win1251;" >> .db.sql - cat $(VAR_DIR)/../00-base-00.sql >> .db.sql - $(FIREBIRD_ISQL) -i .db.sql - rm -f .db.sql -endif uninstall: uninstall-bin uninstall-data diff --git a/projects/stargazer/build b/projects/stargazer/build index 01d96054..1f61b2e9 100755 --- a/projects/stargazer/build +++ b/projects/stargazer/build @@ -25,30 +25,6 @@ DIR_MODE=0755 OWNER=root -# Name of the firebird's group -# Need for chown directory with firebird db - -FIREBIRD_GROUP=firebird - -# Database address -# Firebird must have priviledges to read/write for specified path - -DB_ADDRESS="localhost:/var/stargazer/stargazer.fdb" - -# Database user -# This user must have priviledges to create database - -DB_USER="stg" - -# Database password - -DB_PASSWORD="123456" - -# Full path to isql utility -# Note: Debian users have to specify path to isql-fb utility - -FIREBIRD_ISQL="/opt/firebird/bin/isql" - OS=unknown sys=`uname -s` release=`uname -r | cut -b1` @@ -433,11 +409,6 @@ echo "DIR_MODE=$DIR_MODE" >> $CONFFILE echo "OWNER=$OWNER" >> $CONFFILE echo "VAR_DIR=$VAR_DIR" >> $CONFFILE echo "ETC_DIR=$ETC_DIR" >> $CONFFILE -echo "DB_ADDRESS=$DB_ADDRESS" >> $CONFFILE -echo "DB_USER=$DB_USER" >> $CONFFILE -echo "DB_PASSWORD=$DB_PASSWORD" >> $CONFFILE -echo "FIREBIRD_ISQL=$FIREBIRD_ISQL" >> $CONFFILE -echo "FIREBIRD_GROUP=$FIREBIRD_GROUP" >> $CONFFILE mkdir -p modules