Attachment #11819 for bug #8310

View | Details | Raw Unified | Return to bug 8310
Collapse All | Expand All

Lines 244-251 eof Link Here

(-)a/debian/scripts/koha-create (-2 / +2 lines)
244	# Generate and install Apache site-available file and log dir.	244	# Generate and install Apache site-available file and log dir.
245	generate_config_file apache-site.conf.in \	245	generate_config_file apache-site.conf.in \
246	"/etc/apache2/sites-available/$name"	246	"/etc/apache2/sites-available/$name"
247	mkdir "/var/log/koha/$name"	247	# mkdir "/var/log/koha/$name"
248	chown "$username:$username" "/var/log/koha/$name"	248	# chown "$username:$username" "/var/log/koha/$name"
249		249
250		250
251	# Generate and install main Koha config file.	251	# Generate and install main Koha config file.




    fi
}

createlink() {
   local source="$1"
   local dest="$2"

   if [ ! -L $dest ] && [ ! -d $dest ]
   then
       ln -s "$source" "$dest"
   fi
}

for name in "$@"
do

    KOHA_ROOT="/var/lib/koha/$name"
    userdir "$name" "$KOHA_ROOT"
    userdir "$name" "$KOHA_ROOT/var/lib/authorities"
    userdir "$name" "$KOHA_ROOT/var/lib/authorities/key"
    userdir "$name" "$KOHA_ROOT/var/lib/authorities/register"
    userdir "$name" "$KOHA_ROOT/var/lib/authorities/shadow"
    userdir "$name" "$KOHA_ROOT/var/lib/authorities/tmp"
    userdir "$name" "$KOHA_ROOT/var/lib/biblios"
    userdir "$name" "$KOHA_ROOT/var/lib/biblios/key"
    userdir "$name" "$KOHA_ROOT/var/lib/biblios/register"
    userdir "$name" "$KOHA_ROOT/var/lib/biblios/shadow"
    userdir "$name" "$KOHA_ROOT/var/lib/biblios/tmp"
    userdir "$name" "$KOHA_ROOT/var/lock"
    userdir "$name" "$KOHA_ROOT/var/lock/authorities"
    userdir "$name" "$KOHA_ROOT/var/lock/biblios"
    userdir "$name" "$KOHA_ROOT/var/log"
    userdir "$name" "$KOHA_ROOT/var/run"
    userdir "$name" "$KOHA_ROOT/var/run/authorities"
    userdir "$name" "$KOHA_ROOT/var/run/biblios"
    rootdir "$KOHA_ROOT/var/spool"
    userdir "$name" "$KOHA_ROOT/etc"

    rootdir "/var/lock/koha"
    rootdir "/var/log/koha"
    rootdir "/var/run/koha"
    rootdir "/var/spool/koha"

    createlink "$KOHA_ROOT/var/spool" "/var/spool/koha/$name"
    createlink "$KOHA_ROOT/etc" "/etc/koha/sites/$name"
    createlink "$KOHA_ROOT/var/lib/authorities" "/var/lib/koha/$name/authorities"
    createlink "$KOHA_ROOT/var/lib/biblios" "/var/lib/koha/$name/biblios"
    createlink "$KOHA_ROOT/var/lock" "/var/lock/koha/$name"
    createlink "$KOHA_ROOT/var/log" "/var/log/koha/$name"
    createlink "$KOHA_ROOT/var/run" "/var/run/koha/$name"

done


Lines 63-69 do Link Here

(-)a/debian/scripts/koha-list (-2 / +1 lines)
63	shift	63	shift
64	done	64	done
65		65
66	find /etc/koha/sites -mindepth 1 -maxdepth 1 -type d -printf '%f\n' \|	66	find -L /etc/koha/sites -mindepth 1 -maxdepth 1 -type d -printf '%f\n' \|
67	sort \|	67	sort \|
68	while read name	68	while read name
69	do	69	do
70	-

Return to bug 8310

Lines 36-61 rootdir() { Link Here

(-)a/debian/scripts/koha-create-dirs (-19 / +46 lines)
36	fi	36	fi
37	}	37	}
38		38
		39	createlink() {
		40	local source="$1"
		41	local dest="$2"
		42
		43	if [ ! -L $dest ] && [ ! -d $dest ]
		44	then
		45	ln -s "$source" "$dest"
		46	fi
		47	}
		48
39	for name in "$@"	49	for name in "$@"
40	do	50	do
41	rootdir "/var/spool/koha/$name"	51
42	userdir "$name" "/etc/koha/sites/$name"	52	KOHA_ROOT="/var/lib/koha/$name"
43	userdir "$name" "/var/lib/koha/$name"	53	userdir "$name" "$KOHA_ROOT"
44	userdir "$name" "/var/lib/koha/$name/authorities"	54	userdir "$name" "$KOHA_ROOT/var/lib/authorities"
45	userdir "$name" "/var/lib/koha/$name/authorities/key"	55	userdir "$name" "$KOHA_ROOT/var/lib/authorities/key"
46	userdir "$name" "/var/lib/koha/$name/authorities/register"	56	userdir "$name" "$KOHA_ROOT/var/lib/authorities/register"
47	userdir "$name" "/var/lib/koha/$name/authorities/shadow"	57	userdir "$name" "$KOHA_ROOT/var/lib/authorities/shadow"
48	userdir "$name" "/var/lib/koha/$name/authorities/tmp"	58	userdir "$name" "$KOHA_ROOT/var/lib/authorities/tmp"
49	userdir "$name" "/var/lib/koha/$name/biblios"	59	userdir "$name" "$KOHA_ROOT/var/lib/biblios"
50	userdir "$name" "/var/lib/koha/$name/biblios/key"	60	userdir "$name" "$KOHA_ROOT/var/lib/biblios/key"
51	userdir "$name" "/var/lib/koha/$name/biblios/register"	61	userdir "$name" "$KOHA_ROOT/var/lib/biblios/register"
52	userdir "$name" "/var/lib/koha/$name/biblios/shadow"	62	userdir "$name" "$KOHA_ROOT/var/lib/biblios/shadow"
53	userdir "$name" "/var/lib/koha/$name/biblios/tmp"	63	userdir "$name" "$KOHA_ROOT/var/lib/biblios/tmp"
54	userdir "$name" "/var/lock/koha/$name"	64	userdir "$name" "$KOHA_ROOT/var/lock"
55	userdir "$name" "/var/lock/koha/$name/authorities"	65	userdir "$name" "$KOHA_ROOT/var/lock/authorities"
56	userdir "$name" "/var/lock/koha/$name/biblios"	66	userdir "$name" "$KOHA_ROOT/var/lock/biblios"
57	userdir "$name" "/var/run/koha/$name"	67	userdir "$name" "$KOHA_ROOT/var/log"
58	userdir "$name" "/var/run/koha/$name/authorities"	68	userdir "$name" "$KOHA_ROOT/var/run"
59	userdir "$name" "/var/run/koha/$name/biblios"	69	userdir "$name" "$KOHA_ROOT/var/run/authorities"
		70	userdir "$name" "$KOHA_ROOT/var/run/biblios"
		71	rootdir "$KOHA_ROOT/var/spool"
		72	userdir "$name" "$KOHA_ROOT/etc"
		73
		74	rootdir "/var/lock/koha"
		75	rootdir "/var/log/koha"
		76	rootdir "/var/run/koha"
		77	rootdir "/var/spool/koha"
		78
		79	createlink "$KOHA_ROOT/var/spool" "/var/spool/koha/$name"
		80	createlink "$KOHA_ROOT/etc" "/etc/koha/sites/$name"
		81	createlink "$KOHA_ROOT/var/lib/authorities" "/var/lib/koha/$name/authorities"
		82	createlink "$KOHA_ROOT/var/lib/biblios" "/var/lib/koha/$name/biblios"
		83	createlink "$KOHA_ROOT/var/lock" "/var/lock/koha/$name"
		84	createlink "$KOHA_ROOT/var/log" "/var/log/koha/$name"
		85	createlink "$KOHA_ROOT/var/run" "/var/run/koha/$name"
		86
60	done	87	done
61		88