From 1eb35a1e69d9a9f3f43340b9ea46d95bb2c1a0e8 Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Fri, 28 Aug 2015 15:38:36 +0200 Subject: Add cgit role - git webfrontend --- roles/sublab_web/defaults/main.yaml | 2 +- .../files/ssl/wolpertinger.nowhere.ws/cert.pem | 22 --------------------- .../files/ssl/wolpertinger.nowhere.ws/chain.pem | 22 --------------------- roles/sublab_web/tasks/main.yaml | 23 +++------------------- 4 files changed, 4 insertions(+), 65 deletions(-) delete mode 100644 roles/sublab_web/files/ssl/wolpertinger.nowhere.ws/cert.pem delete mode 100644 roles/sublab_web/files/ssl/wolpertinger.nowhere.ws/chain.pem (limited to 'roles/sublab_web') diff --git a/roles/sublab_web/defaults/main.yaml b/roles/sublab_web/defaults/main.yaml index 367f47c..55f5b5f 100644 --- a/roles/sublab_web/defaults/main.yaml +++ b/roles/sublab_web/defaults/main.yaml @@ -1,2 +1,2 @@ --- -sublab_web_server_name: "sublab.org" +sublab_web_server_name: "{{inventory_hostname}}" diff --git a/roles/sublab_web/files/ssl/wolpertinger.nowhere.ws/cert.pem b/roles/sublab_web/files/ssl/wolpertinger.nowhere.ws/cert.pem deleted file mode 100644 index 48ccadc..0000000 --- a/roles/sublab_web/files/ssl/wolpertinger.nowhere.ws/cert.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDuzCCAqOgAwIBAgIJAKF4UGTy4i2cMA0GCSqGSIb3DQEBCwUAMHQxCzAJBgNV -BAYTAkRFMQ8wDQYDVQQIDAZTYXhvbnkxEDAOBgNVBAcMB0xlaXB6aWcxDzANBgNV -BAoMBnN1YmxhYjEPMA0GA1UECwwGc3VibGFiMSAwHgYDVQQDDBd3b2xwZXJ0aW5n -ZXIubm93aGVyZS53czAeFw0xNTA4MjYyMDU5MzdaFw0xNzA4MjUyMDU5MzdaMHQx -CzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZTYXhvbnkxEDAOBgNVBAcMB0xlaXB6aWcx -DzANBgNVBAoMBnN1YmxhYjEPMA0GA1UECwwGc3VibGFiMSAwHgYDVQQDDBd3b2xw -ZXJ0aW5nZXIubm93aGVyZS53czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBALWJeHqWcnGyiLZQSIxETvxxkZCwrgL4bUCj/iS/YXWHb/9fRw3NsDCz5P1G -AZKqmn4oJmahMMWCJ1Ro37Ms/7MsShneUodcz13tIGuBI7RAcS0U8KK7JZ/x5wqv -/1qDNUcTJGNCzYroKnNlMR6Y1ri8dRcBxYneNDAgYB2VbQI3+POuR4Ma89NyjsxD -lSeA5JzpMD3fBF+BauqV0WoXNdOYV37vWG3nzmuy3qwfk00CP/nF+zkVBlG0sqw/ -vgfcv6yz71RdvfOD+NJCBUiWvoLCZCSKEByc91BOs5iObOWA98/cU8YyFzmPGOY5 -b8dOAJyhZKXVzPnFe2etlhBlNbUCAwEAAaNQME4wHQYDVR0OBBYEFHPz9TLW5CVt -DobXXWgX/qP5fhFaMB8GA1UdIwQYMBaAFHPz9TLW5CVtDobXXWgX/qP5fhFaMAwG -A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBACSfz+XaYljMACvKFho7ifH5 -K3qhh+2i4Q9qS+G4mHcoGQP/rMGJE1Uv77mO0W072RSWp8Sc0xUS5Hlir6XZ3LXK -oqfI0541GbksvwM5e2bKyBEcdoClcJt6J7uI5EWjOldXsQpLT1c0OaeHa/kGJ2pU -nS9DzgdUPg7pRxLVE8+OH6UWb5V2BGqMXhV9ZF4iO1QBCRJpHcEp0pk2dSRD6Wdl -aVcLI8Up70iy9SRA+iucJc9TqwyilDUE1bqo3eHsr2Nj+YNi3ZjrzjuB/LL8qr7G -ePiXaq/uPASzCltwNLzKSEwwdndq8fYygsSS2m1zfzeuLXMH4VhL3F7bkCB9rsw= ------END CERTIFICATE----- diff --git a/roles/sublab_web/files/ssl/wolpertinger.nowhere.ws/chain.pem b/roles/sublab_web/files/ssl/wolpertinger.nowhere.ws/chain.pem deleted file mode 100644 index 48ccadc..0000000 --- a/roles/sublab_web/files/ssl/wolpertinger.nowhere.ws/chain.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDuzCCAqOgAwIBAgIJAKF4UGTy4i2cMA0GCSqGSIb3DQEBCwUAMHQxCzAJBgNV -BAYTAkRFMQ8wDQYDVQQIDAZTYXhvbnkxEDAOBgNVBAcMB0xlaXB6aWcxDzANBgNV -BAoMBnN1YmxhYjEPMA0GA1UECwwGc3VibGFiMSAwHgYDVQQDDBd3b2xwZXJ0aW5n -ZXIubm93aGVyZS53czAeFw0xNTA4MjYyMDU5MzdaFw0xNzA4MjUyMDU5MzdaMHQx -CzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZTYXhvbnkxEDAOBgNVBAcMB0xlaXB6aWcx -DzANBgNVBAoMBnN1YmxhYjEPMA0GA1UECwwGc3VibGFiMSAwHgYDVQQDDBd3b2xw -ZXJ0aW5nZXIubm93aGVyZS53czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBALWJeHqWcnGyiLZQSIxETvxxkZCwrgL4bUCj/iS/YXWHb/9fRw3NsDCz5P1G -AZKqmn4oJmahMMWCJ1Ro37Ms/7MsShneUodcz13tIGuBI7RAcS0U8KK7JZ/x5wqv -/1qDNUcTJGNCzYroKnNlMR6Y1ri8dRcBxYneNDAgYB2VbQI3+POuR4Ma89NyjsxD -lSeA5JzpMD3fBF+BauqV0WoXNdOYV37vWG3nzmuy3qwfk00CP/nF+zkVBlG0sqw/ -vgfcv6yz71RdvfOD+NJCBUiWvoLCZCSKEByc91BOs5iObOWA98/cU8YyFzmPGOY5 -b8dOAJyhZKXVzPnFe2etlhBlNbUCAwEAAaNQME4wHQYDVR0OBBYEFHPz9TLW5CVt -DobXXWgX/qP5fhFaMB8GA1UdIwQYMBaAFHPz9TLW5CVtDobXXWgX/qP5fhFaMAwG -A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBACSfz+XaYljMACvKFho7ifH5 -K3qhh+2i4Q9qS+G4mHcoGQP/rMGJE1Uv77mO0W072RSWp8Sc0xUS5Hlir6XZ3LXK -oqfI0541GbksvwM5e2bKyBEcdoClcJt6J7uI5EWjOldXsQpLT1c0OaeHa/kGJ2pU -nS9DzgdUPg7pRxLVE8+OH6UWb5V2BGqMXhV9ZF4iO1QBCRJpHcEp0pk2dSRD6Wdl -aVcLI8Up70iy9SRA+iucJc9TqwyilDUE1bqo3eHsr2Nj+YNi3ZjrzjuB/LL8qr7G -ePiXaq/uPASzCltwNLzKSEwwdndq8fYygsSS2m1zfzeuLXMH4VhL3F7bkCB9rsw= ------END CERTIFICATE----- diff --git a/roles/sublab_web/tasks/main.yaml b/roles/sublab_web/tasks/main.yaml index 50a2585..0aab602 100644 --- a/roles/sublab_web/tasks/main.yaml +++ b/roles/sublab_web/tasks/main.yaml @@ -31,26 +31,9 @@ - wiki.conf notify: Reload apache -- name: Create SSL DIR - file: - path=/etc/apache2/sites/{{ sublab_web_server_name }}/ssl - state=directory - -- name: Place SSL cert and chain - copy: - src=ssl/{{ sublab_web_server_name }}/{{item}} - dest=/etc/apache2/sites/{{ sublab_web_server_name }}/ssl/{{item}} - with_items: - - cert.pem - - chain.pem - notify: Reload apache - -- name: Place SSL key - copy: - content="{{ssl_keys[sublab_web_server_name]}}" - dest="/etc/apache2/sites/{{sublab_web_server_name}}/ssl/key.pem" - mode=0600 - notify: Reload apache +- include: ../../apache/tasks/ssl.yaml + vars: + ssl_server_name: "{{sublab_web_server_name}}" - name: Create Website group group: name=sublab_web -- cgit v1.2.1