diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-03-07 17:42:09 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-03-07 17:42:09 +0300 |
| commit | 89501363417d9c0a9744a9342e292d7a2b5a589d (patch) | |
| tree | 1e66a8c61e9cd97933977142ec6ec8005fc29645 /shared | |
| parent | 1ae4901c7ea49c4eec8cc26d68ad85c5c8719454 (diff) | |
| parent | 00b6c5f315ac00e9da8a6de99c50b064e9f87872 (diff) | |
Merge branch 'https_only' into 'master'
HTTPS-only pages
See merge request gitlab-org/gitlab-pages!50
Diffstat (limited to 'shared')
10 files changed, 30 insertions, 0 deletions
diff --git a/shared/pages/group.https-only/project1/config.json b/shared/pages/group.https-only/project1/config.json new file mode 100644 index 00000000..88f61b80 --- /dev/null +++ b/shared/pages/group.https-only/project1/config.json @@ -0,0 +1 @@ +{"https_only":true,"domains":[]} diff --git a/shared/pages/group.https-only/project1/public/index.html b/shared/pages/group.https-only/project1/public/index.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/shared/pages/group.https-only/project1/public/index.html @@ -0,0 +1 @@ + diff --git a/shared/pages/group.https-only/project2/config.json b/shared/pages/group.https-only/project2/config.json new file mode 100644 index 00000000..6a3d66c4 --- /dev/null +++ b/shared/pages/group.https-only/project2/config.json @@ -0,0 +1 @@ +{"https_only":false,"domains":[]} diff --git a/shared/pages/group.https-only/project2/public/index.html b/shared/pages/group.https-only/project2/public/index.html new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/shared/pages/group.https-only/project2/public/index.html diff --git a/shared/pages/group.https-only/project3/config.json b/shared/pages/group.https-only/project3/config.json new file mode 100644 index 00000000..0dacdbdb --- /dev/null +++ b/shared/pages/group.https-only/project3/config.json @@ -0,0 +1,8 @@ +{ + "domains": [ + { + "domain": "test.my-domain.com", + "https_only": true + } + ] +} diff --git a/shared/pages/group.https-only/project3/public/index.html b/shared/pages/group.https-only/project3/public/index.html new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/shared/pages/group.https-only/project3/public/index.html diff --git a/shared/pages/group.https-only/project4/config.json b/shared/pages/group.https-only/project4/config.json new file mode 100644 index 00000000..5ef48cef --- /dev/null +++ b/shared/pages/group.https-only/project4/config.json @@ -0,0 +1,8 @@ +{ + "domains": [ + { + "domain": "test2.my-domain.com", + "https_only": false + } + ] +} diff --git a/shared/pages/group.https-only/project4/public/index.html b/shared/pages/group.https-only/project4/public/index.html new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/shared/pages/group.https-only/project4/public/index.html diff --git a/shared/pages/group.https-only/project5/config.json b/shared/pages/group.https-only/project5/config.json new file mode 100644 index 00000000..5813bb85 --- /dev/null +++ b/shared/pages/group.https-only/project5/config.json @@ -0,0 +1,11 @@ +{ + "httpsonly": true, + "domains": [ + { + "domain": "no.cert.com", + "certificate": "test", + "key": "test", + "httpsonly": false + } + ] +} diff --git a/shared/pages/group.https-only/project5/public/index.html b/shared/pages/group.https-only/project5/public/index.html new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/shared/pages/group.https-only/project5/public/index.html |