update manage_records environment

- add test_itzbund yaml
- remove all bmf yamls
- add new dependencies of net-ssh
- update readme

diff --git a/Gemfile b/Gemfile
index 8f2a63c16bd852dcd2927503e49e1d6592ef10e9..7ecc5fa5e72e4dc4bd49399aca2c92bf16d299ab 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,5 @@
-source 'https://rubygems.org' do
-  gem 'net-ssh', '>=5.2.0'
-end
+source 'https://rubygems.org'
+
+gem 'net-ssh', '>=5.2.0'
+gem 'ed25519', '>= 1.2'
+gem 'bcrypt_pbkdf', '>= 1.0'

diff --git a/Gemfile.lock b/Gemfile.lock
index 656b86f8fe470f53f6c538364d6f68b71740a649..3a6f43f885cd5cc13f9bd1ad0cf8502175847bd0 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,17 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    bcrypt_pbkdf (1.1.0)
+    ed25519 (1.3.0)
     net-ssh (5.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  net-ssh (>= 5.2.0)!
+  bcrypt_pbkdf (>= 1.0)
+  ed25519 (>= 1.2)
+  net-ssh (>= 5.2.0)
 
 BUNDLED WITH
-   2.0.1
+   2.3.5

diff --git a/etc/dns/dev_bmf.yaml b/etc/dns/dev_bmf.yaml
deleted file mode 100644 (file)
index 61b35f4..0000000
--- a/etc/dns/dev_bmf.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-dev-bmf10:
-  - dev-standardlsg-preview-bmf10
-  - dev-standardlsg-editor-bmf10
-  - dev-standardlsg-www-bmf10
-  - dev-bmf-preview-bmf10
-  - dev-bmf-editor-bmf10
-  - dev-bmf-www-bmf10
-  - dev-amthb-preview-bmf10
-  - dev-amthb-editor-bmf10
-  - dev-amthb-www-bmf10
-  - dev-lsth-preview-bmf10
-  - dev-lsth-www-bmf10
-  - dev-esth-preview-bmf10
-  - dev-esth-www-bmf10
-  - dev-ksth-preview-bmf10
-  - dev-ksth-www-bmf10
-  - dev-gewsth-preview-bmf10
-  - dev-gewsth-www-bmf10
-  - dev-repository-preview-bmf10
-  - dev-editor-preview-bmf10
-  - dev-service-preview-bmf10
-  - dev-solr-preview-bmf10
-  - dev-delivery-preview-bmf10
-  - dev-workflow-preview-bmf10
-  - dev-newsletter-preview-bmf10
-  - dev-repository-master-bmf10
-  - dev-service-master-bmf10
-  - dev-solr-master-bmf10
-  - dev-delivery1-master-bmf10
-  - dev-delivery2-master-bmf10
-  - dev-repository-replication-bmf10
-  - dev-solr-replication-bmf10
-  - dev-delivery1-replication-bmf10
-  - dev-delivery2-replication-bmf10
-  - dev-adminportal-database-bmf10
-  - dev-site-database-bmf10
-  - dev-preview-database-bmf10
-  - dev-master-database-bmf10
-  - dev-replication-database-bmf10
-  - dev-maildistributor-database-bmf10
-  - dev-workflow-database-bmf10
-  - dev-adminportal-service-bmf10
-  - dev-serviceportal-service-bmf10
-  - dev-maildistributor-service-bmf10
-  - dev-cas-preview-service-bmf10
-  - dev-cas-live-service-bmf10
-  - dev-ldap-preview-service-bmf10
-  - dev-ldap-live-service-bmf10
-  - dev-mail-extern-bmf10
-  - dev-usth-preview-bmf10
-  - dev-usth-www-bmf10
-  - dev-ao-preview-bmf10
-  - dev-ao-www-bmf10

diff --git a/etc/dns/live_bmf.yaml b/etc/dns/live_bmf.yaml
deleted file mode 100644 (file)
index e30b0a1..0000000
--- a/etc/dns/live_bmf.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-master01-bmf10-de:
-  - master-database-bmf10
-  - repository-master-bmf10
-  - service-master-bmf10
-  - site-database-bmf10
-  - solr-master-bmf10
-
-red-bmf10-de:
-  - adminportal-database-bmf10
-  - adminportal-service-bmf10
-  - amthb-editor-bmf10
-  - amthb-preview-bmf10
-  - ao-preview-bmf10
-  - bmf-editor-bmf10
-  - bmf-preview-bmf10
-  - cas-live-service-bmf10
-  - cas-preview-service-bmf10
-  - delivery-preview-bmf10
-  - editor-preview-bmf10
-  - esth-preview-bmf10
-  - gewsth-preview-bmf10
-  - ksth-preview-bmf10
-  - lsth-preview-bmf10
-  - maildistributor-database-bmf10
-  - maildistributor-service-bmf10
-  - newsletter-preview-bmf10
-  - preview-database-bmf10
-  - repository-preview-bmf10
-  - service-preview-bmf10
-  - serviceportal-service-bmf10
-  - solr-preview-bmf10
-  - usth-preview-bmf10
-  - workflow-database-bmf10
-  - workflow-preview-bmf10
-
-slave01-bmf10-de:
-  - replication-database-bmf10
-  - repository-replication-bmf10
-
-www01-bmf10-de:
-  - amthb-www01-bmf10
-  - ao-www01-bmf10
-  - bmf-www01-bmf10
-  - delivery1-master-bmf10
-  - esth-www01-bmf10
-  - gewsth-www01-bmf10
-  - ksth-www01-bmf10
-  - lsth-www01-bmf10
-  - usth-www01-bmf10
-
-www02-bmf10-de:
-  - amthb-www02-bmf10
-  - ao-www02-bmf10
-  - bmf-www02-bmf10
-  - delivery2-master-bmf10
-  - esth-www02-bmf10
-  - gewsth-www02-bmf10
-  - ksth-www02-bmf10
-  - lsth-www02-bmf10
-  - usth-www02-bmf10
-
-www03-bmf10-de:
-  - amthb-www03-bmf10
-  - ao-www03-bmf10
-  - bmf-www03-bmf10
-  - delivery1-replication-bmf10
-  - esth-www03-bmf10
-  - gewsth-www03-bmf10
-  - ksth-www03-bmf10
-  - lsth-www03-bmf10
-  - usth-www03-bmf10
-
-www04-bmf10-de:
-  - amthb-www04-bmf10
-  - ao-www04-bmf10
-  - bmf-www04-bmf10
-  - delivery2-replication-bmf10
-  - esth-www04-bmf10
-  - gewsth-www04-bmf10
-  - ksth-www04-bmf10
-  - lsth-www04-bmf10
-  - usth-www04-bmf10
-
-bmf-www-bmf10:
-  - amthb-www-bmf10
-  - ao-www-bmf10
-  - esth-www-bmf10
-  - gewsth-www-bmf10
-  - ksth-www-bmf10
-  - lsth-www-bmf10
-  - usth-www-bmf10

diff --git a/etc/dns/test_bmf.yaml b/etc/dns/test_bmf.yaml
deleted file mode 100644 (file)
index 6b2b63e..0000000
--- a/etc/dns/test_bmf.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-test-master01-bmf10-de:
-  - test-master-database-bmf10
-  - test-site-database-bmf10
-  - test-repository-master-bmf10
-  - test-service-master-bmf10
-  - test-solr-master-bmf10
-
-test-red-bmf10-de:
-  - test-preview-database-bmf10
-  - test-adminportal-database-bmf10
-  - test-maildistributor-database-bmf10
-  - test-workflow-database-bmf10
-  - test-adminportal-service-bmf10
-  - test-cas-preview-service-bmf10
-  - test-cas-live-service-bmf10
-  - test-service-preview-bmf10
-  - test-solr-preview-bmf10
-  - test-maildistributor-service-bmf10
-  - test-editor-preview-bmf10
-  - test-workflow-preview-bmf10
-  - test-repository-preview-bmf10
-  - test-delivery-preview-bmf10
-  - test-newsletter-preview-bmf10
-  - test-serviceportal-service-bmf10
-  - test-bmf-preview-bmf10
-  - test-bmf-editor-bmf10
-  - test-ldap-preview-service-bmf10
-  - test-ldap-live-service-bmf10
-
-# customer
-  - test-bmf-preview-bmf10
-  - test-lsth-preview-bmf10
-  - test-amthb-preview-bmf10
-  - test-esth-preview-bmf10
-  - test-ksth-preview-bmf10
-  - test-gewsth-preview-bmf10
-  - test-usth-preview-bmf10
-  - test-ao-preview-bmf10
-  - test-bmf-editor-bmf10
-  - test-amthb-editor-bmf10
-
-test-slave01-bmf10-de:
-  - test-replication-database-bmf10
-  - test-repository-replication-bmf10
-
-test-www01-bmf10-de:
-  - test-delivery1-master-bmf10
-  - test-bmf-www01-bmf10
-  - test-bmf-www01-bmf10
-  - test-amthb-www01-bmf10
-  - test-lsth-www01-bmf10
-  - test-esth-www01-bmf10
-  - test-ksth-www01-bmf10
-  - test-gewsth-www01-bmf10
-  - test-usth-www01-bmf10
-  - test-ao-www01-bmf10
-
-test-www02-bmf10-de:
-  - test-delivery1-replication-bmf10
-  - test-bmf-www02-bmf10
-  - test-bmf-www02-bmf10
-  - test-amthb-www02-bmf10
-  - test-lsth-www02-bmf10
-  - test-esth-www02-bmf10
-  - test-ksth-www02-bmf10
-  - test-gewsth-www02-bmf10
-  - test-usth-www02-bmf10
-  - test-ao-www02-bmf10
-
-test-bmf-www-bmf10:
-  - test-amthb-www-bmf10
-  - test-ao-www-bmf10
-  - test-esth-www-bmf10
-  - test-gewsth-www-bmf10
-  - test-ksth-www-bmf10
-  - test-lsth-www-bmf10
-  - test-usth-www-bmf10

diff --git a/etc/dns/test_itzbund.yaml b/etc/dns/test_itzbund.yaml
new file mode 100644 (file)
index 0000000..87b6569
--- /dev/null
+++ b/etc/dns/test_itzbund.yaml
@@ -0,0 +1,48 @@
+test-redaktion01-itzbund:
+  - test-userservicepreview-service-itzbund
+  - test-caspreview-service-itzbund
+  - test-repository-preview-itzbund
+  - test-workflow-preview-itzbund
+  - test-solr-preview-itzbund
+  - test-indexer-preview-itzbund
+  - test-site-preview-itzbund
+  - test-editor-preview-itzbund
+  - test-standardlsg-editor-itzbund
+  - test-standardlsg-preview-itzbund
+  - test-standardlsg-subsite-preview-itzbund
+
+test-service01-itzbund:
+  - test-newsletter-preview-itzbund
+  - test-eventdispatcher-preview-itzbund
+  - test-adminportal-service-itzbund
+
+test-master01-itzbund:
+  - test-userservicelive-service-itzbund
+  - test-caslive-service-itzbund
+  - test-solr-master-itzbund
+  - test-indexer-master-itzbund
+  - test-maildistributor-service-itzbund
+  - test-serviceportal-service-itzbund
+  - test-repository-master-itzbund
+  - test-cmisserver-service-itzbund
+
+test-replication01-itzbund:
+  - test-repository-replication-itzbund
+  - test-solr-replication-itzbund
+
+test-site01-itzbund:
+  - test-site1-replication-itzbund
+  - test-site2-replication-itzbund
+
+test-delivery01-itzbund:
+  - test-standardlsg-live-itzbund
+  - test-standardlsg-subsite-live-itzbund
+
+test-db01-itzbund:
+  - test-adminportal-database-itzbund
+  - test-maildistributor-database-itzbund
+  - test-serviceportal-database-itzbund
+  - test-site-database-itzbund
+  - test-userservicepreview-database-itzbund
+  - test-userservicelive-database-itzbund
+  - test-workflow-database-itzbund

diff --git a/sbin/Readme.md b/sbin/Readme.md
index 22aaa94d166affb0d1548852ca1dca5afb707e82..6c775b70e95e72c0457ed989526611fe66c42360 100644 (file)
--- a/sbin/Readme.md
+++ b/sbin/Readme.md
@@ -19,13 +19,14 @@ Die bisherig config liegt hier im projekt in etc/dns/\*.yaml
 Ausführung:
 
     # einmalig zum installieren der abhängkieten
-    bundle install --path vendor/gems
+    bundle config set --local path 'vendor/bundle'
+    bundle install
 
     # Benutzung
-    bundle exec ruby bin/manage_records.rb --help
+    bundle exec ruby sbin/manage_records.rb --help
 
     # bei jeder änderung der yaml files dann auszuführen
-    bundle exec ruby bin/manage_records.rb --data etc/dns/test_bmas.yaml
+    bundle exec ruby sbin/manage_records.rb --data etc/dns/test_bmas.yaml
 
     # mehr output
-    bundle exec ruby bin/manage_records.rb --data etc/dns/dev_bmas.yaml --debug
+    bundle exec ruby sbin/manage_records.rb --data etc/dns/dev_bmas.yaml --debug