daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 70373e9a5a1d0f19f96c8d40d0955a94adca86d1..2847fe6a3badc4d44e66837bc73b5175990430e8 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -5150,6 +5150,9 @@ maybe chmod 0644 'letsencrypt/csr/3024_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3025_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3026_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3027_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/3028_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/3029_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/3030_csr-certbot.pem'
 maybe chmod 0700 'letsencrypt/keys'
 maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem'
@@ -8179,6 +8182,9 @@ maybe chmod 0600 'letsencrypt/keys/3024_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3025_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3026_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3027_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/3028_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/3029_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/3030_key-certbot.pem'
 maybe chmod 0700 'letsencrypt/live'
 maybe chmod 0644 'letsencrypt/live/README'
 maybe chmod 0755 'letsencrypt/live/collabora.hoellein.online'

diff --git a/letsencrypt/csr/3028_csr-certbot.pem b/letsencrypt/csr/3028_csr-certbot.pem
new file mode 100644 (file)
index 0000000..8f961e7
--- /dev/null
+++ b/letsencrypt/csr/3028_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALe3
+p3FscQ3QdjtT+/FuKFijDLWSfvPCV090YyRvOig+4LAmqShQi/AsYxwER/xPJ+WW
+taYISacp1rxdWHSmY0StswKmtzQ+SHAjxYFk7zUTzEQmTpq3mjVHZOqKcr0NdTx6
+0grBJ7W7tNtKG2Huj58EQd+mZHacjiBn+REwjzuRo8JpsVm9fDT4Ev040sxtzFTw
+6Qwmyzm3usXepTK98nuRMMOvM21R8RzBYqH+gZfjMuPaAFTyXgkqlUTDKIS8Kd03
+2xR8Y2HAZFaLcWxe2F1svWSKWqQOk6QYbCZoUHc3ID6I9MlR2VIcmTrPHYn4UM6X
+XSdJ3Qh11+8cUgNJ8jMCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAZaJEcVp+a2mm
+wDO/VwVvfHoxwGDeCfqxvwfPF0r2bTTLBrMqzTbSej2X1MFPFE+Xu7Yv4Qyo/rBd
+b40BpltgfsKl7ebFof8sQTaUhQoy907iWjcQ/Z10oikLd8UercRA0eNCNG04YryJ
+d05rWAnP+vXK4W7JGVY0iNM1v0zpYFpBZ8Vn1UwEuIohaDrHMSEnqvhmfxe7Ae0P
+1lkQFeluGzSXNIT5N9S+5GUcxE1/Nrl57qiyWPjy+cI/CnHZbu/F7WX83trVyYfG
+kwyGxTqIDjog4Mr+B4i2Ivvf3fWGGHBvmN7agdswEJrSrWHZ4pcX9C+kztl6OQ2B
+q3HybJHFcQ==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/3029_csr-certbot.pem b/letsencrypt/csr/3029_csr-certbot.pem
new file mode 100644 (file)
index 0000000..a25701b
--- /dev/null
+++ b/letsencrypt/csr/3029_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOLP
+yBOqDiIcjcovnLLZ9Mlk9zMtZoLlFbZ5tRhTL4ToXi1JrA0302FZWprLCRsGGAwP
+4eynkZ0OBLZ8Jyd6QYv6zEeE64+VOj2oe948+sak4JORlZf4y7gtJu+sZBbuYNtU
+KXWLDPKiqlAeNMZGcw4M9jFUJ7S8FvFrP+5BRh5wHiaT9cVtZcFTK7YY5cU4pqYT
+29qSuvqjJ1AjUe9cCDSRnFL1lDy8AfO5ahVudqp+th9Ufw4SiMvdUPoX3yhNOuyx
+c2yOrpvD4WOcL6fIgaD/Ww36hIjrA9CBnNfVdeZBS+5FNEdm4uH2g0iGJVBOFrn9
+cGfANRhOtim1LlX6fzkCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEALC/lRF3p4a1L
+9u11IdWPkJkkKkP+ixGK7ObwM1vsHFFWYf0iCnXNqLkegjf8azMKHLXdsQwpv+cD
+ZJQLcQ9p6xpXQlEYU6+Ovg3naf2cCyGButFcQzdcDSpvhy38eFG53oS2oZ9YC6dq
+Hcg5+TRUP7dznSAIEbGdAUsJQ0Esktsck2DpKxsHpDBG6KYFSfLd9PopNslgcWTd
+bKUdNbi3xQ5E5nfhdxnOPNgs0gHtX9I0jefXfBvZHmLs5+KrJScy+Mm5d2DPZNsB
+az+9rkm9qyb8K6rlEA76rQ0LpVV0xa1qY2XKJHy1F+H/G02aijrPj7LgKPs6wX/k
+A4uAtmGMWw==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/3030_csr-certbot.pem b/letsencrypt/csr/3030_csr-certbot.pem
new file mode 100644 (file)
index 0000000..3b7896c
--- /dev/null
+++ b/letsencrypt/csr/3030_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxL
+NbIgrJXbDl73o/r3PMmVkC0vFfn3xSv4rj6EBWqBfozS3sekbxn/Zan8e6WIZ1uS
+5SNcVLHxtXxNF1VeoXzqYsdtsW5EAZ0JaTvUJVXgETJUiIHetzbCODo/TOS+Q9tM
+6wfvJ4IVXpcXkBQgUCzuw9Dmv3H1k1VNFVYmw/85//JMeBfWcejXPd2RrDl1GpON
+ve2Nj1TcP7WW1J0fj1sw1ebPKHvC4piUVQkZjxNbj6Zs0f61Hzfl0ypSpa5BTDWN
+Ic3cARnBxEOj+GmzMh+Nn8Yy7e9C5xRKRQ1y3XesCiRHy7NOOPTlsY84c5hJ6AD8
+Md75+/J5omcn//MAhCUCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAaBw57JWV77m5
+BxgHZrs6zdWtdOCTfKZypE6Y/gzfuoapP3ruMPBSCRA4WmfABngVLFO9gP216pPc
+Bf52vYCv5St1Vsx9hlBZscqO/1fGk/+iMGffpeuegK+rteXpTui+/mFCxGu21zhR
+pa4ES0b4rrR90O5ooAL3cM1bTDYW6EeUDI16p2ML1jqfHEuDcbG9AguBIJAFLu9G
+w3Vswnh6KibECIdKSK3wCN3fZgt3hDful95aw/ohU5SRyWOnS/yHml4fAsImxOdz
+36KsUpGeu6B4jJ0uSCXsoT7c0h1zkpF+e9C28dP1tg2XbfOK2rdK158dk3NCvqUa
+N8QaKM8pNA==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/3028_key-certbot.pem b/letsencrypt/keys/3028_key-certbot.pem
new file mode 100644 (file)
index 0000000..d7ffcd9
--- /dev/null
+++ b/letsencrypt/keys/3028_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3t6dxbHEN0HY7
+U/vxbihYowy1kn7zwldPdGMkbzooPuCwJqkoUIvwLGMcBEf8TyfllrWmCEmnKda8
+XVh0pmNErbMCprc0PkhwI8WBZO81E8xEJk6at5o1R2TqinK9DXU8etIKwSe1u7Tb
+Shth7o+fBEHfpmR2nI4gZ/kRMI87kaPCabFZvXw0+BL9ONLMbcxU8OkMJss5t7rF
+3qUyvfJ7kTDDrzNtUfEcwWKh/oGX4zLj2gBU8l4JKpVEwyiEvCndN9sUfGNhwGRW
+i3FsXthdbL1kilqkDpOkGGwmaFB3NyA+iPTJUdlSHJk6zx2J+FDOl10nSd0Iddfv
+HFIDSfIzAgMBAAECggEAYE/KWz7jYb+YS+/yU5ZRVm5b+lBLd5S5WvEEDJS242Rb
+PF14LqdTRVyvtH9WEaKZotXIcrtDiXv4lBVHixezUMzS3J/zyVKhfRBzuSrl8Ghp
+nIyMhrWcBTRhZkegcRW+ES++L18lZzN5U8Dc7BE5f76mng3H+xqFs91uCCHx5OLH
+xixNyR6HMXSc8/EhJsz9UGc2q/78dajSSQk9SF6Scr7HYxHYJ1WniyTCN7YZKQux
+HlUyfjW8Z1qvipQ9Dbnpn1hVz4GnI9hI1KoEIYszCX6M+l1uJcBzOGKpHvjGjAVO
+QQr8EufpXxESmX+96Ii5+buqQjcuWZV08RZQgPRV6QKBgQDsJt8Ct9Nzwt6qDPvY
+G8NsPcSPtpLVdguweVNzYfxlOmwZnuIZsnJnhMB3kXhrZuTFlCLdtW82Dw2hcIzz
+FtYMRmM58GXLcy04QyVkUhbaKmmAAT6jlF/Wgxur5+ajS/VV7Gk/L6MOvSGoSSeW
+ZX2T6m4tOrPSL7RDNAJXIDRXfQKBgQDHKJWdA8aMVORgeiqRE+Jijc6RY046gQqi
+IAyB4ZjHwjwbKTufQtniCIOaB47CxFeIzHAvu+/VnG3GsBFX0RTr191gP/eTrlmd
+QIYq0ju9KQYRVlAR+MA4LcRXf5BDENYS95ce+6xcNTblVK2PcOirLxARwVf6MfDT
+MKRQasV/bwKBgFC35KhoLxW1eSiE8ZxnuP+JiWNaE4x1If+7KMQarQvo0URco4oH
+DcXGgYcdKR0E+ZNzVAuWVaITuSQCdZstphJiCM6oFhNZlg5SHTjSOk9uCcugIUoG
+kE+hVtcGmDYe44fwG/VmEgUarqN4BdkJbcgebHR3STnB5orF/zrKnjl9AoGBAJg6
+r1GbRzKQ2RfdiZfnKQ3H8vMyguM5K5WNBcJpXEykbSkdtVMg2EZr15vu1vKM/ZO1
+ILN75fDTZx2OC1Oin2k+URp3Cpi5lgoa/fLRS5RlPRwXa5CxIMxQP1naSbzZq6hH
+1B18pdy9WD6nIRsZZN8kVBYeQU8eyUPEVHSbiGbFAoGBAJiXs+WLABhEdDXtSK+i
+h9pHlBwiDx1Y2uANhCsNryt75qO3GFZhypG8ZtfuKHwwy48KyxZtgGc0ZKqHqRI0
+WJYIqIqLNTEfsZNNWXnd44mzg+hBYVqa8N46PX62OEc6jULQDGPt/Nt1rENRzy9H
+Co8n5Im8Fcrbrz+B0JNzU//e
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/3029_key-certbot.pem b/letsencrypt/keys/3029_key-certbot.pem
new file mode 100644 (file)
index 0000000..a43a89d
--- /dev/null
+++ b/letsencrypt/keys/3029_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDiz8gTqg4iHI3K
+L5yy2fTJZPczLWaC5RW2ebUYUy+E6F4tSawNN9NhWVqaywkbBhgMD+Hsp5GdDgS2
+fCcnekGL+sxHhOuPlTo9qHvePPrGpOCTkZWX+Mu4LSbvrGQW7mDbVCl1iwzyoqpQ
+HjTGRnMODPYxVCe0vBbxaz/uQUYecB4mk/XFbWXBUyu2GOXFOKamE9vakrr6oydQ
+I1HvXAg0kZxS9ZQ8vAHzuWoVbnaqfrYfVH8OEojL3VD6F98oTTrssXNsjq6bw+Fj
+nC+nyIGg/1sN+oSI6wPQgZzX1XXmQUvuRTRHZuLh9oNIhiVQTha5/XBnwDUYTrYp
+tS5V+n85AgMBAAECggEADU9wSGckaTAPyhu9MGnGCcOZFjHF4EydV5YQ4JqRIVWZ
+oUK/jA8Iop/hx0+++w0CgEK2WXMEApl+AU+L5K8yBYr0TgYo5MY3IsMucb5WYS3v
+1/klNEPvgKF1tX8CaK4YlQZ9YF6Gpf6RzB3ZrwEXY22zTPXJVrvrBMPsfojqGoMR
+jugBnc5eTNLcb0nv1RMy74uFajlY6qyzol22OIW0IdBh5/rKh5wFOW8lmXnHqS5x
+c2cECJ6Lbu2hVxh9/y8x4So6TnDCGawBXYFAPSYo+ZWCXkI8dB+Qdk3Ynd9Ew88t
+UBaE26wLFNHoQ+ph7d+Go0sQNBbE6ESEaEtkT7GZ4QKBgQD+eFAwYKi7AvbFaiIa
+UHKmcRNGnIacjSidyG83cETn/rKyXjorvOUw8aR2o2xFloZCy2o1RcS5/ZPYo3pq
+oqmltKMWit9f8RK0ez7ceylmWqrGfcAA3xHkdciAOg+71/RcfmFkMOcf0UaUU4W3
+rcV89gMcMnfemGxqr98dkyvvbQKBgQDkLOVZtS1L4QeD1zA68qQvruonblIzMZkA
+my7wacuZpyBMC5VM6m+WvEypYt+i+CPwvfwqH3ZoVZrKsdErDvHsQkyzXlo0R4G2
+uZi3QgczyW02MWcybt9XJIVDxh3yS87sjqcth3ZknzLbRCsJ6DHE1/dvBdNBIWc9
++eqGxVeTfQKBgQDRtGSg+YcTVoX2elhQRyu0bkrsTeHA8bMfFCZTEXo3lXW9+FkH
+4ksd4oUeH98CGeHa+bc036IXhBlq1o3zgsk7fXlJAnjCn/BCO666E+UyLFW/7bFl
+Bm/ATjBFO5PrwTPnZV7tKj/NwLDhW1M+4z10lWhKvGx8TDBMW1MLFFWIoQKBgGwu
+XQ8LN06igk2f2N4Z7H4vEBVh2NcszL3c1YRmpIFVG5ryYvb0r7Nn03D7z8wUmfWq
+HcRa5mjRLXKsm98uVsUNKhBgy6O9w2I+3IkGZSPIfF8VTTg8GOfYCNb5N3mJN7Iw
+cFLFxvwt/o624zDvRaluO4IH4QEgNTLNKsR7C+qBAoGAZbD4gcFaCZaEJ6nH6UvY
+4sir19IZxf5EMEzJqhy703UH5+Z8IHxD4TxwzFfe8dMUvBQw0zU8TVDLH9pW9WnI
+anExVI7zoGC0m58kTahVp7wL+IHnzERf7sWxpm2J+k+EK1DpuYDfwBxwmJbNFzcv
+lvJ2cUOPjjxSlixYruFonV4=
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/3030_key-certbot.pem b/letsencrypt/keys/3030_key-certbot.pem
new file mode 100644 (file)
index 0000000..b774435
--- /dev/null
+++ b/letsencrypt/keys/3030_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC8SzWyIKyV2w5e
+96P69zzJlZAtLxX598Ur+K4+hAVqgX6M0t7HpG8Z/2Wp/HuliGdbkuUjXFSx8bV8
+TRdVXqF86mLHbbFuRAGdCWk71CVV4BEyVIiB3rc2wjg6P0zkvkPbTOsH7yeCFV6X
+F5AUIFAs7sPQ5r9x9ZNVTRVWJsP/Of/yTHgX1nHo1z3dkaw5dRqTjb3tjY9U3D+1
+ltSdH49bMNXmzyh7wuKYlFUJGY8TW4+mbNH+tR835dMqUqWuQUw1jSHN3AEZwcRD
+o/hpszIfjZ/GMu3vQucUSkUNct13rAokR8uzTjj05bGPOHOYSegA/DHe+fvyeaJn
+J//zAIQlAgMBAAECggEBAJLslM+Tk1ezgHk1/uxbc0FQxRmcvic44M+40i3R0nAS
+725vNIrPkinVEb0cWFcIIq5f5xA6gZQAKT7+4JAqsRPJyJ4Yx/RkeGXS7BxVI3To
+zEJbl9DOumOuFTXOIu/yTvyV/mdIg6mLhy2ao0AxHp6RCJa/Fu+TUg2jglyhDxrd
+DiFLt5Ace1dO/WtYQtMWvKVhCrMD2+ttVMAH1yCWbhycKN7zBDMcwkZrj4htcqYn
+UzVXKGD3Bd0Zn8ajorDCwjBN9nEi5sFw4wscwMij4oc1Nh6a2C59Mn/4qLQc8QQo
+2Q8HhObcMc5AfIK4yLtqDUpXDIktAwv9tH3iXRnmB4ECgYEA5KenMUVqWYiHVZYj
+bINMGRDVEb+ipoN+IyTYyGcH7t8hx9Myb1bESSYbx5u2O7XSM3HW9Ptu88oDnVv7
+AF2IiZOdi72Vl56hPsbaNYoyF2fLaTKJuXXTPGiUCLt6opZ0tt2oFn0FHrGG4c0n
+n6IaZnVxf5bI/OtTvBI/0HQ927UCgYEA0s/jQeWYYa+gZCMoiJpjhKD6xbCiE5ps
+wii7xOcebn+2PXLMS4qIXoo4ce8exGoNRepDeZd/H91XVm8o+PwSbJKyWSoRzxKA
+i5hIThMdDB/qg+5voZ6vNWxE7M9fjzn0SbwkreGbh3Fx1z24EC8AHXjRQeowmDfp
+0Ib+TCDmrLECgYAQ0RPG1+gedaAed1BbprxuC4LgL0vzGzCnvQoEky9OLjL501qe
+Pa9qAdeBMr6QXar8BZ9dnTBn1a+2XxFy0W49UBICOQtLf2s0hsN9tJBCkGuxbPoc
+HcJPaxGYItG+K3qiCGNYZBGAVGYrLT+AyhdO+cxDKf/WOiiKaH0xA5uZEQKBgAsT
+Nto4aKgBJQj9u9xpV/8YwfPu0qT7AOm2YB75EWU2umlCBa+WSJHG6y45JMGm3Kmm
+pALYTapr43G8B0gFXiZsEoiSqDrbuvsadfn8EROY/aYOubig8I168agLQPbyUX4q
+LzcfWh9ke1mWeXwILBZgSYYP+puUnGkDHor7U4MRAoGBALplP2TV0M+33fUeB+6c
+ksJ0Vz+z4IfHy/Pyrn9rgsfKSUa4GOFwOWUTQx8VxJaw0R4D5ZuTuHLPKkg3Rh3D
+Bv+uhLfRuXOdRAXHHWT+3HTEsuImbh/ABqf/dDfOYu+3jzU9a4J7eou8cUQ1qWFQ
+TB5bVKnedsGYjrFa0lrdEZTM
+-----END PRIVATE KEY-----

diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index e3b489ebec4382db8823a1b4b82a40b14438ded3..469ac70cf8a882632c93fee539a81f76c8ccd8b3 100644 (file)
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA5SBmgFlpLp3OFk4BRcvMyyGaRqD8eE7NcFr2vxV6kms0QAYViUMD
-6ZpCVhqzJMPXT+/W2TIBn/t31jeJ0D3YZRQtCCeWGwGFlTzil0rs5uhEY4s5alVE
-Ihgo8EpvCax6a8iWA/DfbuPQjV7iF7Jno0LDMxXg2h5DYXYI244/S2DyqFvZ4iMo
-LPp7ZcUaCc1yiQdsZVIZen8HhdBkXds6veNtL2whH5qYiXSKO1sBGDm4LIqDRgwf
-QRFsdavNZT0cwqVYiWoCU5rEbnTKziMS5pwTw9Tssn707/Bv2xchtUBkryUSYORZ
-JnAMGD2EwsBrzrltUDuWAhc6FoQoJjuSOwIBAg==
+MIIBCAKCAQEAofAcBPeVm1/5r781ji9uKBrssPWvHXzqL5s4b900xgbDfIl9pr2M
+QDsctybdW7UwjOUl5BX772/EhWVZo1ZLSSTarIrqPHGfVKdvcDwV7Db5MehOa5sJ
+LBWShWUuMrprHMuRUBoyWbrciXaiGz3Uu6RuNdqStf2CeTJjDb7UUHikY2+oHBPC
+REIifVJaOHeYEiXuHDrFSlTgZseh4E6B3hvFvbGS6hYGPoeki8xQxJHgTq+uWU6n
+de3rKs3bwGBvXlhN720Kr2K3eJz2Hncf8XsRBRn7iRVWay2Q1ygFN7AZ+dgsH0iw
+oO1TcmF5tZ9AUn+bEzZZDpxyKpsarviEGwIBAg==
 -----END DH PARAMETERS-----