Remove dstatic.dev

droidwiki · Aug 27, 2019 · 68aff9e · 68aff9e
1 parent bd23c77
commit 68aff9e
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 145 deletions.
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
@@ -75,26 +75,5 @@ bind::key::letsencrypt: >
     h39jBIBgqjaR0UiSoaIpfqcntS0MUhT/2fpjz4Oi6LiqD07VNx9VOu02t/jd
     BNkrqOIlYre801B6mGjizWMDP8h7elPQwhyyWiHzc6kqlH5Ymv0/XJB+Ifwj
     ic8/T+FI0hANCRii]
-cloudflare::email: >
-    ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEw
-    DQYJKoZIhvcNAQEBBQAEggEAsrgTQKQ8yDlxaFff5IZR/sIOzBXvYJmpmad5
-    96sWthZnBuc/k3P39RVt8eSklnh3yWbQtJg73J0qMA4jxyKGp4M369GyU+AA
-    0yB4HJLuDJdJxkhM9FVSxt8lCcxCEvWw3iC55B6qLM+qMK6b6LsHUvKodYEX
-    b8rkgoAIr9eTKZbCK/mCab2ehjVqQ76OF3zA4mydDzVrXASLL7jhtrOO4YmF
-    2A3QQm0jxz0F8DVLglW7FW83CLRXt2S9BclhAebMVACMFM7CE5NFTLRfeKEm
-    mxmKlTMU8Qb1+ImdxEx8HlUeahqNa38qR2DQluuUHbV0ft2GisuspUG9Nsot
-    gJZoATBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBGbK1Pvw2O3gwwjI3K
-    X3PKgCDyvJ0bMj6lp1ejSytN/Akp3pBBWOAUIyXEmDcwJl2tKg==]
-cloudflare::api_key: >
-    ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEw
-    DQYJKoZIhvcNAQEBBQAEggEAtU2ooSc3vxv3PX+8uki3zqS0O3z7N+8HYq2E
-    DmwKR4vr5nnxVKhM3ea/zTzfTpGWl3ItNTEYgJ/j9XhXmmS6/KUrS566XXk0
-    e2suH+kIRQ8Ixt4rXzjxVUY3XjcEFtIEjE/ytL7mvKvTCkgwH/iesZuvtZIt
-    5ik67mLrLOg+PuLOGVrMWtci5DzLEgdAQ0LuCWnbKpaHCTcQ5m/wCJ4QI0yZ
-    xTwMzhYup4MpWXP/27oFJmlIGFaW7DPiur0F1izqP7ELqnDESjXnbOMUBVNj
-    nnRdX1v/BRhEwIsJ2/2uHxPNbQNrl95/Pj9WdIGk5WW4xPEaKq7sc3KkOdTN
-    Aa0B9DBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAX1cgfzVB7ils8jD6n
-    gAgQgDDRtAM/sZFYUdZ/JKFnBpelnvBLEgvrshkj5OiF0tuFbgejaOHDtvzK
-    p8A3P9xmXiI=]
 
 gluster::service::service_name: glusterfs-server
diff --git a/manifests/site.pp b/manifests/site.pp
@@ -63,7 +63,6 @@
   class { 'role::dns':
     type => 'master',
   }
-  include role::nginx::dstatic
   include role::nginx::droidwiki
   include role::nginx::data_droidwiki
   include role::nginx::ops_go2tech

diff --git a/modules/certbot/manifests/init.pp b/modules/certbot/manifests/init.pp
@@ -24,11 +24,7 @@
   }
 
   package { 'python3-certbot-dns-cloudflare':
-    ensure  => 'present',
+    ensure  => 'absent',
-    require => [
-      Apt::Ppa['ppa:certbot/certbot'],
-      Exec['apt_update'],
-    ]
   }
 
   if ($mode == 'standalone') {

diff --git a/modules/role/manifests/concourse.pp b/modules/role/manifests/concourse.pp
@@ -5,13 +5,13 @@
     version => '1.23.2',
   }
 
-  file { '/data/concourse':
+  file { '/data/ha_volume/concourse':
     ensure => 'directory',
     owner  => 'root',
     group  => 'root',
   }
 
-  file { '/data/concourse/docker-compose.yml':
+  file { '/data/ha_volume/concourse/docker-compose.yml':
     ensure  => present,
     content => template('role/concourse/docker-compose.yml.erb'),
   }

diff --git a/modules/role/manifests/nginx/dstatic.pp b/modules/role/manifests/nginx/dstatic.pp
diff --git a/modules/role/templates/concourse/docker-compose.yml.erb b/modules/role/templates/concourse/docker-compose.yml.erb
@@ -9,7 +9,7 @@ services:
       POSTGRES_USER: dev
       POSTGRES_PASSWORD: dev
     volumes:
-     - /data/concourse/postgres-data:/var/lib/postgresql/data
+     - ./postgres-data:/var/lib/postgresql/data
 
   web:
     image: concourse/concourse:5

diff --git a/modules/role/templates/dns/rfc2136_letsencrypt.ini.erb b/modules/role/templates/dns/rfc2136_letsencrypt.ini.erb
@@ -4,7 +4,3 @@ dns_rfc2136_name = letsencrypt.
 dns_rfc2136_secret = <%= scope().call_function('hiera', ['bind::key::letsencrypt']) %>
 dns_rfc2136_algorithm = HMAC-SHA512
 
-# Cloudflare API credentials used by Certbot
-dns_cloudflare_email = <%= scope().call_function('hiera', ['cloudflare::email']) %>
-dns_cloudflare_api_key = <%= scope().call_function('hiera', ['cloudflare::api_key']) %>
-