Skip to content

Commit

Permalink
Merge pull request #29 from chalbersma/staging
Browse files Browse the repository at this point in the history
Should Generate Documentation
  • Loading branch information
chalbersma authored Feb 12, 2020
2 parents 288ddea + 634c62c commit 023a696
Show file tree
Hide file tree
Showing 457 changed files with 29,890 additions and 22,861 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,12 @@ tmp*

# Ignore Ini
*.ini
/etc/manowar/manoward.yaml
/etc/manowar_agent/collector.yaml
/etc/manowar_agent/minion
/etc/manowar_agent/saltcell.yaml
/travis/artifacts/salt/ssh/salt_key
/travis/artifacts/salt/ssh/salt_key.pub
/etc/manowar/salt/roster
/etc/manowar/salt/ssh/salt_key
/etc/manowar/salt/ssh/salt_key.pub
21 changes: 14 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,40 @@
language: python
cache: pip
python:
- 3.7
sudo: required
dist: xenail
notifications:
email:
recipients:
- [email protected]
on_success: always
on_failure: always
before_script:
- sudo apt-get -y install openssh-server
- "./travis/pre_build.sh"
- "./travis/ssh_setup.sh"
- export DEBIAN_FRONTEND=noninteractive; sudo -E apt-get -y install python3-pip python-dev
shellcheck mariadb-server mariadb-client jq openjdk-7-jre graphviz
shellcheck mariadb-server mariadb-client jq openjdk-8-jre graphviz openssh-server
- "./travis/ssh_setup.sh"
- "./travis/db_setup.sh"
- sudo pip3 install --upgrade setuptools
- sudo pip3 install bandit pylint paramiko pymysql colorama flask flask_cors jsonschema
lxml pika mkdocs requests
- sudo pip3 install -r requirements.txt
- sudo pip3 install mkdocs bandit twine pylint pylint-fail-under
- gem install mdl
script:
- "./travis/testing.sh"
- pylint-fail-under --fail_under 6.0 manoward
- pylint-fail-under --fail_under 6.0 jelly_api_2
- pylint-fail-under --fail_under 6.0 jelly_display_2
- pylint-fail-under --fail_under 6.0 audittools
- "./travis/swagger_test.sh"
- "./travis/swagger_build.sh"
- "./travis/api_test.sh"
- "./travis/sapi_test.sh"
- "./travis/schedule_test.sh"
- "./travis/analyze_test.sh"
after_success:
- "./travis/build_diag.sh"
- "./travis/swagger_build.sh"
- "./travis/build_docs.sh"
- "./travis/packages.sh"
before_install:
- pwd
- openssl aes-256-cbc -K $encrypted_1acdf71f7d2b_key -iv $encrypted_1acdf71f7d2b_iv
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Jellyfish
# Manowar

> Jellyfish, it stores info about your servers and analyzes it for you if you ask it to.
> Manowar, it stores info about your servers and analyzes it for you if you ask it to.
## Description

Jellyfish is a tool designed to help people profile and analyze their server
fleets for for various things. With is companion tool, jellyfish-audits
Manowar is a tool designed to help people profile and analyze their server
fleets for for various things. With is companion tool, audittools
it can check environments for a series of common vulnerabilities that one might
wish to check against.

Expand All @@ -32,7 +32,7 @@ Please refer to the `contributing.md` file for information about how to get invo

## Maintainers

Chris Halbersma : chris[email protected]
Chris Halbersma : chris[email protected]

## Usage

Expand Down
Loading

0 comments on commit 023a696

Please sign in to comment.