diff --git a/.env.template b/.env.template
index 773e8db5a472e4ec55e623bc4f36a2e762ab9917..f2b86fe0f18ed30bb1bb2410f301e339ea194bf4 100644
--- a/.env.template
+++ b/.env.template
@@ -19,4 +19,4 @@ DATABASE_USER
DATABASE_PASSWORD
DATABASE_NAME
-SGE_API_TOKEN
\ No newline at end of file
+SGE_API_TOKEN
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a68ff3ca0740a67e46485adfb109348e7bb3b08e..21135192e1251033fe3943a7519769342b04856b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,14 +35,14 @@ import-convert-assets:
script:
- cd ~
# Fetch and convert email assets
- - curl https://forge.grandlyon.com/api/v4/projects/409/repository/archive?path=src/assets/icons/email&sha=$ECOLYO_ASSETS_BRANCH --output email.tar.gz
+ - curl "https://forge.grandlyon.com/api/v4/projects/409/repository/archive?path=src/assets/icons/email&sha=$ECOLYO_ASSETS_BRANCH" --output email.tar.gz
- tar -xf email.tar.gz
- cd *-email/src/assets/icons/email
- for file in *.svg; do inkscape --export-type="png" $file; done
- rm *.svg
- cd ~
# Fetch and convert ecogesture assets
- - curl https://forge.grandlyon.com/api/v4/projects/409/repository/archive?path=src/assets/icons/visu/ecogesture&sha=$ECOLYO_ASSETS_BRANCH --output ecogesture.tar.gz
+ - curl "https://forge.grandlyon.com/api/v4/projects/409/repository/archive?path=src/assets/icons/visu/ecogesture&sha=$ECOLYO_ASSETS_BRANCH" --output ecogesture.tar.gz
- tar -xf ecogesture.tar.gz
- cd *-ecogesture/src/assets/icons/visu/ecogesture
- for file in *.svg; do inkscape --export-type="png" $file; done
diff --git a/go.mod b/go.mod
index 6636a3dc573a11e3dc31e64ac0eac826cd7bf9d0..7c0165512894ce8716ea983a81b46d8e28c6d4e6 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
github.com/swaggo/http-swagger v1.3.3
github.com/swaggo/swag v1.8.10
golang.org/x/oauth2 v0.4.0
- gorm.io/driver/mysql v1.4.6
+ gorm.io/driver/mysql v1.4.7
gorm.io/driver/sqlite v1.4.4
gorm.io/gorm v1.24.5
)
@@ -24,7 +24,7 @@ require (
github.com/jinzhu/now v1.1.5 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
- github.com/mattn/go-sqlite3 v1.14.16 // indirect
+ github.com/mattn/go-sqlite3 v1.14.15 // indirect
github.com/swaggo/files v1.0.0 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/sys v0.5.0 // indirect
diff --git a/go.sum b/go.sum
index dd1dac0e93f06195f5adfa4632cca15bcca4822c..9c551c3f70575e4633935d02a171c294b6313e97 100644
--- a/go.sum
+++ b/go.sum
@@ -46,9 +46,8 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN
github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
-github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
-github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -79,12 +78,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
-golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/oauth2 v0.4.0 h1:NF0gk8LVPg1Ml7SSbGyySuoxdsXitj7TvgvuRxIMc/M=
golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec=
-golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s=
-golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -128,8 +123,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/mysql v1.4.6 h1:5zS3vIKcyb46byXZNcYxaT9EWNIhXzu0gPuvvVrwZ8s=
-gorm.io/driver/mysql v1.4.6/go.mod h1:SxzItlnT1cb6e1e4ZRpgJN2VYtcqJgqnHxWr4wsP8oc=
+gorm.io/driver/mysql v1.4.7 h1:rY46lkCspzGHn7+IYsNpSfEv9tA+SU4SkkB+GFX125Y=
+gorm.io/driver/mysql v1.4.7/go.mod h1:SxzItlnT1cb6e1e4ZRpgJN2VYtcqJgqnHxWr4wsP8oc=
gorm.io/driver/sqlite v1.4.4 h1:gIufGoR0dQzjkyqDyYSCvsYR6fba1Gw5YKDqKeChxFc=
gorm.io/driver/sqlite v1.4.4/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2ecI=
gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
diff --git a/k8s/README.md b/k8s/README.md
index c9f8112754cfb8674432fae8aaf43fa0e2f3d065..a995fc3807bf581dbbb15738b6dff3e806df4252 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -1,3 +1,5 @@
+# Configuration Openshift
+
## Connexion à la machine de rebond
### Connexion au bureau à distance
@@ -7,16 +9,16 @@ Possible d'utiliser Remmina sous Linux
Configuration:
- serveur : kubernetes.synaaps.com:33338
-- nom d'utilisateur : paas338.<pnom> (ex: paas338.rpailharey)
-- mot de passe : fourni par SMS + possibilité de le changer sur https://safeweb.synaaps.com/cloud/?orgname=synaaps&domainid=2
+- nom d'utilisateur : paas338.pnom (ex: paas338.rpailharey)
+- mot de passe : fourni par SMS + possibilité de le changer sur <https://safeweb.synaaps.com/cloud/?orgname=synaaps&domainid=2>
### Accès à la console OpenShift
-- Se rendre sur https://console-openshift-console.apps.dedicated-0003.kaas.synaaps.intra
+- Se rendre sur <https://console-openshift-console.apps.dedicated-0003.kaas.synaaps.intra>
- Se connecter (mêmes identifiants que ceux du bureau à distance)
- Pour pouvoir lancer les commandes OpenShift (ex: oc apply) depuis un terminal
- - lancer la commande `oc login` qui redirige vers https://oauth-openshift.apps.dedicated-0003.kaas.synaaps.intra/oauth/token/request
+ - lancer la commande `oc login` qui redirige vers <https://oauth-openshift.apps.dedicated-0003.kaas.synaaps.intra/oauth/token/request>
- Se connecter avec les identifiants précédents
- Cliquer sur "Display login"
- Recopier la commande `oc login --token=YOUR_TOKEN --server=https://api-dedicated-0003.kaas.synaaps.intra:6443`
@@ -33,7 +35,7 @@ Configuration:
- Authentification type : Image registry credentials
- Registry server address : registry.forge.grandlyon.com
- Username: llle-project
- - Password: <demander le password>
+ - Password: demander le password
- Cliquer sur Create
### Secrets de la database
@@ -136,6 +138,7 @@ Configuration:
- Répéter l'opération pour **mysql-dump-cronjob-daily** et **mysql-dump-cronjob-weekly**
## Restaurer un dump
+
- Monter un pod du déploiement "database-restore"
- Rentrer dans le terminal de ce pod
- Aller dans le dossier des dumps horaires `cd /dump/hourly` ou journaliers `cd /dump/hourly` ou hebdomadaires `cd /dump/weekly`