aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-06-12 12:32:06 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-06-17 19:28:03 +0200
commit54e3c33fb327efe0cbfd806c5468cbe390dafeaa (patch)
tree2118df87f8ef53ea36f6e53b135cced7590a4648 /etc
parent2fda89944fa528e05c9f6b4fdcd684f2606582a8 (diff)
Implement object model for packages
Diffstat (limited to 'etc')
-rw-r--r--etc/config6
-rwxr-xr-xetc/pgctl62
2 files changed, 45 insertions, 23 deletions
diff --git a/etc/config b/etc/config
index a1e851c..31a03a2 100644
--- a/etc/config
+++ b/etc/config
@@ -6,17 +6,17 @@ WORKSPACE_DIR="$PROJECT_DIR/var"
# PostgreSQL settings (used in pgctl)
PG_PORT=8432
+PG_SCHEMA_DIR="$PROJECT_DIR/brep"
PG_DATA_DIR="$WORKSPACE_DIR/lib/pgsql"
-PG_SOCKET_DIR="$WORKSPACE_DIR/run/pgsql"
PG_LOG_DIR="$WORKSPACE_DIR/log/pgsql"
-PG_OUT_FILE="$WORKSPACE_DIR/run/pgsql/out"
+PG_WORKSPACE_DIR="$WORKSPACE_DIR/run/pgsql"
# Apache settings (used in apachectl)
AP_PORT=8080
AP_SERVER_NAME="cppget.org:$AP_PORT"
AP_ADMIN_EMAIL=admin@cppget.org
AP_LOG_LEVEL=trace1
-AP_DB_HOST="$PG_SOCKET_DIR"
+AP_DB_HOST="$PG_WORKSPACE_DIR"
AP_DB_PORT=$PG_PORT
AP_MODULE_DIR="$PROJECT_DIR"
AP_WWW_DIR="$PROJECT_DIR/www"
diff --git a/etc/pgctl b/etc/pgctl
index 26ad888..4331ca1 100755
--- a/etc/pgctl
+++ b/etc/pgctl
@@ -7,11 +7,13 @@
. `dirname $0`/config
-cmd="$1"
+CMD="$1"
+SOCKET_DIR="$PG_WORKSPACE_DIR"
+OUT_FILE="$PG_WORKSPACE_DIR/out"
# Print usage description and exit.
#
-case $cmd in
+case $CMD in
init|start|stop|status|connect) ;;
*)
echo "Usage: pgctl (init|start|stop|status|connect)"
@@ -21,10 +23,10 @@ esac
ERROR=0
-# Initilization includes creating PostgreSQL DB cluster, creating and
-# populating brep DB.
+# Initialization includes creating PostgreSQL DB cluster, creating brep DB
+# and schema.
#
-if test "$cmd" = "init"; then
+if test "$CMD" = "init"; then
if test -d "$PG_DATA_DIR"; then
echo "PostgreSQL DB cluster directory $PG_DATA_DIR already exist"
else
@@ -41,7 +43,7 @@ if test "$cmd" = "init"; then
fi
fi
-case $cmd in
+case $CMD in
start|init)
# Start DB server if not running yet.
#
@@ -57,21 +59,21 @@ case $cmd in
echo "PostgreSQL server starting ..."
- mkdir -p `dirname $PG_OUT_FILE`
+ mkdir -p `dirname $OUT_FILE`
mkdir -p "$PG_LOG_DIR"
- mkdir -p "$PG_SOCKET_DIR"
+ mkdir -p "$SOCKET_DIR"
pg_ctl start -D "$PG_DATA_DIR" -w -o \
- "-c port=$PG_PORT -c unix_socket_directories=$PG_SOCKET_DIR \
+ "-c port=$PG_PORT -c unix_socket_directories=$SOCKET_DIR \
-c logging_collector=on -c log_directory=$PG_LOG_DIR" \
- 1>"$PG_OUT_FILE" 2>&1
+ 1>"$OUT_FILE" 2>&1
ERROR=$?
if test $ERROR -eq 0; then
echo "server started"
else
- cat "$PG_OUT_FILE" 1>&2
+ cat "$OUT_FILE" 1>&2
echo "server starting failed"
exit $ERROR
fi
@@ -104,15 +106,14 @@ case $cmd in
connect)
echo "connecting to PostgreSQL server ..."
- psql --host=$PG_SOCKET_DIR --port=$PG_PORT brep
+ psql --host=$SOCKET_DIR --port=$PG_PORT brep
;;
esac
-if test "$cmd" = "init"; then
+if test "$CMD" = "init"; then
# Create brep DB if not exist.
#
- psql --host=$PG_SOCKET_DIR --port=$PG_PORT -c "" brep \
- 1>>"$PG_OUT_FILE" 2>&1
+ psql --host=$SOCKET_DIR --port=$PG_PORT -c "" brep 1>/dev/null 2>&1
ERROR=$?
@@ -121,7 +122,7 @@ if test "$cmd" = "init"; then
else
if test $ERROR -eq 2; then
echo "creating brep DB ..."
- createdb --host=$PG_SOCKET_DIR --port=$PG_PORT brep
+ createdb --host=$SOCKET_DIR --port=$PG_PORT brep
ERROR=$?
if test $ERROR -eq 0; then
@@ -136,8 +137,29 @@ if test "$cmd" = "init"; then
fi
fi
- # Populate brep DB if required.
- # psql --host=$PG_SOCKET_DIR --port=$PG_PORT -c "select count(1) ..." brep \
- # 1>>"$PG_OUT_FILE" 2>&1
- # ...
+ # Create brep DB schema if not exist.
+ #
+ psql --host=$SOCKET_DIR --port=$PG_PORT -c "select count(1) from package" \
+ brep 1>/dev/null 2>&1
+
+ ERROR=$?
+
+ if test $ERROR -eq 0; then
+ echo "brep DB schema already exist"
+ else
+ echo "creating brep DB schema ..."
+
+ psql -v ON_ERROR_STOP=1 --host=$SOCKET_DIR --port=$PG_PORT \
+ --file="$PG_SCHEMA_DIR/package.sql" brep 1>"$OUT_FILE" 2>&1
+
+ ERROR=$?
+
+ if test $ERROR -eq 0; then
+ echo "brep DB schema created"
+ else
+ cat "$OUT_FILE" 1>&2
+ echo "brep DB schema creating failed"
+ exit $ERROR;
+ fi
+ fi
fi