You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ce...@apache.org on 2015/12/17 20:03:09 UTC
[08/15] incubator-metron git commit: [METRON-1] Initial code for the
ASF website
[METRON-1] Initial code for the ASF website
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/b0684a18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/b0684a18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/b0684a18
Branch: refs/heads/master
Commit: b0684a18811241e913f4ef6452513532f06674a1
Parents: a64c912
Author: Debo Dutta <de...@cisco.com>
Authored: Wed Dec 16 15:20:14 2015 -0800
Committer: Debo Dutta <de...@cisco.com>
Committed: Wed Dec 16 15:20:14 2015 -0800
----------------------------------------------------------------------
site/.gitignore | 1 +
site/BUILD.md | 10 +++++-----
site/README.md | 8 ++++----
site/_config.yml | 4 ++--
site/_includes/header.html | 2 +-
site/develop/index.md | 12 ++++++------
site/help/index.md | 6 +++---
site/news/index.html | 8 ++++----
site/talks/index.md | 23 ++++++++++-------------
9 files changed, 36 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/b0684a18/site/.gitignore
----------------------------------------------------------------------
diff --git a/site/.gitignore b/site/.gitignore
index 45c1505..f9e1aa8 100644
--- a/site/.gitignore
+++ b/site/.gitignore
@@ -1,3 +1,4 @@
_site
.sass-cache
.jekyll-metadata
+asf_site
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/b0684a18/site/BUILD.md
----------------------------------------------------------------------
diff --git a/site/BUILD.md b/site/BUILD.md
index 77a126e..fb802b0 100644
--- a/site/BUILD.md
+++ b/site/BUILD.md
@@ -1,12 +1,12 @@
-# Apache ORC docs site
+# Apache Metron docs site
-This directory contains the code for the Apache ORC web site,
-[orc.apache.org](https://orc.apache.org/).
+This directory contains the code for the Apache Metron web site,
+[metron.apache.org](https://metron.apache.org/).
## Setup
1. `cd site`
-2. `git clone https://git-wip-us.apache.org/repos/asf/orc.git -b asf-site target`
+2. `git clone https://git-wip-us.apache.org/repos/asf/incubator-metron.git -b asf-site target`
3. `sudo gem install bundler`
4. `sudo gem install github-pages jeykll`
4. `bundle install`
@@ -23,4 +23,4 @@ You can preview your contributions before opening a pull request by running from
2. `git status`
3. You'll need to `git add` any new files
4. `git commit -a`
-5. `git push origin asf-site`
\ No newline at end of file
+5. `git push origin asf-site`
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/b0684a18/site/README.md
----------------------------------------------------------------------
diff --git a/site/README.md b/site/README.md
index 9c7e9ce..fd2d8cc 100644
--- a/site/README.md
+++ b/site/README.md
@@ -1,7 +1,7 @@
-# Apache ORC html branch
+# Apache Metron html branch
This branch contains the generated HTML for the
-[ORC website](https://orc.apache.org).
+[Metron website](https://metron.apache.org).
-You are probably looking for the
-[ORC master branch](https://github.com/apache/orc/tree/master).
\ No newline at end of file
+You are probably looking for the
+[Metron master branch](https://github.com/apache/incubator-metron/tree/master).
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/b0684a18/site/_config.yml
----------------------------------------------------------------------
diff --git a/site/_config.yml b/site/_config.yml
index e5129ad..fa93341 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -3,8 +3,8 @@ highlighter: rouge
permalink: /news/:year/:month/:day/:title/
excerpt_separator: ""
-repository: https://github.com/apache/orc
-destination: target
+repository: https://github.com/apache/incubator-metron
+destination: asf_site
exclude: [BUILD.md, Gemfile*]
keep_files: [.git]
highlight_color: "#199acf"
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/b0684a18/site/_includes/header.html
----------------------------------------------------------------------
diff --git a/site/_includes/header.html b/site/_includes/header.html
index 5e01219..25efd57 100644
--- a/site/_includes/header.html
+++ b/site/_includes/header.html
@@ -6,7 +6,7 @@
<div class="unit one-third center-on-mobiles">
<h1>
<a href="/">
- <span class="sr-only">Apache ORC</span>
+ <span class="sr-only">Apache Metron</span>
<img src="/img/logo.png" width="289" alt="Metron Logo" class="logo">
</a>
</h1>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/b0684a18/site/develop/index.md
----------------------------------------------------------------------
diff --git a/site/develop/index.md b/site/develop/index.md
index 4103e34..351892a 100644
--- a/site/develop/index.md
+++ b/site/develop/index.md
@@ -16,18 +16,18 @@ Owen O'Malley | omalley | PMC
## Mailing Lists
-There are several development mailing lists for ORC:
+There are several development mailing lists for Metron
-* [dev@incubator-metron.apache.org](mailto:dev@incubator-metron.apache.org) - Development discussions
+* [dev@metron.incubator.apache.org](mailto:dev@metron.incubator.apache.org) - Development discussions
with archive [here](https://mail-archives.apache.org/mod_mbox/incubator-metron-dev/)
-* [issues@orc.apache.org](mailto:issues@orc.apache.org) - Bug tracking
+* [issues@metron.incubator.apache.org](mailto:issues@metron.incubator.apache.org) - Bug tracking
with archive [here](https://mail-archives.apache.org/mod_mbox/incubator-metron-issues/)
-* [commits@orc.apache.org](mailto:commits@incubator-metron.apache.org) - Git tracking
+* [commits@incubator-metron.apache.org](mailto:commits@metron.incubator.apache.org) - Git tracking
with archive [here](https://mail-archives.apache.org/mod_mbox/incubator-metron-commits/)
You can subscribe to the lists by sending email to
-*list*-subscribe@incubator-metron.apache.org and unsubscribe by sending email to
-*list*-unsubscribe@incubator-metron.apache.org.
+*list*-subscribe@metron.incubator.apache.org and unsubscribe by sending email to
+*list*-unsubscribe@metron.incubator.apache.org.
## Source code
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/b0684a18/site/help/index.md
----------------------------------------------------------------------
diff --git a/site/help/index.md b/site/help/index.md
index b77a74b..fb4192a 100644
--- a/site/help/index.md
+++ b/site/help/index.md
@@ -8,16 +8,16 @@ Need help with Metron? Try these resources.
## Mailing Lists
The best option is to send email to the user list
-[user@incubator-metron.apache.org](mailto:user@incubator-metron.apache.org), which is for user
+[user@metron.incubator.apache.org](mailto:user@metron.incubator.apache.org), which is for user
discussions. All of the historic traffic is available in the
[archive](http://mail-archives.apache.org/mod_mbox/incubator-metron-user/). To
subscribe to the user list, please send email to
-[user-subscribe@incubator-metron.apache.org](mailto:user-subscribe@incubator-metron.apache.org).
+[user-subscribe@metron.incubator.apache.org](mailto:user-subscribe@incubator-metron.apache.org).
## Bug Reports
Please file any issues you encounter or fixes you'd like on the
-[Apache Metron Jira](https://issues.apache.org/jira/browse/incubator-metron). We welcome
+[Apache Metron Jira](https://issues.apache.org/jira/browse/metron). We welcome
patches!
## StackOverflow
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/b0684a18/site/news/index.html
----------------------------------------------------------------------
diff --git a/site/news/index.html b/site/news/index.html
index 3317496..60dd4c0 100644
--- a/site/news/index.html
+++ b/site/news/index.html
@@ -11,9 +11,9 @@ author: all
<p></p>
-<h2>ORC Twitter</h2>
+<h2>Metron Twitter</h2>
-<p>The official <a href="https://twitter.com/apacheorc">@ApacheOrc</a>
-Twitter account pushes announcements about ORC. If you give a talk about
-ORC, let us know and we'll tweet it out and add it to the news section
+<p>The official <a href="https://twitter.com/apachemetron">@ApacheMetron</a>
+Twitter account pushes announcements about Metron. If you give a talk about
+Metron, let us know and we'll tweet it out and add it to the news section
of the website.</p>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/b0684a18/site/talks/index.md
----------------------------------------------------------------------
diff --git a/site/talks/index.md b/site/talks/index.md
index 61ece70..d14eb4d 100644
--- a/site/talks/index.md
+++ b/site/talks/index.md
@@ -9,22 +9,19 @@ Watch some presentations and read through some slide decks about Metron.
## Videos
-* Metron Intro
- [slides](http://www.slideshare.net/metronintro)
+* Cisco OpenSOC with Bro [slides](http://www.slideshare.net/JamesSirota/cisco-opensoc)
- Metron Intro Talk
+ <iframe width="595" height="485"
+ src="https://www.youtube.com/embed/UKgjd4ttg8o" frameborder="0"
+ allowfullscreen>
+ </iframe>
+ <div style="margin-bottom:5px"> <strong> <a href="//www.slideshare.net/JamesSirota/cisco-opensoc" title="Cisco OpenSOC" target="_blank">Cisco OpenSOC Talk </a> </strong> by <strong> <a href="https://www.youtube.com/watch?v=UKgjd4ttg8o" target="_blank">Kurt Grutzmacher</a> </strong></div>
- <iframe width="420" height="315"
- src="https://www.youtube.com/embed/blabla" frameborder="0"
- allowfullscreen></iframe>
## Slides
-* Metron Files
+* Cisco OpenSOC talk
- Metron talk
-
- <iframe src="//www.slideshare.net/slideshow/embed_code/key/blabla"
- width="425" height="355" frameborder="0" marginwidth="0" marginheight="0"
- scrolling="no" style="border:1px solid #CCC; border-width:1px;
- margin-bottom:5px; max-width: 100%;" allowfullscreen> </iframe>
+ <iframe src="//www.slideshare.net/slideshow/embed_code/key/GgFRMw4XulD4Lj" width="595" height="485" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width:100%;" allowfullscreen>
+ </iframe>
+ <div style="margin-bottom:5px"> <strong> <a href="//www.slideshare.net/JamesSirota/cisco-opensoc" title="Cisco OpenSOC" target="_blank">Cisco OpenSOC </a> </strong> from <strong> <a href="//www.slideshare.net/JamesSirota" target="_blank">James Sirota</a> </strong> </div>