Skip to content

Commit d37b5c0

Browse files
author
Marian Zvada
authored
Merge pull request #63 from djw8605/master
Fixing formatting on a bunch of pages
2 parents 280789d + 46cdc41 commit d37b5c0

5 files changed

Lines changed: 111 additions & 104 deletions

File tree

docs/admin/configure-cache-auth.md

Lines changed: 67 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,26 @@
22

33
Before you continue, make sure [default Cache Server](configure-cache.md) is configured on first place. Enabling authenticated cache is optionali and additional do default cache instance. This chapter describes all the steps needed.
44

5-
Packages installed: `stashcache-daemon fetch-crl stashcache-cache-server xrootd-lcmaps globus-proxy-utils`
5+
Packages installed:
6+
stashcache-daemon fetch-crl stashcache-cache-server xrootd-lcmaps globus-proxy-utils
67

78
## Authenticated Cache server
89

9-
:heavy_exclamation_mark: Make sure you've in place following pre-requisities from [install step here](install.md):
10+
Make sure you've in place following pre-requisities from [install step here](install.md):
11+
1012
* __Service certificate:__ create copy of the certificate to `/etc/grid-security/xrd/xrd{cert,key}.pem`
11-
* set owner of the directory `/etc/grid-security/xrd/` to `xrootd:xrootd` user:
12-
```
13-
$ chown -R xrootd:xrootd /etc/grid-security/xrd/
14-
```
13+
* Set owner of the directory `/etc/grid-security/xrd/` to `xrootd:xrootd` user:
14+
15+
$ chown -R xrootd:xrootd /etc/grid-security/xrd/
16+
1517
* __Network ports__: allow connections on port `8443 (TCP)`
1618

17-
:heavy_exclamation_mark: Beware, authenticated cache requires presence of the [config file](../configs/xrootd-stashcache-cache-server.cfg) `/etc/xrootd/xrootd-stashcache-cache-server.cfg`.
19+
Beware, authenticated cache requires presence of the [config file](../configs/xrootd-stashcache-cache-server.cfg) `/etc/xrootd/xrootd-stashcache-cache-server.cfg`.
1820

1921
Now, create symbolic link to existing configuration file with `-auth` postfix:
20-
```
21-
[root@client ~]$ cd /etc/xrootd/
22-
[root@client ~]$ ln -s xrootd-stashcache-cache-server.cfg xrootd-stashcache-cache-server-auth.cfg
23-
```
22+
23+
[root@client ~]$ cd /etc/xrootd/
24+
[root@client ~]$ ln -s xrootd-stashcache-cache-server.cfg xrootd-stashcache-cache-server-auth.cfg
2425

2526
### RHEL7
2627

@@ -32,89 +33,91 @@ On RHEL7 system, you need to configure and run following systemd units:
3233

3334
#### Auth.service
3435
1. Enable `xrootd@stashcache-cache-server-auth.service` instance:
35-
```
36-
[root@client ~]$ systemctl enable xrootd@stashcache-cache-server-auth
37-
```
36+
37+
[root@client ~]$ systemctl enable xrootd@stashcache-cache-server-auth
38+
3839

3940
2. Reload daemons:
40-
```
41-
[root@client ~]$ systemctl daemon-reload
42-
```
41+
42+
[root@client ~]$ systemctl daemon-reload
43+
4344

4445
#### Proxy.service
4546
1. Create the file with following content:
47+
4648
```
47-
[root@client ~]$ cat /usr/lib/systemd/system/xrootd-renew-proxy.service
48-
[Unit]
49-
Description=Renew xrootd proxy
50-
51-
[Service]
52-
User=xrootd
53-
Group=xrootd
54-
Type = oneshot
55-
ExecStart = /bin/grid-proxy-init -cert /etc/grid-security/xrd/xrdcert.pem -key /etc/grid-security/xrd/xrdkey.pem -out /tmp/x509up_xrootd -valid 48:00
56-
57-
[Install]
58-
WantedBy=multi-user.target
49+
[root@client ~]$ cat /usr/lib/systemd/system/xrootd-renew-proxy.service
50+
[Unit]
51+
Description=Renew xrootd proxy
52+
53+
[Service]
54+
User=xrootd
55+
Group=xrootd
56+
Type = oneshot
57+
ExecStart = /bin/grid-proxy-init -cert /etc/grid-security/xrd/xrdcert.pem -key /etc/grid-security/xrd/xrdkey.pem -out /tmp/x509up_xrootd -valid 48:00
58+
59+
[Install]
60+
WantedBy=multi-user.target
5961
```
6062

6163
2. Reload daemons:
62-
```
63-
[root@client ~]$ systemctl daemon-reload
64-
```
64+
65+
[root@client ~]$ systemctl daemon-reload
66+
6567

6668
#### Proxy.timer
6769
1. Create the file with following content:
6870
```
69-
[root@client ~]$ cat /usr/lib/systemd/system/xrootd-renew-proxy.timer
70-
[Unit]
71-
Description=Renew proxy every day at midnight
72-
73-
[Timer]
74-
OnCalendar=*-*-* 00:00:00
75-
Unit=xrootd-renew-proxy.service
76-
77-
[Install]
78-
WantedBy=multi-user.target
71+
[root@client ~]$ cat /usr/lib/systemd/system/xrootd-renew-proxy.timer
72+
[Unit]
73+
Description=Renew proxy every day at midnight
74+
75+
[Timer]
76+
OnCalendar=*-*-* 00:00:00
77+
Unit=xrootd-renew-proxy.service
78+
79+
[Install]
80+
WantedBy=multi-user.target
7981
```
8082

8183
2. Enable timer:
82-
```
83-
[root@client ~]$ systemctl enable xrootd-renew-proxy.timer
84-
```
84+
85+
[root@client ~]$ systemctl enable xrootd-renew-proxy.timer
86+
8587

8688
3. Start and check if timer is active and working:
87-
```
88-
[root@client ~]$ systemctl start xrootd-renew-proxy.timer
89-
...
90-
[root@client ~]$ systemctl is-active xrootd-renew-proxy.timer
91-
active
92-
[root@client ~]$ systemctl list-timers xrootd-renew-proxy*
93-
NEXT LEFT LAST PASSED UNIT ACTIVATES
94-
Thu 2017-05-11 00:00:00 CDT 54min left Wed 2017-05-10 00:00:01 CDT 23h ago xrootd-renew-proxy.timer xrootd-renew-proxy.service
95-
```
89+
90+
91+
[root@client ~]$ systemctl start xrootd-renew-proxy.timer
92+
...
93+
[root@client ~]$ systemctl is-active xrootd-renew-proxy.timer
94+
active
95+
[root@client ~]$ systemctl list-timers xrootd-renew-proxy*
96+
NEXT LEFT LAST PASSED UNIT ACTIVATES
97+
Thu 2017-05-11 00:00:00 CDT 54min left Wed 2017-05-10 00:00:01 CDT 23h ago xrootd-renew-proxy.timer xrootd-renew-proxy.service
98+
9699

97100
4. Reload daemons:
98-
```
99-
[root@client ~]$ systemctl daemon-reload
100-
```
101+
102+
[root@client ~]$ systemctl daemon-reload
103+
101104

102105
#### CRLs updates
103106
It is very important to keep CRL list updated from cron:
104107
1. Enable fetch-crl-cron
105108
```
106-
[root@client ~]$ systemctl enable fetch-crl-cron
109+
[root@client ~]$ systemctl enable fetch-crl-cron
107110
```
108111

109112
2. Start fetch-crl-cron
110-
```
111-
[root@client ~]$ systemctl start fetch-crl-cron
112-
```
113+
114+
[root@client ~]$ systemctl start fetch-crl-cron
115+
113116

114117
3. Reload daemons:
115-
```
116-
[root@client ~]$ systemctl daemon-reload
117-
```
118+
119+
[root@client ~]$ systemctl daemon-reload
120+
118121

119122
### RHEL6
120123
...to be added

docs/admin/configure-cache.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Packages installed: `stashcache-daemon fetch-crl stashcache-cache-server`
55
The following section describes required configuration to have a functional non-authenticated StashCache Cache (not origin server!). StashCache Cache package `stashcache-cache-server` needs to be manually configured from pre-existing XRootD configuration.
66

77
## Cache server
8-
!!! Note: While example of the configuration file below provides combination of _authenticated_ and _non-authenticated_ _Cache_, the non-authenticated cache is considered to be default and authenticated cache just optional (additional) service. If you're about to configure in addition _authenticated cache_ read to the end of this document and then follow post-installation of [authenticated part here](configure-cache-auth.md).
8+
!!! Note:
9+
While example of the configuration file below provides combination of _authenticated_ and _non-authenticated_ _Cache_, the non-authenticated cache is considered to be default and authenticated cache just optional (additional) service. If you're about to configure in addition _authenticated cache_ read to the end of this document and then follow post-installation of [authenticated part here](configure-cache-auth.md).
910

1011
For configuring **cache** one needs to define directive `pss.origin redirector.osgstorage.org:1024` (not `all.manager redirector.osgstorage.org+ 1213` directive as it is in case of [configuring origin](configure-origin.md)).
1112
`StashCache-daemon` package provides default configuration file `/etc/xrootd/xrootd-stashcache-cache-server.cfg`. Example of the configuration of cache server is as follows:

docs/admin/configure.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ xrootd.monitor all auth flush 30s window 5s fstat 60 lfn ops xfr 5 dest redir fs
2828
```
2929

3030
## Cache server
31-
!!! Note:
32-
:bangbang: While example of the configuration file below provides combination of _authenticated_ and _non-authenticated_ _Cache_, the non-authenticated cache config is considered to load by system as default.
31+
!!! Note
32+
While example of the configuration file below provides combination of _authenticated_ and _non-authenticated_ _Cache_, the non-authenticated cache config is considered to load by system as default.
3333

3434
For configuring **cache** one needs to define directive `pss.origin redirector.osgstorage.org:1024` (not `all.manager redirector.osgstorage.org+ 1213` directive as it is in case of configuring **origin**).
3535
`StashCache-daemon` package provides default configuration file `/etc/xrootd/xrootd-stashcache-cache-server.cfg`. Example of the configuration of cache server is as follows:

docs/admin/install.md

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,20 @@ Before starting the installation process, consider the following mandatory point
1313

1414
* __User IDs:__ If they do not exist already, the installation will create the Linux user IDs condor and xrootd
1515
* __Service certificate:__ The StashCache service uses a host certificate at `/etc/grid-security/host*.pem`
16-
* __Network ports:__ The StashCache service must talk to:
17-
* the central collector on port `9619 (TCP)`
18-
* XRootD service on port `1094 (TCP)`
19-
* and allow XRootD service over HTTP on port `8000 (TCP)`
16+
* __Network ports:__ The StashCache service must listen on ports:
17+
* the central collector on port `9619 (TCP)`
18+
* XRootD service on port `1094 (TCP)`
19+
* and allow XRootD service over HTTP on port `8000 (TCP)`
2020
* __Hardware requirements:__ We recommend that a StashCache server has at least 10Gbps connectivity, 1TB of disk space, and 8GB of RAM.
21-
* More information about hardware and system configuration of existing caches you can find at [Upgrade status page](../ops/upgrades.md).
21+
* More information about hardware and system configuration of existing caches you can find at [Upgrade status page](../ops/upgrades.md).
22+
23+
If installing the (optional) authenticated StashCache, you need to do in addition the following:
2224

23-
If installing authenticated StashCache, you need to do in addition following:
2425
* __Service certificate:__ create copy of the certificate to `/etc/grid-security/xrd/xrd{cert,key}.pem`
25-
* set owner of the directory `/etc/grid-security/xrd/` to `xrootd:xrootd` user:
26-
```
27-
$ chown -R xrootd:xrootd /etc/grid-security/xrd/
28-
```
26+
* set owner of the directory `/etc/grid-security/xrd/` to `xrootd:xrootd` user:
27+
28+
$ chown -R xrootd:xrootd /etc/grid-security/xrd/
29+
2930
* __Network ports__: allow connections on port `8443 (TCP)`
3031

3132
As with all OSG software installations, there are some one-time steps to prepare in advance:
@@ -40,29 +41,30 @@ As with all OSG software installations, there are some one-time steps to prepare
4041
The StashCache daemon consists of an XRootD server and an HTCondor-based service for collecting and reporting statistics about the cache. To simplify installation, OSG provides convenience RPMs that install all required software with a single command:
4142

4243
1. Clean yum cache:
43-
```
44-
[root@client ~]$ yum clean all --enablerepo=*
45-
```
44+
45+
[root@client ~]$ yum clean all --enablerepo=*
46+
4647

4748
2. Update software, this command will update all packages on your system:
48-
```
49-
[root@client ~]$ yum update
50-
```
49+
50+
[root@client ~]$ yum update
51+
5152

5253
3. Install the StashCache metapackage from OSG repository:
5354

54-
* if you are installing __Origin server__:
55-
```
56-
[root@client ~]$ yum install stashcache-daemon fetch-crl stashcache-cache-origin
57-
```
58-
* if you are installing __Cache server__:
59-
```
60-
[root@client ~]$ yum install stashcache-daemon fetch-crl stashcache-cache-server
61-
```
62-
63-
!!! Note: If installing authenticated StashCache Cache server, you need additional packages to be installed:
64-
```
65-
[root@client ~]$ yum install xrootd-lcmaps globus-proxy-utils
66-
```
55+
* if you are installing __Origin server__:
56+
57+
[root@client ~]$ yum install stashcache-daemon fetch-crl stashcache-cache-origin
58+
59+
* if you are installing __Cache server__:
60+
61+
[root@client ~]$ yum install stashcache-daemon fetch-crl stashcache-cache-server
62+
63+
64+
!!! Note:
65+
If installing authenticated StashCache Cache server, you need additional packages to be installed:
66+
67+
[root@client ~]$ yum install xrootd-lcmaps globus-proxy-utils
68+
6769

6870
4. Mount the disk that will be used for the cache to */stash* and set owner of the directory to `xrootd:xrootd` user.

docs/ops/register.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,27 @@ You can see the current state of affairs here:
1111
To register a cache instance go [here](https://oim.grid.iu.edu/oim/resourceedit) (with a cert in your browser). Fill in the required fields, example is displayed below:
1212

1313
### Registering StashCache resource information:
14-
* the site __must be__ _OSG-GOC_
15-
* the resource group __must be__ _Monitored Caches_
14+
* The site __must be__ _OSG-GOC_
15+
* The resource group __must be__ _Monitored Caches_
1616
![ResourceInfo](../images/resource-info.png)
1717

1818
### Registering StashCache resource services:
19-
* the service __must be__ XRootD component
19+
* The service __must be__ XRootD component
2020
![ResourceServices](../images/resource-services.png)
2121

22-
!!! Note: Contact Information (will be pre-filled, add or modify as you see fit) - there are several types of contact, administrative and security are the most important to the GOC - __DO NOT__ check the WLCG resource box; Add a Update comment if you'd like.
22+
!!! Note:
23+
Contact Information (will be pre-filled, add or modify as you see fit) - there are several types of contact, administrative and security are the most important to the GOC - __DO NOT__ check the WLCG resource box; Add a Update comment if you'd like.
2324

2425
### Confirming and submitting StashCache resource registration:
25-
* you must click the __"Acceptable Use Policy"__ checkbox
26+
* Tou must click the __"Acceptable Use Policy"__ checkbox
2627
![FormConfirm](../images/resource-confirm.png)
2728
Hit the __blue__ submit button.
2829

2930
## Configuring resource monitoring for RSV
3031
E.g. for the Nebraska instance the status of the following command is checked:
31-
```
32-
[user@client ~]$ xrdcp root://hcc-stash.unl.edu//stash/user/test.1M /tmp/dump
33-
```
32+
33+
[user@client ~]$ xrdcp root://hcc-stash.unl.edu//stash/user/test.1M /tmp/dump
34+
3435
If the return status is zero, the cache is working, otherwise it is not. What we need from you is:
3536
* the equivalent `//stash/user/test.1M` a file you select that will always be there.
3637

0 commit comments

Comments
 (0)