Skip to content

Commit

Permalink
replace
Browse files Browse the repository at this point in the history
Signed-off-by: Lee Calcote <[email protected]>
  • Loading branch information
leecalcote committed Jul 29, 2023
1 parent 2e6ccfc commit fca4204
Show file tree
Hide file tree
Showing 18 changed files with 40 additions and 92 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ assignees: ''
- 📚 [Instructions for contributing to documentation](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#documentation-contribution-flow)
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](https://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ assignees: ''
---
#### Contributor [Guides](https://docs.meshery.io/project/contributing) and Resources
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/build-and-release)
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](https://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ assignees: ''
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/build-and-release)
- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](https://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: 🙋🏾🙋🏼‍Question
url: https://github.com/layer5io/meshery/discussions/new
url: https://github.com/meshery/meshery/discussions/new
about: Submit your question using GitHub Discussions.
10 changes: 5 additions & 5 deletions .github/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
# Comment to be posted to on first time issues
newIssueWelcomeComment: >
Thanks for opening this issue. A contributor will be by to give feedback soon. In the meantime, please review the [Layer5 Community Welcome Guide](https://docs.google.com/document/d/17OPtDE_rdnPQxmk2Kauhm3GwXF1R5dZ3Cj8qZLKdo5E/edit?usp=sharing) and sure to join the [community Slack](http://slack.layer5.io/).
Thanks for opening this issue. A contributor will be by to give feedback soon. In the meantime, please review the [Meshery Community Welcome Guide](https://meshery.io/community) and sure to join the [community Slack](https://slack.meshery.io/).
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
# Comment to be posted to on PRs from first time contributors in your repository
newPRWelcomeComment: >
Yay, your first pull request! :thumbsup: A contributor will be by to give feedback soon. In the meantime, please review the [Layer5 Community Welcome Guide](https://docs.google.com/document/d/17OPtDE_rdnPQxmk2Kauhm3GwXF1R5dZ3Cj8qZLKdo5E/edit?usp=sharing) and sure to join the [community Slack](http://slack.layer5.io/).
Yay, your first pull request! :thumbsup: A contributor will be by to give feedback soon. In the meantime, please review the [Meshery Community Welcome Guide](https://meshery.io/community) and sure to join the [community Slack](https://slack.meshery.io/).
Be sure to double-check that you have signed your commits. Here are instructions for [making signing an implicit activity while peforming a commit](../CONTRIBUTING.md#signing-off-on-commits-developer-certificate-of-origin).
Expand All @@ -15,7 +15,7 @@ newPRWelcomeComment: >
# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
# Comment to be posted to on pull requests merged by a first time user
firstPRMergeComment: >
&nbsp; &#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; Thank you for contributing to the Layer5 community! :tada:
&nbsp; &#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; Thank you for contributing to the Meshery community! :tada:
\
\
<picture>
Expand All @@ -36,7 +36,7 @@ requestInfoReplyComment: >
# *OPTIONAL* Add a list of people whose Issues/PRs will not be commented on
# keys must be GitHub usernames
#requestInfoUserstoExclude:
# - layer5io/maintainers
# - meshery/maintainers


#-------------------------------------------------------------------------------
Expand All @@ -47,5 +47,5 @@ sentimentBotToxicityThreshold: .9

# *Required* Comment to reply with
sentimentBotReplyComment: >
Please be sure to review the code of conduct and be respectful of other users. // @layer5io/maintainers
Please be sure to review the code of conduct and be respectful of other users. // @meshery/maintainers
2 changes: 1 addition & 1 deletion .github/label-commenter-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ comment:
# header: "Please note the following requirement:"
footer: "\
---\n\n
> &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; Be sure to [join the community](http://slack.layer5.io), if you haven't yet and please leave a :star: [star on the project](../stargazers) :smile:
> &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; Be sure to [join the community](https://slack.meshery.io), if you haven't yet and please leave a :star: [star on the project](../stargazers) :smile:
"

labels:
Expand Down
6 changes: 3 additions & 3 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Layer5 Community Code of Conduct
# Meshery Community Code of Conduct

The Layer5 community follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
The Meshery project follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting community@layer5.io.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting community@meshery.io.
2 changes: 1 addition & 1 deletion CONTRIBUTING-gitflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ While this isn't an absolutely necessary step, if you plan on doing anything mor

## Add 'upstream' repo to list of remotes
```
git remote add upstream https://github.com/layer5io/meshery.git
git remote add upstream https://github.com/meshery/meshery.git
```
("meshery" is used as the example repo. Be sure to reference the _actual_ repo you're contributing to e.g. "meshery-linkerd").

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Please do! Thanks for your help improving the project! :balloon:

All contributors are welcome. Please see the [newcomers welcome guide](https://docs.google.com/document/d/17OPtDE_rdnPQxmk2Kauhm3GwXF1R5dZ3Cj8qZLKdo5E/edit) for how, where and why to contribute. This project is community-built and welcomes collaboration. Contributors are expected to adhere to our [Code of Conduct](.CODE_OF_CONDUCT.md).

Not sure where to start? First, see the [newcomers welcome guide](https://docs.google.com/document/d/17OPtDE_rdnPQxmk2Kauhm3GwXF1R5dZ3Cj8qZLKdo5E/edit). Grab an open issue with the [help-wanted label](../../labels/help%20wanted) and jump in. Join the [Slack account](http://slack.layer5.io) and engage in conversation. Create a [new issue](/../../issues/new/choose) if needed. All [pull requests](/../../pulls) should reference an open [issue](/../../issues). Include keywords in your pull request descriptions, as well as commit messages, to [automatically close issues in GitHub](https://help.github.com/en/github/managing-your-work-on-github/closing-issues-using-keywords).
Not sure where to start? First, see the [newcomers welcome guide](https://docs.google.com/document/d/17OPtDE_rdnPQxmk2Kauhm3GwXF1R5dZ3Cj8qZLKdo5E/edit). Grab an open issue with the [help-wanted label](../../labels/help%20wanted) and jump in. Join the [Slack account](https://slack.meshery.io) and engage in conversation. Create a [new issue](/../../issues/new/choose) if needed. All [pull requests](/../../pulls) should reference an open [issue](/../../issues). Include keywords in your pull request descriptions, as well as commit messages, to [automatically close issues in GitHub](https://help.github.com/en/github/managing-your-work-on-github/closing-issues-using-keywords).

**Sections**
- <a name="contributing">General Contribution Flow</a>
Expand Down Expand Up @@ -199,7 +199,7 @@ Or you may configure your IDE, for example, Visual Studio Code to automatically
<a href="https://user-images.githubusercontent.com/7570704/64490167-98906400-d25a-11e9-8b8a-5f465b854d49.png" ><img src="https://user-images.githubusercontent.com/7570704/64490167-98906400-d25a-11e9-8b8a-5f465b854d49.png" width="50%"><a>

## <a name="contributing-docs">Documentation Contribution Flow</a>
Please contribute! Layer5 documentation uses Jekyll and GitHub Pages to host docs sites. Learn more about [Layer5's documentation framework](https://docs.google.com/document/d/17guuaxb0xsfutBCzyj2CT6OZiFnMu9w4PzoILXhRXSo/edit?usp=sharing). The process of contributing follows this flow:
Please contribute! Meshery documentation uses Jekyll and GitHub Pages to host docs sites. Learn more about [Meshery's documentation framework](https://docs.meshery.io/project/contributing). The process of contributing follows this flow:

1. Create a fork, if you have not already, by following the steps described [here](./CONTRIBUTING-gitflow.md)
1. In the local copy of your fork, navigate to the docs folder.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2020 Layer5, Inc.
Copyright 2023 Meshery Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include install/Makefile.core.mk
include install/Makefile.show-help.mk

setup-libs: site-setup
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
## Join the Community!

<a name="contributing"></a><a name="community"></a>
Our projects are community-built and welcome collaboration. 👍 Be sure to see the <a href="https://layer5.io/community/newcomers">Layer5 Community Welcome Guide</a> for a tour of resources available to you and jump into our <a href="http://slack.layer5.io">Slack</a>!
Our projects are community-built and welcome collaboration. 👍 Be sure to see the <a href="https://layer5.io/community/newcomers">Layer5 Community Welcome Guide</a> for a tour of resources available to you and jump into our <a href="https://slack.meshery.io">Slack</a>!

<p style="clear:both;">
<a href ="https://layer5.io/community/meshmates"><img alt="MeshMates" src=".github\readme\images\Layer5-MeshMentors-new.png" style="margin-right:10px; margin-bottom:15px;" width="28%" align="left"/></a>
Expand All @@ -33,13 +33,13 @@ Find out more on the <a href="https://layer5.io/community">Layer5 community</a>.
</picture>
</a>

<a href="https://meshery.io/community"><img alt="Layer5 Cloud Native Community" src="https://raw.githubusercontent.com/meshery/play/master/.github/readme/images/community.svg" style="margin-right:8px;padding-top:5px;" width="140px" align="left" /></a>
<a href="https://meshery.io/community"><img alt="Meshery Cloud Native Community" src="https://raw.githubusercontent.com/meshery/play/master/.github/readme/images/community.svg" style="margin-right:8px;padding-top:5px;" width="140px" align="left" /></a>

<p>
✔️ <em><strong>Join</strong></em> any or all of the weekly meetings on <a href="https://calendar.google.com/calendar/b/1?cid=bGF5ZXI1LmlvX2VoMmFhOWRwZjFnNDBlbHZvYzc2MmpucGhzQGdyb3VwLmNhbGVuZGFyLmdvb2dsZS5jb20">community calendar</a>.<br />
✔️ <em><strong>Watch</strong></em> community <a href="https://www.youtube.com/playlist?list=PL3A-A6hPO2IMPPqVjuzgqNU5xwnFFn3n0">meeting recordings</a>.<br />
✔️ <em><strong>Access</strong></em> the <a href="https://drive.google.com/drive/u/4/folders/0ABH8aabN4WAKUk9PVA">Community Drive</a> by completing a community <a href="https://layer5.io/newcomer">Member Form</a>.<br />
✔️ <em><strong>Discuss</strong></em> in the <a href="https://discuss.layer5.io">Community Forum</a>.<br />
✔️ <em><strong>Discuss</strong></em> in the <a href="https://discuss.meshery.io">Community Forum</a>.<br />
✔️<em><strong>Explore more</strong></em> in the <a href="https://layer5.io/community/handbook">Community Handbook</a>.<br />
</p>
<p align="center">
Expand Down
30 changes: 15 additions & 15 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Security Policy
We are very grateful to the security researchers and users that report
back Layer5 project security vulnerabilities. We investigate every report thoroughly.
back Meshery project security vulnerabilities. We investigate every report thoroughly.

## Reporting a vulnerability
To make a report, send an email to the private
Expand All @@ -13,39 +13,39 @@ the appropriate repository and submit a [new issue](../../issues/new/choose).

Send us a report whenever you:

- Think Layer5 projects have a potential security vulnerability.
- Are unsure whether or how a vulnerability affects Layer5 projects.
- Think a vulnerability is present in another project that Layer5 projects
- Think Meshery projects have a potential security vulnerability.
- Are unsure whether or how a vulnerability affects Meshery projects.
- Think a vulnerability is present in another project that Meshery projects
depend on (Docker for example).

### When not to report a security vulnerability?

Don't send a vulnerability report if:

- You need help tuning Layer5 project components for security.
- You need help tuning Meshery project components for security.
- You need help applying security related updates.
- Your issue is not security related.

## Evaluation

The Layer5 team acknowledges and analyzes each vulnerability report within 10 working days.
The Meshery team acknowledges and analyzes each vulnerability report within 10 working days.

Any vulnerability information you share with the Layer5 team stays
within the Layer5 project. We don't disseminate the information to other
Any vulnerability information you share with the Meshery team stays
within the Meshery project. We don't disseminate the information to other
projects. We only share the information as needed to fix the issue.

We keep the reporter updated as the status of the security issue is addressed.

## Fixing the issue

Once a security vulnerability has been fully characterized, a fix is developed by the Layer5 team.
Once a security vulnerability has been fully characterized, a fix is developed by the Meshery team.
The development and testing for the fix happens in a private GitHub repository in order to prevent
premature disclosure of the vulnerability.

## Early disclosure

The Layer5 team maintains a mailing list for private early disclosure of security vulnerabilities.
The list is used to provide actionable information to close Layer5 partners. The list is not intended
The Meshery team maintains a mailing list for private early disclosure of security vulnerabilities.
The list is used to provide actionable information to close Meshery partners. The list is not intended
for individuals to find out about security issues.

## Public disclosure
Expand All @@ -54,11 +54,11 @@ On the day chosen for public disclosure, a sequence of activities takes place as

- Changes are merged from the private GitHub repository holding the fix into the appropriate set of public
branches.
- Layer5 team ensures all necessary binaries are promptly built and published.
- Meshery team ensures all necessary binaries are promptly built and published.
- Once the binaries are available, an announcement is sent out on the following channels:
- The [Layer5 blog](https://layer5.io/blog/)
- The [Layer5 Twitter feed](https://twitter.com/layer5)
- The [Meshery blog](https://meshery.io/blog/)
- The [Meshery Twitter feed](https://twitter.com/mesheryio)
- The #announcements channel on Slack

As much as possible this announcement will be actionable, and include any mitigating steps customers can take prior to
upgrading to a fixed version.
upgrading to a fixed version.
51 changes: 0 additions & 51 deletions install/Makefile.core.mk

This file was deleted.

2 changes: 1 addition & 1 deletion site/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const App = () => {
<div>
<h1>Join the community!</h1>
<p>Engage in the Meshery community by joining us on Slack</p>
<a href="https://slack.layer5.io/" >Join Our Open Source Community</a>
<a href="https://slack.meshery.io/" >Join Our Open Source Community</a>
</div>
</section>
</Main>
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/Discuss-Callout/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const DiscussCallout = () => {
<div className="explain">
<div className="cards">
<div className="card">
<a href="https://discuss.layer5.io/">
<a href="https://discuss.meshery.io/">
<div className="parentcard">
<div className="section-title">
<h2>Join the Conversation</h2>
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/Footer/Footer.styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const FooterWrapper = styled.section`
}
}
.layer5-footer {
.meshery-footer {
display: inline-flex;
align-items: center;
justify-content: center;
Expand Down
4 changes: 2 additions & 2 deletions site/src/components/Footer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const Footer = () => {
<li>
<a
className="category-link"
href="https://slack.layer5.io/"
href="https://slack.meshery.io/"
>
<img src={SlackIcon} alt="Slack Icon" />
Slack
Expand Down Expand Up @@ -198,7 +198,7 @@ const Footer = () => {
<li>
<a
className="category-link"
href="https://www.linkedin.com/company/layer5/"
href="https://www.linkedin.com/company/meshery/"
>
<img src={LinkedinIcon} alt="Linkedin Icon" />
Linkedin
Expand Down

0 comments on commit fca4204

Please sign in to comment.