Merge branch 'master' into new_ldap_server

2022-04-28 09:23:18 +02:00
parent 3cc11e58d3 71f9b06d28
commit 1da5ef4979
241 changed files with 4770 additions and 2404 deletions
--- a/roles/drone.rb
+++ b/roles/drone.rb
@@ -1,5 +1,6 @@
 name "drone"

 run_list %w(
+  role[postgresql_client]
  kosmos_drone::default
 )
--- a/roles/nginx_proxy.rb
+++ b/roles/nginx_proxy.rb
@@ -0,0 +1,15 @@
+name "nginx_proxy"
+
+default_run_list = %w(
+  kosmos_assets::nginx_site
+  kosmos_discourse::nginx
+  kosmos_drone::nginx
+  kosmos_gitea::nginx
+  kosmos_website::default
+)
+
+env_run_lists(
+  '_default' => default_run_list,
+  'development' => [],
+  'production' => default_run_list
+)
--- a/roles/postgresql_primary.rb
+++ b/roles/postgresql_primary.rb
@@ -3,4 +3,6 @@ name "postgresql_primary"
 run_list %w(
  kosmos_postgresql::primary
  kosmos_postgresql::firewall
+  kosmos_gitea::pg_db
+  kosmos_drone::pg_db
 )
--- a/roles/sockethub.rb
+++ b/roles/sockethub.rb
@@ -1,5 +1,9 @@
 name "sockethub"

+default_attributes 'sockethub' => {
+  'version' => '5.0.0-alpha.1'
+}
+
 run_list %w(
  sockethub::default
  sockethub::proxy