X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=debian%2Fscripts%2Fkoha-create;h=bb2b642082749d79ca2cd495d3ae91653b241cbc;hb=81d5f9dcdae68037a43c7953be1e91a2fcf92b04;hp=4f7760306737cd03c9aa52e2f1f64f9710113166;hpb=57d11aee2ccc877228dc493a042b6de1cd527e1c;p=koha.git diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create index 4f77603067..bb2b642082 100755 --- a/debian/scripts/koha-create +++ b/debian/scripts/koha-create @@ -19,23 +19,32 @@ set -e +usage="Usage: $0 [--create-db|--request-db|--populate-db|--use-db] \ + [--marcflavor marc21|normarc|unimarc] \ + [--zebralang en|nb|fr] \ + [--defaultsql /path/to/some.sql] \ + [--configfile /path/to/config] [--passwdfile /path/to/passwd] \ + [--database database] [--adminuser n] instancename" die() { echo "$@" 1>&2 exit 1 } - +# UPPER CASE VARIABLES - from configfile or default value +# lower case variables - generated within this script generate_config_file() { touch "$2" chown "root:$username" "$2" chmod 0640 "$2" sed -e "s/__KOHASITE__/$name/g" \ - -e "s/__OPACPORT__/80/g" \ + -e "s/__OPACPORT__/$OPACPORT/g" \ -e "s/__INTRAPORT__/$INTRAPORT/g" \ - -e "s/__OPACSERVER__/$domain/g" \ + -e "s/__OPACSERVER__/$opacdomain/g" \ -e "s/__INTRASERVER__/$intradomain/g" \ -e "s/__ZEBRA_PASS__/$zebrapwd/g" \ + -e "s/__ZEBRA_MARC_FORMAT__/$ZEBRA_MARC_FORMAT/g" \ + -e "s/__ZEBRA_LANGUAGE__/$ZEBRA_LANGUAGE/g" \ -e "s/__DB_NAME__/$mysqldb/g" \ -e "s/__DB_HOST__/$mysqlhost/g" \ -e "s/__DB_USER__/$mysqluser/g" \ @@ -54,56 +63,143 @@ getmysqlhost() { } getinstancemysqlpassword() { - sed -n '//s:.*>\(.*\).*:\1:p' \ - "/etc/koha/sites/$1/koha-conf.xml" + xmlstarlet sel -t -v 'yazgfs/config/pass' "/etc/koha/sites/$1/koha-conf.xml" } +getinstancemysqluser() { + xmlstarlet sel -t -v 'yazgfs/config/user' "/etc/koha/sites/$1/koha-conf.xml" +} + +getinstancemysqldatabase() { + xmlstarlet sel -t -v 'yazgfs/config/database' "/etc/koha/sites/$1/koha-conf.xml" +} # Set defaults and read config file, if it exists. DOMAIN="" +OPACPORT="80" +OPACPREFIX="" +OPACSUFFIX="" INTRAPORT="8080" INTRAPREFIX="" INTRASUFFIX="" DEFAULTSQL="" +ZEBRA_MARC_FORMAT="marc21" +ZEBRA_LANGUAGE="en" +ADMINUSER="1" +PASSWDFILE="/etc/koha/passwd" if [ -e /etc/koha/koha-sites.conf ] then . /etc/koha/koha-sites.conf fi +[ $# -ge 2 ] && [ $# -le 16 ] || die $usage + +TEMP=`getopt -o crpm:l:d:f:a: -l create-db,request-db,populate-db,use-db,marcflavor:,zebralang:,defaultsql:,configfile:,passwdfile:,adminuser: \ + -n "$0" -- "$@"` + +# Note the quotes around `$TEMP': they are essential! +eval set -- "$TEMP" + +# Temporary variables for the command line options +CLO_ZEBRA_MARC_FORMAT="" +CLO_ZEBRA_LANGUAGE="" +CLO_DEFAULTSQL="" +CLO_ADMINUSER="" + +while true ; do + case "$1" in + -c|--create-db) op=create ; shift ;; + -r|--request-db) op=request ; shift ;; + -p|--populate-db) op=populate ; shift ;; + -u|--use-db) op=use ; shift ;; + -m|--marcflavor) CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;; + -l|--zebralang) CLO_ZEBRA_LANGUAGE="$2" ; shift 2 ;; + -d|--defaultsql) CLO_DEFAULTSQL="$2" ; shift 2 ;; + -f|--configfile) configfile="$2" ; shift 2 ;; + -s|--passwdfile) CLO_PASSWDFILE="$2" ; shift 2 ;; + -b|--database) CLO_DATABASE="$2" ; shift 2 ;; + -a|--adminuser) CLO_ADMINUSER="$2" ; shift 2 ;; + --) shift ; break ;; + *) die "Internal error processing command line arguments" ;; + esac +done + +# Load the configfile given on the command line +if [ "$configfile" != "" ] +then + if [ -e "$configfile" ] + then + . "$configfile" + else + die "$configfile does not exist."; + fi +fi + +# Make sure options from the command line get the highest precedence +if [ "$CLO_ZEBRA_MARC_FORMAT" != "" ] +then + ZEBRA_MARC_FORMAT="$CLO_ZEBRA_MARC_FORMAT" +fi +if [ "$CLO_ZEBRA_LANGUAGE" != "" ] +then + ZEBRA_LANGUAGE="$CLO_ZEBRA_LANGUAGE" +fi +if [ "$CLO_DEFAULTSQL" != "" ] +then + DEFAULTSQL="$CLO_DEFAULTSQL" +fi +if [ "$CLO_ADMINUSER" != "" ] +then + ADMINUSER="$CLO_ADMINUSER" +fi +if [ "$CLO_PASSWDFILE" != "" ] +then + PASSWDFILE="$CLO_PASSWDFILE" +fi + +name="$1" + +opacdomain="$OPACPREFIX$name$OPACSUFFIX$DOMAIN" +intradomain="$INTRAPREFIX$name$INTRASUFFIX$DOMAIN" -# Parse command line. -[ "$#" = 2 ] || - die "Usage: $0 [--create-db|--request-db|--populate-db] instancename" -case "$1" in - --create-db) op=create ;; - --request-db) op=request ;; - --populate-db) op=populate ;; - *) die "Usage: $0 [--create-db|--request-db|--populate-db] instancename" ;; -esac -name="$2" -domain="$name$DOMAIN" -if [ "$INTRAPORT" = 80 ] || [ "$INTRAPORT" = "" ] +if [ `cat $PASSWDFILE | grep "^$name:"` ] then - intradomain="$INTRAPREFIX$name$INTRASUFFIX$DOMAIN" -else - intradomain="$INTRAPREFIX$name$INTRASUFFIX$DOMAIN:$INTRAPORT" + passwdline=`cat $PASSWDFILE | grep "^$name:"` + mysqluser=`echo $passwdline | cut -d ":" -f 2` + mysqlpwd=`echo $passwdline | cut -d ":" -f 3` + mysqldb=`echo $passwdline | cut -d ":" -f 4` fi +# The order of precedence for MySQL database name is: +# default < passwd file < command line +if [ "$mysqldb" = "" ] +then + mysqldb="koha_$name" +fi +if [ "$CLO_DATABASE" != "" ] +then + mysqldb="$CLO_DATABASE" +fi -mysqldb="koha_$name" +if [ "$mysqluser" = "" ] +then + mysqluser="koha_$name" +fi mysqlhost="$(getmysqlhost)" -mysqluser="koha_$name" -if [ "$op" = create ] || [ "$op" = request ] +if [ "$op" = create ] || [ "$op" = request ] || [ "$op" = use ] then - mysqlpwd="$(pwgen -1)" + if [ "$mysqlpwd" = "" ] + then + mysqlpwd="$(pwgen -1)" + fi else mysqlpwd="$(getinstancemysqlpassword $name)" fi -if [ "$op" = create ] || [ "$op" = request ] +if [ "$op" = create ] || [ "$op" = request ] || [ "$op" = use ] then # Create new user and group. username="$name-koha" @@ -124,19 +220,26 @@ then koha-create-dirs "$name" # Generate Zebra database password. - zebrapwd="$(pwgen -1)" - + zebrapwd="$(pwgen -s 12 1)" # Set up MySQL database for this instance. if [ "$op" = create ] then mysql --defaults-extra-file=/etc/mysql/koha-common.cnf <