Algemene Mailcatcher toegevoegd voor hnode4

INSERT report.url made conditionally dependent on existence

README.md

@@ -1,92 +1,132 @@
-# Testserver
-
-Module die zoveel mogelijk instellingen/configuratie voor een testomgeving zet.
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
+# Mailcatcher Testserver
 
+## Mailhog installeren
 ```
-cd existing_repo
-git remote add origin https://gitlab.com/open2bizz/testserver.git
-git branch -M main
-git push -uf origin main
+chmod +x install_mailhog_as_service.sh
+./install_mailhog_as_service.sh
 ```
 
-## Integrate with your tools
+## Workaround bij foutmelding in Ubuntu 22.04: "note: module requires Go 1.20"
+```
+- Download gewenste versie van Go:
+wget -c https://go.dev/dl/go1.22.0.linux-amd64.tar.gz
 
-- [ ] [Set up project integrations](https://gitlab.com/open2bizz/testserver/-/settings/integrations)
+- Ga naar de map waar het bestand staat en pak het uit:
+sudo tar -C /usr/local/ -xzf go1.22.0.linux-amd64.tar.gz
 
-## Collaborate with your team
+- Set PATH Environment Variable
+export PATH=$PATH:/usr/local/go/bin
 
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
+- Voeg onderstaande code toe aan .profile om het definitief te maken:
+# set PATH so it includes /usr/local/go/bin if it exists
+if [ -d "/usr/local/go/bin" ] ; then
+    PATH="/usr/local/go/bin:$PATH"
+fi
 
-## Test and Deploy
+- reload .profile (let op: mét punt!)
+. ~/.profile
 
-Use the built-in continuous integration in GitLab.
+- Controleer welke versie van Go actief is:
+go version
 
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
+- Installeer nu Mailhog met het installatie script
+```
 
-***
+## Na de installatie
+```
+systemctl enable mailhog
+```
+reboot server
 
-# Editing this README
 
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
+Nginx configuratie (gebruik template: xxx.BEWAREN.mailcatcher.open2bizz.com.conf) 
 
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
+```
+server {
+  listen 8025;
+  server_name 434-mailcatcher.staging.open2bizz.com;
 
-## Name
-Choose a self-explaining name for your project.
+  # log
+  access_log /var/log/nginx/434.access.log;
+  error_log /var/log/nginx/434.error.log;
 
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
+  gzip_types text/css text/less text/plain text/xml application/xml application/json application/javascript;
+  gzip on;
 
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
 
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
+  location / {
+   #kantoor Open2bizz 83.84.200.111
+    allow 83.84.200.111;
+    allow 83.82.145.237;
+    allow 45.132.40.125;
+    allow 86.93.238.87;
+    allow 80.114.214.241;
+    allow 94.157.36.155;
+    allow 145.131.221.238;
+    deny all;
 
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
+    auth_basic "Administrator Area";
+    auth_basic_user_file /etc/nginx/.htpasswd;
 
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
+    proxy_redirect off;
+    proxy_pass http://192.168.78.134:8025;
+  }
 
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
+    #error pages
+    error_page 500 501 502 503 504 https://www.open2bizz.tech/503;
 
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
+    listen 443 ssl; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/434-mailcatcher.staging.open2bizz.com/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/434-mailcatcher.staging.open2bizz.com/privkey.pem; # managed by Certbot
+    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot    
+```
 
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
 
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
 
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
 
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
+In de nginx config file een wachtwoord opnemen:
+```
+
+
+========================================================
+Voorbeeld: 
+In de nginx config file voor omgeving 499 een wachtwoord instellen:
+========================================================
+
+   auth_basic "Administrator Area";
+   auth_basic_user_file /etc/nginx/.htpasswd-499;
+========================================================
+
+Voor iedere omgeving is op de 401 een aparte .htpasswd aangemaakt in de map /etc/nginx/
+Voor alle test-omgevingen in de reeks 402 en 499 is een bestand aangemaakt.
+Om een nieuw htpasswd te maken (bijvoorbeeld in de 500-reeks) kan het beste een bestaande file gekopieerd worden:
+   cp /etc/nginx/.htpasswd-402 /etc/nginx/.htpasswd-499
+
+Om al de (verborgen) .htpasswd bestanden opvragen:
+   ls -rtla /etc/nginx | grep .htpasswd
+
+Een .htpasswd kan bekeken worden met nano, maar je ziet dan alleen de user én het encrypte wachtwoord:
+   nano  /etc/nginx/.htpasswd-499
+
+Om een nieuw wachtwoord in te stellen voor de user 'mail' voor omgeving 499:
+   htpasswd /etc/nginx/.htpasswd-499 mail
+
+=================================================
+Om de wijzigingen toe te passen moet nginx herstart worden:
+service nginx restart
+=================================================
+```
+
+
+
+
+## ODOO: Menu maken voor Mailcatcher
+
+Maak een Menu aan met de naam Mailcatcher
+Hang deze aan de groep 'Internal User'
+Action: ir.actions.act_url  => Thirdparty apps
+Klik door op 'Thirdparty apps' en verwijs de action URL naar de in nginx opgegeven naam (bijv: https://426-mailcatcher.staging.open2bizz.com/)
+Zet het target op New Window
 
-## License
-For open source projects, say how it is licensed.
 
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.

install_mailhog_as_service.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+echo "";
+echo "===================================";
+echo "Install golang-go...";
+echo "===================================";
+apt-get -y install golang-go;
+if [ $? == 0 ] ; then
+  echo 'golang-go installed'
+else 
+  echo 'ERROR: Installing golang-go NOT succesfull!'
+  exit 
+fi
+echo "";
+echo "===================================";
+echo "Installing mailhog...";
+echo "===================================";
+go install github.com/mailhog/MailHog@latest;
+if [ $? == 0 ] ; then
+  echo "";
+  echo "===================================";
+  echo "Mailcatcher installed succesfully!";
+  echo "===================================";
+  echo "";
+else 
+  echo 'ERROR: Installing Mailcatcher NOT succesfull!'
+  exit 
+fi
+echo "===================================";
+echo "Copy Mailhog to bin...";
+echo "===================================";
+sudo cp ~/go/bin/MailHog /usr/local/bin/MailHog
+if [ $? == 0 ] ; then
+  echo 'Mailhog copied'
+else 
+  echo 'ERROR: Copy Mailhog NOT succesfull!'
+  exit 
+fi
+echo "";
+echo "===================================";
+echo "Create MailHog service...";
+echo "===================================";
+sudo tee /etc/systemd/system/mailhog.service <<EOL
+[Unit]
+Description=MailHog
+After=network.target
+[Service]
+User=root 
+ExecStart=/usr/bin/env /usr/local/bin/MailHog > /dev/null 2>&1 &
+[Install]
+WantedBy=multi-user.target
+EOL
+systemctl enable mailhog
+systemctl start mailhog
+echo "";
+echo "===================================";
+echo "Mailhog service created and started.";
+echo "===================================";

mailcatcher_menu/__init__.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import controllers
+from . import models

mailcatcher_menu/__manifest__.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "mailcatcher_menu",
+
+    'summary': """
+        Add menu-item to local mailcatcher""",
+
+    'description': """
+        Add menu-item to local mailcatcher
+    """,
+
+    'author': "Open2bizz",
+    'website': "http://www.open2bizz.tech",
+    'category': 'Uncategorized',
+    'version': '0.1',
+    'depends': ['mail','base',],
+    'data': [
+        'views/views.xml',
+        'data/data.xml'
+    ],
+}

mailcatcher_menu/controllers/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import controllers

mailcatcher_menu/controllers/controllers.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# from odoo import http
+
+
+# class TestserverO2b(http.Controller):
+#     @http.route('/testserver_o2b/testserver_o2b/', auth='public')
+#     def index(self, **kw):
+#         return "Hello, world"
+
+#     @http.route('/testserver_o2b/testserver_o2b/objects/', auth='public')
+#     def list(self, **kw):
+#         return http.request.render('testserver_o2b.listing', {
+#             'root': '/testserver_o2b/testserver_o2b',
+#             'objects': http.request.env['testserver_o2b.testserver_o2b'].search([]),
+#         })
+
+#     @http.route('/testserver_o2b/testserver_o2b/objects/<model("testserver_o2b.testserver_o2b"):obj>/', auth='public')
+#     def object(self, obj, **kw):
+#         return http.request.render('testserver_o2b.object', {
+#             'object': obj
+#         })

mailcatcher_menu/data/data.xml

@@ -0,0 +1,5 @@
+<odoo>
+    <data>
+        <function model="ir.config_parameter" name="_mailcatcher_url"/>
+    </data>
+</odoo>

mailcatcher_menu/demo/demo.xml

@@ -0,0 +1,30 @@
+<odoo>
+    <data>
+<!--
+          <record id="object0" model="testserver_o2b.testserver_o2b">
+            <field name="name">Object 0</field>
+            <field name="value">0</field>
+          </record>
+
+          <record id="object1" model="testserver_o2b.testserver_o2b">
+            <field name="name">Object 1</field>
+            <field name="value">10</field>
+          </record>
+
+          <record id="object2" model="testserver_o2b.testserver_o2b">
+            <field name="name">Object 2</field>
+            <field name="value">20</field>
+          </record>
+
+          <record id="object3" model="testserver_o2b.testserver_o2b">
+            <field name="name">Object 3</field>
+            <field name="value">30</field>
+          </record>
+
+          <record id="object4" model="testserver_o2b.testserver_o2b">
+            <field name="name">Object 4</field>
+            <field name="value">40</field>
+          </record>
+-->
+    </data>
+</odoo>

mailcatcher_menu/models/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import mailcatcher_menu

mailcatcher_menu/models/mailcatcher_menu.py

@@ -0,0 +1,29 @@
+# Copyright 2024 Open2Bizz <info@open2bizz.nl>
+# License LGPL-3
+
+from odoo import api, fields, models, _
+
+import logging
+_logger = logging.getLogger(__name__)
+
+class IrActionUrl(models.Model):
+    _inherit = "ir.config_parameter"
+
+    @api.model
+    #def init(self):
+    def _mailcatcher_url(self):
+        parameters = self.env['ir.config_parameter'].search([('key','=', 'web.base.url')])
+        if parameters:
+            parameter = parameters[0]
+            cont_nr = parameter.value.split("//",1)[1] #Haal https://  van string
+            cont_nr = cont_nr[0:3] #De eerste 3 karakters is het containernummer
+            node = parameter.value.split("staging",1)[1] #Haal alles van string weg t/m staging
+            node = node[0:1] #Het eerste karakters is het de stagingarea
+            act_url = "https://" + cont_nr + "-mailcatcher.staging" + node + ".open2bizz.com"
+            _logger.info('----------  ACT_URL ---------- %s', act_url)
+            action_id = self.env['ir.model.data']._xmlid_to_res_id('mailcatcher_menu.action_mailcatcher_url')
+            action = self.env['ir.actions.act_url'].browse(action_id)
+            if action:
+                action.write({'url':act_url})
+
+

mailcatcher_menu/security/ir.model.access.csv

@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_mailcatcher_menu_mailcatcher_menu","mailcatcher_menu.mailcatcher_menu","model_mailcatcher_menu_mailcatcher_menu","base.group_user",1,1,1,1

mailcatcher_menu/static/description/index.html

@@ -0,0 +1,18 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<body>
+<div class="document" id="module-name">
+<h1 class="title">mailcatcher_menu</h1>
+<p>
+	This module is ONLY for test environments In DC Open2Bizz
+</p>
+
+<p>
+	Module is developed by Open2Bizz. Bug reports: support@open2bizz.eu
+</p>
+<p>
+	<img src="https://www.open2bizz.tech/logo.png" style="max-height: 100px;">
+</p>
+
+</div>
+</body>
+</html>

mailcatcher_menu/views/views.xml

@@ -0,0 +1,14 @@
+<odoo>
+  <data>
+
+    <record model="ir.actions.act_url" id="action_mailcatcher_url">
+        <field name="name">Open Mailcatcher</field>
+        <field name="url">https://mailcatcher.staging.open2bizz.com</field> 
+        <field name="target">new</field>
+    </record>
+ 
+    <!-- Top menu item -->
+    <menuitem name="MailCatcher" id="mailcatcher_menu.menu_root" sequence="99" web_icon="mailcatcher_menu,static/description/email-icon.png" action="action_mailcatcher_url"/>
+
+  </data>
+</odoo>

testserver_o2b/models/init_test.py

@@ -22,9 +22,32 @@ class IrLogging(models.Model):
         DELETE FROM mail_mail;
         UPDATE ir_config_parameter set value = 'M160129258730' where key = 'database.enterprise_code';
         UPDATE ir_config_parameter set value = (NOW() + INTERVAL '30 DAY') where key = 'database.expiration_date';        
-        UPDATE ir_config_parameter set value = '%s' where key = 'database.uuid';        
-        INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('192.168.78.25','1025','mailcatcher','login','name','t');
+        UPDATE ir_config_parameter set value = '%s' where key = 'database.uuid';     
+        INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('127.0.0.1','1025','Lokale mailcatcher','login','name','t');                        
+        INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('192.168.78.199','1025','Algemene mailcatcher','login','name','t');
+        INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('hnode6.openworx.nl','1025','Algemene mailcatcher vanaf hnode4','login','name','t');
+        UPDATE website SET google_analytics_key = NULL WHERE google_analytics_key IS NOT NULL;
+        UPDATE product_template SET is_published = FALSE WHERE is_published = TRUE;
         """ %(db_id))
+        if self.env['ir.config_parameter'].search([('key','=','web.base.url.freeze')]):
+            self.env.cr.execute("""DELETE FROM ir_config_parameter WHERE key = 'web.base.url.freeze';""")
+        if not self.env['ir.config_parameter'].search([('key','=','report.url')]):
+            self.env.cr.execute("""INSERT INTO ir_config_parameter(key,value) VALUES ('report.url','http://127.0.0.1:8069');""")
+        model = self.env['ir.model'].search([('model','=','delivery.carrier')])
+        if model:
+            field = self.env['ir.model.fields'].search([('name','=','prod_environment'),('model_id','=',model.id)])
+            if field:
+                self.env.cr.execute("""UPDATE delivery_carrier SET prod_environment = False WHERE id>0;""")
+        model = self.env['ir.model'].search([('model','=','account.online.link')])
+        if model:
+            field = self.env['ir.model.fields'].search([('id','>',0),('model_id','=',model.id)])
+            if field:
+                self.env.cr.execute("""DELETE FROM account_online_link WHERE id > 0;""") 
+        model = self.env['ir.model'].search([('model','=','payment.provider')])
+        if model:
+            field = self.env['ir.model.fields'].search([('name','=','state'),('model_id','=',model.id)])
+            if field:
+                self.env.cr.execute("""UPDATE payment_provider SET state = 'disabled' WHERE id>0;""") 
         if self.env['ir.model'].search([('model','=','account.journal')]):
             self.env.cr.execute("""UPDATE account_journal set bank_statements_source = 'undefined';""")
         ip_ok = False

testserver_o2b/static/description/index.html

@@ -0,0 +1,18 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<body>
+<div class="document" id="module-name">
+<h1 class="title">Testservers</h1>
+<p>
+	This module is ONLY for test environments In DC Open2Bizz
+</p>
+
+<p>
+	Module is developed by Open2Bizz. Bug reports: support@open2bizz.eu
+</p>
+<p>
+	<img src="https://www.open2bizz.tech/logo.png" style="max-height: 100px;">
+</p>
+
+</div>
+</body>
+</html>