svg
This commit is contained in:
15
docker/.vscode/settings.json
vendored
15
docker/.vscode/settings.json
vendored
@ -1,15 +0,0 @@
|
||||
{
|
||||
"markdown-pdf.stylesRelativePathFile": true,
|
||||
"markdown-pdf.styles": [
|
||||
"./misc/tools/cadoles_theme.css"
|
||||
],
|
||||
"markdown-pdf.breaks": true,
|
||||
"markdown-pdf.outputDirectory": "./",
|
||||
"markdown.extension.toc.levels": "2..6",
|
||||
"markdown-pdf.outputDirectoryRelativePathFile": true,
|
||||
"markdown-pdf.headerTemplate": "<div style=\"font-size: 9px; margin-left: 1cm;\">SHELA</div> <div style=\"font-size: 9px; margin-left: auto; margin-right: 1cm; \"> Cadoles - <span class='date'></span></div>",
|
||||
"esbonio.sphinx.confDir": "",
|
||||
"markdown-pdf.convertOnSave": true,
|
||||
"markdown-pdf.type": ["pdf","html"],
|
||||
"markdown-pdf.convertOnSaveExclude": ["readme.md"],
|
||||
}
|
||||
@ -1,479 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>etude.md</title>
|
||||
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
|
||||
|
||||
<style>
|
||||
/* https://github.com/microsoft/vscode/blob/master/extensions/markdown-language-features/media/markdown.css */
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
body {
|
||||
font-family: var(--vscode-markdown-font-family, -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "Ubuntu", "Droid Sans", sans-serif);
|
||||
font-size: var(--vscode-markdown-font-size, 14px);
|
||||
padding: 0 26px;
|
||||
line-height: var(--vscode-markdown-line-height, 22px);
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
#code-csp-warning {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
right: 0;
|
||||
color: white;
|
||||
margin: 16px;
|
||||
text-align: center;
|
||||
font-size: 12px;
|
||||
font-family: sans-serif;
|
||||
background-color:#444444;
|
||||
cursor: pointer;
|
||||
padding: 6px;
|
||||
box-shadow: 1px 1px 1px rgba(0,0,0,.25);
|
||||
}
|
||||
|
||||
#code-csp-warning:hover {
|
||||
text-decoration: none;
|
||||
background-color:#007acc;
|
||||
box-shadow: 2px 2px 2px rgba(0,0,0,.25);
|
||||
}
|
||||
|
||||
body.scrollBeyondLastLine {
|
||||
margin-bottom: calc(100vh - 22px);
|
||||
}
|
||||
|
||||
body.showEditorSelection .code-line {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
body.showEditorSelection .code-active-line:before,
|
||||
body.showEditorSelection .code-line:hover:before {
|
||||
content: "";
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: -12px;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
body.showEditorSelection li.code-active-line:before,
|
||||
body.showEditorSelection li.code-line:hover:before {
|
||||
left: -30px;
|
||||
}
|
||||
|
||||
.vscode-light.showEditorSelection .code-active-line:before {
|
||||
border-left: 3px solid rgba(0, 0, 0, 0.15);
|
||||
}
|
||||
|
||||
.vscode-light.showEditorSelection .code-line:hover:before {
|
||||
border-left: 3px solid rgba(0, 0, 0, 0.40);
|
||||
}
|
||||
|
||||
.vscode-light.showEditorSelection .code-line .code-line:hover:before {
|
||||
border-left: none;
|
||||
}
|
||||
|
||||
.vscode-dark.showEditorSelection .code-active-line:before {
|
||||
border-left: 3px solid rgba(255, 255, 255, 0.4);
|
||||
}
|
||||
|
||||
.vscode-dark.showEditorSelection .code-line:hover:before {
|
||||
border-left: 3px solid rgba(255, 255, 255, 0.60);
|
||||
}
|
||||
|
||||
.vscode-dark.showEditorSelection .code-line .code-line:hover:before {
|
||||
border-left: none;
|
||||
}
|
||||
|
||||
.vscode-high-contrast.showEditorSelection .code-active-line:before {
|
||||
border-left: 3px solid rgba(255, 160, 0, 0.7);
|
||||
}
|
||||
|
||||
.vscode-high-contrast.showEditorSelection .code-line:hover:before {
|
||||
border-left: 3px solid rgba(255, 160, 0, 1);
|
||||
}
|
||||
|
||||
.vscode-high-contrast.showEditorSelection .code-line .code-line:hover:before {
|
||||
border-left: none;
|
||||
}
|
||||
|
||||
img {
|
||||
max-width: 100%;
|
||||
max-height: 100%;
|
||||
}
|
||||
|
||||
a {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
a:focus,
|
||||
input:focus,
|
||||
select:focus,
|
||||
textarea:focus {
|
||||
outline: 1px solid -webkit-focus-ring-color;
|
||||
outline-offset: -1px;
|
||||
}
|
||||
|
||||
hr {
|
||||
border: 0;
|
||||
height: 2px;
|
||||
border-bottom: 2px solid;
|
||||
}
|
||||
|
||||
h1 {
|
||||
padding-bottom: 0.3em;
|
||||
line-height: 1.2;
|
||||
border-bottom-width: 1px;
|
||||
border-bottom-style: solid;
|
||||
}
|
||||
|
||||
h1, h2, h3 {
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
}
|
||||
|
||||
table > thead > tr > th {
|
||||
text-align: left;
|
||||
border-bottom: 1px solid;
|
||||
}
|
||||
|
||||
table > thead > tr > th,
|
||||
table > thead > tr > td,
|
||||
table > tbody > tr > th,
|
||||
table > tbody > tr > td {
|
||||
padding: 5px 10px;
|
||||
}
|
||||
|
||||
table > tbody > tr + tr > td {
|
||||
border-top: 1px solid;
|
||||
}
|
||||
|
||||
blockquote {
|
||||
margin: 0 7px 0 5px;
|
||||
padding: 0 16px 0 10px;
|
||||
border-left-width: 5px;
|
||||
border-left-style: solid;
|
||||
}
|
||||
|
||||
code {
|
||||
font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Courier New", monospace, "Droid Sans Fallback";
|
||||
font-size: 1em;
|
||||
line-height: 1.357em;
|
||||
}
|
||||
|
||||
body.wordWrap pre {
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
|
||||
pre:not(.hljs),
|
||||
pre.hljs code > div {
|
||||
padding: 16px;
|
||||
border-radius: 3px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
pre code {
|
||||
color: var(--vscode-editor-foreground);
|
||||
tab-size: 4;
|
||||
}
|
||||
|
||||
/** Theming */
|
||||
|
||||
.vscode-light pre {
|
||||
background-color: rgba(220, 220, 220, 0.4);
|
||||
}
|
||||
|
||||
.vscode-dark pre {
|
||||
background-color: rgba(10, 10, 10, 0.4);
|
||||
}
|
||||
|
||||
.vscode-high-contrast pre {
|
||||
background-color: rgb(0, 0, 0);
|
||||
}
|
||||
|
||||
.vscode-high-contrast h1 {
|
||||
border-color: rgb(0, 0, 0);
|
||||
}
|
||||
|
||||
.vscode-light table > thead > tr > th {
|
||||
border-color: rgba(0, 0, 0, 0.69);
|
||||
}
|
||||
|
||||
.vscode-dark table > thead > tr > th {
|
||||
border-color: rgba(255, 255, 255, 0.69);
|
||||
}
|
||||
|
||||
.vscode-light h1,
|
||||
.vscode-light hr,
|
||||
.vscode-light table > tbody > tr + tr > td {
|
||||
border-color: rgba(0, 0, 0, 0.18);
|
||||
}
|
||||
|
||||
.vscode-dark h1,
|
||||
.vscode-dark hr,
|
||||
.vscode-dark table > tbody > tr + tr > td {
|
||||
border-color: rgba(255, 255, 255, 0.18);
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<style>
|
||||
/* Tomorrow Theme */
|
||||
/* http://jmblog.github.com/color-themes-for-google-code-highlightjs */
|
||||
/* Original theme - https://github.com/chriskempson/tomorrow-theme */
|
||||
|
||||
/* Tomorrow Comment */
|
||||
.hljs-comment,
|
||||
.hljs-quote {
|
||||
color: #8e908c;
|
||||
}
|
||||
|
||||
/* Tomorrow Red */
|
||||
.hljs-variable,
|
||||
.hljs-template-variable,
|
||||
.hljs-tag,
|
||||
.hljs-name,
|
||||
.hljs-selector-id,
|
||||
.hljs-selector-class,
|
||||
.hljs-regexp,
|
||||
.hljs-deletion {
|
||||
color: #c82829;
|
||||
}
|
||||
|
||||
/* Tomorrow Orange */
|
||||
.hljs-number,
|
||||
.hljs-built_in,
|
||||
.hljs-builtin-name,
|
||||
.hljs-literal,
|
||||
.hljs-type,
|
||||
.hljs-params,
|
||||
.hljs-meta,
|
||||
.hljs-link {
|
||||
color: #f5871f;
|
||||
}
|
||||
|
||||
/* Tomorrow Yellow */
|
||||
.hljs-attribute {
|
||||
color: #eab700;
|
||||
}
|
||||
|
||||
/* Tomorrow Green */
|
||||
.hljs-string,
|
||||
.hljs-symbol,
|
||||
.hljs-bullet,
|
||||
.hljs-addition {
|
||||
color: #718c00;
|
||||
}
|
||||
|
||||
/* Tomorrow Blue */
|
||||
.hljs-title,
|
||||
.hljs-section {
|
||||
color: #4271ae;
|
||||
}
|
||||
|
||||
/* Tomorrow Purple */
|
||||
.hljs-keyword,
|
||||
.hljs-selector-tag {
|
||||
color: #8959a8;
|
||||
}
|
||||
|
||||
.hljs {
|
||||
display: block;
|
||||
overflow-x: auto;
|
||||
color: #4d4d4c;
|
||||
padding: 0.5em;
|
||||
}
|
||||
|
||||
.hljs-emphasis {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.hljs-strong {
|
||||
font-weight: bold;
|
||||
}
|
||||
</style>
|
||||
|
||||
<style>
|
||||
/*
|
||||
* Markdown PDF CSS
|
||||
*/
|
||||
|
||||
body {
|
||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "Ubuntu", "Droid Sans", sans-serif, "Meiryo";
|
||||
padding: 0 12px;
|
||||
}
|
||||
|
||||
pre {
|
||||
background-color: #f8f8f8;
|
||||
border: 1px solid #cccccc;
|
||||
border-radius: 3px;
|
||||
overflow-x: auto;
|
||||
white-space: pre-wrap;
|
||||
overflow-wrap: break-word;
|
||||
}
|
||||
|
||||
pre:not(.hljs) {
|
||||
padding: 23px;
|
||||
line-height: 19px;
|
||||
}
|
||||
|
||||
blockquote {
|
||||
background: rgba(127, 127, 127, 0.1);
|
||||
border-color: rgba(0, 122, 204, 0.5);
|
||||
}
|
||||
|
||||
.emoji {
|
||||
height: 1.4em;
|
||||
}
|
||||
|
||||
code {
|
||||
font-size: 14px;
|
||||
line-height: 19px;
|
||||
}
|
||||
|
||||
/* for inline code */
|
||||
:not(pre):not(.hljs) > code {
|
||||
color: #C9AE75; /* Change the old color so it seems less like an error */
|
||||
font-size: inherit;
|
||||
}
|
||||
|
||||
/* Page Break : use <div class="page"/> to insert page break
|
||||
-------------------------------------------------------- */
|
||||
.page {
|
||||
page-break-after: always;
|
||||
}
|
||||
|
||||
</style>
|
||||
<link rel="stylesheet" href="file:///run/user/1000/gvfs/sftp%3Ahost%3Deolebase.ac-test.fr%2Cuser%3Droot/root/git/envole/src/envole-1.0/doc/misc/tools/cadoles_theme.css" type="text/css">
|
||||
<script src="https://unpkg.com/mermaid/dist/mermaid.min.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<script>
|
||||
mermaid.initialize({
|
||||
startOnLoad: true,
|
||||
theme: document.body.classList.contains('vscode-dark') || document.body.classList.contains('vscode-high-contrast')
|
||||
? 'dark'
|
||||
: 'default'
|
||||
});
|
||||
</script>
|
||||
<h1 id="envole">Envole</h1>
|
||||
<h2 id="introduction">Introduction</h2>
|
||||
<p>Envole est une solution qui propose un ensemble d'applicatifs web fédérés autour d'un annaire afin de gérer l'identité ainsi qu'un SSO afin de gérer l'authentification.</p>
|
||||
<p>Il s'appuit sur la distrution EOLE pour déployer ses différents composants.</p>
|
||||
<p>Envole rencontre depuis des années des problèmatiques :</p>
|
||||
<ul>
|
||||
<li>Elle doit se baser sur une version précise d'EOLE 2.5 ou 2.6 ou 2.7 ou 2.8 ou 2.9 qui ont chacune leur contrainte de version php</li>
|
||||
<li>Les différentes applications Envole ont leur propre contrainte de version php.</li>
|
||||
<li>Ce qui oblige de limiter les possibilités de montée de version de l'application dans une version x d'eole car cette dernière ne fournit pas la version minimum de php requise</li>
|
||||
<li>Ou qui empéche le passage d'une application de fonctionner dans une version x d'eole car cette dernière propose une version trop résente de php pour l'application</li>
|
||||
</ul>
|
||||
<p>Ce document va chercher à évaluer la possibilité de conteneriser les applications Envole, afin qu'elles puissent fonctionner le moins possible en contrainte avec la version d'Eole</p>
|
||||
<h2 id="architecture">Architecture</h2>
|
||||
<h3 id="eolebase">EoleBase</h3>
|
||||
<p>La présente étude part du principe qu'Envole ne serait plus installé sur une instance Scribe mais sur une installation EoleBase d'Eole</p>
|
||||
<p><strong>Avantages</strong></p>
|
||||
<ul>
|
||||
<li>Décharger le serveur Scribe et lui laisser ses fonctions principales. C'est à dire
|
||||
<ul>
|
||||
<li>Contrôleur de Domaine</li>
|
||||
<li>SSO</li>
|
||||
<li>Annuaire</li>
|
||||
<li>Imap (et SMTP ?)</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>Faire évoluer plus facilement le serveur Envole vers des versions plus récente d'Eole avec moins de contrainte tout en assurant une mise à jour de sécurité plus régulière</li>
|
||||
</ul>
|
||||
<p><strong>Inconvéhients</strong></p>
|
||||
<ul>
|
||||
<li>L'adminstrateur devra configurer le lien SSO et Annaire qui eux restent sur le scribe.</li>
|
||||
<li>Il devra donc fixer certains secrets sur le Scribe (notamment le compte reader/writer annuaire sur le scibe)</li>
|
||||
<li>Connaitre et renseigner les hosts/ports des service SSO et Annuaire</li>
|
||||
<li>Avoir un second nom de domaine pour l'accès aux applications Envole</li>
|
||||
</ul>
|
||||
<h3 id="paquet-debian">Paquet Debian</h3>
|
||||
<p>Contrairement à la précédente logique Envole, il n'y aurait qu'un seul paquet Debian pour Envole. Il n'installerait pas les sources des applications, mais uniquement</p>
|
||||
<ul>
|
||||
<li>le dictionnaire eole de configuration</li>
|
||||
<li>les templates de configuration</li>
|
||||
<li>le dossier de définitions de l'ensemble des conteneurs possible pour Envole</li>
|
||||
<li>un script qui viendrait monter ou non les conteneurs souhaités par l'administateur</li>
|
||||
</ul>
|
||||
<h3 id="poc">POC</h3>
|
||||
<p>Afin de s'assurer de la faisabilité d'un tel changement, un POC a été initié, dans le cadre des éléments précédents cités. La première question fut de savoir quelle technologie de conteneurisation serait à utiliser PODMAN ou DOCKER, et dans leur logique de composer PODMAN-COMPOSE ou DOCKER-COMPOSER.</p>
|
||||
<h3 id="podman-vs-docker-sur-eole">PODMAN vs DOCKER sur Eole</h3>
|
||||
<p><strong>PODMAN</strong></p>
|
||||
<p>Eole a intégré à partir de la 2.9 dans sa distribution podman. Ce qui de prime abord devrait-être la technologie à utiliser, sauf que</p>
|
||||
<ul>
|
||||
<li>Ubuntu 22.04 ne dispose pas de paquet pour podman-compose</li>
|
||||
<li>Pour installer podman-compose, il est nécessaire de l'installer via pip</li>
|
||||
<li>De plus la version de podman disponible sur Ubuntu 22.04 est une version 3.4 qui n'est pas compatible avec la version de podman-compose</li>
|
||||
<li>Il est nécessaire d'installer la dernière version 4.4 de Podman PPA pour faire fonctionner l'ensemble</li>
|
||||
<li>Par la suite il est possible de créer un composer d'image docker comme on pourrait le faire avec docker-compose. Podman est juste plus stricte dans sa synthaxe et certaines commandes ne sont pas tout à fait indentique</li>
|
||||
<li>Mais il apparait qu'un reconfigure rendra totalement inopérant le réseau des conteneurs. Pour le rendre de nouveau opérant, il est nécessaire de le détruire pour le reconstruire.</li>
|
||||
</ul>
|
||||
<p><strong>DOCKER</strong></p>
|
||||
<p>Eole n'a pas intégré nativement docker. Mais il est tout à fait possible de l'installer par ses propres moyens sauf que</p>
|
||||
<ul>
|
||||
<li>Tout comme Podman Ubuntu ne propose pas de paquet suffisament à jour de docker-ce et docker-compose</li>
|
||||
<li>Il est nécessaire de les installer via la mise en place d'un PPA</li>
|
||||
<li>Par la suite docker se comporte bien mieux que podman. Il est plus souple d'usage, moins verbeux</li>
|
||||
<li>Mais tout comme podman, un reconfigure vient rendre totalement inopérant le reseau des conteneurs. Il est nécessaire de réinitialiser docker-ce pour rétablir le reseau.</li>
|
||||
</ul>
|
||||
<p><strong>CONCLUSION</strong></p>
|
||||
<p>Quoi qu'il arrive, une intégration compléte que cela soit avec Podman ou avec Docker, demandera un travail d'intégration d'Eole</p>
|
||||
<ul>
|
||||
<li>afin de disposer des dernières versions possibles de l'un ou de l'autre</li>
|
||||
<li>que l'un ou l'autre ne détruit pas le réseau associé au composer de conteneur</li>
|
||||
</ul>
|
||||
<p>Ma préférence va malgrés tout sur Docker, il est plus souple moins verbeux et me semble plus fiable à long terme. Il serait possible de maitenir les deux solutions en parrallèle avec un effort supplémentaire d'intégration et de maintenance.</p>
|
||||
<h2 id="poc">POC</h2>
|
||||
<h3 id="sources">Sources</h3>
|
||||
<p>Les sources du POC sont disponible ici<br>
|
||||
https://forge.cadoles.com/Envole/envole</p>
|
||||
<p>Elles sont pour l'instant hébergé à Cadoles pour des raisons de simplicité de mise en oeuvre, mais à terme elles seront bien stockées chez Eole</p>
|
||||
<h3 id="repository">Repository</h3>
|
||||
<p>Certaines images sont hébergées elles aussi sur un repository public de Cadoles. Là aussi pour des raisons de simplicité de mise en oevre, mais à terme Eole devra fournir un repository propre aux images Envole.</p>
|
||||
<p>Les images en questions sont celles des applications maintenues par Envole, en l'occurence pour l'instant uniquement Ninegate. Mais à terme pourra aussi y figurer des images d'applications tiers sur lesquelles nous aurions besion d'altérer légèrement le comportement.</p>
|
||||
<h3 id="installation-du-poc">Installation du POC</h3>
|
||||
<p>1- Instancier un eolebase 2.9</p>
|
||||
<p>2- Installer eole-web</p>
|
||||
<pre class="hljs"><code><div>apt-get install eole-web
|
||||
Genconfig
|
||||
Services > Activer l'interface web de l'EAD = non
|
||||
Services > Activer le serveur de bases de données MySQL = non
|
||||
Services > Activer l’interface d’administration du module (EAD3) = non
|
||||
Applications Web > Nom de domaine des applications web = mondomaine.fr
|
||||
save & quit
|
||||
Reconfigure
|
||||
</div></code></pre>
|
||||
<p>3- Installer docker & docker-compose</p>
|
||||
<pre class="hljs"><code><div>apt install git make apt-transport-https ca-certificates curl gnupg-agent software-properties-common
|
||||
mkdir -p /etc/apt/keyrings
|
||||
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
|
||||
echo \
|
||||
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
|
||||
$(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
|
||||
apt update
|
||||
apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin docker-compose
|
||||
</div></code></pre>
|
||||
<p>4- Installer Envole</p>
|
||||
<pre class="hljs"><code><div>cd /root
|
||||
mkdir git
|
||||
cd /root/git
|
||||
git clone https://forge.cadoles.com/Envole/envole.git
|
||||
cd /root/git/envole
|
||||
make install
|
||||
</div></code></pre>
|
||||
<p>5- Configurer Envole</p>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@ -1,147 +0,0 @@
|
||||
# Envole
|
||||
|
||||
## Introduction
|
||||
|
||||
Envole est une solution qui propose un ensemble d'applicatifs web fédérés autour d'un annaire afin de gérer l'identité ainsi qu'un SSO afin de gérer l'authentification.
|
||||
|
||||
Il s'appuit sur la distrution EOLE pour déployer ses différents composants.
|
||||
|
||||
Envole rencontre depuis des années des problèmatiques :
|
||||
|
||||
- Elle doit se baser sur une version précise d'EOLE 2.5 ou 2.6 ou 2.7 ou 2.8 ou 2.9 qui ont chacune leur contrainte de version php
|
||||
- Les différentes applications Envole ont leur propre contrainte de version php.
|
||||
- Ce qui oblige de limiter les possibilités de montée de version de l'application dans une version x d'eole car cette dernière ne fournit pas la version minimum de php requise
|
||||
- Ou qui empéche le passage d'une application de fonctionner dans une version x d'eole car cette dernière propose une version trop résente de php pour l'application
|
||||
|
||||
Ce document va chercher à évaluer la possibilité de conteneriser les applications Envole, afin qu'elles puissent fonctionner le moins possible en contrainte avec la version d'Eole
|
||||
|
||||
## Architecture
|
||||
|
||||
### EoleBase
|
||||
|
||||
La présente étude part du principe qu'Envole ne serait plus installé sur une instance Scribe mais sur une installation EoleBase d'Eole
|
||||
|
||||
**Avantages**
|
||||
- Décharger le serveur Scribe et lui laisser ses fonctions principales. C'est à dire
|
||||
- Contrôleur de Domaine
|
||||
- SSO
|
||||
- Annuaire
|
||||
- Imap (et SMTP ?)
|
||||
- Faire évoluer plus facilement le serveur Envole vers des versions plus récente d'Eole avec moins de contrainte tout en assurant une mise à jour de sécurité plus régulière
|
||||
|
||||
**Inconvéhients**
|
||||
- L'adminstrateur devra configurer le lien SSO et Annaire qui eux restent sur le scribe.
|
||||
- Il devra donc fixer certains secrets sur le Scribe (notamment le compte reader/writer annuaire sur le scibe)
|
||||
- Connaitre et renseigner les hosts/ports des service SSO et Annuaire
|
||||
- Avoir un second nom de domaine pour l'accès aux applications Envole
|
||||
|
||||
|
||||
### Paquet Debian
|
||||
|
||||
Contrairement à la précédente logique Envole, il n'y aurait qu'un seul paquet Debian pour Envole. Il n'installerait pas les sources des applications, mais uniquement
|
||||
|
||||
- le dictionnaire eole de configuration
|
||||
- les templates de configuration
|
||||
- le dossier de définitions de l'ensemble des conteneurs possible pour Envole
|
||||
- un script qui viendrait monter ou non les conteneurs souhaités par l'administateur
|
||||
|
||||
### POC
|
||||
|
||||
Afin de s'assurer de la faisabilité d'un tel changement, un POC a été initié, dans le cadre des éléments précédents cités. La première question fut de savoir quelle technologie de conteneurisation serait à utiliser PODMAN ou DOCKER, et dans leur logique de composer PODMAN-COMPOSE ou DOCKER-COMPOSER.
|
||||
|
||||
### PODMAN vs DOCKER sur Eole
|
||||
|
||||
**PODMAN**
|
||||
|
||||
Eole a intégré à partir de la 2.9 dans sa distribution podman. Ce qui de prime abord devrait-être la technologie à utiliser, sauf que
|
||||
|
||||
- Ubuntu 22.04 ne dispose pas de paquet pour podman-compose
|
||||
- Pour installer podman-compose, il est nécessaire de l'installer via pip
|
||||
- De plus la version de podman disponible sur Ubuntu 22.04 est une version 3.4 qui n'est pas compatible avec la version de podman-compose
|
||||
- Il est nécessaire d'installer la dernière version 4.4 de Podman PPA pour faire fonctionner l'ensemble
|
||||
- Par la suite il est possible de créer un composer d'image docker comme on pourrait le faire avec docker-compose. Podman est juste plus stricte dans sa synthaxe et certaines commandes ne sont pas tout à fait indentique
|
||||
- Mais il apparait qu'un reconfigure rendra totalement inopérant le réseau des conteneurs. Pour le rendre de nouveau opérant, il est nécessaire de le détruire pour le reconstruire.
|
||||
|
||||
**DOCKER**
|
||||
|
||||
Eole n'a pas intégré nativement docker. Mais il est tout à fait possible de l'installer par ses propres moyens sauf que
|
||||
- Tout comme Podman Ubuntu ne propose pas de paquet suffisament à jour de docker-ce et docker-compose
|
||||
- Il est nécessaire de les installer via la mise en place d'un PPA
|
||||
- Par la suite docker se comporte bien mieux que podman. Il est plus souple d'usage, moins verbeux
|
||||
- Mais tout comme podman, un reconfigure vient rendre totalement inopérant le reseau des conteneurs. Il est nécessaire de réinitialiser docker-ce pour rétablir le reseau.
|
||||
|
||||
**CONCLUSION**
|
||||
|
||||
Quoi qu'il arrive, une intégration compléte que cela soit avec Podman ou avec Docker, demandera un travail d'intégration d'Eole
|
||||
- afin de disposer des dernières versions possibles de l'un ou de l'autre
|
||||
- que l'un ou l'autre ne détruit pas le réseau associé au composer de conteneur
|
||||
|
||||
Ma préférence va malgrés tout sur Docker, il est plus souple moins verbeux et me semble plus fiable à long terme. Il serait possible de maitenir les deux solutions en parrallèle avec un effort supplémentaire d'intégration et de maintenance.
|
||||
|
||||
## POC
|
||||
|
||||
### Sources
|
||||
|
||||
Les sources du POC sont disponible ici
|
||||
https://forge.cadoles.com/Envole/envole
|
||||
|
||||
Elles sont pour l'instant hébergé à Cadoles pour des raisons de simplicité de mise en oeuvre, mais à terme elles seront bien stockées chez Eole
|
||||
|
||||
### Repository
|
||||
|
||||
Certaines images sont hébergées elles aussi sur un repository public de Cadoles. Là aussi pour des raisons de simplicité de mise en oevre, mais à terme Eole devra fournir un repository propre aux images Envole.
|
||||
|
||||
Les images en questions sont celles des applications maintenues par Envole, en l'occurence pour l'instant uniquement Ninegate. Mais à terme pourra aussi y figurer des images d'applications tiers sur lesquelles nous aurions besion d'altérer légèrement le comportement.
|
||||
|
||||
### Installation du POC
|
||||
|
||||
1- Instancier un eolebase 2.9
|
||||
|
||||
2- Installer eole-web
|
||||
```
|
||||
apt-get install eole-web
|
||||
Genconfig
|
||||
Services > Activer l'interface web de l'EAD = non
|
||||
Services > Activer le serveur de bases de données MySQL = non
|
||||
Services > Activer l’interface d’administration du module (EAD3) = non
|
||||
Applications Web > Nom de domaine des applications web = mondomaine.fr
|
||||
save & quit
|
||||
Reconfigure
|
||||
```
|
||||
|
||||
3- Installer docker & docker-compose
|
||||
```
|
||||
apt install git make apt-transport-https ca-certificates curl gnupg-agent software-properties-common
|
||||
mkdir -p /etc/apt/keyrings
|
||||
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
|
||||
echo \
|
||||
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
|
||||
$(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
|
||||
apt update
|
||||
apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin docker-compose
|
||||
```
|
||||
|
||||
4- Installer Envole
|
||||
|
||||
```
|
||||
cd /root
|
||||
mkdir git
|
||||
cd /root/git
|
||||
git clone https://forge.cadoles.com/Envole/envole.git
|
||||
cd /root/git/envole
|
||||
make install
|
||||
```
|
||||
|
||||
5- Configurer Envole
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
@ -66,7 +66,7 @@ services:
|
||||
container_name: envole-ninegate
|
||||
restart: always
|
||||
healthcheck:
|
||||
test: curl --fail http://localhost || exit 1
|
||||
test: curl --fail http://localhost/ninegate || exit 1
|
||||
interval: 1s
|
||||
timeout: 60s
|
||||
env_file: ./.env.local
|
||||
@ -79,7 +79,7 @@ services:
|
||||
- ./volume/ninegate/data/public:/app/public/uploads
|
||||
|
||||
nextcloud:
|
||||
image: docker.io/library/nextcloud
|
||||
image: reg.cadoles.com/envole/nextcloud
|
||||
container_name: envole-nextcloud
|
||||
restart: always
|
||||
healthcheck:
|
||||
|
||||
11
docker/env/.env
vendored
11
docker/env/.env
vendored
@ -6,7 +6,7 @@ RELEASE_SYSTEM=linux
|
||||
# GLOBAL
|
||||
APP_ENV=PROD
|
||||
WEB_URL=localhost
|
||||
WEB_PROTOCOL=http
|
||||
PROTOCOLE=http
|
||||
|
||||
# ADMIN USER
|
||||
ADMIN_USER=admin
|
||||
@ -50,8 +50,12 @@ LDAP_TEMPLATE=
|
||||
LDAP_USERNAME=uid
|
||||
LDAP_FIRSTNAME=givenname
|
||||
LDAP_LASTNAME=sn
|
||||
LDAP_DISPLAYNAME=displayName
|
||||
LDAP_EMAIL=mail
|
||||
LDAP_MEMBER=memberUid
|
||||
LDAP_USER_FILTER="(&(${LDAP_USERNAME}=*)(objectClass=person)(!(description=Computer)))"
|
||||
LDAP_LOGIN_FILTER="(&(${LDAP_USERNAME}=%uid)(objectClass=person)(!(description=Computer)))"
|
||||
LDAP_GROUP_FILTER="(&(objectClass=posixGroup))"
|
||||
SCRIBE_GROUP=1
|
||||
SCRIBE_MASTER=1
|
||||
OPENLDAPREQNIVEAU01=
|
||||
@ -81,6 +85,7 @@ NEXTCLOUD_SERVICE_NAME=nextcloud
|
||||
NEXTCLOUD_ACTIVATE=0
|
||||
NEXTCLOUD_LOCAL=1
|
||||
NEXTCLOUD_URL=${WEB_PROTOCOL}://${WEB_URL}:9001
|
||||
NEXTCLOUD_SAMBA=0
|
||||
|
||||
# ADMINER
|
||||
ADMINER_SERVICE_NAME=adminer
|
||||
@ -94,6 +99,10 @@ PHPLDAPADMIN_ACTIVATE=0
|
||||
PHPLDAPADMIN_LOCAL=1
|
||||
PHPLDAPADMIN_URL=${WEB_PROTOCOL}://${WEB_URL}:9101
|
||||
|
||||
# GENCONFIG
|
||||
GENCONFIG_ACTIVATE=0
|
||||
GENCONFIG_URL=${WEB_PROTOCOL}://${WEB_URL}:9102
|
||||
|
||||
# NINEAPACHE
|
||||
NINEAPACHE_SERVICE_NAME=nineapache
|
||||
NINEAPACHE_ACTIVATE=0
|
||||
|
||||
1
docker/env/.env.zapp.nextcloud
vendored
1
docker/env/.env.zapp.nextcloud
vendored
@ -8,3 +8,4 @@ MYSQL_PASSWORD=${MARIADB_PASSWORD}
|
||||
NEXTCLOUD_ADMIN_USER=${ADMIN_USER}
|
||||
NEXTCLOUD_ADMIN_PASSWORD=${ADMIN_PASSWORD}
|
||||
NEXTCLOUD_ALIAS=
|
||||
|
||||
|
||||
2
docker/env/.env.zapp.ninegate
vendored
2
docker/env/.env.zapp.ninegate
vendored
@ -11,3 +11,5 @@ WIDPHPLDAPADMIN_URL=${PHPLDAPADMIN_URL}
|
||||
ACTIVATE_WIDNEXTCLOUD=${NEXTCLOUD_ACTIVATE}
|
||||
WIDNEXTCLOUD_URL=${NEXTCLOUD_URL}
|
||||
|
||||
ACTIVATE_WIDGENCONFIG=${GENCONFIG_ACTIVATE}
|
||||
WIDGENCONFIG_URL=${GENCONFIG_URL}
|
||||
@ -6,13 +6,12 @@
|
||||
# Fusionner l'ensemble des fichier .env en un seul
|
||||
rm -f ./.env.local
|
||||
cat ./env/.env* >> ./.env.local
|
||||
. ./misc/tools/e-ihm.sh
|
||||
. ./misc/e-ihm.sh
|
||||
. .env
|
||||
. ./env/.env
|
||||
. ./env/.env.local
|
||||
|
||||
# Start script
|
||||
clear
|
||||
BigTitle "ENVOLE"
|
||||
|
||||
# on remplace les valeur reprise dans les autres .env car podman interprète mal
|
||||
@ -124,6 +123,9 @@ up(){
|
||||
Title "NETWORK"
|
||||
# On réinstall docker-ce car le reconf détruit le reseau docker, la reinstall de docker-ce rétablit le reseau
|
||||
apt-get install docker-ce --reinstall
|
||||
|
||||
# ATTENTION A REVOIR car ouvre complétement le firewall
|
||||
iptables -P INPUT ACCEPT
|
||||
fi
|
||||
|
||||
# MARIADB
|
||||
|
||||
@ -1,67 +0,0 @@
|
||||
FROM alpine:3.15
|
||||
|
||||
RUN apk add --no-cache \
|
||||
bash \
|
||||
sed \
|
||||
vim \
|
||||
ca-certificates \
|
||||
openldap-clients \
|
||||
wget \
|
||||
npm \
|
||||
git \
|
||||
curl \
|
||||
unzip \
|
||||
zip \
|
||||
openssl
|
||||
|
||||
RUN apk add --no-cache \
|
||||
apache2 \
|
||||
apache2-proxy \
|
||||
apache2-ssl
|
||||
|
||||
RUN apk add --no-cache \
|
||||
php7 \
|
||||
php7-apache2 \
|
||||
php7-gd \
|
||||
php7-zip \
|
||||
php7-xml \
|
||||
php7-ctype \
|
||||
php7-simplexml \
|
||||
php7-tokenizer \
|
||||
php7-sodium \
|
||||
php7-dom \
|
||||
php7-pdo \
|
||||
php7-pdo_pgsql \
|
||||
php7-pdo_mysql \
|
||||
php7-curl \
|
||||
php7-ldap \
|
||||
php7-pecl-igbinary \
|
||||
php7-session \
|
||||
php7-pecl-redis \
|
||||
php7-fileinfo \
|
||||
php7-xmlwriter \
|
||||
php7-openssl \
|
||||
php7-phar \
|
||||
php7-iconv \
|
||||
php7-mbstring \
|
||||
php7-fpm \
|
||||
php7-sockets \
|
||||
php7-opcache \
|
||||
php7-intl \
|
||||
php7-bcmath \
|
||||
php7-pecl-ssh2
|
||||
|
||||
RUN curl -k https://forge.cadoles.com/Cadoles/Jenkins/raw/branch/master/resources/com/cadoles/common/add-letsencrypt-ca.sh | bash
|
||||
RUN curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer
|
||||
|
||||
RUN npm install -g n
|
||||
RUN npm install -g yarn
|
||||
|
||||
COPY apache2.sh /etc/apache2/apache2.sh
|
||||
RUN chmod +x /etc/apache2/apache2.sh
|
||||
COPY php.local.ini /etc/php7/conf.d/
|
||||
COPY apache.conf /etc/apache2/conf.d/zapp.conf
|
||||
COPY ssl.conf /etc/apache2/conf.d/ssl.conf
|
||||
COPY index.php /app/public/index.php
|
||||
|
||||
CMD /etc/apache2/apache2.sh
|
||||
@ -1,19 +0,0 @@
|
||||
|
||||
LoadModule rewrite_module modules/mod_rewrite.so
|
||||
ServerName nineapache.local
|
||||
DocumentRoot "/app/public"
|
||||
<Directory "/app/public">
|
||||
Options Indexes FollowSymLinks
|
||||
AllowOverride All
|
||||
Require all granted
|
||||
|
||||
RewriteEngine On
|
||||
RewriteCond %{REQUEST_URI}::$0 ^(/.+)/(.*)::\2$
|
||||
RewriteRule .* - [E=BASE:%1]
|
||||
RewriteCond %{HTTP:Authorization} .+
|
||||
RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0]
|
||||
RewriteCond %{ENV:REDIRECT_STATUS} =""
|
||||
RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
|
||||
RewriteCond %{REQUEST_FILENAME} !-f
|
||||
RewriteRule ^ %{ENV:BASE}/index.php [L]
|
||||
</Directory>
|
||||
@ -1,27 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
envfile=/etc/apache2/conf.d/env.conf
|
||||
haveenv=/etc/apache2/haveenv.txt
|
||||
|
||||
rm -rf $envfile
|
||||
rm -rf $haveenv
|
||||
|
||||
echo "GENERATION DES VARIABLES D'ENVIRONNEMENT"
|
||||
printf "\n# Expose environment variables to scripts.\nPassEnv" >> $envfile
|
||||
compgen -e | while read name ; do
|
||||
if [[ "$name" != "TERM" && "$name" != "HOME" && "$name" != "HOSTNAME" && "$name" != "PATH" && "$name" != "PWD" && "$name" != "SHLVL" ]]
|
||||
then
|
||||
touch $haveenv
|
||||
printf " $name" >> $envfile
|
||||
fi
|
||||
done
|
||||
printf "\n" >> $envfile
|
||||
|
||||
if [[ ! -f $haveenv ]]
|
||||
then
|
||||
rm -rf $envfile
|
||||
fi
|
||||
rm -rf $haveenv
|
||||
|
||||
echo "START HTTPD"
|
||||
httpd -DFOREGROUND
|
||||
@ -1,9 +0,0 @@
|
||||
<?php
|
||||
echo "<html><head><title>Nineapache 7</title></head><body>";
|
||||
echo "<h1><center>NINEAPACHE 7</center></h1>";
|
||||
|
||||
echo phpinfo();
|
||||
echo "</body></html>";
|
||||
?>
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
memory_limit = 512M
|
||||
upload_max_filesize = 512M
|
||||
post_max_size = 512M
|
||||
@ -1,43 +0,0 @@
|
||||
LoadModule ssl_module modules/mod_ssl.so
|
||||
LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
|
||||
|
||||
SSLRandomSeed startup file:/dev/urandom 512
|
||||
SSLRandomSeed connect builtin
|
||||
|
||||
Listen 443
|
||||
|
||||
SSLCipherSuite HIGH:MEDIUM:!MD5:!RC4:!3DES:!ADH
|
||||
SSLProxyCipherSuite HIGH:MEDIUM:!MD5:!RC4:!3DES:!ADH
|
||||
SSLHonorCipherOrder on
|
||||
SSLProtocol all -SSLv3
|
||||
SSLProxyProtocol all -SSLv3
|
||||
SSLPassPhraseDialog builtin
|
||||
SSLSessionCache "shmcb:/var/cache/mod_ssl/scache(512000)"
|
||||
SSLSessionCacheTimeout 300
|
||||
|
||||
<VirtualHost _default_:443>
|
||||
DocumentRoot "/app/public"
|
||||
ServerName www.example.com:443
|
||||
ServerAdmin you@example.com
|
||||
ErrorLog logs/ssl_error.log
|
||||
TransferLog logs/ssl_access.log
|
||||
|
||||
SSLEngine on
|
||||
|
||||
SSLCertificateFile /etc/ssl/apache2/server.pem
|
||||
SSLCertificateKeyFile /etc/ssl/apache2/server.key
|
||||
|
||||
<FilesMatch "\.(cgi|shtml|phtml|php)$">
|
||||
SSLOptions +StdEnvVars
|
||||
</FilesMatch>
|
||||
<Directory "/app/public/cgi-bin">
|
||||
SSLOptions +StdEnvVars
|
||||
</Directory>
|
||||
|
||||
BrowserMatch "MSIE [2-5]" \
|
||||
nokeepalive ssl-unclean-shutdown \
|
||||
downgrade-1.0 force-response-1.0
|
||||
|
||||
CustomLog logs/ssl_request.log \
|
||||
"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
|
||||
</VirtualHost>
|
||||
@ -1,11 +0,0 @@
|
||||
version: '3'
|
||||
|
||||
services:
|
||||
nineapache:
|
||||
build:
|
||||
context: ./containers/nineapache
|
||||
image: reg.cadoles.com/envole/nineapache:7.4
|
||||
container_name: nineapache7
|
||||
ports:
|
||||
- 8080:80
|
||||
|
||||
@ -1,68 +0,0 @@
|
||||
FROM alpine:3.18
|
||||
|
||||
RUN apk add --no-cache \
|
||||
bash \
|
||||
sed \
|
||||
vim \
|
||||
ca-certificates \
|
||||
openldap-clients \
|
||||
wget \
|
||||
npm \
|
||||
git \
|
||||
curl \
|
||||
unzip \
|
||||
zip \
|
||||
openssl
|
||||
|
||||
RUN apk add --no-cache \
|
||||
apache2 \
|
||||
apache2-proxy \
|
||||
apache2-ssl
|
||||
|
||||
RUN apk add --no-cache \
|
||||
php81 \
|
||||
php81-apache2 \
|
||||
php81-gd \
|
||||
php81-zip \
|
||||
php81-xml \
|
||||
php81-ctype \
|
||||
php81-simplexml \
|
||||
php81-tokenizer \
|
||||
php81-sodium \
|
||||
php81-dom \
|
||||
php81-pdo \
|
||||
php81-pdo_pgsql \
|
||||
php81-pdo_mysql \
|
||||
php81-curl \
|
||||
php81-ldap \
|
||||
php81-pecl-igbinary \
|
||||
php81-session \
|
||||
php81-pecl-redis \
|
||||
php81-fileinfo \
|
||||
php81-xmlwriter \
|
||||
php81-openssl \
|
||||
php81-phar \
|
||||
php81-iconv \
|
||||
php81-mbstring \
|
||||
php81-fpm \
|
||||
php81-sockets \
|
||||
php81-opcache \
|
||||
php81-intl \
|
||||
php81-bcmath \
|
||||
php81-pecl-ssh2
|
||||
|
||||
RUN curl -k https://forge.cadoles.com/Cadoles/Jenkins/raw/branch/master/resources/com/cadoles/common/add-letsencrypt-ca.sh | bash
|
||||
|
||||
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
|
||||
|
||||
RUN npm install -g n
|
||||
RUN npm install -g yarn
|
||||
|
||||
COPY apache2.sh /etc/apache2/apache2.sh
|
||||
RUN chmod +x /etc/apache2/apache2.sh
|
||||
COPY php.local.ini /etc/php81/conf.d/
|
||||
COPY apache.conf /etc/apache2/conf.d/zapp.conf
|
||||
COPY ssl.conf /etc/apache2/conf.d/ssl.conf
|
||||
COPY index.php /app/public/index.php
|
||||
|
||||
CMD /etc/apache2/apache2.sh
|
||||
@ -1,20 +0,0 @@
|
||||
|
||||
LoadModule rewrite_module modules/mod_rewrite.so
|
||||
ServerName nineapache.local
|
||||
DocumentRoot "/app/public"
|
||||
<Directory "/app/public">
|
||||
Options Indexes FollowSymLinks
|
||||
AllowOverride All
|
||||
Require all granted
|
||||
|
||||
RewriteEngine On
|
||||
RewriteCond %{REQUEST_URI}::$0 ^(/.+)/(.*)::\2$
|
||||
RewriteRule .* - [E=BASE:%1]
|
||||
RewriteCond %{HTTP:Authorization} .+
|
||||
RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0]
|
||||
RewriteCond %{ENV:REDIRECT_STATUS} =""
|
||||
RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
|
||||
RewriteCond %{REQUEST_FILENAME} !-f
|
||||
RewriteRule ^ %{ENV:BASE}/index.php [L]
|
||||
</Directory>
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
envfile=/etc/apache2/conf.d/env.conf
|
||||
haveenv=/etc/apache2/haveenv.txt
|
||||
|
||||
rm -rf $envfile
|
||||
rm -rf $haveenv
|
||||
|
||||
echo "GENERATION DES VARIABLES D'ENVIRONNEMENT"
|
||||
printf "\n# Expose environment variables to scripts.\nPassEnv" >> $envfile
|
||||
compgen -e | while read name ; do
|
||||
if [[ "$name" != "TERM" && "$name" != "HOME" && "$name" != "HOSTNAME" && "$name" != "PATH" && "$name" != "PWD" && "$name" != "SHLVL" ]]
|
||||
then
|
||||
touch $haveenv
|
||||
printf " $name" >> $envfile
|
||||
fi
|
||||
done
|
||||
printf "\n" >> $envfile
|
||||
|
||||
if [[ ! -f $haveenv ]]
|
||||
then
|
||||
rm -rf $envfile
|
||||
fi
|
||||
rm -rf $haveenv
|
||||
|
||||
echo "START HTTPD"
|
||||
httpd -DFOREGROUND
|
||||
@ -1,9 +0,0 @@
|
||||
<?php
|
||||
echo "<html><head><title>Nineapache 8</title></head><body>";
|
||||
echo "<h1><center>NINEAPACHE 8</center></h1>";
|
||||
|
||||
echo phpinfo();
|
||||
echo "</body></html>";
|
||||
?>
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
memory_limit = 512M
|
||||
upload_max_filesize = 512M
|
||||
post_max_size = 512M
|
||||
@ -1,43 +0,0 @@
|
||||
LoadModule ssl_module modules/mod_ssl.so
|
||||
LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
|
||||
|
||||
SSLRandomSeed startup file:/dev/urandom 512
|
||||
SSLRandomSeed connect builtin
|
||||
|
||||
Listen 443
|
||||
|
||||
SSLCipherSuite HIGH:MEDIUM:!MD5:!RC4:!3DES:!ADH
|
||||
SSLProxyCipherSuite HIGH:MEDIUM:!MD5:!RC4:!3DES:!ADH
|
||||
SSLHonorCipherOrder on
|
||||
SSLProtocol all -SSLv3
|
||||
SSLProxyProtocol all -SSLv3
|
||||
SSLPassPhraseDialog builtin
|
||||
SSLSessionCache "shmcb:/var/cache/mod_ssl/scache(512000)"
|
||||
SSLSessionCacheTimeout 300
|
||||
|
||||
<VirtualHost _default_:443>
|
||||
DocumentRoot "/app/public"
|
||||
ServerName www.example.com:443
|
||||
ServerAdmin you@example.com
|
||||
ErrorLog logs/ssl_error.log
|
||||
TransferLog logs/ssl_access.log
|
||||
|
||||
SSLEngine on
|
||||
|
||||
SSLCertificateFile /etc/ssl/apache2/server.pem
|
||||
SSLCertificateKeyFile /etc/ssl/apache2/server.key
|
||||
|
||||
<FilesMatch "\.(cgi|shtml|phtml|php)$">
|
||||
SSLOptions +StdEnvVars
|
||||
</FilesMatch>
|
||||
<Directory "/app/public/cgi-bin">
|
||||
SSLOptions +StdEnvVars
|
||||
</Directory>
|
||||
|
||||
BrowserMatch "MSIE [2-5]" \
|
||||
nokeepalive ssl-unclean-shutdown \
|
||||
downgrade-1.0 force-response-1.0
|
||||
|
||||
CustomLog logs/ssl_request.log \
|
||||
"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
|
||||
</VirtualHost>
|
||||
@ -1,10 +0,0 @@
|
||||
version: '3'
|
||||
|
||||
services:
|
||||
nineapache:
|
||||
build:
|
||||
context: ./containers/nineapache
|
||||
image: reg.cadoles.com/envole/nineapache:8.1
|
||||
container_name: nineapache8
|
||||
ports:
|
||||
- 8080:443
|
||||
@ -1,111 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Source: https://github.com/Silejonu/bash_loading_animations
|
||||
|
||||
# shellcheck disable=SC2034 # https://github.com/koalaman/shellcheck/wiki/SC2034
|
||||
|
||||
### Loading animations list ###
|
||||
# The first value of an array is the interval (in seconds) between each frame
|
||||
|
||||
## ASCII animations ##
|
||||
# Will work in any terminal, including the TTY.
|
||||
BLA_classic=( 0.25 '-' "\\" '|' '/' )
|
||||
BLA_box=( 0.2 ┤ ┴ ├ ┬ )
|
||||
BLA_bubble=( 0.6 · o O O o · )
|
||||
BLA_breathe=( 0.9 ' () ' ' ( ) ' '( )' ' ( ) ' )
|
||||
BLA_growing_dots=( 0.5 '. ' '.. ' '...' '.. ' '. ' ' ' )
|
||||
BLA_passing_dots=( 0.25 '. ' '.. ' '...' ' ..' ' .' ' ' )
|
||||
BLA_metro=( 0.2 '[ ]' '[= ]' '[== ]' '[=== ]' '[ ===]' '[ ==]' '[ =]' )
|
||||
BLA_snake=( 0.4 '[= ]' '[~< ]' '[~~= ]' '[~~~< ]' '[ ~~~= ]' '[ ~~~<]' '[ ~~~]' '[ ~~]' '[ ~]' '[ ]' )
|
||||
BLA_filling_bar=( 0.25 '█▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '██▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '███▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '████▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '█████▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '██████▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '███████▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '████████▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '█████████▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '██████████▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '███████████▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '████████████▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '█████████████▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '██████████████▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '███████████████▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '████████████████▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '█████████████████▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '██████████████████▒▒▒▒▒▒▒▒▒▒▒▒▒▒' '███████████████████▒▒▒▒▒▒▒▒▒▒▒▒▒' '████████████████████▒▒▒▒▒▒▒▒▒▒▒▒' '█████████████████████▒▒▒▒▒▒▒▒▒▒▒' '██████████████████████▒▒▒▒▒▒▒▒▒▒' '███████████████████████▒▒▒▒▒▒▒▒▒' '████████████████████████▒▒▒▒▒▒▒▒' '█████████████████████████▒▒▒▒▒▒▒' '██████████████████████████▒▒▒▒▒▒' '███████████████████████████▒▒▒▒▒' '████████████████████████████▒▒▒▒' '█████████████████████████████▒▒▒' '██████████████████████████████▒▒' '███████████████████████████████▒' '████████████████████████████████')
|
||||
|
||||
## UTF-8 animations ##
|
||||
# Require Unicode support (will work in most modern terminals, but not in TTY).
|
||||
# Some animations may not render properly with certain fonts.
|
||||
BLA_classic_utf8=( 0.25 '—' "\\" '|' '/' )
|
||||
BLA_bounce=( 0.3 . · ˙ · )
|
||||
BLA_vertical_block=( 0.25 ▁ ▂ ▃ ▄ ▅ ▆ ▇ █ █ ▇ ▆ ▅ ▄ ▃ ▂ ▁ )
|
||||
BLA_horizontal_block=( 0.25 ▏ ▎ ▍ ▌ ▋ ▊ ▉ ▉ ▊ ▋ ▌ ▍ ▎ ▏ )
|
||||
BLA_quarter=( 0.25 ▖ ▘ ▝ ▗ )
|
||||
BLA_triangle=( 0.45 ◢ ◣ ◤ ◥)
|
||||
BLA_semi_circle=( 0.1 ◐ ◓ ◑ ◒ )
|
||||
BLA_rotating_eyes=( 0.4 ◡◡ ⊙⊙ ⊙⊙ ◠◠ )
|
||||
BLA_firework=( 0.4 '⢀' '⠠' '⠐' '⠈' '*' '*' ' ' )
|
||||
BLA_braille=( 0.2 ⠁ ⠂ ⠄ ⡀ ⢀ ⠠ ⠐ ⠈ )
|
||||
BLA_braille_whitespace=( 0.2 ⣾ ⣽ ⣻ ⢿ ⡿ ⣟ ⣯ ⣷ )
|
||||
BLA_trigram=( 0.25 ☰ ☱ ☳ ☶ ☴ )
|
||||
BLA_arrow=( 0.15 ▹▹▹▹▹ ▸▹▹▹▹ ▹▸▹▹▹ ▹▹▸▹▹ ▹▹▹▸▹ ▹▹▹▹▸ ▹▹▹▹▹ ▹▹▹▹▹ ▹▹▹▹▹ ▹▹▹▹▹ ▹▹▹▹▹ ▹▹▹▹▹ ▹▹▹▹▹ )
|
||||
BLA_bouncing_ball=( 0.4 '(● )' '( ● )' '( ● )' '( ● )' '( ● )' '( ●)' '( ● )' '( ● )' '( ● )' '( ● )' )
|
||||
BLA_big_dot=( 0.7 ∙∙∙ ●∙∙ ∙●∙ ∙∙● )
|
||||
BLA_modern_metro=( 0.15 ▰▱▱▱▱▱▱ ▰▰▱▱▱▱▱ ▰▰▰▱▱▱▱ ▱▰▰▰▱▱▱ ▱▱▰▰▰▱▱ ▱▱▱▰▰▰▱ ▱▱▱▱▰▰▰ ▱▱▱▱▱▰▰ ▱▱▱▱▱▱▰ ▱▱▱▱▱▱▱ ▱▱▱▱▱▱▱ ▱▱▱▱▱▱▱ ▱▱▱▱▱▱▱ )
|
||||
BLA_pong=( 0.35 '▐⠂ ▌' '▐⠈ ▌' '▐ ⠂ ▌' '▐ ⠠ ▌' '▐ ⡀ ▌' '▐ ⠠ ▌' '▐ ⠂ ▌' '▐ ⠈ ▌' '▐ ⠂ ▌' '▐ ⠠ ▌' '▐ ⡀ ▌' '▐ ⠠ ▌' '▐ ⠂ ▌' '▐ ⠈ ▌' '▐ ⠂▌' '▐ ⠠▌' '▐ ⡀▌' '▐ ⠠ ▌' '▐ ⠂ ▌' '▐ ⠈ ▌' '▐ ⠂ ▌' '▐ ⠠ ▌' '▐ ⡀ ▌' '▐ ⠠ ▌' '▐ ⠂ ▌' '▐ ⠈ ▌' '▐ ⠂ ▌' '▐ ⠠ ▌' '▐ ⡀ ▌' '▐⠠ ▌' )
|
||||
BLA_earth=( 0.45 🌍 🌎 🌏 )
|
||||
BLA_clock=( 0.2 🕛 🕐 🕑 🕒 🕓 🕔 🕕 🕖 🕗 🕘 🕙 🕚 )
|
||||
BLA_moon=( 0.8 🌑 🌒 🌓 🌔 🌕 🌖 🌗 🌘 )
|
||||
BLA_orange_pulse=( 0.35 🔸 🔶 🟠 🟠 🔶 )
|
||||
BLA_blue_pulse=( 0.35 🔹 🔷 🔵 🔵 🔷 )
|
||||
BLA_football=( 0.25 ' 👧⚽️ 👦' '👧 ⚽️ 👦' '👧 ⚽️ 👦' '👧 ⚽️ 👦' '👧 ⚽️ 👦' '👧 ⚽️ 👦' '👧 ⚽️👦 ' '👧 ⚽️ 👦' '👧 ⚽️ 👦' '👧 ⚽️ 👦' '👧 ⚽️ 👦' '👧 ⚽️ 👦' )
|
||||
BLA_blink=( 0.25 😐 😐 😐 😐 😐 😐 😐 😐 😐 😑 )
|
||||
BLA_camera=( 0.1 📷 📷 📷 📷 📷 📷 📷 📷 📷 📷 📷 📷 📷 📷 📷 📷 📷 📷 📷 📷 📸 📷 📸 )
|
||||
BLA_sparkling_camera=( 0.1 '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📷 ' '📸✨' '📷 ' '📸✨' )
|
||||
BLA_sick=( 0.9 🤢 🤢 🤮 )
|
||||
BLA_monkey=( 0.4 🙉 🙈 🙊 🙈 )
|
||||
BLA_bomb=( 0.25 '💣 ' ' 💣 ' ' 💣 ' ' 💣' ' 💣' ' 💣' ' 💣' ' 💣' ' 💥' ' ' ' ' )
|
||||
|
||||
declare -a BLA_active_loading_animation
|
||||
|
||||
BLA::play_loading_animation_loop() {
|
||||
while true ; do
|
||||
for frame in "${BLA_active_loading_animation[@]}" ; do
|
||||
printf "\r%s" "${frame}"
|
||||
sleep "${BLA_loading_animation_frame_interval}"
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
BLA::start_loading_animation() {
|
||||
BLA_active_loading_animation=( "${@}" )
|
||||
# Extract the delay between each frame from array BLA_active_loading_animation
|
||||
BLA_loading_animation_frame_interval="${BLA_active_loading_animation[0]}"
|
||||
unset "BLA_active_loading_animation[0]"
|
||||
tput civis # Hide the terminal cursor
|
||||
BLA::play_loading_animation_loop &
|
||||
BLA_loading_animation_pid="${!}"
|
||||
}
|
||||
|
||||
BLA::stop_loading_animation() {
|
||||
kill "${BLA_loading_animation_pid}" &> /dev/null
|
||||
printf "\n"
|
||||
tput cnorm # Restore the terminal cursor
|
||||
}
|
||||
|
||||
|
||||
###############################################################################
|
||||
################################# USAGE GUIDE #################################
|
||||
###############################################################################
|
||||
################## Read below for the explanations on how to ##################
|
||||
################### show loading animations in your script. ###################
|
||||
###############################################################################
|
||||
|
||||
:<<'EXAMPLES'
|
||||
|
||||
## Put these lines at the top of your script:
|
||||
## (replace /path/to/bash_loading_animations.sh with the appropriate filepath)
|
||||
# Load in the functions and animations
|
||||
source /path/to/bash_loading_animations.sh
|
||||
# Run BLA::stop_loading_animation if the script is interrupted
|
||||
trap BLA::stop_loading_animation SIGINT
|
||||
|
||||
# Show a loading animation for the command "foo"
|
||||
BLA::start_loading_animation "${BLA_name_of_the_animation[@]}"
|
||||
foo
|
||||
BLA::stop_loading_animation
|
||||
|
||||
# If foo prints some output in the terminal, you may want to add:
|
||||
foo 1> /dev/null # hide standard output
|
||||
# or
|
||||
foo 2> /dev/null # hide error messages
|
||||
# or
|
||||
foo &> /dev/null # hide all output
|
||||
|
||||
EXAMPLES
|
||||
@ -1,129 +0,0 @@
|
||||
@font-face {
|
||||
font-family: "Roboto";
|
||||
src: url("fonts/Roboto/Roboto-Regular.ttf") format('truetype');
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: "Roboto" !important;
|
||||
color: #333;
|
||||
max-width: 1200px;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
.title {
|
||||
color: #078eb5;
|
||||
text-transform: uppercase;
|
||||
font-size: 3em;
|
||||
margin-top:30px;
|
||||
text-align: center;
|
||||
line-height: 1em;
|
||||
font-weight: bold
|
||||
}
|
||||
|
||||
h1 {
|
||||
text-transform: uppercase;
|
||||
page-break-before: always;
|
||||
}
|
||||
|
||||
h2 {
|
||||
text-transform: uppercase;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
h3 {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
a, a:hover, a:visited , h1, h2, h3, h4, h5, h6 {
|
||||
color: #078eb5;
|
||||
font-weight: bold
|
||||
}
|
||||
|
||||
img {
|
||||
max-width:100%;
|
||||
margin:auto;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.center {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
footer img {
|
||||
width: 32px;
|
||||
}
|
||||
|
||||
.info,
|
||||
.success,
|
||||
.warning,
|
||||
.danger {
|
||||
padding: 1rem;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.info {
|
||||
background-color: rgba(41, 128, 185, .1);
|
||||
border-left: solid 4px rgba(41, 128, 185,1.0);
|
||||
color: rgba(41, 128, 185,1.0);
|
||||
}
|
||||
|
||||
.success {
|
||||
background-color: rgba(39, 174, 96, .1);
|
||||
border-left: solid 4px rgba(39, 174, 96,1.0);
|
||||
color:rgba(39, 174, 96,1.0);
|
||||
}
|
||||
|
||||
.warning {
|
||||
padding: 1rem;
|
||||
background-color: rgba(243, 156, 18, .1);
|
||||
border-left: solid 4px #f39c12;
|
||||
color: #f39c12;
|
||||
}
|
||||
|
||||
.danger {
|
||||
background-color: rgba(231, 76, 60, .1);
|
||||
border-left: solid 4px rgba(231, 76, 60,1.0);
|
||||
color: rgba(231, 76, 60,1.0);
|
||||
}
|
||||
|
||||
.page-break {
|
||||
page-break-after: always;
|
||||
}
|
||||
|
||||
.center {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
table {
|
||||
width:100%;
|
||||
}
|
||||
|
||||
table > thead > tr > th {
|
||||
border: 1px solid;
|
||||
text-align:center;
|
||||
}
|
||||
|
||||
table > tbody > tr > td {
|
||||
border: 1px solid;
|
||||
}
|
||||
|
||||
.matriceresponsabilites {
|
||||
text-align:center;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.matriceresponsabilites td:nth-child(2) {
|
||||
text-align:left;
|
||||
}
|
||||
|
||||
.matriceresponsabilites td {
|
||||
padding: 2px;
|
||||
}
|
||||
|
||||
img[alt="schéma declenchement PCA"] { width: 500px; }
|
||||
img[alt="Type Epique"] { width: 500px; }
|
||||
img[alt="Type Epique Dependance"] { width: 200px; }
|
||||
img[alt="Type Scenario"] { width: 500px; }
|
||||
img[alt="Type Scenario Dependance"] { width: 200px; }
|
||||
img[alt="Type Tache"] { width: 500px; }
|
||||
img[alt="Jalon"] { width: 200px; }
|
||||
@ -1,202 +0,0 @@
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
@ -299,7 +299,6 @@ class AppService
|
||||
}
|
||||
|
||||
$serviceBasedUrl = $this->getServiceBasedUrl();
|
||||
$this->loggingService->write(\OCA\UserCas\Service\LoggingService::ERROR, 'MON SERVICE BASE = '.$serviceBasedUrl);
|
||||
|
||||
# Initialize client
|
||||
if ($this->casUseProxy) {
|
||||
|
||||
@ -52,6 +52,10 @@ echo "== FILES EXTERNAL"
|
||||
run_as 'php occ app:install files_external'
|
||||
run_as 'php occ app:update files_external'
|
||||
run_as 'php occ app:enable files_external'
|
||||
if [[ "${NEXTCLOUD_SAMBA}" == "1" ]]
|
||||
then
|
||||
run_as 'php occ files_external:import /envole/mount.json -q'
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "== FILES MINDMAP"
|
||||
@ -85,6 +89,41 @@ then
|
||||
run_as 'php occ app:install user_ldap'
|
||||
run_as 'php occ app:update user_ldap'
|
||||
run_as 'php occ app:enable user_ldap'
|
||||
|
||||
run_as 'php occ config:app:set user_ldap bgjRefreshInterval --value=300 -q'
|
||||
run_as 'php occ config:app:set user_ldap cleanUpJobChunkSize --value=300 -q'
|
||||
run_as 'php occ config:app:set user_ldap background_sync_interval --value=300 -q'
|
||||
|
||||
run_as 'php occ ldap:show-config s01' > /tmp/nextcloud-ldap.txt
|
||||
if grep -q "Invalid configID" /tmp/nextcloud-ldap.txt;then run_as 'php occ ldap:create-empty-config -q'; fi
|
||||
|
||||
run_as 'php occ ldap:set-config s01 ldapHost "${LDAP_HOST}"'
|
||||
run_as 'php occ ldap:set-config s01 ldapPort "${LDAP_PORT}"'
|
||||
run_as 'php occ ldap:set-config s01 ldapTLS "${LDAP_TLS}"'
|
||||
run_as 'php occ ldap:set-config s01 ldapAgentName "${LDAP_USER}"'
|
||||
run_as 'php occ ldap:set-config s01 ldapAgentPassword "${LDAP_PASSWORD}"'
|
||||
|
||||
run_as 'php occ ldap:set-config s01 ldapBase "${LDAP_BASEDN}"'
|
||||
run_as 'php occ ldap:set-config s01 ldapBaseGroups "${LDAP_BASEGROUP}"'
|
||||
run_as 'php occ ldap:set-config s01 ldapBaseUsers "${LDAP_BASEUSER}"'
|
||||
run_as 'php occ ldap:set-config s01 ldapConfigurationActive "1"'
|
||||
run_as 'php occ ldap:set-config s01 ldapExperiencedAdmin "0"'
|
||||
run_as 'php occ ldap:set-config s01 ldapExpertUUIDUserAttr "${LDAP_USERNAME}"'
|
||||
|
||||
run_as 'php occ ldap:set-config s01 ldapLoginFilter "${LDAP_LOGIN_FILTER}"'
|
||||
run_as 'php occ ldap:set-config s01 ldapUserFilter "${LDAP_USER_FILTER}"'
|
||||
run_as 'php occ ldap:set-config s01 ldapGroupFilter "${LDAP_GROUP_FILTER}"'
|
||||
|
||||
run_as 'php occ ldap:set-config s01 ldapUserDisplayName "${LDAP_DISPLAYNAME}"'
|
||||
|
||||
run_as 'php occ ldap:set-config s01 ldapCacheTTL "300"'
|
||||
run_as 'php occ ldap:set-config s01 ldapPagingSize "0"'
|
||||
|
||||
#sudo -u www-data php /var/www/html/nextcloud/occ ldap:set-config s01 ldapGroupFilterObjectclass "${ldapGroupFilterObjectclass}"
|
||||
#sudo -u www-data php /var/www/html/nextcloud/occ ldap:set-config s01 ldapGroupMemberAssocAttr "${ldapGroupMemberAssocAttr}"
|
||||
#sudo -u www-data php /var/www/html/nextcloud/occ ldap:set-config s01 ldapUserFilterObjectclass "${ldapUserFilterObjectclass}"
|
||||
#sudo -u www-data php /var/www/html/nextcloud/occ ldap:set-config s01 ldapEmailAttribute "${ldapEmailAttribute}"
|
||||
|
||||
else
|
||||
run_as 'php occ app:disable user_ldap'
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user