Skip to content

Commit 041cc08

Browse files
OCA-git-botOCA-git-bot
committed
[BOT] post-merge updates
1 parent 789be82 commit 041cc08

File tree

4 files changed

+32
-22
lines changed

4 files changed

+32
-22
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ addon | version | maintainers | summary
2626
[mail_environment_google_gmail](mail_environment_google_gmail/) | 14.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
2727
[mail_environment_office365](mail_environment_office365/) | 14.0.1.0.0 | | Configure Office365 parameters with environment variables via server_environment
2828
[payment_environment](payment_environment/) | 14.0.1.0.2 | <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 payment acquirers with server_environment
29-
[server_environment](server_environment/) | 14.0.2.2.4 | | move some configurations out of the database
29+
[server_environment](server_environment/) | 14.0.2.3.0 | | move some configurations out of the database
3030
[server_environment_data_encryption](server_environment_data_encryption/) | 14.0.1.0.2 | | Server Environment Data Encryption
3131
[server_environment_iap](server_environment_iap/) | 14.0.1.0.0 | | Configure IAP Account with server_environment_files
3232
[server_environment_ir_config_parameter](server_environment_ir_config_parameter/) | 14.0.1.1.1 | | Override System Parameters from server environment file

‎server_environment/README.rst‎

Lines changed: 6 additions & 2 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:f0fd229f245a0b69ee443a25b9bb216df35eb548e0a24c580d807532d905ada2
14+
!! source digest: sha256:49cc54fa3804a8eede35b23ce7498be5f6baa6b6d2f0b1a5d3257aa84d519ab8
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

‎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": "14.0.2.2.4",
7+
"version": "14.0.2.3.0",
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: 24 additions & 18 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:f0fd229f245a0b69ee443a25b9bb216df35eb548e0a24c580d807532d905ada2
375+
!! source digest: sha256:49cc54fa3804a8eede35b23ce7498be5f6baa6b6d2f0b1a5d3257aa84d519ab8
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/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-env/tree/14.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-14-0/server-env-14-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=14.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/14.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-14-0/server-env-14-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=14.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
375380
depending on the configured environment: you define the environment in
@@ -406,7 +411,7 @@ <h1 class="title">server configuration environment files</h1>
406411
</ul>
407412
</div>
408413
<div class="section" id="installation">
409-
<h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
414+
<h2><a class="toc-backref" href="#toc-entry-1">Installation</a></h2>
410415
<p>By itself, this module does little. See for instance the
411416
<tt class="docutils literal">mail_environment</tt> addon which depends on this one to allow configuring
412417
the incoming and outgoing mail servers depending on the environment.</p>
@@ -417,7 +422,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
417422
<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>
@@ -434,7 +439,7 @@ <h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>
434439
<p>If you don’t provide any value, <cite>test</cite> is used as a safe default.</p>
435440
<p>You have several possibilities to set configuration values:</p>
436441
<div class="section" id="server-environment-files">
437-
<h2><a class="toc-backref" href="#toc-entry-3">server_environment_files</a></h2>
442+
<h3><a class="toc-backref" href="#toc-entry-3">server_environment_files</a></h3>
438443
<p>You can edit the settings you need in the <tt class="docutils literal">server_environment_files</tt> addon. The
439444
<tt class="docutils literal">server_environment_files_sample</tt> can be used as an example:</p>
440445
<ul class="simple">
@@ -453,7 +458,7 @@ <h2><a class="toc-backref" href="#toc-entry-3">server_environment_files</a></h2>
453458
</ul>
454459
</div>
455460
<div class="section" id="environment-variable">
456-
<h2><a class="toc-backref" href="#toc-entry-4">Environment variable</a></h2>
461+
<h3><a class="toc-backref" href="#toc-entry-4">Environment variable</a></h3>
457462
<p>You can define configuration in the environment variable <tt class="docutils literal">SERVER_ENV_CONFIG</tt>
458463
and/or <tt class="docutils literal">SERVER_ENV_CONFIG_SECRET</tt>. The 2 variables are handled the exact same
459464
way, this is only a convenience for the deployment where you can isolate the
@@ -502,7 +507,7 @@ <h2><a class="toc-backref" href="#toc-entry-4">Environment variable</a></h2>
502507
See “USAGE”.</blockquote>
503508
</div>
504509
<div class="section" id="default-values">
505-
<h2><a class="toc-backref" href="#toc-entry-5">Default values</a></h2>
510+
<h3><a class="toc-backref" href="#toc-entry-5">Default values</a></h3>
506511
<p>When using the <tt class="docutils literal">server.env.mixin</tt> mixin, for each env-computed field, a
507512
companion field <tt class="docutils literal">&lt;field&gt;_env_default</tt> is created. This field is not
508513
environment-dependent. It’s a fallback value used when no key is set in
@@ -511,12 +516,12 @@ <h2><a class="toc-backref" href="#toc-entry-5">Default values</a></h2>
511516
<p>Note: empty environment keys always take precedence over default fields</p>
512517
</div>
513518
<div class="section" id="server-environment-integration">
514-
<h2><a class="toc-backref" href="#toc-entry-6">Server environment integration</a></h2>
519+
<h3><a class="toc-backref" href="#toc-entry-6">Server environment integration</a></h3>
515520
<p>Read the documentation of the class <a class="reference external" href="models/server_env_mixin.py">models/server_env_mixin.py</a>.</p>
516521
</div>
517522
</div>
518523
<div class="section" id="usage">
519-
<h1><a class="toc-backref" href="#toc-entry-7">Usage</a></h1>
524+
<h2><a class="toc-backref" href="#toc-entry-7">Usage</a></h2>
520525
<p>You can include a mixin in your model and configure the env-computed fields
521526
by an override of <tt class="docutils literal">_server_env_fields</tt>.</p>
522527
<pre class="literal-block">
@@ -539,7 +544,7 @@ <h1><a class="toc-backref" href="#toc-entry-7">Usage</a></h1>
539544
</pre>
540545
</div>
541546
<div class="section" id="known-issues-roadmap">
542-
<h1><a class="toc-backref" href="#toc-entry-8">Known issues / Roadmap</a></h1>
547+
<h2><a class="toc-backref" href="#toc-entry-8">Known issues / Roadmap</a></h2>
543548
<ul class="simple">
544549
<li>it is not possible to set the environment from the command line. A
545550
configuration file must be used.</li>
@@ -549,23 +554,23 @@ <h1><a class="toc-backref" href="#toc-entry-8">Known issues / Roadmap</a></h1>
549554
</ul>
550555
</div>
551556
<div class="section" id="bug-tracker">
552-
<h1><a class="toc-backref" href="#toc-entry-9">Bug Tracker</a></h1>
557+
<h2><a class="toc-backref" href="#toc-entry-9">Bug Tracker</a></h2>
553558
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-env/issues">GitHub Issues</a>.
554559
In case of trouble, please check there if your issue has already been reported.
555560
If you spotted it first, help us to smash it by providing a detailed and welcomed
556561
<a class="reference external" href="https://github.com/OCA/server-env/issues/new?body=module:%20server_environment%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
557562
<p>Do not contact contributors directly about support or help with technical issues.</p>
558563
</div>
559564
<div class="section" id="credits">
560-
<h1><a class="toc-backref" href="#toc-entry-10">Credits</a></h1>
565+
<h2><a class="toc-backref" href="#toc-entry-10">Credits</a></h2>
561566
<div class="section" id="authors">
562-
<h2><a class="toc-backref" href="#toc-entry-11">Authors</a></h2>
567+
<h3><a class="toc-backref" href="#toc-entry-11">Authors</a></h3>
563568
<ul class="simple">
564569
<li>Camptocamp</li>
565570
</ul>
566571
</div>
567572
<div class="section" id="contributors">
568-
<h2><a class="toc-backref" href="#toc-entry-12">Contributors</a></h2>
573+
<h3><a class="toc-backref" href="#toc-entry-12">Contributors</a></h3>
569574
<ul class="simple">
570575
<li>Florent Xicluna (Wingo) &lt;<a class="reference external" href="mailto:florent.xicluna&#64;gmail.com">florent.xicluna&#64;gmail.com</a>&gt;</li>
571576
<li>Nicolas Bessi &lt;<a class="reference external" href="mailto:nicolas.bessi&#64;camptocamp.com">nicolas.bessi&#64;camptocamp.com</a>&gt;</li>
@@ -582,7 +587,7 @@ <h2><a class="toc-backref" href="#toc-entry-12">Contributors</a></h2>
582587
</ul>
583588
</div>
584589
<div class="section" id="maintainers">
585-
<h2><a class="toc-backref" href="#toc-entry-13">Maintainers</a></h2>
590+
<h3><a class="toc-backref" href="#toc-entry-13">Maintainers</a></h3>
586591
<p>This module is maintained by the OCA.</p>
587592
<a class="reference external image-reference" href="https://odoo-community.org">
588593
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -595,5 +600,6 @@ <h2><a class="toc-backref" href="#toc-entry-13">Maintainers</a></h2>
595600
</div>
596601
</div>
597602
</div>
603+
</div>
598604
</body>
599605
</html>

0 commit comments

Comments
 (0)