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

(-)a/debian/docs/koha-create.xml (+9 lines)
Lines 39-44 Link Here
39
      <arg><option>--adminuser</option> n</arg>
39
      <arg><option>--adminuser</option> n</arg>
40
      <arg><option>--enable-sru</option></arg>
40
      <arg><option>--enable-sru</option></arg>
41
      <arg><option>--sru-port</option> port</arg>
41
      <arg><option>--sru-port</option> port</arg>
42
      <arg><option>--template-cache-dir</option> directory</arg>
42
      <arg><option>--upload-path</option> directory</arg>
43
      <arg><option>--upload-path</option> directory</arg>
43
      <arg><option>--letsencrypt</option></arg>
44
      <arg><option>--letsencrypt</option></arg>
44
      <arg><option>--help</option>|<option>-h</option></arg>
45
      <arg><option>--help</option>|<option>-h</option></arg>
Lines 177-182 Link Here
177
    </varlistentry>
178
    </varlistentry>
178
179
179
    <varlistentry>
180
    <varlistentry>
181
      <term><option>--template-cache-dir</option></term>
182
      <listitem>
183
        <para>Specify a <option>directory</option> for storing the template cache files of the instance.
184
              It defaults to <filename>/var/cache/koha/instance/templates</filename>.</para>
185
      </listitem>
186
    </varlistentry>
187
188
    <varlistentry>
180
      <term><option>--upload-path</option></term>
189
      <term><option>--upload-path</option></term>
181
      <listitem>
190
      <listitem>
182
        <para>Specify a <option>directory</option> for storing the permanently uploaded files of the instance.
191
        <para>Specify a <option>directory</option> for storing the permanently uploaded files of the instance.
(-)a/debian/koha-common.dirs (+1 lines)
Lines 1-4 Link Here
1
etc/koha/sites
1
etc/koha/sites
2
var/cache/koha
2
var/lib/koha
3
var/lib/koha
3
var/log/koha
4
var/log/koha
4
var/lock/koha
5
var/lock/koha
(-)a/debian/scripts/koha-create (-2 / +16 lines)
Lines 69-74 Options: Link Here
69
  --database dbname         Enforce the use of the specified DB name (64 char limit)
69
  --database dbname         Enforce the use of the specified DB name (64 char limit)
70
  --adminuser n             Explicit the admin user ID in the DB. Relevant in
70
  --adminuser n             Explicit the admin user ID in the DB. Relevant in
71
                            conjunction with --defaultsql and --populate-db.
71
                            conjunction with --defaultsql and --populate-db.
72
  --template-cache-dir      Set a user defined template_cache_dir. It defaults to
73
                            /var/cache/koha/<instance>/templates
72
  --upload-path dir         Set a user defined upload_path. It defaults to
74
  --upload-path dir         Set a user defined upload_path. It defaults to
73
                            /var/lib/koha/<instance>/uploads
75
                            /var/lib/koha/<instance>/uploads
74
  --letsencrypt             Set up a https-only site with letsencrypt certificates
76
  --letsencrypt             Set up a https-only site with letsencrypt certificates
Lines 112-117 generate_config_file() { Link Here
112
        -e "s/__DB_PASS__/$mysqlpwd/g" \
114
        -e "s/__DB_PASS__/$mysqlpwd/g" \
113
        -e "s/__UNIXUSER__/$username/g" \
115
        -e "s/__UNIXUSER__/$username/g" \
114
        -e "s/__UNIXGROUP__/$username/g" \
116
        -e "s/__UNIXGROUP__/$username/g" \
117
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
115
        -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
118
        -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
116
        -e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \
119
        -e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \
117
        -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
120
        -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
Lines 404-409 DEFAULT_MEMCACHED_PREFIX="koha_" Link Here
404
UPLOAD_PATH_BASE="/var/lib/koha"
407
UPLOAD_PATH_BASE="/var/lib/koha"
405
UPLOAD_DIR="uploads"
408
UPLOAD_DIR="uploads"
406
UPLOAD_PATH=""
409
UPLOAD_PATH=""
410
# cache base dir
411
CACHE_DIR_BASE="/var/cache/koha"
407
# Generate a randomizaed API secret
412
# Generate a randomizaed API secret
408
API_SECRET="$(pwgen -s 64 1)"
413
API_SECRET="$(pwgen -s 64 1)"
409
# SRU server variables
414
# SRU server variables
Lines 432-438 fi Link Here
432
437
433
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
438
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
434
439
435
TEMP=`getopt -o chrpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,use-memcached,enable-sru,sru-port:,help,marcflavor:,auth-idx:,biblio-idx:,zebralang:,defaultsql:,configfile:,passwdfile:,database:,adminuser:,memcached-servers:,memcached-prefix:,upload-path:,letsencrypt, \
440
TEMP=`getopt -o chrpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,use-memcached,enable-sru,sru-port:,help,marcflavor:,auth-idx:,biblio-idx:,zebralang:,defaultsql:,configfile:,passwdfile:,database:,adminuser:,memcached-servers:,memcached-prefix:,template-cache-dir:,upload-path:,letsencrypt, \
436
     -n "$0" -- "$@"`
441
     -n "$0" -- "$@"`
437
442
438
# Note the quotes around `$TEMP': they are essential!
443
# Note the quotes around `$TEMP': they are essential!
Lines 449-454 CLO_MEMCACHED_SERVERS="" Link Here
449
CLO_MEMCACHED_PREFIX=""
454
CLO_MEMCACHED_PREFIX=""
450
CLO_UPLOAD_PATH=""
455
CLO_UPLOAD_PATH=""
451
CLO_LETSENCRYPT=""
456
CLO_LETSENCRYPT=""
457
CLO_TEMPLATE_CACHE_DIR=""
452
458
453
while true ; do
459
while true ; do
454
    case "$1" in
460
    case "$1" in
Lines 488-493 while true ; do Link Here
488
            ENABLE_SRU="yes" ; shift ;;
494
            ENABLE_SRU="yes" ; shift ;;
489
        --sru-port)
495
        --sru-port)
490
            SRU_SERVER_PORT="$2" ; shift 2 ;;
496
            SRU_SERVER_PORT="$2" ; shift 2 ;;
497
        --template-cache-dir)
498
            CLO_TEMPLATE_CACHE_DIR="$2" ; shift 2 ;;
491
        --upload-path)
499
        --upload-path)
492
            CLO_UPLOAD_PATH="$2" ; shift 2 ;;
500
            CLO_UPLOAD_PATH="$2" ; shift 2 ;;
493
        --letsencrypt)
501
        --letsencrypt)
Lines 574-579 else Link Here
574
    MEMCACHED_PREFIX=""
582
    MEMCACHED_PREFIX=""
575
fi
583
fi
576
584
585
# Set template cache dir
586
if [ "$CLO_TEMPLATE_CACHE_DIR" != "" ]; then
587
    TEMPLATE_CACHE_DIR="$CLO_TEMPLATE_CACHE_DIR"
588
else
589
    TEMPLATE_CACHE_DIR="$CACHE_DIR_BASE/$name/templates"
590
fi
591
577
# Are we root? If not, the mod_rewrite check will fail and be confusing, so
592
# Are we root? If not, the mod_rewrite check will fail and be confusing, so
578
# we look into this first.
593
# we look into this first.
579
if [[ $UID -ne 0 ]]
594
if [[ $UID -ne 0 ]]
Lines 709-715 eof Link Here
709
    generate_config_file zebra.passwd.in \
724
    generate_config_file zebra.passwd.in \
710
        "/etc/koha/sites/$name/zebra.passwd"
725
        "/etc/koha/sites/$name/zebra.passwd"
711
726
712
713
    # Create a GPG-encrypted file for requesting a DB to be set up.
727
    # Create a GPG-encrypted file for requesting a DB to be set up.
714
    if [ "$op" = request ]
728
    if [ "$op" = request ]
715
    then
729
    then
(-)a/debian/scripts/koha-create-dirs (+2 lines)
Lines 40-45 for name in "$@" Link Here
40
do
40
do
41
    rootdir "/var/spool/koha/$name"
41
    rootdir "/var/spool/koha/$name"
42
    userdir "$name" "/etc/koha/sites/$name"
42
    userdir "$name" "/etc/koha/sites/$name"
43
    userdir "$name" "/var/cache/koha/$name"
44
    userdir "$name" "/var/cache/koha/$name/templates"
43
    userdir "$name" "/var/lib/koha/$name"
45
    userdir "$name" "/var/lib/koha/$name"
44
    userdir "$name" "/var/lib/koha/$name/authorities"
46
    userdir "$name" "/var/lib/koha/$name/authorities"
45
    userdir "$name" "/var/lib/koha/$name/authorities/key"
47
    userdir "$name" "/var/lib/koha/$name/authorities/key"
(-)a/debian/scripts/koha-remove (+2 lines)
Lines 125-130 eof Link Here
125
        rm -r "/var/lock/koha/$name"
125
        rm -r "/var/lock/koha/$name"
126
    [ -d "/var/log/koha/$name" ] && \
126
    [ -d "/var/log/koha/$name" ] && \
127
        rm -r "/var/log/koha/$name"
127
        rm -r "/var/log/koha/$name"
128
    [ -d "/var/cache/koha/$name" ] && \
129
        rm -r "/var/cache/koha/$name"
128
    [ -d "/var/run/koha/$name" ] && \
130
    [ -d "/var/run/koha/$name" ] && \
129
        rm -r "/var/run/koha/$name"
131
        rm -r "/var/run/koha/$name"
130
    [ "$purgeall" = "1" ] && [ -d "/var/lib/koha/$name" ] && \
132
    [ "$purgeall" = "1" ] && [ -d "/var/lib/koha/$name" ] && \
(-)a/debian/templates/koha-conf-site.xml.in (-5 / +1 lines)
Lines 291-300 __END_SRU_PUBLICSERVER__ Link Here
291
 <!-- <zebra_loglevels>none,fatal,warn</zebra_loglevels> -->
291
 <!-- <zebra_loglevels>none,fatal,warn</zebra_loglevels> -->
292
 <memcached_servers>__MEMCACHED_SERVERS__</memcached_servers>
292
 <memcached_servers>__MEMCACHED_SERVERS__</memcached_servers>
293
 <memcached_namespace>__MEMCACHED_NAMESPACE__</memcached_namespace>
293
 <memcached_namespace>__MEMCACHED_NAMESPACE__</memcached_namespace>
294
 <!-- Uncomment the following line if you want to use template caching
294
 <template_cache_dir>__TEMPLATE_CACHE_DIR__</template_cache_dir>
295
      That will bring a performance boost
296
      <template_cache_dir>/tmp</template_cache_dir>
297
 -->
298
295
299
 <!-- Secret passphrase used by Mojolicious for signed cookies -->
296
 <!-- Secret passphrase used by Mojolicious for signed cookies -->
300
 <api_secret_passphrase>__API_SECRET__</api_secret_passphrase>
297
 <api_secret_passphrase>__API_SECRET__</api_secret_passphrase>
301
- 

Return to bug 17951