Skip to content

Commit f8e7fc3

Browse files
committed
moved some pointers to dirac-install
1 parent 479e3a6 commit f8e7fc3

File tree

7 files changed

+24
-97
lines changed

7 files changed

+24
-97
lines changed

container/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN mkdir -p /opt/dirac/DIRAC && \
2424
# Installing DIRAC in /opt/dirac
2525
RUN \
2626
cd /opt/dirac && \
27-
curl -L -o dirac-install https://raw.githubusercontent.com/DIRACGrid/DIRAC/integration/src/DIRAC/Core/scripts/dirac-install.py && \
27+
curl -L -o dirac-install https://raw.githubusercontent.com/DIRACGrid/management/master/dirac-install.py && \
2828
chmod +x dirac-install && \
2929
./dirac-install -r v6r20 -t server -i 27 -g v14r1 && \
3030
rm -rf /opt/dirac/.installCache && \

docs/source/AdministratorGuide/Tutorials/basicTutoSetup.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ the user's home folder):
214214

215215
The output should look something like this::
216216

217-
--2019-04-11 08:51:21-- https://github.com/DIRACGrid/DIRAC/raw/integration/src/DIRAC/Core/scripts/dirac-install.py
217+
--2019-04-11 08:51:21-- https://raw.githubusercontent.com/DIRACGrid/management/master/dirac-install.py
218218
Resolving github.com... 140.82.118.4, 140.82.118.3
219219
Connecting to github.com|140.82.118.4|:443... connected.
220220
HTTP request sent, awaiting response... 302 Found

docs/source/AdministratorGuide/Tutorials/basicTutoSetup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ chown -R diracuser:diracuser ~diracuser/.globus/
225225
cat > InstallDiracClient <<EOF
226226
# START installClient1
227227
mkdir -p ~/DiracInstallation && cd ~/DiracInstallation
228-
curl -O -L https://github.com/DIRACGrid/DIRAC/raw/integration/src/DIRAC/Core/scripts/dirac-install.py
228+
curl -O -L https://raw.githubusercontent.com/DIRACGrid/management/master/dirac-install.py
229229
chmod +x dirac-install.py
230230
./dirac-install.py -r v7r0p36 --dirac-os
231231
# END installClient1

docs/source/UserGuide/GettingStarted/InstallingClient/index.rst

Lines changed: 13 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.. _dirac_install:
22

33

4-
==================================
4+
=======================
55
Installing DIRAC client
6-
==================================
6+
=======================
77

88
The DIRAC client installation procedure consists of few steps.
99
You can do these steps as any user without the need to be root.
@@ -15,77 +15,21 @@ If you want to create a shared client installation, you can do it by simply givi
1515
to the directory where the client is installed.
1616

1717

18-
Install script
19-
---------------
18+
Install script (for python2 clients)
19+
------------------------------------
2020

21-
Download the *dirac-install* script from::
22-
23-
wget -np -O dirac-install https://github.com/DIRACGrid/DIRAC/raw/integration/src/DIRAC/Core/scripts/dirac-install.py --no-check-certificate
24-
chmod +x dirac-install
25-
26-
Choose the directory where you want to install the DIRAC software and run the dirac-install script from
27-
this directory giving the appropriate version of the DIRAC release,
28-
and the version of the "lcgBundle" (with "-g" option), to be skipped by MacOS and RHEL(other than 6 or 7 equivalent) users due to its current unavailability, that you want to use::
29-
30-
dirac-install -r v6r20p14 -g v14r2
31-
32-
The example above assumes that you need the release version v6r20p14 and along with that lcgBundle version v14r2 to be installed.
33-
34-
An "lcgBundle" is simply a tarball(.tar) file containing a number of statically-compiled libraries that are used
35-
for interacting with grid environments (e.g. GFAL2, or ARC, or Condor).
36-
The libraries in "lcgBundle" are not maintained within DIRAC, but DIRAC may use them.
37-
The produced lcgBundles can be found on `this server <http://diracproject.web.cern.ch/diracproject/lcgBundles/>`_.
38-
39-
40-
This installs the software and you should get the following directories and files::
41-
42-
drwxr-xr-x. 20 dirac dirac 4096 Jul 25 15:13 DIRAC
43-
drwxr-xr-x. 6 dirac dirac 4096 Jul 21 16:27 Linux_x86_64_glibc-2.12
44-
-rw-r--r--. 1 dirac dirac 2153 Jul 25 15:13 bashrc
45-
-rw-r--r--. 1 dirac dirac 2234 Jul 25 15:13 cshrc
46-
-rw-r--r--. 1 dirac dirac 42 Jul 25 15:13 defaults-DIRAC.cfg
47-
-rwxr-xr-x. 1 dirac dirac 61754 Jul 25 15:11 dirac-install
48-
drwxr-xr-x. 2 dirac dirac 12288 Jul 25 15:13 scripts
49-
50-
51-
Instead of the *Linux_x86_64_glibc-2.12* directory there can be another one that corresponds to the binary platform
52-
of your installation. The *scripts* directory contains command line tools. The *DIRAC* directory has all the
53-
software. Finally, the *bashrc* and *cshrc* script is there to easily set up the environment for your DIRAC installation,
54-
so assuming you are using bash::
21+
Choose the directory where you want to install the DIRAC software and run the dirac-install and dirac-configure scripts from
22+
this directory::
5523

24+
wget -np -O https://raw.githubusercontent.com/DIRACGrid/management/master/dirac-install.py --no-check-certificate
25+
chmod +x dirac-install.py
26+
./dirac-install.py -r v7r2 -t client
5627
source bashrc
28+
dirac-proxy-init --nocs
29+
dirac-configure -S DIRAC-Certification -C dips://some.whe.re:9135/Configuration/Server --SkipCAChecks
5730

58-
Think of adding the above line to your login scripts.
59-
60-
Configuring client
61-
----------------------------
62-
63-
Once the client software is installed, it should be configured in order to access the corresponding DIRAC services.
64-
The minimal necessary configuration is done by *dirac-configure* command.
65-
66-
The dirac-configure command can take as input a .cfg file whose content can be, for example, the following::
67-
68-
LocalInstallation
69-
{
70-
ConfigurationServer = dips://lbcertifdirac70.cern.ch:9135/Configuration/Server
71-
Setup = Dirac-Certification
72-
}
73-
74-
where the Setup option is specifying the DIRAC Setup name within which the client will be working.
75-
The ConfigurationServer option is used to define the URL of the Configuration Service
76-
that the client will contact to discover all the DIRAC services.
77-
78-
The exact values for the command options are specific to a given user community, ask the
79-
group administrators for details. Typically, a single-community specific installation script will be
80-
provided, which includes all the necessary specifications.
81-
82-
In any case, save a "install.cfg" file with the content desired.
83-
84-
At this point, in order to successfully issue the *dirac-configure* command, you need either a user proxy, or a host certificate.
85-
These are needed because dirac-configure will take care of updating the local configuration, but more importantly, it will
86-
download the CAs(Certification Authorities) used for connecting to DIRAC services
87-
(this option may be overridden if necessary).
88-
31+
The example above assumes that you need the release version v7r2.
32+
8933
**Using a user proxy**
9034

9135
If you want to use a user proxy, we assume that you already have a user certificate,
@@ -102,23 +46,6 @@ At this point you need a proxy, but you still have not configured DIRAC. So, you
10246
This will probably give you an error, but will still create a local proxy file anyway.
10347
You can see which file is your proxy certificate using the *dirac-proxy-info* command.
10448

105-
It is then possible to issue the *dirac-configure* command::
106-
107-
dirac-configure install.cfg
108-
109-
**Using a host certificate**
110-
111-
If you have a host certificate for the machine where the client is being installed,
112-
and if this host certificate Distinguished Name (DN) is registered in the Configuration Server of the DIRAC server
113-
machine, then such a host certificate can be used instead of the user proxy certificate,
114-
with the following command::
115-
116-
dirac-configure --UseServerCertificate -o /DIRAC/Security/CertFile=<directory>/hostcert.pem -o /DIRAC/Security/KeyFile=<directory>/hostkey.pem install.cfg
117-
118-
119-
120-
121-
12249
Updating client
12350
----------------
12451

docs/source/UserGuide/Tutorials/ClientInstallation/index.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
======================
2-
1. Client Installation
3-
======================
1+
============================================
2+
1. Client Installation (for python2 clients)
3+
============================================
44

55
The DIRAC client installation procedure consists of several steps. This example is destinated for tutorials.
66
For more information about various options of installing DIRAC Client see the :ref:`Getting Started guide <dirac_install>`.
77

88
1.1 Install script
99
------------------
1010

11-
Download the *dirac-install* script from `here <https://github.com/DIRACGrid/DIRAC/raw/master/Core/scripts/dirac-install.py>`_::
11+
Download the *dirac-install* script from `here <https://raw.githubusercontent.com/DIRACGrid/management/master/dirac-install.py>`_::
1212

13-
curl https://github.com/DIRACGrid/DIRAC/raw/master/Core/scripts/dirac-install.py --output=dirac-install
13+
curl https://raw.githubusercontent.com/DIRACGrid/management/master/dirac-install.py --output=dirac-install
1414
chmod +x dirac-install
1515

1616

tests/Integration/WorkloadManagementSystem/Test_GenerateAndExecutePilotWrapper.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@
4949
di = url_library_urlopen(sys.argv[2],
5050
context=context)
5151
except IndexError:
52-
di_loc = 'https://raw.githubusercontent.com/DIRACGrid/DIRAC/integration/src/DIRAC/Core/scripts/dirac-install.py'
52+
di_loc = 'https://raw.githubusercontent.com/DIRACGrid/management/master/dirac-install.py'
5353
di = url_library_urlopen(di_loc,
5454
context=context)
5555
else:
5656
rf = url_library_urlopen(sys.argv[1])
5757
try: # dirac-install.py location from the args, if provided
5858
di = url_library_urlopen(sys.argv[2])
5959
except IndexError:
60-
di_loc = 'https://raw.githubusercontent.com/DIRACGrid/DIRAC/integration/src/DIRAC/Core/scripts/dirac-install.py'
60+
di_loc = 'https://raw.githubusercontent.com/DIRACGrid/management/master/dirac-install.py'
6161
di = url_library_urlopen(di_loc)
6262

6363
with open('PilotWrapper.py', 'wb') as pj:

virtualmachine/Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Vagrant.configure("2") do |config|
8585
# ln -s /home/vagrant/etc /home/vagrant/hostcode/etc
8686

8787
# # Installing DIRAC in /opt/dirac
88-
# curl -L -o dirac-install https://raw.githubusercontent.com/DIRACGrid/DIRAC/integration/src/DIRAC/Core/scripts/dirac-install.py && \
88+
# curl -L -o dirac-install https://raw.githubusercontent.com/DIRACGrid/management/master/dirac-install.py && \
8989
# chmod +x dirac-install && \
9090
# ./dirac-install -r $DIRAC_VERSION -t client && \
9191
# rm dirac-install && \

0 commit comments

Comments
 (0)