diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml index 734b769..e4dbc14 100644 --- a/.github/workflows/site.yml +++ b/.github/workflows/site.yml @@ -21,7 +21,6 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v6 with: - node-version: 20 cache: npm cache-dependency-path: site/package-lock.json diff --git a/LICENSE b/LICENSE index 81901d3..ec3d306 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,39 @@ +This repository uses a dual license: + +- Alert rules and content (_data/rules.yml, dist/rules/, README.md): + Creative Commons Attribution 4.0 International (CC BY 4.0) + https://creativecommons.org/licenses/by/4.0/ + +- Site source code (site/): + MIT License + https://opensource.org/licenses/MIT + +--- + Creative Commons Attribution 4.0 International License (CC BY 4.0) http://creativecommons.org/licenses/by/4.0/ + +--- + +MIT License (site source code) + +Copyright (c) 2018 Samuel Berthe + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/site/LICENSE b/site/LICENSE new file mode 100644 index 0000000..c7988df --- /dev/null +++ b/site/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 Samuel Berthe + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/site/src/components/Footer.astro b/site/src/components/Footer.astro index 80bf8bd..1da41ea 100644 --- a/site/src/components/Footer.astro +++ b/site/src/components/Footer.astro @@ -1,7 +1,7 @@ --- import { sponsors } from '../data/sponsors'; import { getPopularServices, data, getGroupSlug } from '../data/rules'; -import { SITE_NAME, SITE_URL, GITHUB_URL, GITHUB_CONTRIBUTING_URL, GITHUB_LICENSE_URL, AUTHOR_NAME, AUTHOR_GITHUB_URL, TWITTER_HANDLE, LICENSE_CC_BY_NAME } from '../data/site'; +import { SITE_NAME, SITE_URL, GITHUB_URL, GITHUB_CONTRIBUTING_URL, GITHUB_LICENSE_URL, GITHUB_MIT_LICENSE_URL, AUTHOR_NAME, AUTHOR_GITHUB_URL, TWITTER_HANDLE, LICENSE_CC_BY_NAME, LICENSE_MIT_NAME } from '../data/site'; interface Props { base: string; @@ -90,7 +90,11 @@ const featuredGroups = data.groups.filter((g) => featuredGroupSlugs.includes(get {' '}is maintained by{' '} @{AUTHOR_GITHUB_URL.split('/').pop()} - Licensed under {LICENSE_CC_BY_NAME} + + Alert rules: {LICENSE_CC_BY_NAME} + {' ยท '} + Site code: {LICENSE_MIT_NAME} + diff --git a/site/src/data/site.ts b/site/src/data/site.ts index c76fe71..02b819d 100644 --- a/site/src/data/site.ts +++ b/site/src/data/site.ts @@ -21,6 +21,8 @@ export const GITHUB_LICENSE_URL = `${GITHUB_URL}/blob/master/LICENSE`; export const LICENSE_CC_BY_URL = 'https://creativecommons.org/licenses/by/4.0/'; export const LICENSE_CC_BY_NAME = 'Creative Commons CC BY 4.0'; export const LICENSE_MIT_URL = 'https://opensource.org/licenses/MIT'; +export const LICENSE_MIT_NAME = 'MIT'; +export const GITHUB_MIT_LICENSE_URL = `${GITHUB_URL}/blob/master/site/LICENSE`; export const schemaAuthor = { '@type': 'Person', diff --git a/site/src/pages/index.astro b/site/src/pages/index.astro index f72210a..b6bb4a7 100644 --- a/site/src/pages/index.astro +++ b/site/src/pages/index.astro @@ -100,7 +100,7 @@ const faqItems = [ name: 'What is the license for these alert rules?', acceptedAnswer: { '@type': 'Answer', - text: `The alert rules are licensed under Creative Commons CC BY 4.0. You are free to use, adapt, and redistribute them โ€” including in commercial environments โ€” as long as you provide attribution. See the LICENSE file in the GitHub repository for details.`, + text: `The alert rules and content are licensed under Creative Commons CC BY 4.0 โ€” you are free to use, adapt, and redistribute them, including commercially, as long as you provide attribution. The site source code is licensed under MIT. See the LICENSE file in the GitHub repository for details.`, }, }, ];