Skip to content

Commit 7c9a24e

Browse files
spell checking, remove a lot of whitespace, rephrasing some things, reformatting texttt, fix broken link (#199)
1 parent f796322 commit 7c9a24e

28 files changed

+699
-663
lines changed

apx-contact.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Contact Information
44
For support requests and bug reports, please submit a GitHub issue in our
55
`issue tracker <https://github.com/cvmfs/cvmfs/issues>`_.
66

7-
Together with bug reports, please attach a "bugreport tarball", which is created
7+
Together with bug reports, please attach a "bug report tarball", which is created
88
with ``sudo cvmfs_config bugreport``.
99

1010
Discourse Forum

apx-issues.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ This issue is resolved in CernVM-FS 2.11.
1313
Publisher nodes with AUFS and XFS
1414
---------------------------------
1515

16-
If the /tmp file system is on xfs, the publisher node cannot be used with AUFS.
16+
If the ``/tmp`` file system is on xfs, the publisher node cannot be used with AUFS.
1717
On such systems, adding the mount option ``xino=/dev/shm/aufs.xino`` can be
1818
a workaround. In general, new repositories should use OverlayFS if available.

apx-parameters.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ CVMFS_HTTP_PROXY | Chain of HTTP proxy groups used by CernVM-FS.
6060
CVMFS_IGNORE_SIGNATURE When set to *yes*, don't verify CernVM-FS file catalog signatures.
6161
CVMFS_INITIAL_GENERATION Initial inode generation. Used for testing.
6262
CVMFS_INSTRUMENT_FUSE | When set to *true* gather performance statistics about the FUSE callbacks.
63-
| The results are displayed with `cvmfs_talk internal affairs`.
63+
| The results are displayed with ``cvmfs_talk internal affairs``.
6464
CVMFS_NFS_INTERLEAVED_INODES In NFS mode, use only inodes of the form :math:`an+b`, specified as "b%a".
6565
CVMFS_INFLUX_EXTRA_FIELDS Static fields always attached to the (absolute) output of the InfluxDB Telemetry Aggregator
6666
CVMFS_INFLUX_EXTRA_TAGS Static tags always attached to the (absolute + delta) output of the InfluxDB Telemetry Aggregator
@@ -79,7 +79,7 @@ CVMFS_MAX_IPADDR_PER_PROXY | Limit the number of IP addresses a proxy names
7979
CVMFS_MAX_RETRIES Maximum number of retries for a given proxy/host combination.
8080
CVMFS_MAX_SERVERS Limit the number of (geo sorted) stratum 1 servers that are effectively used.
8181
CVMFS_MAX_TTL Maximum file catalog TTL in minutes. Can overwrite the TTL stored in the catalog.
82-
CVMFS_MEMCACHE_SIZE Size of the CernVM-FS meta-data memory cache in Megabyte.
82+
CVMFS_MEMCACHE_SIZE Size of the CernVM-FS metadata memory cache in Megabyte.
8383
CVMFS_MOUNT_RW | Mount CernVM-FS as a read/write file system. Write operations will fail
8484
| but this option can workaround faulty ``open()`` flags.
8585
CVMFS_NFILES Maximum number of open file descriptors that can be used by the CernVM-FS process.
@@ -222,7 +222,7 @@ CVMFS_UNION_DIR | Mount point of the union file system for c
222222
| Here, changes to the repository are performed
223223
| (see :ref:`sct_repocreation_update`).
224224
CVMFS_UNION_FS_TYPE | Defines the union file system to be used for the repository.
225-
| (currently `aufs` and `overlayfs` are fully supported)
225+
| (only ``overlayfs`` is fully supported, ``aufs`` has no active support anymore)
226226
CVMFS_UPLOAD_STATS_DB | Publish repository statistics data file to the Stratum 0 /stats location
227227
CVMFS_UPLOAD_STATS_PLOTS | Publish repository statistics plots and webpage to the Stratum 0 /stats location (requires ROOT)
228228
CVMFS_UPSTREAM_STORAGE | Upstream spooler description defining the basic upstream storage type

apx-rpms.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ The CernVM-FS software is available in form of several packages:
1414
cern.ch, egi.eu, and opensciencegrid.org domains.
1515

1616
**cvmfs-config-none**
17-
Empty package to satisfy the cvmfs-config requirement of the cvmfs
17+
Empty package to satisfy the ``cvmfs-config`` requirement of the cvmfs
1818
package without actually installing any configuration.
1919

2020
**cvmfs**
2121
Contains the Fuse module and additional client tools. It has
22-
dependencies to at least one of the cvmfs-config-\ :math:`\cdots`
22+
dependencies to at least one of the ``cvmfs-config-...``
2323
packages.
2424

2525
**cvmfs-fuse3**
@@ -50,12 +50,12 @@ The CernVM-FS software is available in form of several packages:
5050
on a publisher node.
5151

5252
**cvmfs-notify**
53-
Websockets frontend for used for repository update notifications. Supposed
53+
WebSockets frontend for used for repository update notifications. Supposed
5454
to be co-located with a RabbitMQ service.
5555

5656
**kernel-...-.aufs21**
57-
Scientific Linux 6 kernel with aufs. Required for SL6 based
58-
Stratum 0 servers.
57+
Scientific Linux 6 kernel with ``aufs``. Required for SL6 based
58+
Stratum 0 servers. (Note: no active support for ``aufs`` anymore)
5959

6060
**cvmfs-shrinkwrap**
6161
Stand-alone utility to export file system trees into containers for HPC

apx-security.rst

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,47 @@ Security Considerations
44
=======================
55

66
CernVM-FS provides end-to-end data integrity and authenticity using a signed
7-
Merkle Tree. CernVM-FS clients verify the signature and the content hashes of
8-
all downloaded data. Once a particular revision of a file system is stored in
7+
Merkle Tree. CernVM-FS clients verify the signature and the content hashes of
8+
all downloaded data. Once a particular revision of a file system is stored in
99
a client's local cache, the client will not apply an older revision anymore.
1010

1111
The public key used to ultimately verify a repository's signature needs to be
1212
distributed to clients through a channel different from CernVM-FS content
13-
distribution. In practice, these public keys are distributed as part of the
14-
source code or through ``cvmfs-config-...`` packages. One or multiple public
13+
distribution. In practice, these public keys are distributed as part of the
14+
source code or through ``cvmfs-config-...`` packages. One or multiple public
1515
keys can be configured for a repository (the *fully qualified repository name*),
1616
all repositories within a specific domain (like ``*.cern.ch``) or all
17-
repositories (``*``). If multiple keys are configured, it is sufficient if any
17+
repositories (``*``). If multiple keys are configured, it is sufficient if any
1818
of them validates a signature.
1919

2020
Besides the client, data is also verified by the replication code (Stratum 1 or
2121
preloaded cache) and by the release manager machine in case the repository is
2222
stored in S3 and not on a local file system.
2323

24-
CernVM-FS does **not** provide data confidentiality out of the box. By default
24+
CernVM-FS does **not** provide data confidentiality out of the box. By default,
2525
data is transferred through HTTP and thus only public data should be stored on
26-
CernVM-FS. However, CernVM-FS can be operated with HTTPS data transport. In
26+
CernVM-FS. However, CernVM-FS can be operated with HTTPS data transport. In
2727
combination with client-authentication using an authz helper (see Section
2828
:ref:`sct_authz`), CernVM-FS can be configured for end-to-end data
2929
confidentiality.
3030

3131
Once downloaded and stored in a cache, the CernVM-FS client fully trusts the
32-
cache. Data in the cache can be checked for silent corruption but no integrity
32+
cache. Data in the cache can be checked for silent corruption but no integrity
3333
re-check takes place.
3434

3535
Signature Details
3636
-----------------
3737

38-
Creating and validating a repository signature is a two-step process. The
38+
Creating and validating a repository signature is a two-step process. The
3939
*repository manifest* (the file ``.cvmfspublished``) is signed by a private RSA
4040
key whose public part is stored in the form of an X.509 certificate in the
41-
repository. The fingerprint of all certificates that are allowed to sign a
41+
repository. The fingerprint of all certificates that are allowed to sign a
4242
repository is stored on a *repository whitelist* (the file ``.cvmfswhitelist``).
4343
The whitelist is signed with a different RSA key, the *repository master key*.
4444
Only the public part of this master key needs to be distributed to clients.
4545

4646
The X.509 certificate currently only serves as an envelope for the public part
47-
of a repository key. No further certificate validation takes place.
47+
of a repository key. No further certificate validation takes place.
4848

4949
The repository manifest contains, among other information, the content hash of
5050
the root file catalog, the content hash of the signing certificate, the fully
@@ -53,11 +53,11 @@ content of the manifest is hashed and encrypted with a private repository key.
5353
The timestamp and repository name are used prevent replay attacks.
5454

5555
The whitelist contains the fully qualified repository name, a creation
56-
timestamp, an expiry timestamp, and the certificate fingerprints. Since the
56+
timestamp, an expiry timestamp, and the certificate fingerprints. Since the
5757
whitelist expires, it needs to be regularly resigned.
5858

5959
The private part of the repository key needs to be accessible on the release
60-
manager machine. The private part of the repository master key used to sign the
60+
manager machine. The private part of the repository master key used to sign the
6161
whitelist *can* be maintained on a file on the release manager machine.
6262
We recommend, however, to use a smart card to store this private key.
6363
See section :ref:`sct_master_keys` for more details.
@@ -67,27 +67,27 @@ Content Hashes
6767
--------------
6868

6969
CernVM-FS supports multiple content hash algorithms: SHA-1 (default),
70-
RIPEMD-160, and SHAKE-128 with 160 output bits. The content hash algorithm
71-
can be changed with every repository publish operation. Files and file catalogs
72-
hashed with different content hash algorithms can co-exist. On changing the
70+
RIPEMD-160, and SHAKE-128 with 160 output bits. The content hash algorithm
71+
can be changed with every repository publish operation. Files and file catalogs
72+
hashed with different content hash algorithms can co-exist. On changing the
7373
algorithm, new and changed files are hashed with the new algorithm, existing
74-
data remains unchanged. That allows seamless migration from one algorithm to
74+
data remains unchanged. That allows seamless migration from one algorithm to
7575
another.
7676

7777

7878
Local UNIX Permissions
7979
----------------------
8080

81-
Most parts of CernVM-FS do not require root privileges. On the server side,
81+
Most parts of CernVM-FS do not require root privileges. On the server side,
8282
only creating and deleting a repository (or replica) requires root privileges.
8383
Repository transactions and snapshots can be performed with an unprivileged user
84-
account. In order to remount a new file system revision after publishing a
85-
transaction, the release manager machines uses a custom suid binary.
84+
account. In order to remount a new file system revision after publishing a
85+
transaction, the release manager machine uses a custom suid binary.
8686

87-
On client side, the CernVM-FS fuse module is normally started as root. It drops
87+
On client side, the CernVM-FS fuse module is normally started as root. It drops
8888
root privileges and changes the persona to the ``cvmfs`` user early in the file
89-
system initialization. The client RPM package installs SElinux rules for RHEL6
90-
and RHEL7. The cache directory should be labeled as ``cvmfs_cache_t``.
89+
system initialization. The client RPM package installs SElinux rules for RHEL6
90+
and RHEL7. The cache directory should be labeled as ``cvmfs_cache_t``.
9191

9292

9393
.. _sct_running_client_as_normal_user:
@@ -96,15 +96,15 @@ Running the client as a normal user
9696
-----------------------------------
9797

9898
The client can also be started as a normal user. In this case, the user needs
99-
to have access to /dev/fuse. On Linux kernels < 4.18, mounting /dev/fuse is
99+
to have access to /dev/fuse. On Linux kernels < 4.18, mounting /dev/fuse is
100100
either performed by fuse's ``fusermount`` utility or through a pre-mounted file
101101
descriptor. On newer Linux kernels, the client can mount as an unprivileged
102102
user in a user namespace with a detached mount namespace.
103103

104104
The easiest way to run the client as a normal user is with the
105-
`cvmfsexec <https://github.com/cvmfs/cvmfsexec>`_ package. It supports
105+
`cvmfsexec <https://github.com/cvmfs/cvmfsexec>`_ package. It supports
106106
four ways to run cvmfs as an unprivileged user, depending on the
107-
capabilities available on the host. See the README there for details.
107+
capabilities available on the host. See the README there for details.
108108

109109

110110
SETUID bit and file capabilities
@@ -120,7 +120,7 @@ and file capabilities is restored.
120120
CernVM-FS Software Distribution
121121
-------------------------------
122122

123-
CernVM-FS software is distributed through HTTPS in packages. There are yum and
124-
apt repositories for Linux and ``pkg`` packages for OS X. Software is available
125-
from HTTPS servers. The Linux packages and repositories are signed with a GPG
123+
CernVM-FS software is distributed through HTTPS in packages. There are yum and
124+
apt repositories for Linux and ``pkg`` packages for OS X. Software is available
125+
from HTTPS servers. The Linux packages and repositories are signed with a GPG
126126
key.

apx-serverinfra.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Prerequisites
1818
A CernVM-FS server installation depends on the following environment
1919
setup and tools to be in place:
2020

21-
- Appropriate kernel version. You must have ONE of the following:
21+
- Appropriate kernel version. You must have ONE of the following:
2222

2323
- kernel 4.2.x or later.
2424
- RHEL7.3 kernel (for OverlayFS)
@@ -34,7 +34,7 @@ Local Backend Storage Infrastructure
3434
------------------------------------
3535

3636
CernVM-FS stores the entire repository content (file content and
37-
meta-data catalogs) into a content addressable storage (CAS). This
37+
metadata catalogs) into a content addressable storage (CAS). This
3838
storage can either be a file system at ``/srv/cvmfs`` or an S3
3939
compatible object storage system (see ":ref:`sct_s3storagesetup`" for
4040
details). In the former case the contents of ``/srv/cvmfs`` are as
@@ -148,7 +148,7 @@ Repository Configuration Directory
148148

149149
The authoritative configuration of a CernVM-FS repository is located in
150150
``/etc/cvmfs/repositories.d`` and should only be writable by the
151-
administrator. Furthermore the repository's keychain is located in
151+
administrator. Furthermore, the repository's keychain is located in
152152
``/etc/cvmfs/keys`` and follows the naming convention ``<fqrn>.crt`` for
153153
the certificate, ``<fqrn>.key`` for the repository's private key and
154154
``<fqrn>.pub`` for the public key. All of those files can be symlinked
@@ -199,14 +199,14 @@ chosen backend storage type. For an S3 hosted backend storage, the
199199
CernVM-FS client can usually be directly pointed to the S3 bucket used
200200
for storage (see ":ref:`sct_s3storagesetup`" for details). In case of a
201201
local file system backend any web server can be used for this purpose.
202-
By default CernVM-FS assumes Apache and uses that automatically.
202+
By default, CernVM-FS assumes Apache and uses that automatically.
203203

204204
Internally the CernVM-FS server uses a SUID binary (i.e.
205205
``cvmfs_suid_helper``) to manipulate its mount points. This is necessary
206206
since transactional CernVM-FS commands must be accessible to the
207207
repository owner that is usually different from root. Both the mount
208208
directives for ``/var/spool/cvmfs/<fqrn>/rdonly`` and ``/cvmfs/<fqrn>``
209-
must be placed into ``/etc/fstab`` for this reason. By default
209+
must be placed into ``/etc/fstab`` for this reason. By default,
210210
CernVM-FS uses the following entries for these mount points:
211211

212212
::

conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
#
6969
# This is also used if you do content translation via gettext catalogs.
7070
# Usually you set "language" from the command line for these cases.
71-
language = None
71+
language ="en"
7272

7373
# There are two options for replacing |today|: either, you set today to some
7474
# non-false value, then it is used:

0 commit comments

Comments
 (0)