Skip to content

Commit 4b5f728

Browse files
fstagnifstagni
authored
Merge pull request DIRACGrid#7896 from fstagni/90_setup_removals
[9.0] More setup removals
2 parents bc5b5fb + 37b1d7a commit 4b5f728

File tree

55 files changed

+70
-577
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+70
-577
lines changed

‎dirac.cfg‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ DIRAC
55
# The option is defined in a single VO installation.
66
#VirtualOrganization = myVO
77

8-
# The name of the DIRAC installation Setup. This option is defined in the client
9-
# installations to define which subset of DIRAC Systems the client will work with.
10-
Setup = mySetup
11-
128
# The list of extensions to the Core DIRAC software used by the given installation
139
#Extensions = WebApp
1410

@@ -101,31 +97,8 @@ DIRAC
10197
# grant_types = refresh_token,
10298
#}
10399
}
104-
105100
}
106-
107101
}
108-
109-
# The subsection defines the names of different DIRAC Setups.
110-
Setups
111-
{
112-
113-
# For each Setup known to the installation, there must be a subsection with the appropriate name.
114-
# In each subsection of the Setup section the names of corresponding system instances are defined.
115-
# In the example below "Production" instances of the Configuration
116-
# and Framework systems are defined as part of the "Dirac-Production" setup.
117-
Dirac-Production
118-
{
119-
# Each option represents a DIRAC System available in the Setup
120-
# and the Value is the instance of System that is used in that setup.
121-
# For instance, since the Configuration is unique for the whole installation,
122-
# all setups should have the same instance for the Configuration systems.
123-
Configuration = Production
124-
Framework = Production
125-
}
126-
127-
}
128-
129102
}
130103
# This part contains anything related to DiracX
131104
DiracX

‎docs/docs.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ sectionPath = source/AdministratorGuide/CommandReference
9595
title = General information
9696

9797
# [mandatory] pattern to match in the full path of the command names.
98-
pattern = dirac-admin-service-ports, dirac-platform
98+
pattern = dirac-platform
9999

100100
# this list of patterns will reject scripts that are matched by the patterns above
101101
# exclude = user

‎docs/source/AdministratorGuide/Configuration/ConfReference/Operations/VOs/index.rst‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
Operations / VOs - Subsections
22
==============================
33

4-
<VO_NAME> subsections allows to define pilot jobs versions for each setup defined for each VO supported by the server.
4+
<VO_NAME> subsections allows to define pilot jobs DIRAC versions for each VO supported by the server.
55

66
+-----------------------------------------------+----------------------------------------------+---------------------------+
77
| **Name** | **Description** | **Example** |
88
+-----------------------------------------------+----------------------------------------------+---------------------------+
99
| *<VO_NAME>* | Subsection: Virtual organization name | vo.formation.idgrilles.fr |
1010
+-----------------------------------------------+----------------------------------------------+---------------------------+
11-
| *<VO_NAME>/<SETUP_NAME>/* | Subsection: VO Setup name | Dirac-Production |
12-
+-----------------------------------------------+----------------------------------------------+---------------------------+
1311

1412
This section will progressively incorporate most of the other sections under /Operations in such a way
15-
that different values can be defined for each [VO] (in multi-VO installations) and [Setup]. A helper
13+
that different values can be defined for each [VO] (in multi-VO installations). A helper
1614
class is provided to access to these new structure.
1715

1816
::

‎docs/source/AdministratorGuide/Configuration/ConfReference/Operations/index.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ This section allows to configure options concerning to:
1313
- Virtual Organization special parameters
1414
- Component Monitoring
1515

16-
In the short term, most of this schema will be moved into [vo]/[setup] dependent sections in order to allow better support for multi-VO installations.
17-
1816
.. toctree::
1917
:maxdepth: 2
2018

‎docs/source/AdministratorGuide/Configuration/ConfReference/Systems/Accounting/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Accounting System configuration
22
==================================
33

4-
In this subsection are described the databases, services and URLs related with Accounting framework for each setup.
4+
In this subsection are described the databases, services and URLs related with Accounting framework.
55

66
.. toctree::
77
:maxdepth: 2

‎docs/source/AdministratorGuide/Configuration/ConfReference/Systems/Configuration/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Configuration System configuration
22
==================================
33

4-
In this subsection are described the databases, services and URLs related with Accounting framework for each setup.
4+
In this subsection are described the databases, services and URLs related with Accounting framework.
55

66
.. toctree::
77
:maxdepth: 2

‎docs/source/AdministratorGuide/Configuration/ConfReference/Systems/DataManagement/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
DataManagement System configuration
22
======================================
33

4-
In this subsection are described the databases, services and URLs related with the DataManagement system for each setup.
4+
In this subsection are described the databases, services and URLs related with the DataManagement system.
55

66
.. toctree::
77
:maxdepth: 2

‎docs/source/AdministratorGuide/Configuration/ConfReference/Systems/Framework/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Framework System configuration
22
==================================
33

4-
In this subsection are described the databases, services and URLs related with Framework System for each setup.
4+
In this subsection are described the databases, services and URLs related with Framework System.
55

66
.. toctree::
77
:maxdepth: 2

‎docs/source/AdministratorGuide/Configuration/ConfReference/Systems/StorageManagement/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
StorageManagement System configuration
22
=========================================
33

4-
In this subsection are described the databases, services and URLs related with RequestManagement System for each setup.
4+
In this subsection are described the databases, services and URLs related with RequestManagement System.
55

66
.. toctree::
77
:maxdepth: 2

‎docs/source/AdministratorGuide/Configuration/ConfReference/Systems/Transformation/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Transformation System configuration
22
=========================================
33

44
In this subsection are described the databases, services, agents, and URLs related to
5-
Transformation System for each setup.
5+
Transformation System.
66

77
.. toctree::
88
:maxdepth: 2

0 commit comments

Comments
 (0)