Merge branch 'dev'

3 files changed, 10 insertions, 2 deletions

diff --git a/modules/role/manifests/cryptoportfolio.pp b/modules/role/manifests/cryptoportfolio.pp
index 966f549..5aaaee3 100644
--- a/modules/role/manifests/cryptoportfolio.pp
+++ b/modules/role/manifests/cryptoportfolio.pp
@@ -7,7 +7,7 @@ class role::cryptoportfolio (
   String            $pg_user,
   String            $pg_user_replication,
   String            $pg_db,
-  Optional[String]  $pg_hostname          = "localhost",
+  Optional[String]  $pg_hostname          = "/run/postgresql",
   Optional[String]  $pg_port              = "5432",
   Optional[String]  $redis_host           = "/run/redis/redis.sock",
   Optional[String]  $web_host             = undef,
diff --git a/modules/role/templates/cryptoportfolio/api_conf.toml.erb b/modules/role/templates/cryptoportfolio/api_conf.toml.erb
index 63f39c7..d806778 100644
--- a/modules/role/templates/cryptoportfolio/api_conf.toml.erb
+++ b/modules/role/templates/cryptoportfolio/api_conf.toml.erb
@@ -6,7 +6,13 @@ log_out="stdout"
 user="<%= @pg_user %>"
 password="<%= @pg_password %>"
 database="<%= @pg_db %>"
-address="<%= @pg_host %>"
+<%- if @pg_hostname[0] == "/" -%>
+type="unix"
+address="<%= @pg_hostname %>/.s.PGSQL.<%= @pg_port %>"
+<%- else -%>
+type="tcp"
+address="<%= @pg_hostname %>:<%= @pg_port %>"
+<%- end -%>
 
 <%- if !@redis_host.nil? && @redis_host != "" -%>
 [redis]
diff --git a/python/reboot_ovh_cloud_instance.py b/python/reboot_ovh_cloud_instance.py
index de20c07..bd70e0b 100644
--- a/python/reboot_ovh_cloud_instance.py
+++ b/python/reboot_ovh_cloud_instance.py
@@ -26,3 +26,5 @@ if netboot_mode is not None:
         instance["id"]), imageId=instance["imageId"], rescue=(netboot_mode == "rescue"))
     print(result)
 
+# reboot normal:
+#result = client.post("/cloud/project/{}/instance/{}/reboot".format(project, instance["id"]), type="soft")