update
This commit is contained in:
parent
cdd5cdd393
commit
4b9b8c2abd
29 changed files with 1859 additions and 494 deletions
2
.orgids
2
.orgids
|
@ -1,2 +1,2 @@
|
||||||
|
|
||||||
(("../Library/Mobile Documents/iCloud~com~appsonthemove~beorg/Documents/org/journal/2020/2020-09-26.org" "d6bfe273-22e1-40b4-92db-14b22e092498") ("../Library/Mobile Documents/iCloud~com~appsonthemove~beorg/Documents/org/journal/2020/2020-09-20.org" "8a931436-5db6-4ff1-8fa8-3415c1f67c61") ("../Library/Mobile Documents/iCloud~com~appsonthemove~beorg/Documents/org/inbox.org" "a4ebd43b-b589-499e-85e1-7ebea0abf3af") ("../dev/her.esy.fun/src/drafts/XXXX-org-mode-intro/index.org" "21c48431-c0db-4a34-95fe-7228fea6233f"))
|
(("../Library/Mobile Documents/iCloud~com~appsonthemove~beorg/Documents/org/journal/2020-12-04--13-19-56Z--english_lesson.org" "1a758996-2bb0-4753-8365-34ca3ef0f940") ("../dev/her.esy.fun/src/drafts/XXXX-org-mode-intro/index.org" "21c48431-c0db-4a34-95fe-7228fea6233f") ("../Library/Mobile Documents/iCloud~com~appsonthemove~beorg/Documents/org/journal/2020/2020-09-20.org" "8a931436-5db6-4ff1-8fa8-3415c1f67c61") ("../Library/Mobile Documents/iCloud~com~appsonthemove~beorg/Documents/org/journal/2020/2020-09-26.org" "d6bfe273-22e1-40b4-92db-14b22e092498") ("../y/her.esy.fun/src/posts/0013-how-to-choose-your-tools/index.org" "c2e61938-8493-434a-9ffa-9fd4698d9863") ("../Library/Mobile Documents/iCloud~com~appsonthemove~beorg/Documents/org/inbox.org" "a4ebd43b-b589-499e-85e1-7ebea0abf3af" "797ba971-6ae3-49a1-9499-928572760d09"))
|
||||||
|
|
|
@ -1,70 +0,0 @@
|
||||||
# Created 2021-01-29 Fri 16:16
|
|
||||||
#+TITLE: Cisco Notes #+Author: Yann Esposito
|
|
||||||
#+AUTHOR: Yann Esposito
|
|
||||||
* Provisionning API doc
|
|
||||||
|
|
||||||
From AMP point of view.
|
|
||||||
We start from an admin A with some user-id and some business_guid.
|
|
||||||
|
|
||||||
|
|
||||||
After the first admin migrate AMP will have:
|
|
||||||
|
|
||||||
- AMP user-id: =amp-user-id=
|
|
||||||
- AMP business_guid: =business_guid=
|
|
||||||
- SxSO user-identity-id: =okta-user-id=
|
|
||||||
|
|
||||||
How to migrate users in SecureX with the API
|
|
||||||
|
|
||||||
1. Check SecureX know the org
|
|
||||||
GET =/iroh/provisioning/org/{business_guid}=
|
|
||||||
|
|
||||||
If the org does not exists stop here there is nothing to migrate in SecureX.
|
|
||||||
|
|
||||||
2. Mark the org as being migrated to Okta
|
|
||||||
POST to =/iroh/provisioning/org/{business_guid}=
|
|
||||||
with an empty body.
|
|
||||||
|
|
||||||
3. Check SecureX know the user
|
|
||||||
GET to =/iroh/provision/user/{amp-user-id}=
|
|
||||||
|
|
||||||
4. If the user exists, update its idp-mapping
|
|
||||||
|
|
||||||
HTTP POST to =/iroh/provisioning/user/{amp-user-id}=
|
|
||||||
With the following body:
|
|
||||||
|
|
||||||
#+begin_src js
|
|
||||||
{"idp-mappings":[{ "idp":"sxso",
|
|
||||||
"user-identity-id": okta-user-id,
|
|
||||||
"enabled?": true}]}
|
|
||||||
#+end_src
|
|
||||||
|
|
||||||
Notice there is no =org-id= in the =idp-mappings=.
|
|
||||||
Optionally AMP can also sync the =user-email=, and =role= (either "user"
|
|
||||||
or "admin").
|
|
||||||
|
|
||||||
1. If the user is not found inside SecureX, create the user
|
|
||||||
|
|
||||||
HTTP POST to =/iroh/provisionning/user=
|
|
||||||
With the following body:
|
|
||||||
|
|
||||||
#+begin_src js
|
|
||||||
{
|
|
||||||
"user-email": user-email,
|
|
||||||
"org-id": business_guid,
|
|
||||||
"role": user-role,
|
|
||||||
"idp-mappings": [
|
|
||||||
{
|
|
||||||
"idp": "sxso",
|
|
||||||
"user-identity-id": okta-user-id,
|
|
||||||
"enabled?": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"user-name": user-name
|
|
||||||
}
|
|
||||||
#+end_src
|
|
||||||
|
|
||||||
|
|
||||||
Everytime a new user login into AMP via Okta.
|
|
||||||
|
|
||||||
1. Check if the org is known. If not, do not migrate the user.
|
|
||||||
2. Do the step from 3 to 5 of the previous section.
|
|
File diff suppressed because it is too large
Load diff
15
elpher-bookmarks
Normal file
15
elpher-bookmarks
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
; Elpher bookmarks file
|
||||||
|
|
||||||
|
; Bookmarks are stored as a list of (label URL) items.
|
||||||
|
; Feel free to edit by hand, but take care to ensure
|
||||||
|
; the list structure remains intact.
|
||||||
|
|
||||||
|
(("rosenzweig.io" "gemini://rosenzweig.io/")
|
||||||
|
("drewdevault.com" "gemini://drewdevault.com/")
|
||||||
|
("Exploration Surprise!" "gemini://tilde.team/~sumpygump/explore/")
|
||||||
|
("Spacewalk" "gemini://rawtext.club/~sloum/spacewalk.gmi")
|
||||||
|
("Houston search engine" "gemini://houston.coder.town/")
|
||||||
|
("gemlog.blue/users" "gemini://gemlog.blue/users/")
|
||||||
|
("gopherddit" "gopher://gopherddit.com/1")
|
||||||
|
("GUS" "gemini://gus.guru/")
|
||||||
|
("gemini://her.esy.fun" "gemini://her.esy.fun/"))
|
|
@ -8,14 +8,15 @@ tags :: [[file:../journal/2020-06-02--11-31-33Z--nix.org][nix]] [[file:../journa
|
||||||
go https://nixos.org/nix/
|
go https://nixos.org/nix/
|
||||||
|
|
||||||
#+BEGIN_SRC bash
|
#+BEGIN_SRC bash
|
||||||
echo "curl -L --proto '=https' --tlsv1.2 https://nixos.org/nix/install | sh"
|
sh <(curl -L https://nixos.org/nix/install) --darwin-use-unencrypted-nix-store-volume
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
* Init nix-channels
|
* Init nix-channels
|
||||||
|
|
||||||
#+BEGIN_SRC bash
|
#+BEGIN_SRC bash
|
||||||
|
. .nix-profile/etc/profile.d/nix.sh
|
||||||
nix-channel --add https://nixos.org/channels/nixpkgs-20.03-darwin nixpkgs
|
nix-channel --add https://nixos.org/channels/nixpkgs-20.03-darwin nixpkgs
|
||||||
nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager
|
nix-channel --add https://github.com/rycee/home-manager/archive/release-20.09.tar.gz home-manager
|
||||||
nix-channel --update
|
nix-channel --update
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
|
@ -79,14 +80,7 @@ open solaryzed-iterm2/*.itermcolors
|
||||||
cp -r ~/.nix-profile/Applications/Emacs.app /Applications
|
cp -r ~/.nix-profile/Applications/Emacs.app /Applications
|
||||||
* Mails
|
* Mails
|
||||||
|
|
||||||
offlineimap -o
|
TODO...??
|
||||||
notmuch new
|
|
||||||
cd ~/mail
|
|
||||||
mkdir yann.esposito.gmail
|
|
||||||
cd yann.esposito.gmail
|
|
||||||
gmi init yann.esposito@gmail.com
|
|
||||||
gmi pull
|
|
||||||
gmi push
|
|
||||||
|
|
||||||
* Install clj-kondo
|
* Install clj-kondo
|
||||||
Does not work from =nix=.
|
Does not work from =nix=.
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
#+title: 2020-09-08
|
|
|
@ -0,0 +1,43 @@
|
||||||
|
#+TITLE: I'm Thinking of Ending Things (2020)
|
||||||
|
#+Author: Yann Esposito
|
||||||
|
#+Date: [2020-10-25]
|
||||||
|
|
||||||
|
tags :: [[file:2020-10-25--15-47-30Z--film.org][film]]
|
||||||
|
source :: https://www.imdb.com/title/tt7939766/
|
||||||
|
|
||||||
|
Un film qui m'a fait beaucoup pensé aux films de David Lynch.
|
||||||
|
Les personnages parraissent vivant mais des choses « impossible » leur arrive.
|
||||||
|
Des pertes de mémoire, des inconsistences dans leur mémoire, leur vie, etc...
|
||||||
|
|
||||||
|
Parfois un personne se retourne au milieu d'une discussion pour se
|
||||||
|
retrouver au milieu d'un pièce vide.
|
||||||
|
|
||||||
|
Et c'est ce dont il s'agit dans "I'm Thinking of Ending Things".
|
||||||
|
Mais comme je suis un fan de David Lynch et que j'analyse ce genre de
|
||||||
|
chose.
|
||||||
|
Et bien, j'étais un peu « à la maison » en regardant ce film.
|
||||||
|
|
||||||
|
Les personnages sont tous des personnages inventés dans l'esprit du
|
||||||
|
personnage principal qui fantasme d'un scénario.
|
||||||
|
Le personnage principal est un "janitor" de lycée.
|
||||||
|
Il est la cible des ricanneries des jeunes filles qui lui trouve un air
|
||||||
|
bizarre.
|
||||||
|
Il aurait aimé être un scientifique, un poète, ou tout un tas d'autres
|
||||||
|
choses.
|
||||||
|
Mais il n'a toujours été bon qu'à s'occuper de nettoyer le lycée le soir.
|
||||||
|
Dans le scénario qu'il imagine, il s'imagine de nouveau jeune.
|
||||||
|
Avec une jeune fille qui lui ressemble et qui le trouve super.
|
||||||
|
Il s'imagine lui faire découvrir sa vie.
|
||||||
|
Sa famille, là où il a vécu.
|
||||||
|
Ses moments difficiles, lorsque ses parents tombent malades et meurent.
|
||||||
|
|
||||||
|
Et finalement il l'amène au lieu qui a fini sa vie.
|
||||||
|
Le lycée qu'il n'a jamais quitté et qu'il soccupe de nettoyer.
|
||||||
|
|
||||||
|
Dans ce film il y avait beaucoup de choses bien faites.
|
||||||
|
Mais aussi certains ratés.
|
||||||
|
Les acteurs sont vraiment très bon à mon goût.
|
||||||
|
Je trouve la fin un peu ratée.
|
||||||
|
Et il est trop long, certaines scènes sont ennuyeuses.
|
||||||
|
Pourtant j'aime bien les films avec des longeurs en général, mais là les
|
||||||
|
longeurs manquaient de profondeur.
|
|
@ -1,6 +1,6 @@
|
||||||
#+TITLE: plan
|
#+TITLE: film
|
||||||
#+Author: Yann Esposito
|
#+Author: Yann Esposito
|
||||||
#+Date: [2020-12-01]
|
#+Date: [2020-10-25]
|
||||||
|
|
||||||
tags ::
|
tags ::
|
||||||
source ::
|
source ::
|
|
@ -1,6 +0,0 @@
|
||||||
#+TITLE: Resume
|
|
||||||
#+Author: Yann Esposito
|
|
||||||
#+Date: [2020-11-14]
|
|
||||||
|
|
||||||
tags ::
|
|
||||||
source ::
|
|
|
@ -1,116 +0,0 @@
|
||||||
# Created 2020-11-26 Thu 11:14
|
|
||||||
#+TITLE: [Meta RFC] RFC template
|
|
||||||
#+DATE: [2020-11-26 Thu]
|
|
||||||
#+AUTHOR: Yann Esposito
|
|
||||||
tags :: [[file:../../../../../../.org/journal/2020-11-26--10-12-21Z--work.org][work]] [[file:../../../../../../.org/journal/2020-11-26--10-12-42Z--organisation.org][organisation]]
|
|
||||||
source ::
|
|
||||||
|
|
||||||
/Abstract/: Yesterday in our weekly meeting I discussed about how I would
|
|
||||||
like us to work with RFCs.
|
|
||||||
I would like to add this document to talk about RFCs.
|
|
||||||
So this is a meta document.
|
|
||||||
I hope not to trigger the need for a meta-meta-document ;).
|
|
||||||
I will try to keep it self-referencing by using its own description.
|
|
||||||
Closer to the quine :).
|
|
||||||
|
|
||||||
*Audience*: (Who's impacted?)
|
|
||||||
- iroh team
|
|
||||||
- managers
|
|
||||||
|
|
||||||
*RFC kind*:
|
|
||||||
- team organisation
|
|
||||||
|
|
||||||
** Objective
|
|
||||||
|
|
||||||
*Improvement*: Write a proper RFC template.
|
|
||||||
|
|
||||||
* Proposed Solutions
|
|
||||||
|
|
||||||
** Template
|
|
||||||
|
|
||||||
This is the template I would like us to provide.
|
|
||||||
We should probably add that as a github template for issue.
|
|
||||||
So if you declare you want to create a new RFC issue you will be presented
|
|
||||||
this template.
|
|
||||||
|
|
||||||
The author will only need to fill the blanks and remove parts that are not
|
|
||||||
relevant.
|
|
||||||
|
|
||||||
*** [Title] <- name of the issue in github
|
|
||||||
|
|
||||||
/Abstract/: A little bit more than in the title
|
|
||||||
|
|
||||||
*Audience*: (Who's impacted?)
|
|
||||||
- iroh team
|
|
||||||
- ops
|
|
||||||
- ui team
|
|
||||||
- managers
|
|
||||||
- customers
|
|
||||||
|
|
||||||
*RFC kind*: (remove non relevant part)
|
|
||||||
- code convention (=> Audience; iroh-team only)
|
|
||||||
- ns naming convention
|
|
||||||
- position of args
|
|
||||||
- naming of args
|
|
||||||
- etc..
|
|
||||||
- dev tooling (=> Audience; iroh-team, maybe ops)
|
|
||||||
- emacs mode
|
|
||||||
- cider
|
|
||||||
- clj-refactor
|
|
||||||
- CI
|
|
||||||
- scripts
|
|
||||||
- git commit message
|
|
||||||
- docker
|
|
||||||
- etc...
|
|
||||||
- team organisation (=> Audience; iroh-team, managers)
|
|
||||||
- technical specification (Audience not constrained);
|
|
||||||
The goal of a technical specification RFC is is to produce a
|
|
||||||
document containing:
|
|
||||||
- a functional specification
|
|
||||||
- a technical specification for our team
|
|
||||||
- technical specification(s) for other team if necessary (ops, UI, etc...)
|
|
||||||
- an execution plan
|
|
||||||
|
|
||||||
**** Objective
|
|
||||||
|
|
||||||
Probably it should be one of those:
|
|
||||||
|
|
||||||
- Solve a problem.
|
|
||||||
- Provide a new feature,
|
|
||||||
- Improve the current situation.
|
|
||||||
|
|
||||||
Describe the objective of this RFC.
|
|
||||||
|
|
||||||
**** Proposed Solutions
|
|
||||||
|
|
||||||
***** [Solution 1]
|
|
||||||
|
|
||||||
- describe one possible solution
|
|
||||||
- pros
|
|
||||||
- cons
|
|
||||||
|
|
||||||
***** [Solution 2]
|
|
||||||
|
|
||||||
- describe another possible solution
|
|
||||||
- pros
|
|
||||||
- cons
|
|
||||||
|
|
||||||
**** Furter Considerations and Remarks
|
|
||||||
|
|
||||||
Generic place to put comment not suitable in any other subsection.
|
|
||||||
Typically, we could add
|
|
||||||
|
|
||||||
- Security
|
|
||||||
- Communication
|
|
||||||
|
|
||||||
** Further Considerations and Remarks
|
|
||||||
|
|
||||||
*** =dev= label
|
|
||||||
|
|
||||||
We already have a =dev= label we should probably use for RFC whose audience
|
|
||||||
is just the iroh team.
|
|
||||||
|
|
||||||
*** =Epic= label
|
|
||||||
|
|
||||||
We should continu to use the =Epic= label for issues whose goal is to
|
|
||||||
produce a specification document along with an execution plan.
|
|
|
@ -1,111 +0,0 @@
|
||||||
# Created 2020-11-26 Thu 11:10
|
|
||||||
#+TITLE: [Meta RFC] RFC template
|
|
||||||
#+DATE: [2020-11-26 Thu]
|
|
||||||
#+AUTHOR: Yann Esposito
|
|
||||||
tags :: [[file:../../../../../../.org/journal/2020-11-26--10-12-21Z--work.org][work]] [[file:../../../../../../.org/journal/2020-11-26--10-12-42Z--organisation.org][organisation]]
|
|
||||||
source ::
|
|
||||||
|
|
||||||
/Abstract/: Yesterday in our weekly meeting I discussed about how I would
|
|
||||||
like us to work with RFCs.
|
|
||||||
I would like to add this document to talk about RFCs.
|
|
||||||
So this is a meta document.
|
|
||||||
I hope not to trigger the need for a meta-meta-document ;).
|
|
||||||
I will try to keep it self-referencing by using its own description.
|
|
||||||
Closer to the quine :).
|
|
||||||
|
|
||||||
*Audience*: (Who's impacted?)
|
|
||||||
- iroh team
|
|
||||||
- managers
|
|
||||||
|
|
||||||
*RFC kind*:
|
|
||||||
- team organisation
|
|
||||||
|
|
||||||
** Objective
|
|
||||||
|
|
||||||
*Improvement*: Write a proper RFC template.
|
|
||||||
|
|
||||||
* Proposed Solutions
|
|
||||||
|
|
||||||
** Template
|
|
||||||
|
|
||||||
This is the template I would like us to provide.
|
|
||||||
We should probably add that as a github template for issue.
|
|
||||||
So if you declare you want to create a new RFC issue you will be presented
|
|
||||||
this template.
|
|
||||||
|
|
||||||
The author will only need to fill the blanks and remove parts that are not
|
|
||||||
relevant.
|
|
||||||
|
|
||||||
*** [Title] <- name of the issue in github
|
|
||||||
|
|
||||||
/Abstract/: A little bit more than in the title
|
|
||||||
|
|
||||||
*Audience*: (Who's impacted?)
|
|
||||||
- iroh team
|
|
||||||
- ops
|
|
||||||
- ui team
|
|
||||||
- managers
|
|
||||||
- customers
|
|
||||||
|
|
||||||
*RFC kind*: (remove non relevant part)
|
|
||||||
- code convention (=> Audience; iroh-team only)
|
|
||||||
- ns naming convention
|
|
||||||
- position of args
|
|
||||||
- naming of args
|
|
||||||
- etc..
|
|
||||||
- dev tooling (=> Audience; iroh-team, maybe ops)
|
|
||||||
- emacs mode
|
|
||||||
- cider
|
|
||||||
- clj-refactor
|
|
||||||
- CI
|
|
||||||
- scripts
|
|
||||||
- git commit message
|
|
||||||
- docker
|
|
||||||
- etc...
|
|
||||||
- team organisation (=> Audience; iroh-team, managers)
|
|
||||||
- technical specification ( not Audience constraint )
|
|
||||||
- goal write a document for other dev (potential other teams), managers, and provide an execution plan
|
|
||||||
|
|
||||||
**** Objective
|
|
||||||
|
|
||||||
Probably it should be one of those:
|
|
||||||
|
|
||||||
- Solve a problem.
|
|
||||||
- Provide a new feature,
|
|
||||||
- Improve the current situation.
|
|
||||||
|
|
||||||
Describe the objective of this RFC.
|
|
||||||
|
|
||||||
**** Proposed Solutions
|
|
||||||
|
|
||||||
***** [Solution 1]
|
|
||||||
|
|
||||||
- describe one possible solution
|
|
||||||
- pros
|
|
||||||
- cons
|
|
||||||
|
|
||||||
***** [Solution 2]
|
|
||||||
|
|
||||||
- describe another possible solution
|
|
||||||
- pros
|
|
||||||
- cons
|
|
||||||
|
|
||||||
**** Furter Considerations and Remarks
|
|
||||||
|
|
||||||
Generic place to put comment not suitable in any other subsection.
|
|
||||||
Typically, we could add
|
|
||||||
|
|
||||||
- Security
|
|
||||||
- Communication
|
|
||||||
|
|
||||||
** Further Considerations and Remarks
|
|
||||||
|
|
||||||
*** =dev= label
|
|
||||||
|
|
||||||
We already have a =dev= label we should probably use for RFC whose audience
|
|
||||||
is just the iroh team.
|
|
||||||
|
|
||||||
*** =Epic= label
|
|
||||||
|
|
||||||
We should continu to use the =Epic= label for issues whose goal is to
|
|
||||||
produce a specification document along with an execution plan.
|
|
|
@ -1,6 +0,0 @@
|
||||||
#+TITLE: plan
|
|
||||||
#+Author: Yann Esposito
|
|
||||||
#+Date: [2020-12-01]
|
|
||||||
|
|
||||||
tags ::
|
|
||||||
source ::
|
|
|
@ -2,16 +2,9 @@
|
||||||
#+Author: Dr Escalante
|
#+Author: Dr Escalante
|
||||||
#+Date: [2020-12-27]
|
#+Date: [2020-12-27]
|
||||||
|
|
||||||
tags :: [[file:2020-07-01--07-25-51Z--psychology.org][psychology]]
|
- tags :: [[file:2020-07-01--07-25-51Z--psychology.org][psychology]]
|
||||||
source :: https://www.psychologytoday.com/us/blog/shouldstorm/202012/we-ve-got-depression-all-wrong-it-s-trying-save-us
|
- source :: https://www.psychologytoday.com/us/blog/shouldstorm/202012/we-ve-got-depression-all-wrong-it-s-trying-save-us
|
||||||
|
- ref :: https://news.ycombinator.com/item?id=25546043
|
||||||
references ::
|
|
||||||
|
|
||||||
- Porges, Stephen. (Apr 2009) The polyvagal theory:
|
|
||||||
New insights into adaptive reactions of the autonomic nervous system.
|
|
||||||
Cleve Clin J Med.
|
|
||||||
- Porges, Stephen. (Feb 2007) The polyvagal perspective
|
|
||||||
Biol Psychology.
|
|
||||||
|
|
||||||
|
|
||||||
* We’ve Got Depression All Wrong. It’s Trying to Save Us.
|
* We’ve Got Depression All Wrong. It’s Trying to Save Us.
|
||||||
|
@ -221,3 +214,11 @@ It is time we start valuing the incredible capacity of our biology to find
|
||||||
a way in hard times.
|
a way in hard times.
|
||||||
And it is time that we stop pretending depressed people are any different
|
And it is time that we stop pretending depressed people are any different
|
||||||
than anyone else.
|
than anyone else.
|
||||||
|
|
||||||
|
* References
|
||||||
|
|
||||||
|
- Porges, Stephen. (Apr 2009) The polyvagal theory:
|
||||||
|
New insights into adaptive reactions of the autonomic nervous system.
|
||||||
|
Cleve Clin J Med.
|
||||||
|
- Porges, Stephen. (Feb 2007) The polyvagal perspective
|
||||||
|
Biol Psychology.
|
||||||
|
|
|
@ -28,3 +28,4 @@ Je pense que c'est plutôt bon signe.
|
||||||
Je vais aller à Martigues ce week-end.
|
Je vais aller à Martigues ce week-end.
|
||||||
Mais je me suis réveillé vers 6h30 alors que je faisais un rêve pendant
|
Mais je me suis réveillé vers 6h30 alors que je faisais un rêve pendant
|
||||||
lequel j'étais en colère.
|
lequel j'étais en colère.
|
||||||
|
Et je pense que les deux sont corrélés.
|
||||||
|
|
55
journal/2020/2020-10-25.org
Normal file
55
journal/2020/2020-10-25.org
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
#+Title: Journal (2020-10-25 - ∆y=43.64 (15939))
|
||||||
|
#+Author: Yann Esposito
|
||||||
|
#+Date: [2020-10-25]
|
||||||
|
#+STARTUP: showeverything
|
||||||
|
#+STARTUP: inlineimages
|
||||||
|
|
||||||
|
* Résume Journée
|
||||||
|
:PROPERTIES:
|
||||||
|
:CREATED: 20201025
|
||||||
|
:END:
|
||||||
|
|
||||||
|
| sommeil | 4/5 | horrible -> comme un bébé |
|
||||||
|
| activité φ | 2/5 | au lit -> sport |
|
||||||
|
| nourriture | 3/5 | malbouffe -> saine |
|
||||||
|
| humeur | 3/5 | exécrable -> excellente |
|
||||||
|
| intérêt | ?/5 | ennuie -> exceptionnel |
|
||||||
|
|
||||||
|
- Faits positifs
|
||||||
|
- Faits marquants
|
||||||
|
- Résumé des discussions intéressantes
|
||||||
|
- Réflexions/Essais
|
||||||
|
|
||||||
|
* 2020-10-25 Sunday
|
||||||
|
** 15:38
|
||||||
|
Celà fait quelques jours que je n'ai pas écrit de journal.
|
||||||
|
|
||||||
|
Il faut du temps, de l'inspiration.
|
||||||
|
|
||||||
|
Je ne sais plus vraiment ce que je racontais dans mes entrées précédentes.
|
||||||
|
Je vais toutefois essayer de faire un résumé des faits les plus marquants.
|
||||||
|
|
||||||
|
Anna a commencé le CNED cette semaine.
|
||||||
|
Elle a reçu les cours notre compte a été créé.
|
||||||
|
Elle m'a dit qu'elle avait fait la moitié d'un cours évalué à 30h de
|
||||||
|
travail en 2h.
|
||||||
|
Et ça ne m'étonne pas.
|
||||||
|
Elle a les capacités de faire de grandes choses et de réussir.
|
||||||
|
Il lui faut juste un environnement adapté à son état psychologique.
|
||||||
|
|
||||||
|
Krystelle a réussie à se détendre un petit peu.
|
||||||
|
Elle était très stressée et surmenée.
|
||||||
|
En réalité il suffit que j'ai un peu plus de temps pour faire des taches
|
||||||
|
ménagères et ça aide beaucoup.
|
||||||
|
Le linge, l'aspirateur, un peu de bricolage, etc...
|
||||||
|
|
||||||
|
Bastien continu de s'entraîner, il n'a pas appelé l'auto-école pour prendre
|
||||||
|
un nouveau rendez-vous pour son permis.
|
||||||
|
C'est difficile pour lui.
|
||||||
|
|
||||||
|
Au niveau du travail, nous « psychotons » encore pas mal.
|
||||||
|
Mais petit à petit on se rassure sur le départ de Craig et Dean.
|
||||||
|
On ne sait toujours pas à quoi ressemblera l'après.
|
||||||
|
J'ai du mal à imaginer que ça soit vraiment mieux.
|
||||||
|
Mais ce n'est pas non plus impossible.
|
||||||
|
Nous verrons bien.
|
40
journal/2020/2020-10-29.org
Normal file
40
journal/2020/2020-10-29.org
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
#+Title: Journal (2020-10-29 - ∆y=43.65 (15944))
|
||||||
|
#+Author: Yann Esposito
|
||||||
|
#+Date: [2020-10-29]
|
||||||
|
#+STARTUP: showeverything
|
||||||
|
#+STARTUP: inlineimages
|
||||||
|
|
||||||
|
* Résume Journée
|
||||||
|
:PROPERTIES:
|
||||||
|
:CREATED: 20201029
|
||||||
|
:END:
|
||||||
|
|
||||||
|
| sommeil | 1/5 | horrible -> comme un bébé |
|
||||||
|
| activité φ | 2/5 | au lit -> sport |
|
||||||
|
| nourriture | 2/5 | malbouffe -> saine |
|
||||||
|
| humeur | 2/5 | exécrable -> excellente |
|
||||||
|
| intérêt | 1/5 | ennuie -> exceptionnel |
|
||||||
|
|
||||||
|
- Faits positifs
|
||||||
|
- Faits marquants
|
||||||
|
- Résumé des discussions intéressantes
|
||||||
|
- Réflexions/Essais
|
||||||
|
|
||||||
|
* 2020-10-29 Thursday
|
||||||
|
** 18:53
|
||||||
|
Krystelle est partie avec les enfants cette semaine de lundi à jeudi.
|
||||||
|
|
||||||
|
Elle est revenue aujourd'hui.
|
||||||
|
Tout la semaine j'ai été assez détendu.
|
||||||
|
J'avais le temps de faire un peu ce que je voulais comme je le souhaitais.
|
||||||
|
Et hier soir je me suis endormi à 1h30.
|
||||||
|
Ce qui est trop tard.
|
||||||
|
Et je me suis réveillé vers 7h ce matin.
|
||||||
|
Du coups, j'ai assez peu dormi.
|
||||||
|
J'ai publié un nouvel article de blog rapide sur org mode ce matin.
|
||||||
|
|
||||||
|
Il était loin d'être assez complet relativement à mes écrits habituels.
|
||||||
|
|
||||||
|
En tout cas, j'ai pris un café aussi aujourd'hui pour compensé, je pense
|
||||||
|
que ça m'énerve pour rien.
|
||||||
|
Je ne me sens pas détendu du tout.
|
21
journal/2020/2020-11-03.org
Normal file
21
journal/2020/2020-11-03.org
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
#+Title: Journal (2020-11-04 - ∆y=43.67 (15950))
|
||||||
|
#+Author: Yann Esposito
|
||||||
|
#+Date: [2020-11-04]
|
||||||
|
#+STARTUP: showeverything
|
||||||
|
#+STARTUP: inlineimages
|
||||||
|
|
||||||
|
* Résume Journée
|
||||||
|
:PROPERTIES:
|
||||||
|
:CREATED: 20201104
|
||||||
|
:END:
|
||||||
|
|
||||||
|
| sommeil | ?/5 | horrible -> comme un bébé |
|
||||||
|
| activité φ | ?/5 | au lit -> sport |
|
||||||
|
| nourriture | ?/5 | malbouffe -> saine |
|
||||||
|
| humeur | ?/5 | exécrable -> excellente |
|
||||||
|
| intérêt | ?/5 | ennuie -> exceptionnel |
|
||||||
|
|
||||||
|
- Faits positifs
|
||||||
|
- Faits marquants
|
||||||
|
- Résumé des discussions intéressantes
|
||||||
|
- Réflexions/Essais
|
36
journal/2020/2020-11-18.org
Normal file
36
journal/2020/2020-11-18.org
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
#+Title: Journal (2020-11-18 - ∆y=43.71 (15963))
|
||||||
|
#+Author: Yann Esposito
|
||||||
|
#+Date: [2020-11-18]
|
||||||
|
#+STARTUP: showeverything
|
||||||
|
#+STARTUP: inlineimages
|
||||||
|
|
||||||
|
* Résume Journée
|
||||||
|
:PROPERTIES:
|
||||||
|
:CREATED: 20201118
|
||||||
|
:END:
|
||||||
|
|
||||||
|
| sommeil | ?/5 | horrible -> comme un bébé |
|
||||||
|
| activité φ | ?/5 | au lit -> sport |
|
||||||
|
| nourriture | ?/5 | malbouffe -> saine |
|
||||||
|
| humeur | ?/5 | exécrable -> excellente |
|
||||||
|
| intérêt | ?/5 | ennuie -> exceptionnel |
|
||||||
|
|
||||||
|
- Faits positifs
|
||||||
|
- Faits marquants
|
||||||
|
- Résumé des discussions intéressantes
|
||||||
|
- Réflexions/Essais
|
||||||
|
|
||||||
|
* 2020-11-18 Wednesday
|
||||||
|
** 09:59
|
||||||
|
Celà fait plusieurs jours que je m'endors très tard (après 1h du matin).
|
||||||
|
Je sens que ce n'est pas bon du tout.
|
||||||
|
Il va falloir que je fasse des pauses actives.
|
||||||
|
|
||||||
|
Ah je viens d'avoir ma mère au téléphone, elle voudrait venir la semaine
|
||||||
|
prochaine pour nous voir.
|
||||||
|
Je pense elle se sent vraiment seule.
|
||||||
|
|
||||||
|
Ha une petite discussion sur le chat sur les offres Haskell du moment.
|
||||||
|
Matt me propose de rester chez Cisco et en plus de prendre un contrat à
|
||||||
|
temps partiel avec l'autre boite.
|
||||||
|
Comme d'habitude on verra.
|
38
journal/2020/2020-11-21.org
Normal file
38
journal/2020/2020-11-21.org
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
#+Title: Journal (2020-11-21 - ∆y=43.72 (15966))
|
||||||
|
#+Author: Yann Esposito
|
||||||
|
#+Date: [2020-11-21]
|
||||||
|
#+STARTUP: showeverything
|
||||||
|
#+STARTUP: inlineimages
|
||||||
|
|
||||||
|
* Résume Journée
|
||||||
|
:PROPERTIES:
|
||||||
|
:CREATED: 20201121
|
||||||
|
:END:
|
||||||
|
|
||||||
|
| sommeil | 2/5 | horrible -> comme un bébé |
|
||||||
|
| activité φ | 2/5 | au lit -> sport |
|
||||||
|
| nourriture | 2/5 | malbouffe -> saine |
|
||||||
|
| humeur | 4/5 | exécrable -> excellente |
|
||||||
|
| intérêt | 3/5 | ennuie -> exceptionnel |
|
||||||
|
|
||||||
|
- Faits positifs
|
||||||
|
- Faits marquants
|
||||||
|
- Résumé des discussions intéressantes
|
||||||
|
- Réflexions/Essais
|
||||||
|
|
||||||
|
* 2020-11-21 Saturday
|
||||||
|
|
||||||
|
** 16:07
|
||||||
|
|
||||||
|
Aujourd'hui Krystelle travaille.
|
||||||
|
Je me suis réveillé avec elle et je me suis rendormi jusqu'a 9h.
|
||||||
|
Je me suis forcé pour sortir le chien.
|
||||||
|
Une petite balade sympathique.
|
||||||
|
Je m'amuse actuellement à avoir un mode d'écriture agréable pour org-mode.
|
||||||
|
J'ai installé le package focus qui fait exactement ce que je veux.
|
||||||
|
Il grise toute la page à l'exception de la phrase courante.
|
||||||
|
|
||||||
|
Du coups, j'ai pu un peu geeker ce matin.
|
||||||
|
** 18:53
|
||||||
|
Je me prépare à faire des présentations avec emacs.
|
||||||
|
Ce n'est pas directement facile à accomplir.
|
|
@ -24,5 +24,3 @@
|
||||||
** 12:24
|
** 12:24
|
||||||
Ma mère est arrivée hier.
|
Ma mère est arrivée hier.
|
||||||
C'est bien de l'avoir avec nous.
|
C'est bien de l'avoir avec nous.
|
||||||
|
|
||||||
J
|
|
||||||
|
|
|
@ -136,3 +136,12 @@ J'ai pu réagir plus efficacement contre des frustrations.
|
||||||
J'ai pu avoir assez d'énergie pour faire des choses.
|
J'ai pu avoir assez d'énergie pour faire des choses.
|
||||||
J'ai pu faire ces choses qui me gonfle sans le vivre trop mal.
|
J'ai pu faire ces choses qui me gonfle sans le vivre trop mal.
|
||||||
J'ai pu prendre le temps d'écrire cette entrée de journal.
|
J'ai pu prendre le temps d'écrire cette entrée de journal.
|
||||||
|
|
||||||
|
Vraiment, c'est mieux que mes habitudes.
|
||||||
|
Je pense aussi la musique aide à puiser dans l'énergie que j'ai.
|
||||||
|
Il va falloir que je fasse un peu attention.
|
||||||
|
|
||||||
|
Bon, je pense qu'il en est assez.
|
||||||
|
Je vais aller me coucher.
|
||||||
|
Je ne sais pas encore ce que je vais faire.
|
||||||
|
Mais il est presque 22h et je commence à fatiguer.
|
||||||
|
|
|
@ -85,3 +85,9 @@ Ai-je de bonne résolutions pour 2021 ?
|
||||||
Pas vraiment, mais j'ai une forme d'inuition légèrement optimiste pour le
|
Pas vraiment, mais j'ai une forme d'inuition légèrement optimiste pour le
|
||||||
monde.
|
monde.
|
||||||
Par contre, j'ai une intuition très pessimiste sur ma vie personnelle.
|
Par contre, j'ai une intuition très pessimiste sur ma vie personnelle.
|
||||||
|
Je ne sais pas trop de quoi demain sera fait.
|
||||||
|
Et si je ne trouve pas un moyen de me retrouver une passion très vite.
|
||||||
|
Quelque chose qui me redonne un élan de vie.
|
||||||
|
J'ai peur de m'enfoncer dans une spirale de négativité et d'échec.
|
||||||
|
|
||||||
|
Il est très probable que l'écriture d'un journal sera utile.
|
||||||
|
|
|
@ -10,10 +10,10 @@
|
||||||
:END:
|
:END:
|
||||||
|
|
||||||
| sommeil | 3/5 | horrible -> comme un bébé |
|
| sommeil | 3/5 | horrible -> comme un bébé |
|
||||||
| activité φ | ?/5 | au lit -> sport |
|
| activité φ | 1/5 | au lit -> sport |
|
||||||
| nourriture | ?/5 | malbouffe -> saine |
|
| nourriture | 2/5 | malbouffe -> saine |
|
||||||
| humeur | ?/5 | exécrable -> excellente |
|
| humeur | 3/5 | exécrable -> excellente |
|
||||||
| intérêt | ?/5 | ennuie -> exceptionnel |
|
| intérêt | 2/5 | ennuie -> exceptionnel |
|
||||||
|
|
||||||
- Faits positifs
|
- Faits positifs
|
||||||
- Faits marquants
|
- Faits marquants
|
||||||
|
@ -47,3 +47,9 @@ Les malheurs du mondes et les catastrophes finiront par arriver, ainsi va
|
||||||
la vie.
|
la vie.
|
||||||
Et il faut donc une stratégie pour se préparer à elles sans trop se
|
Et il faut donc une stratégie pour se préparer à elles sans trop se
|
||||||
blinder.
|
blinder.
|
||||||
|
** 18:50
|
||||||
|
Sur le résumé de cette journée je dois dire j'ai encore des fragilités avec
|
||||||
|
mon rapport avec les autres au travail.
|
||||||
|
Disons là c'était avec Victor.
|
||||||
|
Je trouve que ça avance positivement mais je peux facilement mal vivre
|
||||||
|
certains échanges.
|
||||||
|
|
Binary file not shown.
|
@ -11,7 +11,7 @@ DEADLINE: <2020-10-20 Tue>
|
||||||
DEADLINE: <2020-10-21 Wed>
|
DEADLINE: <2020-10-21 Wed>
|
||||||
***** DONE Poisson, riz, légumes
|
***** DONE Poisson, riz, légumes
|
||||||
DEADLINE: <2020-10-22 Thu>
|
DEADLINE: <2020-10-22 Thu>
|
||||||
***** Couscous végétarien
|
***** DONE Couscous végétarien
|
||||||
DEADLINE: <2020-10-23 Fri>
|
DEADLINE: <2020-10-23 Fri>
|
||||||
***** Poque ball
|
***** Poque ball
|
||||||
*** W22
|
*** W22
|
||||||
|
|
|
@ -39,35 +39,22 @@
|
||||||
2020-08-10T12:53:36Z /Users/yaesposi/.org/inbox.org 96343FD2-E7A9-4AAA-A40A-8D048DA340E9 0 2.50 5 38.96 hard 13.71 sm2-v1
|
2020-08-10T12:53:36Z /Users/yaesposi/.org/inbox.org 96343FD2-E7A9-4AAA-A40A-8D048DA340E9 0 2.50 5 38.96 hard 13.71 sm2-v1
|
||||||
2020-08-13T08:40:19Z /Users/yaesposi/.org/inbox.org A87F7BB6-BEE1-4C07-85AD-018AFDCD38D6 front 2.65 5 46.37 hard 20.23 sm2-v1
|
2020-08-13T08:40:19Z /Users/yaesposi/.org/inbox.org A87F7BB6-BEE1-4C07-85AD-018AFDCD38D6 front 2.65 5 46.37 hard 20.23 sm2-v1
|
||||||
2020-08-14T09:25:03Z /Users/yaesposi/.org/inbox.org 49981B50-AFBD-4C93-A9C2-8D88550AB425 front 2.80 5 45.26 hard 8.73 sm2-v1
|
2020-08-14T09:25:03Z /Users/yaesposi/.org/inbox.org 49981B50-AFBD-4C93-A9C2-8D88550AB425 front 2.80 5 45.26 hard 8.73 sm2-v1
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
2020-08-27T08:05:10Z /Users/yaesposi/.org/inbox.org 90110976-520D-4B0C-B1D9-3798323C370E front 2.65 5 46.07 hard 25.57 sm2-v1
|
2020-08-27T08:05:10Z /Users/yaesposi/.org/inbox.org 90110976-520D-4B0C-B1D9-3798323C370E front 2.65 5 46.07 hard 25.57 sm2-v1
|
||||||
2020-08-27T08:05:30Z /Users/yaesposi/.org/inbox.org 2110820C-4877-40B3-A351-2DEDE0F222C6 front 2.50 4 15.77 easy 20.20 sm2-v1
|
2020-08-27T08:05:30Z /Users/yaesposi/.org/inbox.org 2110820C-4877-40B3-A351-2DEDE0F222C6 front 2.50 4 15.77 easy 20.20 sm2-v1
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
2020-09-03T12:19:21Z /Users/esposito/.org/inbox.org a4ebd43b-b589-499e-85e1-7ebea0abf3af front 2.50 0 0.00 hard 22.88 sm2-v1
|
2020-09-03T12:19:21Z /Users/esposito/.org/inbox.org a4ebd43b-b589-499e-85e1-7ebea0abf3af front 2.50 0 0.00 hard 22.88 sm2-v1
|
||||||
2020-09-04T08:20:08Z /Users/esposito/.org/inbox.org a4ebd43b-b589-499e-85e1-7ebea0abf3af front 2.50 1 0.01 good 73.91 sm2-v1
|
2020-09-04T08:20:08Z /Users/esposito/.org/inbox.org a4ebd43b-b589-499e-85e1-7ebea0abf3af front 2.50 1 0.01 good 73.91 sm2-v1
|
||||||
2020-09-07T10:13:56Z /Users/esposito/.org/inbox.org a4ebd43b-b589-499e-85e1-7ebea0abf3af front 2.50 2 1.00 good 16.86 sm2-v1
|
2020-09-07T10:13:56Z /Users/esposito/.org/inbox.org a4ebd43b-b589-499e-85e1-7ebea0abf3af front 2.50 2 1.00 good 16.86 sm2-v1
|
||||||
2020-09-14T12:07:50Z /Users/esposito/.org/inbox.org a4ebd43b-b589-499e-85e1-7ebea0abf3af front 2.50 3 6.00 easy 24.15 sm2-v1
|
2020-09-14T12:07:50Z /Users/esposito/.org/inbox.org a4ebd43b-b589-499e-85e1-7ebea0abf3af front 2.50 3 6.00 easy 24.15 sm2-v1
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
2020-10-01T16:33:58Z /Users/esposito/.org/inbox.org a4ebd43b-b589-499e-85e1-7ebea0abf3af front 2.65 4 16.32 easy 11.52 sm2-v1
|
2020-10-01T16:33:58Z /Users/esposito/.org/inbox.org a4ebd43b-b589-499e-85e1-7ebea0abf3af front 2.65 4 16.32 easy 11.52 sm2-v1
|
||||||
2020-10-08T10:25:05Z /Users/esposito/.org/inbox.org 2110820C-4877-40B3-A351-2DEDE0F222C6 front 2.65 5 38.28 hard 24.88 sm2-v1
|
2020-10-08T10:25:05Z /Users/esposito/.org/inbox.org 2110820C-4877-40B3-A351-2DEDE0F222C6 front 2.65 5 38.28 hard 24.88 sm2-v1
|
||||||
|
2020-11-10T15:12:11Z /Users/esposito/.org/inbox.org 96343FD2-E7A9-4AAA-A40A-8D048DA340E9 0 2.35 6 91.09 hard 21.33 sm2-v1
|
||||||
|
2020-11-19T08:54:08Z /Users/esposito/.org/inbox.org a4ebd43b-b589-499e-85e1-7ebea0abf3af front 2.80 5 43.21 hard 43.58 sm2-v1
|
||||||
|
2020-12-02T13:55:49Z /Users/esposito/.org/inbox.org 9207b53a-e38e-4996-abc6-140c31f2960a front 2.50 0 0.00 good 28.63 sm2-v1
|
||||||
|
2020-12-03T15:21:19Z /Users/esposito/.org/inbox.org 9207b53a-e38e-4996-abc6-140c31f2960a front 2.50 1 0.01 good 28.65 sm2-v1
|
||||||
|
2021-01-19T12:56:07Z /Users/esposito/.org/inbox.org 49981B50-AFBD-4C93-A9C2-8D88550AB425 front 2.65 6 117.87 good 46.03 sm2-v1
|
||||||
|
2021-01-25T14:01:35Z /Users/esposito/.org/inbox.org 8B092321-BA1F-47F9-A927-76D2E232CF51 front 3.10 6 131.51 easy 17.37 sm2-v1
|
||||||
|
2021-01-25T14:01:50Z /Users/esposito/.org/inbox.org B72E4288-E96B-4099-8684-37DDF3395C50 front 2.65 6 120.74 hard 15.31 sm2-v1
|
||||||
|
2021-01-25T14:02:00Z /Users/esposito/.org/inbox.org 2110820C-4877-40B3-A351-2DEDE0F222C6 front 2.50 6 102.66 easy 9.95 sm2-v1
|
||||||
|
2021-01-25T14:02:24Z /Users/esposito/.org/inbox.org B72E4288-E96B-4099-8684-37DDF3395C50 back 2.95 6 154.63 easy 23.64 sm2-v1
|
||||||
|
2021-01-25T14:02:51Z /Users/esposito/.org/inbox.org 9207b53a-e38e-4996-abc6-140c31f2960a front 2.50 2 1.00 hard 26.49 sm2-v1
|
||||||
|
2021-01-25T14:03:08Z /Users/esposito/.org/inbox.org 90110976-520D-4B0C-B1D9-3798323C370E front 2.50 6 110.04 hard 17.15 sm2-v1
|
||||||
|
|
|
BIN
org-roam.db
Normal file
BIN
org-roam.db
Normal file
Binary file not shown.
BIN
roam/org-roam.db
BIN
roam/org-roam.db
Binary file not shown.
|
@ -1,125 +0,0 @@
|
||||||
# Created 2020-11-09 Mon 16:07
|
|
||||||
#+TITLE: Work Time Tracker
|
|
||||||
#+AUTHOR: Yann Esposito
|
|
||||||
* IN-PROGRESS Write issue about config.edn simplification :work:
|
|
||||||
[2020-11-09 Mon 15:24]
|
|
||||||
|
|
||||||
|
|
||||||
** Problem
|
|
||||||
|
|
||||||
we have a lot of duplication between our =config.edn= files in
|
|
||||||
=tenzin-config=.
|
|
||||||
This make it easy to be wrong while we copy (5 times) similar values.
|
|
||||||
We would like to make those configuration file a lot shorter and easier to
|
|
||||||
manage by only puting into them the field that are really different between
|
|
||||||
all environment.
|
|
||||||
|
|
||||||
** A little bit of short-time history.
|
|
||||||
|
|
||||||
At first we relied on a single template that used different =.json=
|
|
||||||
entries.
|
|
||||||
Which is kind of duplicating the =config.edn= by adding a layer of logic in
|
|
||||||
the middle.
|
|
||||||
After lot of confusions and bugs, we decided (both devs and ops) to duplicate
|
|
||||||
the config.edn and minimize the amount of templating in the process.
|
|
||||||
|
|
||||||
** Abstract of previous discussions
|
|
||||||
|
|
||||||
If you look at the problem, there are plenty of different solutions to
|
|
||||||
handle that.
|
|
||||||
Here are what we thought about:
|
|
||||||
|
|
||||||
1. Use a better templating system than jinja. The best in class in my
|
|
||||||
opinion (and by far) is dhall.
|
|
||||||
The issue with dhall is that it is still put a limitation about how we
|
|
||||||
generate the =config.edn= and this is also another new language to
|
|
||||||
learn.
|
|
||||||
2. Use a Clojure project to handle =config.edn= templating/generation.
|
|
||||||
Mainly re-write a dhall-like project in Clojure better suited for our need.
|
|
||||||
3. Use another =ConfigService= that would take care of some logic in Clojure.
|
|
||||||
4. Make every service to use better default values.
|
|
||||||
So typically some service will depend on some `tk-store` that are named
|
|
||||||
by something and generally the service is also responsible to know the
|
|
||||||
intended store to be used. Typically the service know that it should
|
|
||||||
rely on postgres and not redis nor RAM-only store.
|
|
||||||
The issue is the service will need to declare its expected configuration
|
|
||||||
to other services (typically to tk-stores). So we should move from
|
|
||||||
=init= to =start=. Every of our service should declare its default
|
|
||||||
config to a centralized =IROHConfigService= during =init= phase.
|
|
||||||
Then every service should initialize its context during the
|
|
||||||
=start= phase during which we should use a function similar to
|
|
||||||
=get-in-config= but from =IROHConfigService= and not TK =ConfigService=.
|
|
||||||
|
|
||||||
From an architecture standpoint the conclusion was to prefer the 4th choice
|
|
||||||
(which would not be incompatible with the 3rd.)
|
|
||||||
Mainly the service start to take responsibility from some dependencies.
|
|
||||||
Also the =IROHConfigService= could take care of potential configuration
|
|
||||||
conflict.
|
|
||||||
If two services want different value for the same field we should make the
|
|
||||||
configuration fail (unless the configuration is overwritten in =config.edn=)
|
|
||||||
|
|
||||||
** High level technical spec
|
|
||||||
|
|
||||||
So technically most (all?) our services have a =init-context= function.
|
|
||||||
Generally this function use =get-in-config= from TK =ConfigService=.
|
|
||||||
Also the =init-context= is called in the =init= phase.
|
|
||||||
|
|
||||||
We should instead make all our service dependant on the new =IROHConfigService=.
|
|
||||||
And during the =init= phase the service should send its default
|
|
||||||
configuration to the =IROHConfigService=.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
#+begin_src clojure
|
|
||||||
(ns iroh.my-service
|
|
||||||
(:require [iroh.my-service.core :as core],,,))
|
|
||||||
(defprotocol MyServiceProt ,,,)
|
|
||||||
(tk/defservice
|
|
||||||
[[:IROHConfigService declare-default-conf get-in-conf]]
|
|
||||||
(init [this context]
|
|
||||||
(core/init-conf declare-default-conf))
|
|
||||||
(start [this context]
|
|
||||||
(into context
|
|
||||||
(core/start-context get-in-conf ,,,)))
|
|
||||||
,,,)
|
|
||||||
|
|
||||||
(ns iroh.my-service.core ,,,)
|
|
||||||
|
|
||||||
(def default-config
|
|
||||||
{:stores {"foo" {:type :postgres :conf {:table-name "foo"}}
|
|
||||||
"my-service-cache" {:type :redis :conf {:db 1}}}
|
|
||||||
:my-service {:default-timeout 3000}})
|
|
||||||
|
|
||||||
(defn init-conf
|
|
||||||
[declare-default-conf]
|
|
||||||
(declare-default-conf default-config))
|
|
||||||
|
|
||||||
(defn get-in-conf
|
|
||||||
[set-default-config
|
|
||||||
get-in-config path]
|
|
||||||
(or (get-in-config path) (get-in default-config path)))
|
|
||||||
|
|
||||||
(defn ^:always-validate start-context :- MyServiceContext
|
|
||||||
[get-in-conf ,,,]
|
|
||||||
(let [foo (get-in-conf [:my-service :default-timeout])]
|
|
||||||
))
|
|
||||||
#+end_src
|
|
||||||
|
|
||||||
So the =IROHConfigService= should take care of doing a =deep-merge-with
|
|
||||||
concat= on all default configurations and the config from =ConfigService=.
|
|
||||||
It should also throw an exception in case of configuration conflict.
|
|
||||||
If two services do not agree on the value of some inner field.
|
|
||||||
|
|
||||||
Doing so, we should better separate the developer concerns from the ops
|
|
||||||
concerns.
|
|
||||||
Currently the ops are responsible to select the type of database, the
|
|
||||||
default routes.
|
|
||||||
While this should be configurable and at the same time not the matter of
|
|
||||||
the ops.
|
|
||||||
|
|
||||||
** Last word
|
|
||||||
|
|
||||||
This Epic is just here to keep track of the discussions about that
|
|
||||||
recurring subject and make a proposal of solution.
|
|
||||||
The objective would be to reach a consensus on a the best way to handle
|
|
||||||
config.edn simplification and prevent duplication.
|
|
Loading…
Reference in a new issue