Merge branch 'dev'

4 files changed, 1 insertions, 42 deletions

diff --git a/modules/base_installation/manifests/cleanup.pp b/modules/base_installation/manifests/cleanup.pp
index 96aaa6b..61a9c8c 100644
--- a/modules/base_installation/manifests/cleanup.pp
+++ b/modules/base_installation/manifests/cleanup.pp
@@ -1,20 +1,4 @@
 class base_installation::cleanup inherits base_installation {
   # This class contains temporary classes used to cleanup old stuff
   # after refactoring
-
-  cron { "puppet-pull-apply":
-    ensure => absent;
-  "puppet-apply":
-    ensure => absent;
-  "puppet-apply-reboot":
-    ensure => absent;
-  "pacman_keys":
-    ensure => absent;
-  "backup":
-    ensure => absent;
-  "py-cryptoportfolio-before":
-    ensure => absent;
-  "py-cryptoportfolio-after":
-    ensure => absent;
-  }
 }
diff --git a/modules/role/manifests/cryptoportfolio.pp b/modules/role/manifests/cryptoportfolio.pp
index 59dacd0..c675e91 100644
--- a/modules/role/manifests/cryptoportfolio.pp
+++ b/modules/role/manifests/cryptoportfolio.pp
@@ -5,7 +5,6 @@ class role::cryptoportfolio (
   Optional[String]  $env                 = "prod",
   Optional[String]  $webhook_url         = undef,
   String            $pg_user,
-  String            $pg_user_replication,
   String            $pg_db,
   Optional[String]  $pg_hostname          = "/run/postgresql",
   Optional[String]  $pg_port              = "5432",
diff --git a/modules/role/manifests/cryptoportfolio/front.pp b/modules/role/manifests/cryptoportfolio/front.pp
index 0aa419f..cf73a27 100644
--- a/modules/role/manifests/cryptoportfolio/front.pp
+++ b/modules/role/manifests/cryptoportfolio/front.pp
@@ -33,13 +33,6 @@ class role::cryptoportfolio::front inherits role::cryptoportfolio {
     require => User["$user:"],
   }
 
-  # Cleanup of old directories
-  file { "${home}/go/src/immae.eu":
-    ensure => "absent",
-    force  => true,
-    backup => false,
-  }
-
   file { "${home}/front":
     ensure  => "link",
     target  => $cf_front_app,
diff --git a/modules/role/manifests/cryptoportfolio/postgresql.pp b/modules/role/manifests/cryptoportfolio/postgresql.pp
index addad67..eda0d02 100644
--- a/modules/role/manifests/cryptoportfolio/postgresql.pp
+++ b/modules/role/manifests/cryptoportfolio/postgresql.pp
@@ -13,7 +13,7 @@ class role::cryptoportfolio::postgresql inherits role::cryptoportfolio {
     password =>  postgresql_password($pg_user, $pg_password),
   }
 
-  postgresql::server::pg_hba_rule { 'allow localhost TCP access to cryptoportfolio user':
+  postgresql::server::pg_hba_rule { 'allow local access to cryptoportfolio user':
     type        => 'local',
     database    => $pg_db,
     user        => $pg_user,
@@ -21,21 +21,4 @@ class role::cryptoportfolio::postgresql inherits role::cryptoportfolio {
     order       => "05-01",
   }
 
-  # cleanup
-  postgresql_psql { "DROP PUBLICATION ${pg_db}_publication":
-    db     => $pg_db,
-    onlyif => "SELECT 1 FROM pg_catalog.pg_publication WHERE pubname = '${pg_db}_publication'",
-  } ->
-  postgresql_replication_slot { $pg_user_replication:
-    ensure => absent
-  } ->
-  postgresql_psql { "DROP OWNED BY $pg_user_replication":
-    db     => $pg_db,
-    onlyif => "SELECT 1 FROM pg_user WHERE usename='$pg_user_replication'"
-  } ->
-  postgresql::server::role { $pg_user_replication:
-    ensure        => absent,
-  }
-  # /cleanup
-
 }