Merge pull request #5 from innovyou/development

1.0.0 to master
innovyou · May 13, 2024 · 57efd43 · 57efd43
2 parents d426990 + 0d8c81c
commit 57efd43
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -4,22 +4,22 @@ Start and configure a odoo instance.
 
 ## Version
 
-16.20240509.0
+1.0.0
 
 ## Documentation
 
-See docs: https://www.innovyou.it/odoo-documentation/
+See docs: https://docs.nethserver.org/projects/ns8/en/latest/odoo.html
 
 ## Install
 
 Instantiate the module with:
 
-    add-module ghcr.io/innovyou/odoo:16.20240509.0 1
+    add-module ghcr.io/innovyou/odoo:1.0.0 1
 
 The output of the command will return the instance name.
 Output example:
 
-    {"module_id": "odoo1", "image_name": "odoo", "image_url": "ghcr.io/innovyou/odoo:16.20240509.0"}
+    {"module_id": "odoo1", "image_name": "odoo", "image_url": "ghcr.io/innovyou/odoo:1.0.0"}
 
 ## Configure
 
@@ -77,7 +77,7 @@ To uninstall the instance:
 Test the module using the `test-module.sh` script:
 
 
-    ./test-module.sh <NODE_ADDR> ghcr.io/innovyou/odoo:16.20240509.0
+    ./test-module.sh <NODE_ADDR> ghcr.io/innovyou/odoo:1.0.0
 
 The tests are made using [Robot Framework](https://robotframework.org/)
 

diff --git a/imageroot/actions/configure-module/80start_services b/imageroot/actions/configure-module/80start_services
@@ -23,3 +23,6 @@ systemctl --user restart odoo-app.service
 
 # Let services be responsive, to run next 90ldap
 sleep 5
+
+# fix odoo conf permissions
+podman exec -u root -it odoo-app bash -c "chown -R odoo:odoo /etc/odoo"
diff --git a/imageroot/actions/create-module/90set_firewall b/imageroot/actions/create-module/90set_firewall
@@ -1,14 +1,4 @@
 #!/usr/bin/env python3
 
 import os
-import agent
-
-# add all the exposed tcp ports
-for index, port in enumerate(os.environ["TCP_PORTS"].split(",")):
-    agent.add_public_service(
-        "%s%s" % (
-            index,
-            os.environ['MODULE_ID']
-        ),
-        ["%s/tcp" % (port),]
-    )
+import agent
diff --git a/imageroot/actions/destroy-module/90firewall b/imageroot/actions/destroy-module/90firewall
@@ -3,12 +3,3 @@
 import os
 import agent
 
-
-# remove all the exposed tcp ports
-for index, port in enumerate(os.environ["TCP_PORTS"].split(",")):
-    agent.remove_public_service(
-        "%s%s" % (
-            index,
-            os.environ['MODULE_ID']
-        )
-    )
diff --git a/imageroot/etc/state-include.conf b/imageroot/etc/state-include.conf
@@ -1,3 +1,4 @@
 volumes/odoo-filestore
 volumes/odoo-extra-addons
+volumes/odoo-config
 state/all_dbs.pg_dump
diff --git a/imageroot/events/smarthost-changed/10reload_services b/imageroot/events/smarthost-changed/10reload_services
@@ -2,4 +2,5 @@
 
 set -e
 
-systemctl --user restart odoo-app.service
+# executed when smarthost-changed
+#systemctl --user restart odoo-app.service
diff --git a/imageroot/systemd/user/odoo-app.service b/imageroot/systemd/user/odoo-app.service
@@ -15,7 +15,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/odoo-app.pid \
     --pod-id-file %t/odoo.pod-id --replace -d --name odoo-app \
     --env-file=%S/state/smarthost.env \
     --volume odoo-filestore:/var/lib/odoo:Z \
-    --volume utils:/utils:Z \
+    --volume odoo-config:/etc/odoo:Z \
     --volume odoo-extra-addons:/mnt/extra-addons:Z \
     --env PGHOST=127.0.0.1 \
     --env PGPORT=5432 \

diff --git a/ui/public/metadata.json b/ui/public/metadata.json
@@ -14,7 +14,7 @@
         }
     ],
     "docs": {
-        "documentation_url": "https://www.innovyou.it/odoo-documentation/",
+        "documentation_url": "https://docs.nethserver.org/projects/ns8/en/latest/odoo.html",
         "bug_url": "https://github.com/innovyou/ns8-odoo/issues",
         "code_url": " https://github.com/innovyou/ns8-odoo"
     },