diff --git a/openafs-client.service b/openafs-client.service index 84e4485..30afaef 100644 --- a/openafs-client.service +++ b/openafs-client.service @@ -11,6 +11,7 @@ EnvironmentFile=/etc/sysconfig/openafs-client ExecStartPre=/sbin/modprobe libafs ExecStart=/usr/sbin/afsd $AFSD_ARGS ExecStartPost=/usr/bin/fs sysname $SYSNAME +ExecStartPost=/usr/bin/fs setcrypt $CRYPT ExecStop=/usr/bin/umount /afs ExecStop=/usr/sbin/afsd -shutdown ExecStop=/sbin/rmmod libafs diff --git a/openafs.changes b/openafs.changes index efc296d..f12bb52 100644 --- a/openafs.changes +++ b/openafs.changes @@ -5,6 +5,8 @@ Tue Apr 30 10:17:44 UTC 2019 - Christof Hanke - Require krb5-client for package openafs-client - fix broken directory layout - fix broken post-install script +- allow crypt to be set/unset on startup of client +- clean up source-filenames ------------------------------------------------------------------- Mon Mar 25 11:32:32 UTC 2019 - Jan Engelhardt diff --git a/openafs.spec b/openafs.spec index 3ed1ad3..1b9f8d5 100644 --- a/openafs.spec +++ b/openafs.spec @@ -79,13 +79,12 @@ Source16: ld.conf.openafs Source18: RELNOTES-%{upstream_version} Source19: ChangeLog Source20: kernel-source.build-modules.sh -Source22: sysconfig.openafs-fuse-client Source23: openafs-client.service Source25: openafs-server.service Source26: openafs-fuse-client.service -Source27: sysconfig.openafs-client-systemd -Source28: sysconfig.openafs-server-systemd -Source29: sysconfig.openafs-fuse-client-systemd +Source27: sysconfig.openafs-client +Source28: sysconfig.openafs-server +Source29: sysconfig.openafs-fuse-client Source30: preamble Source55: openafs.SuidCells Source56: openafs.CellAlias diff --git a/sysconfig.openafs-client-systemd b/sysconfig.openafs-client similarity index 70% rename from sysconfig.openafs-client-systemd rename to sysconfig.openafs-client index 4405486..f39a5de 100644 --- a/sysconfig.openafs-client-systemd +++ b/sysconfig.openafs-client @@ -2,7 +2,6 @@ # startup options for the openAFS client. # see man afsd for details - AFSD_ARGS="-fakestat -memcache -blocks 102400 -dynroot -afsdb" @@ -11,3 +10,9 @@ AFSD_ARGS="-fakestat -memcache -blocks 102400 -dynroot -afsdb" # leave empty for default setting. SYSNAME="" + +# +# switch for encryption to be set after startup +# must be one of "on" or "off" + +CRYPT="on" diff --git a/sysconfig.openafs-fuse-client b/sysconfig.openafs-fuse-client deleted file mode 100644 index 8a51291..0000000 --- a/sysconfig.openafs-fuse-client +++ /dev/null @@ -1,145 +0,0 @@ -## Path: Network/File systems/AFS client -## Description: AFS client configuration, default mode -## This package is for the fuse-client -## Type: yesno -## Default: no -# -# Set to "yes" if you want to generate CellServDB and ThisCell files -# from THIS_CELL and THIS_CELL_SERVER variables. -# If you want more complicated setting, set REGENERATE_CELL_INFO to "no" -# and edit the files manually. -# -REGENERATE_CELL_INFO="no" - -## Type: string -## Default: "" -# -# This cell name -# -THIS_CELL="" - -## Type: string -## Default: "" -# -# IP address of afs server for this cell -# -THIS_CELL_SERVER="" - -## Type: string -## Default: "" -# -# DNS name of afs server for this cell -# -THIS_CELL_SERVER_NAME="" - -## Type: yesno -## Default: yes -# -# Set to "yes" if you want to use data encription (secure, slower) -# -DATA_ENCRYPTION="yes" - -## Type: yesno -## Default: yes -# -# Set to "yes" if you want to generate cacheinfo file -# -REGENERATE_CACHE_INFO="yes" - -## Type: string -## Default: "" -# -# AFS client configuration options -# -XXLARGE="-stat 8000 -daemons 6 -volumes 256 -files 50000" -XLARGE="-stat 3600 -daemons 5 -volumes 196 -files 50000" -LARGE="-stat 2800 -daemons 5 -volumes 128" -MEDIUM="-stat 2000 -daemons 3 -volumes 70" -SMALL="-stat 300 -daemons 2 -volumes 50" - -## Type: yesno -## Default: yes -# -# Instead of mounting the home cell's root.afs volume at the AFS mount -# point (typically /afs) a fake root is constructed from information -# available in the client's CellServDB. -# With this option enabled openafs can start up even on network outage. -# -DYNROOT="yes" - -## Type: yesno -## Default: yes -# -# Instead of calling a stat on a mountpoint to a foreign cell, -# return a faked status to the application. -# "ls -l /afs" is the most prominent example for its usefulness. -# -FAKESTAT="yes" - - -## Type: yesno -## Default: yes -# -# Instead of looking up database server in CellServDB try DNS first. -# With this option enabled openafs can access cells which are not in the packaged CellServDB-file, but -# which do provide the required DNS-information. -# -AFSDB="yes" - -## Type: yesno -## Default: yes -# -# use memory-only cache -# -MEMCACHE="yes" - -## Type: string(AUTOMATIC) -## Default: AUTOMATIC -# -# if you set CACHESIZE to "AUTOMATIC", it will automatically be chosen -# deduced by parition sizes (does not work if your cache is on / or -# /usr or /var) or by machine memory size for memory-only cache, -# otherwise the value in (1k-blocks) specified here will be used. -# -CACHESIZE="AUTOMATIC" - -## Type: string(AUTOMATIC,$XXLARGE,$XLARGE,$LARGE,$MEDIUM,$SMALL) -## Default: AUTOMATIC -# -# If you set OPTIONS to "AUTOMATIC", the init script will choose a set -# of options based on the cache size, otherwise the values specified here -# will be used. -# -OPTIONS="AUTOMATIC" - -## Type: string(/var/cache/openafs) -## Default: /var/cache/openafs -# -# Path to cache directory, it is recommended to use separate partition. -# It does not work on reiserfs. A valid directory must be specified -# even if memory only cache is used. -# Recommended cache directory is "/var/cache/openafs" -# -CACHEDIR="/var/cache/openafs" - -## Type: string(/afs) -## Default: /afs -# -# AFS directory. You should never need to change this -# -AFSDIR=/afs - -## Type: yesno -## Default: no -# -# Set to "yes" for a lot of debugging information from afsd. Only -# useful for debugging as it prints _a lot_ of information. -# -VERBOSE="no" - -## Type: string -## Default: "" -# -# SYSNAME of client. Used to expand the magic "@sys" in pathes within /afs. -# If left blank, the hardcoded sysname (e.g. amd64_linux26) will be used. -SYSNAME="" diff --git a/sysconfig.openafs-fuse-client-systemd b/sysconfig.openafs-fuse-client-systemd deleted file mode 100644 index a41b8a6..0000000 --- a/sysconfig.openafs-fuse-client-systemd +++ /dev/null @@ -1,7 +0,0 @@ -# -# startup options for the openAFS client. -# see man afsd for details - - -AFSD_ARGS="-fakestat -memcache -blocks 102400 -dynroot -afsdb" - diff --git a/sysconfig.openafs-server-systemd b/sysconfig.openafs-server similarity index 100% rename from sysconfig.openafs-server-systemd rename to sysconfig.openafs-server