Skip to content

Commit 4e6c531

Browse files
committed
[BOT] post-merge updates
1 parent c209104 commit 4e6c531

4 files changed

Lines changed: 63 additions & 53 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ addon | version | maintainers | summary
2424
[data_encryption](data_encryption/) | 18.0.1.0.0 | <a href='https://github.com/florian-dacosta'><img src='https://github.com/florian-dacosta.png' width='32' height='32' style='border-radius:50%;' alt='florian-dacosta'/></a> | Store accounts and credentials encrypted by environment
2525
[mail_environment](mail_environment/) | 18.0.1.0.0 | | Configure mail servers with server_environment_files
2626
[mail_environment_google_gmail](mail_environment_google_gmail/) | 18.0.1.0.0 | <a href='https://github.com/ivantodorovich'><img src='https://github.com/ivantodorovich.png' width='32' height='32' style='border-radius:50%;' alt='ivantodorovich'/></a> | Configure Gmail mail servers with server_environment_files
27-
[server_environment](server_environment/) | 18.0.1.0.3 | | move some configurations out of the database
27+
[server_environment](server_environment/) | 18.0.1.0.4 | | move some configurations out of the database
2828
[server_environment_data_encryption](server_environment_data_encryption/) | 18.0.1.0.0 | <a href='https://github.com/florian-dacosta'><img src='https://github.com/florian-dacosta.png' width='32' height='32' style='border-radius:50%;' alt='florian-dacosta'/></a> | Server Environment Data Encryption
2929
[server_environment_ir_config_parameter](server_environment_ir_config_parameter/) | 18.0.1.0.0 | | Override System Parameters from server environment file
3030

server_environment/README.rst

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
.. image:: https://odoo-community.org/readme-banner-image
2+
:target: https://odoo-community.org/get-involved?utm_source=readme
3+
:alt: Odoo Community Association
4+
15
======================================
26
server configuration environment files
37
======================================
@@ -7,13 +11,13 @@ server configuration environment files
711
!! This file is generated by oca-gen-addon-readme !!
812
!! changes will be overwritten. !!
913
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:63b219d993d67edff4ef7cdfdb79606dce9435d848bf3c0e56252b4f5fd2d415
14+
!! source digest: sha256:39cd61c3a9621d0b7ee7a346adf45f4a2c90e80e6a61e18f182386c6fc90fd19
1115
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1216
1317
.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
1418
:target: https://odoo-community.org/page/development-status
1519
:alt: Production/Stable
16-
.. |badge2| image:: https://img.shields.io/badge/licence-LGPL--3-blue.png
20+
.. |badge2| image:: https://img.shields.io/badge/license-LGPL--3-blue.png
1721
:target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
1822
:alt: License: LGPL-3
1923
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--env-lightgray.png?logo=github
@@ -96,12 +100,12 @@ You can edit the settings you need in the ``server_environment_files``
96100
addon. The ``server_environment_files_sample`` can be used as an
97101
example:
98102

99-
- values common to all / most environments can be stored in the
100-
``default/`` directory using the .ini file syntax;
101-
- each environment you need to define is stored in its own directory
102-
and can override or extend default values;
103-
- you can override or extend values in the main configuration file of
104-
your instance;
103+
- values common to all / most environments can be stored in the
104+
``default/`` directory using the .ini file syntax;
105+
- each environment you need to define is stored in its own directory and
106+
can override or extend default values;
107+
- you can override or extend values in the main configuration file of
108+
your instance;
105109

106110
Environment variable
107111
--------------------
@@ -213,13 +217,13 @@ If you want to have a technical name to reference:
213217
Known issues / Roadmap
214218
======================
215219

216-
- it is not possible to set the environment from the command line. A
217-
configuration file must be used.
218-
- the module does not allow to set low level attributes such as
219-
database server, etc.
220-
- server.env.techname.mixin's tech_name field could leverage the new
221-
option for computable / writable fields and get rid of some onchange
222-
/ read / write code.
220+
- it is not possible to set the environment from the command line. A
221+
configuration file must be used.
222+
- the module does not allow to set low level attributes such as database
223+
server, etc.
224+
- server.env.techname.mixin's tech_name field could leverage the new
225+
option for computable / writable fields and get rid of some onchange /
226+
read / write code.
223227

224228
Bug Tracker
225229
===========
@@ -242,18 +246,18 @@ Authors
242246
Contributors
243247
------------
244248

245-
- Florent Xicluna (Wingo) <florent.xicluna@gmail.com>
246-
- Nicolas Bessi <nicolas.bessi@camptocamp.com>
247-
- Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
248-
- Daniel Reis <dgreis@sapo.pt>
249-
- Holger Brunn <hbrunn@therp.nl>
250-
- Leonardo Pistone <leonardo.pistone@camptocamp.com>
251-
- Adrien Peiffer <adrien.peiffer@acsone.com>
252-
- Thierry Ducrest <thierry.ducrest@camptocamp.com>
253-
- Guewen Baconnier <guewen.baconnier@camptocamp.com>
254-
- Thomas Binfeld <thomas.binsfeld@acsone.eu>
255-
- Stéphane Bidoul <stefane.bidoul@acsone.com>
256-
- Simone Orsi <simahawk@gmail.com>
249+
- Florent Xicluna (Wingo) <florent.xicluna@gmail.com>
250+
- Nicolas Bessi <nicolas.bessi@camptocamp.com>
251+
- Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
252+
- Daniel Reis <dgreis@sapo.pt>
253+
- Holger Brunn <hbrunn@therp.nl>
254+
- Leonardo Pistone <leonardo.pistone@camptocamp.com>
255+
- Adrien Peiffer <adrien.peiffer@acsone.com>
256+
- Thierry Ducrest <thierry.ducrest@camptocamp.com>
257+
- Guewen Baconnier <guewen.baconnier@camptocamp.com>
258+
- Thomas Binfeld <thomas.binsfeld@acsone.eu>
259+
- Stéphane Bidoul <stefane.bidoul@acsone.com>
260+
- Simone Orsi <simahawk@gmail.com>
257261

258262
Maintainers
259263
-----------

server_environment/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
{
66
"name": "server configuration environment files",
7-
"version": "18.0.1.0.3",
7+
"version": "18.0.1.0.4",
88
"depends": ["base", "base_sparse_field"],
99
"author": "Camptocamp,Odoo Community Association (OCA)",
1010
"summary": "move some configurations out of the database",

server_environment/static/description/index.html

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
55
<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
6-
<title>server configuration environment files</title>
6+
<title>README.rst</title>
77
<style type="text/css">
88

99
/*
@@ -360,16 +360,21 @@
360360
</style>
361361
</head>
362362
<body>
363-
<div class="document" id="server-configuration-environment-files">
364-
<h1 class="title">server configuration environment files</h1>
363+
<div class="document">
365364

365+
366+
<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
367+
<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
368+
</a>
369+
<div class="section" id="server-configuration-environment-files">
370+
<h1>server configuration environment files</h1>
366371
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
367372
!! This file is generated by oca-gen-addon-readme !!
368373
!! changes will be overwritten. !!
369374
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370-
!! source digest: sha256:63b219d993d67edff4ef7cdfdb79606dce9435d848bf3c0e56252b4f5fd2d415
375+
!! source digest: sha256:39cd61c3a9621d0b7ee7a346adf45f4a2c90e80e6a61e18f182386c6fc90fd19
371376
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372-
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/license-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-env/tree/17.0/server_environment"><img alt="OCA/server-env" src="https://img.shields.io/badge/github-OCA%2Fserver--env-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-env-17-0/server-env-17-0-server_environment"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-env&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
377+
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/license-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-env/tree/18.0/server_environment"><img alt="OCA/server-env" src="https://img.shields.io/badge/github-OCA%2Fserver--env-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-env-18-0/server-env-18-0-server_environment"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-env&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
373378
<p>This module provides a way to define an environment in the main Odoo
374379
configuration file and to read some configurations from files depending
375380
on the configured environment: you define the environment in the main
@@ -405,7 +410,7 @@ <h1 class="title">server configuration environment files</h1>
405410
</ul>
406411
</div>
407412
<div class="section" id="installation">
408-
<h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
413+
<h2><a class="toc-backref" href="#toc-entry-1">Installation</a></h2>
409414
<p>By itself, this module does little. See for instance the
410415
<tt class="docutils literal">mail_environment</tt> addon which depends on this one to allow
411416
configuring the incoming and outgoing mail servers depending on the
@@ -417,7 +422,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
417422
<tt class="docutils literal">SERVER_ENV_CONFIG</tt> and <tt class="docutils literal">SERVER_ENV_CONFIG_SECRET</tt>.</p>
418423
</div>
419424
<div class="section" id="configuration">
420-
<h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>
425+
<h2><a class="toc-backref" href="#toc-entry-2">Configuration</a></h2>
421426
<p>To configure this module, you need to edit the main configuration file
422427
of your instance, and add a directive called <tt class="docutils literal">running_env</tt>. Commonly
423428
used values are ‘dev’, ‘test’, ‘production’:</p>
@@ -436,21 +441,21 @@ <h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>
436441
<p>If you don’t provide any value, test is used as a safe default.</p>
437442
<p>You have several possibilities to set configuration values:</p>
438443
<div class="section" id="server-environment-files">
439-
<h2><a class="toc-backref" href="#toc-entry-3">server_environment_files</a></h2>
444+
<h3><a class="toc-backref" href="#toc-entry-3">server_environment_files</a></h3>
440445
<p>You can edit the settings you need in the <tt class="docutils literal">server_environment_files</tt>
441446
addon. The <tt class="docutils literal">server_environment_files_sample</tt> can be used as an
442447
example:</p>
443448
<ul class="simple">
444449
<li>values common to all / most environments can be stored in the
445450
<tt class="docutils literal">default/</tt> directory using the .ini file syntax;</li>
446-
<li>each environment you need to define is stored in its own directory
447-
and can override or extend default values;</li>
451+
<li>each environment you need to define is stored in its own directory and
452+
can override or extend default values;</li>
448453
<li>you can override or extend values in the main configuration file of
449454
your instance;</li>
450455
</ul>
451456
</div>
452457
<div class="section" id="environment-variable">
453-
<h2><a class="toc-backref" href="#toc-entry-4">Environment variable</a></h2>
458+
<h3><a class="toc-backref" href="#toc-entry-4">Environment variable</a></h3>
454459
<p>You can define configuration in the environment variable
455460
<tt class="docutils literal">SERVER_ENV_CONFIG</tt> and/or <tt class="docutils literal">SERVER_ENV_CONFIG_SECRET</tt>. The 2
456461
variables are handled the exact same way, this is only a convenience for
@@ -500,7 +505,7 @@ <h2><a class="toc-backref" href="#toc-entry-4">Environment variable</a></h2>
500505
reference records. See “USAGE”.</blockquote>
501506
</div>
502507
<div class="section" id="default-values">
503-
<h2><a class="toc-backref" href="#toc-entry-5">Default values</a></h2>
508+
<h3><a class="toc-backref" href="#toc-entry-5">Default values</a></h3>
504509
<p>When using the <tt class="docutils literal">server.env.mixin</tt> mixin, for each env-computed field,
505510
a companion field <tt class="docutils literal">&lt;field&gt;_env_default</tt> is created. This field is not
506511
environment-dependent. It’s a fallback value used when no key is set in
@@ -509,15 +514,15 @@ <h2><a class="toc-backref" href="#toc-entry-5">Default values</a></h2>
509514
<p>Note: empty environment keys always take precedence over default fields</p>
510515
</div>
511516
<div class="section" id="server-environment-integration">
512-
<h2><a class="toc-backref" href="#toc-entry-6">Server environment integration</a></h2>
517+
<h3><a class="toc-backref" href="#toc-entry-6">Server environment integration</a></h3>
513518
<p>Read the documentation of the class
514519
<a class="reference external" href="models/server_env_mixin.py">models/server_env_mixin.py</a> and
515520
[models/server_env_tech_name_mixin.py]
516521
(models/server_env_tech_name_mixin.py)</p>
517522
</div>
518523
</div>
519524
<div class="section" id="usage">
520-
<h1><a class="toc-backref" href="#toc-entry-7">Usage</a></h1>
525+
<h2><a class="toc-backref" href="#toc-entry-7">Usage</a></h2>
521526
<p>You can include a mixin in your model and configure the env-computed
522527
fields by an override of <tt class="docutils literal">_server_env_fields</tt>.</p>
523528
<pre class="literal-block">
@@ -541,35 +546,35 @@ <h1><a class="toc-backref" href="#toc-entry-7">Usage</a></h1>
541546
</pre>
542547
</div>
543548
<div class="section" id="known-issues-roadmap">
544-
<h1><a class="toc-backref" href="#toc-entry-8">Known issues / Roadmap</a></h1>
549+
<h2><a class="toc-backref" href="#toc-entry-8">Known issues / Roadmap</a></h2>
545550
<ul class="simple">
546551
<li>it is not possible to set the environment from the command line. A
547552
configuration file must be used.</li>
548-
<li>the module does not allow to set low level attributes such as
549-
database server, etc.</li>
553+
<li>the module does not allow to set low level attributes such as database
554+
server, etc.</li>
550555
<li>server.env.techname.mixin’s tech_name field could leverage the new
551-
option for computable / writable fields and get rid of some onchange
552-
/ read / write code.</li>
556+
option for computable / writable fields and get rid of some onchange /
557+
read / write code.</li>
553558
</ul>
554559
</div>
555560
<div class="section" id="bug-tracker">
556-
<h1><a class="toc-backref" href="#toc-entry-9">Bug Tracker</a></h1>
561+
<h2><a class="toc-backref" href="#toc-entry-9">Bug Tracker</a></h2>
557562
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-env/issues">GitHub Issues</a>.
558563
In case of trouble, please check there if your issue has already been reported.
559564
If you spotted it first, help us to smash it by providing a detailed and welcomed
560565
<a class="reference external" href="https://github.com/OCA/server-env/issues/new?body=module:%20server_environment%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
561566
<p>Do not contact contributors directly about support or help with technical issues.</p>
562567
</div>
563568
<div class="section" id="credits">
564-
<h1><a class="toc-backref" href="#toc-entry-10">Credits</a></h1>
569+
<h2><a class="toc-backref" href="#toc-entry-10">Credits</a></h2>
565570
<div class="section" id="authors">
566-
<h2><a class="toc-backref" href="#toc-entry-11">Authors</a></h2>
571+
<h3><a class="toc-backref" href="#toc-entry-11">Authors</a></h3>
567572
<ul class="simple">
568573
<li>Camptocamp</li>
569574
</ul>
570575
</div>
571576
<div class="section" id="contributors">
572-
<h2><a class="toc-backref" href="#toc-entry-12">Contributors</a></h2>
577+
<h3><a class="toc-backref" href="#toc-entry-12">Contributors</a></h3>
573578
<ul class="simple">
574579
<li>Florent Xicluna (Wingo) &lt;<a class="reference external" href="mailto:florent.xicluna&#64;gmail.com">florent.xicluna&#64;gmail.com</a>&gt;</li>
575580
<li>Nicolas Bessi &lt;<a class="reference external" href="mailto:nicolas.bessi&#64;camptocamp.com">nicolas.bessi&#64;camptocamp.com</a>&gt;</li>
@@ -586,7 +591,7 @@ <h2><a class="toc-backref" href="#toc-entry-12">Contributors</a></h2>
586591
</ul>
587592
</div>
588593
<div class="section" id="maintainers">
589-
<h2><a class="toc-backref" href="#toc-entry-13">Maintainers</a></h2>
594+
<h3><a class="toc-backref" href="#toc-entry-13">Maintainers</a></h3>
590595
<p>This module is maintained by the OCA.</p>
591596
<a class="reference external image-reference" href="https://odoo-community.org">
592597
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -599,5 +604,6 @@ <h2><a class="toc-backref" href="#toc-entry-13">Maintainers</a></h2>
599604
</div>
600605
</div>
601606
</div>
607+
</div>
602608
</body>
603609
</html>

0 commit comments

Comments
 (0)