diff --git a/.kitchen.yml b/.kitchen.yml index 5cecb3b..654dbaf 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -56,62 +56,3 @@ suites: run_list: recipe[owncloud_test::sqlite] - name: nginx run_list: recipe[owncloud_test::nginx] -- name: ssl_data_bag - run_list: recipe[owncloud_test::mysql] - data_bags_path: test/integration/mysql/data_bags - encrypted_data_bag_secret_key_path: test/integration/mysql/encrypted_data_bag_secret - attributes: - owncloud: - ssl_key: - source: data-bag - bag: ssl - item: key - item_key: content - encrypted: true - ssl_cert: - source: data-bag - bag: ssl - item: cert - item_key: content -- name: ssl_attribute - run_list: recipe[owncloud_test::mysql] - attributes: - owncloud: - ssl_key: - source: attribute - content: | - -----BEGIN PRIVATE KEY----- - MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOgkYt9sTZb/mEwG - zNFIOkOrNhtSKyst300Ycdjg/8C1+Ji43SapBZeQpYuymOE0bCa7No0tktvYgxLn - vXxHnW5yJfWbskX9ADAa8LxftyRUiASta9SXoDRF4Usayb1+84TUsDLjP02IjVtc - EiwxnhIp4X8C0jyKopCVP1wc4SwJAgMBAAECgYEAtfw4arCrzvFGwmseS/7UdlIV - U6vB3dLTWMwODBivRrMhVRCvhmxAzwX9UZvMT9hZ5K8lX93XYHPGpZ54pKI73mhT - rkzIWc49J71Yeucli/IdCUj6ZjU6wz7M8S6Iq5PAPet0B43Tgr2GuSpYBTaCGDKs - zPNhUiU/aya0zVnAZxECQQD6Ds7GxFn/way0nrdjOl93daEKg9qKNNcxQc9edO81 - 4ZQFoB5PGD0FAaSqFfei7kNG4Ab1TkvGKnNLNg1J7ehdAkEA7aiXPGDle9jCmUSm - Qrej2Cs7OJNIm5K3FiqtXyd0/zszHbsp9eT1z5xIbRZhzF85I/xxda3O4brvuJq3 - BqmnnQJBAKHgmCfA0OpqvJ0o6ltIXKj+80PVW9KAppZyngXt+TWOVL7Xiwd1D3uA - NtMM6YUGbXMicB65kwA0VvLniO7FHtkCQGJg7KHw1m4q73s0wMJTdH6SfsRPq7nC - xQlnBzehhLv2zJUdGiSQ7/ROFGkb38YTEPtFj84P8djdYkh/uw4GAr0CQA1BCV5C - mCRO24Sn5K9AtA4Cu1NsAM8/sfBvewJ8MjkxCG/lnWjSDNMoVXivo5kk5txT4uVF - 1pdo84Vs2Abj3JE= - -----END PRIVATE KEY----- - ssl_cert: - source: attribute - content: | - -----BEGIN CERTIFICATE----- - MIICjDCCAfWgAwIBAgIJALJSpKd0ZsHVMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNV - BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX - aWRnaXRzIFB0eSBMdGQxFzAVBgNVBAMMDm93bmNsb3VkLmxvY2FsMCAXDTE0MDIx - MzE3MzYyMFoYDzIxMTQwMTIwMTczNjIwWjBeMQswCQYDVQQGEwJBVTETMBEGA1UE - CAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRk - MRcwFQYDVQQDDA5vd25jbG91ZC5sb2NhbDCBnzANBgkqhkiG9w0BAQEFAAOBjQAw - gYkCgYEA6CRi32xNlv+YTAbM0Ug6Q6s2G1IrKy3fTRhx2OD/wLX4mLjdJqkFl5Cl - i7KY4TRsJrs2jS2S29iDEue9fEedbnIl9ZuyRf0AMBrwvF+3JFSIBK1r1JegNEXh - SxrJvX7zhNSwMuM/TYiNW1wSLDGeEinhfwLSPIqikJU/XBzhLAkCAwEAAaNQME4w - HQYDVR0OBBYEFH+LWAqDxMpEObxsdPR/HUxbSvTaMB8GA1UdIwQYMBaAFH+LWAqD - xMpEObxsdPR/HUxbSvTaMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEA - AHeOpZbU6ak47dHfZVevB34JUkuje+nnG01ahDqtRtIuAiXdWE8+r4XeNeQTMQMZ - 0/WOwseFPzfG3D9KaynYe7Py7kaACHZweEyVDgRlgxa7U2fJim+/f6pEcRUIfb2F - wCVUQVe2b2XgEGlbTpmzyOHrERKM2C7w0ueeOG/FU04= - -----END CERTIFICATE----- diff --git a/attributes/default.rb b/attributes/default.rb index f8f136f..57befcc 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -26,22 +26,6 @@ default['owncloud']['skip_permissions'] = false default['owncloud']['ssl'] = true -default['owncloud']['ssl_key']['source'] = 'self-signed' -default['owncloud']['ssl_key']['bag'] = nil -default['owncloud']['ssl_key']['item'] = nil -default['owncloud']['ssl_key']['item_key'] = nil -default['owncloud']['ssl_key']['encrypted'] = false -default['owncloud']['ssl_key']['secret_file'] = nil -default['owncloud']['ssl_key']['path'] = nil -default['owncloud']['ssl_key']['content'] = nil -default['owncloud']['ssl_cert']['source'] = 'self-signed' -default['owncloud']['ssl_cert']['bag'] = nil -default['owncloud']['ssl_cert']['item'] = nil -default['owncloud']['ssl_cert']['item_key'] = nil -default['owncloud']['ssl_cert']['encrypted'] = false -default['owncloud']['ssl_cert']['secret_file'] = nil -default['owncloud']['ssl_cert']['path'] = nil -default['owncloud']['ssl_cert']['content'] = nil default['owncloud']['admin']['user'] = 'admin' default['owncloud']['admin']['pass'] = nil diff --git a/test/integration/mysql/data_bags/ssl/cert.json b/test/integration/mysql/data_bags/ssl/cert.json deleted file mode 100644 index 737d35a..0000000 --- a/test/integration/mysql/data_bags/ssl/cert.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "id": "cert", - "content": "-----BEGIN CERTIFICATE-----\nMIICjDCCAfWgAwIBAgIJALJSpKd0ZsHVMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQxFzAVBgNVBAMMDm93bmNsb3VkLmxvY2FsMCAXDTE0MDIx\nMzE3MzYyMFoYDzIxMTQwMTIwMTczNjIwWjBeMQswCQYDVQQGEwJBVTETMBEGA1UE\nCAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRk\nMRcwFQYDVQQDDA5vd25jbG91ZC5sb2NhbDCBnzANBgkqhkiG9w0BAQEFAAOBjQAw\ngYkCgYEA6CRi32xNlv+YTAbM0Ug6Q6s2G1IrKy3fTRhx2OD/wLX4mLjdJqkFl5Cl\ni7KY4TRsJrs2jS2S29iDEue9fEedbnIl9ZuyRf0AMBrwvF+3JFSIBK1r1JegNEXh\nSxrJvX7zhNSwMuM/TYiNW1wSLDGeEinhfwLSPIqikJU/XBzhLAkCAwEAAaNQME4w\nHQYDVR0OBBYEFH+LWAqDxMpEObxsdPR/HUxbSvTaMB8GA1UdIwQYMBaAFH+LWAqD\nxMpEObxsdPR/HUxbSvTaMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEA\nAHeOpZbU6ak47dHfZVevB34JUkuje+nnG01ahDqtRtIuAiXdWE8+r4XeNeQTMQMZ\n0/WOwseFPzfG3D9KaynYe7Py7kaACHZweEyVDgRlgxa7U2fJim+/f6pEcRUIfb2F\nwCVUQVe2b2XgEGlbTpmzyOHrERKM2C7w0ueeOG/FU04=\n-----END CERTIFICATE-----\n" -} diff --git a/test/integration/mysql/data_bags/ssl/key.json b/test/integration/mysql/data_bags/ssl/key.json deleted file mode 100644 index 1240f6d..0000000 --- a/test/integration/mysql/data_bags/ssl/key.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "id": "key", - "content": { - "encrypted_data": "RBda1OVKhk4l7WTfvTc18LOXdofWKf38v7JRczvNCcG9RRLy1w1+MxME3R2B\nErGUw7BHYJ/7tbMeeU1/xcWcSHt1GrNV5mNUQpbst0ah/KgWLUfjZ8MCjv9v\nJ1eANngxqXLxKCxkLCzB3Jk7yExiSKauyYU0yT+iSVEd/oGAZ4CCpgAt0xcY\nZTDU34qcXkoQtKGeFCAUZQjsIEsRV6ipRT5q4k0vsNKv9/+HpRn1kRpk5cj0\n2r03lSh0ojbTDtAXarXW3sf2EwFbUi5SzmtEzVPpP8ZeALp24yKr04/LAG2s\nFiJx0kt9jaCGdmPdngMoXHTZr4ArKBgWER9hwxF1FdwnvAezsZRTdew75OUx\nsFiJfBg/KfBR4CHvWbhLR1GkTEWBG3YEiBWcEbrDJraBP2XIkTdErd1Nqn81\nZzouBeD8MmmNsOTa2I5Fsn8AwoamR24ta7cfUxvnXpTsDa4MQsOm4W+139XU\nGjIZC9mD+zbhmncajRnctjZAl7NybgM8VPcjpgquWtIlV/tOorT3QpIpfoBV\nlNKIL1G3zfAqrXyet4xo9wW5bEFnnPhm+NpKoX24UuqPGm8K/HTdZ9eFsnKb\naT+y9IcK88mNZ+o2l2dVsVl3DwJ3sus7aBbA2r7DNCEzW4KqbEYpLQgreN6q\nn77914q+5/xr+nQatBLZZbk5FI8xAm4m2DECSt1Gxf0MkT+ifO0YJvV2bdrD\nWTMgWnKjy9vE79xSvDujxoqbsPJdy9TCYP3SgAmJUpWVN29n3tE+4ozCKf7w\nHmYalhMvHBuxcyTAISeTBvBu4p8NoG09bSC8j44nxBscwGC2g1sfEUmiiHkl\nN7K+5GZgiuyVgnyhOvTOlcOT6xbSGbylqj1hK8hAlQ3cyRjo/sWHi+zMTjog\nM88opxA1WsaDzYSI3JqqnOZEAvMJPM74j5QFalHcPYFYloriffdY+9yhs0qH\nLONSpQ1kL5q1HeyEoHOZzF5Eh6zachojjnEImA2sqKM6cyPfMYG0T5i8WHqV\nujWXVRmTlPNLy+rT+fXU7tv8b0/oYxeFwTIlV9Puzy5wvQ21Y8fB9m+7+rRk\nfF3jN6SDpt9O8w90QWNEz2x0V+7Wm39e6MvXCDGmbgHr1EoftSyhBqJ27sb6\nuD8/4MPV3a/LHjr/PkCvD9iYkhJMV5kul802H+t53OcdEVzL5gsC3zM8yxts\ntHDYf36ygcBoASPvOpKZdaWowexMx3pWNX0v6f5C/YUpOuSlHW1TrcKNfFC7\nZKx+kHo3JwV8BgCcocTD\n", - "iv": "GOCkZ6Xr+A2MQPjnAJKcCQ==\n", - "version": 1, - "cipher": "aes-256-cbc" - } -} diff --git a/test/integration/mysql/encrypted_data_bag_secret b/test/integration/mysql/encrypted_data_bag_secret deleted file mode 100644 index bec3438..0000000 --- a/test/integration/mysql/encrypted_data_bag_secret +++ /dev/null @@ -1,11 +0,0 @@ -B/0FkuL0p3bARnWJSJZvK88c/9y+/nrSnBlICx+ior/+Zu/wrXYvkYQ4KzZgW4rt -izghMSYMwT/oX0o9nMOihT/9Tg6R7K4EKcAcUvtYrAJGGRoUpcjWeDoMH/5l1IOT -7IGVkuYvTt/fEH7JsoREzMbDzF0Ok+UyXfLNMosQPDyZ4pp+4HapPy10uFFAiwvq -Cma0U/PzgdLOalxPy/vCnrerwIN3Tq8ge4iNVaCIZbgiY+pdC1tw8iP2Ow+zf367 -YSPsnNkBvCQ3H71i2Q05qgjcEMl3sMOtemsw6VXJGlTg93kdW5vm0zNcscFfneal -E94FcvNdKuhx2hde/9xWaqzF1MKUOVTCFBHIG2ZVqVNz6uniepuzWBUDXVfI4Nrk -zKlgCEVEd8cMbq0EQ+wtfOEemWHO/PULoX8O3dubX98e/cMzW/n2Ktg0qVP1/qYc -laRNfjFDWpnSylreuG31GhcUOA0u8EUjM59mbuGaQbshHTx7jFggh0++rMvyDZW/ -pi8bRbVUmfSg82H5IukxTbPVGjtsVO9VDlYocIhmPRXLLuesda/z5IjOrdzK/ndQ -iPGopYGgbaxUyvqqmTI9mrqzT1hTi0o27NGVZ4GQDf3IGwUEN67sC0foM8Laj+Qk -4rwOgCdyg8UPaDEPjC9O4rVRlAjU1nZzN2ycKD+ZiJY=