Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
273 commits
Select commit Hold shift + click to select a range
9f22eed
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Feb 6, 2015
c19d252
Merge branch 'develop' of [email protected]:MG-RAST/MG-RAST into develop
Feb 9, 2015
676ee6c
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Feb 9, 2015
52f9858
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Feb 12, 2015
5c555be
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Feb 13, 2015
f879f5a
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Feb 17, 2015
7ed9466
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Feb 17, 2015
76ce335
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Feb 17, 2015
9d7aaf0
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Feb 18, 2015
7c6c7f5
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Feb 18, 2015
6c9d85b
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Feb 18, 2015
50a1563
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Feb 18, 2015
35910e5
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Feb 18, 2015
77b378c
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Feb 18, 2015
237164d
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Feb 19, 2015
6f38a94
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Feb 19, 2015
4146e41
support in analysis perl module and matrix resourse for multiple vers…
teharrison Mar 6, 2015
a526451
clean up info struct
teharrison Mar 6, 2015
ab4d801
Merge pull request #692 from teharrison/develop
jaredbischof Mar 6, 2015
0842e1c
added missing action registration
Mar 12, 2015
0e27131
fixed semicolon
Mar 12, 2015
8cc240c
Merge pull request #693 from paczian/develop
Mar 12, 2015
c123ba1
fixed unknown number
Mar 12, 2015
1b38fa0
Merge pull request #694 from paczian/develop
Mar 12, 2015
031010b
Merge pull request #695 from MG-RAST/develop
teharrison Mar 16, 2015
8134601
added ebi submission placeholders
Mar 17, 2015
8e2b03b
add env to workflows
teharrison Mar 18, 2015
2c56aff
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Mar 18, 2015
fdb8ee9
add env to task
Mar 18, 2015
dc715ed
fix env in workflows
teharrison Mar 18, 2015
f8419dd
fix env in workflows
Mar 18, 2015
e31c66e
Merge pull request #696 from teharrison/develop
teharrison Mar 18, 2015
80f556e
adding submission resource / refactoring inbox
teharrison Mar 18, 2015
75f2e65
fix conflict
teharrison Mar 18, 2015
3d6e8dd
get error from shock file retrieval
Mar 18, 2015
6a186f8
fix conflict
teharrison Mar 18, 2015
03c73c6
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
teharrison Mar 18, 2015
894d672
process error message from shock file retrieval
teharrison Mar 18, 2015
4ecc07e
fix error handeling in annotation download
teharrison Mar 18, 2015
a399a1f
process error message from shock file retrieval
teharrison Mar 18, 2015
23cef77
fix error handeling in annotation download
teharrison Mar 18, 2015
89680c8
Merge pull request #697 from teharrison/develop
teharrison Mar 18, 2015
8be60f1
Merge pull request #698 from MG-RAST/develop
teharrison Mar 18, 2015
31360db
fix syntax error
Mar 18, 2015
508a08d
Merge pull request #699 from teharrison/develop
teharrison Mar 18, 2015
e70665c
Merge pull request #700 from MG-RAST/develop
teharrison Mar 18, 2015
66dfa30
fix bug in annotation retrieval
Mar 18, 2015
45604a6
Merge pull request #701 from teharrison/develop
teharrison Mar 18, 2015
ff0eb7a
Merge pull request #702 from MG-RAST/develop
teharrison Mar 18, 2015
1a76f3c
fix typo
Mar 18, 2015
f96f841
Merge pull request #703 from teharrison/develop
teharrison Mar 18, 2015
1c65862
Merge pull request #704 from MG-RAST/develop
teharrison Mar 18, 2015
bbdfac5
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Mar 19, 2015
07ce72d
missing comma
Mar 20, 2015
0acbe2c
fix function return
Mar 20, 2015
cc71053
better error handeling of awe submit
Mar 20, 2015
379cb13
Merge pull request #705 from teharrison/develop
teharrison Mar 20, 2015
df6d7a8
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Mar 23, 2015
db4dd95
added cancel action
Mar 23, 2015
a4f5004
fixed syntax error in cancel action
Mar 23, 2015
dd52253
added delete support for awe jobs
Mar 23, 2015
72dcf68
fix demultiplex file names
Mar 24, 2015
ebbeb61
Merge pull request #706 from teharrison/develop
teharrison Mar 24, 2015
f9fa75f
Merge pull request #707 from MG-RAST/develop
teharrison Mar 24, 2015
85f64ac
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Mar 25, 2015
8e26834
typo fix
teharrison Mar 30, 2015
a75fb48
fix return variables
teharrison Mar 30, 2015
969cd47
merge conflicts
teharrison Mar 30, 2015
c57ab22
Added check for filter length multiplier to be 1.0 or greater.
jaredbischof Mar 30, 2015
413efc5
Merge pull request #708 from jaredbischof/develop
teharrison Mar 30, 2015
7153b91
add submission id to job creation and display
teharrison Apr 2, 2015
69bbe9b
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Apr 2, 2015
b91e31f
more inmox / submission refactoring
teharrison Apr 2, 2015
cc8ed30
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Apr 2, 2015
a4fb089
fix variable names
teharrison Apr 2, 2015
ed135c6
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Apr 2, 2015
4988a0a
fix broken function
teharrison Apr 2, 2015
b7cbdc5
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Apr 2, 2015
348b33a
fix json
teharrison Apr 2, 2015
1622240
fix perl syntax
teharrison Apr 2, 2015
a728f18
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Apr 2, 2015
163c71d
fix perl syntax
teharrison Apr 2, 2015
9079a14
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Apr 2, 2015
a1cc4f2
fix perl syntax
teharrison Apr 2, 2015
83929de
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Apr 2, 2015
d316322
dont throw error on deleted job
teharrison Apr 2, 2015
3eab30c
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Apr 2, 2015
8214135
add count
teharrison Apr 2, 2015
bb867ff
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Apr 2, 2015
78c473c
add debug mode for awe submit
teharrison Apr 2, 2015
2b91a41
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Apr 2, 2015
25b528a
return empty list and not error if missing
teharrison Apr 2, 2015
07eb331
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Apr 2, 2015
a92ddb6
add stage name and outputs
teharrison Apr 2, 2015
2cdf3f8
add view option for metadata labels
teharrison Apr 7, 2015
89fc70f
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Apr 7, 2015
fc66d6b
fix perl syntax
teharrison Apr 7, 2015
9c5f0a6
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Apr 7, 2015
83e8224
add to error message
teharrison Apr 7, 2015
92b1b50
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Apr 7, 2015
2c29e03
add md5sum to dupe message
teharrison Apr 7, 2015
6be208d
add md5sum to metagenome return
teharrison Apr 7, 2015
596c34a
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Apr 7, 2015
8870bd0
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Apr 15, 2015
0128801
added support for array queries
Apr 15, 2015
54e0304
fixed syntax error
Apr 15, 2015
b426f89
fixed bug
Apr 15, 2015
256ec56
added https to recaptcha
Apr 16, 2015
7a838cf
add support for amplicon gene sequence types
teharrison Apr 22, 2015
08f56dd
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Apr 22, 2015
632067e
Merge branch 'develop' of [email protected]:MG-RAST/MG-RAST into develop
Apr 22, 2015
9a83c8f
perl syntax
teharrison Apr 22, 2015
991e8b1
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
Apr 22, 2015
e2eecf9
fix variable name
Apr 22, 2015
09fa0f7
more submission updates
teharrison Apr 22, 2015
af14242
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
teharrison Apr 22, 2015
e87de1f
fix perl syntax
Apr 22, 2015
34d837b
error checking, more status info
teharrison Apr 22, 2015
9505923
found perl lib for uuidv4
teharrison Apr 22, 2015
37311e3
fix query return
teharrison Apr 22, 2015
d8e6835
more error checking
teharrison Apr 22, 2015
a398244
handle array types in queries
teharrison Apr 22, 2015
cb759af
more error handeling
teharrison Apr 22, 2015
c8dd119
syntax error
teharrison Apr 22, 2015
3972b3d
more error handeling
teharrison Apr 23, 2015
a8f9f48
Merge pull request #709 from teharrison/develop
teharrison Apr 28, 2015
27b891b
update download file docs
Apr 28, 2015
ab36208
updates for inbox / submission API
Apr 28, 2015
16d2bf7
Merge pull request #710 from teharrison/develop
teharrison Apr 28, 2015
bac9454
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Apr 29, 2015
b581f69
mg name option for pair-join with no metadata
teharrison Apr 29, 2015
171b90c
Merge pull request #711 from teharrison/develop
teharrison Apr 29, 2015
f7f12fb
add postdata support, error checking
teharrison Apr 29, 2015
108fa15
improve status report
teharrison Apr 29, 2015
54dbb6e
Merge pull request #712 from teharrison/develop
teharrison Apr 29, 2015
c31aa01
perl syntax
teharrison Apr 29, 2015
cc18f9d
fix validation
teharrison Apr 29, 2015
cb4e96b
bug fixes
teharrison Apr 29, 2015
5acb5a2
Merge pull request #713 from teharrison/develop
teharrison Apr 29, 2015
ecae566
update profile resource
teharrison Apr 30, 2015
75d0573
minor bug fix
teharrison Apr 30, 2015
ea6e686
minor inbox updates
teharrison May 1, 2015
3340a2d
update submission
teharrison May 1, 2015
fae927b
perl syntax
teharrison May 1, 2015
2a8cac6
more perl syntax
teharrison May 1, 2015
a27b7fc
bug fix
teharrison May 1, 2015
8f4145a
fix broken query
teharrison May 1, 2015
c45ef77
fix info struct
teharrison May 4, 2015
2236840
Merge pull request #714 from teharrison/develop
teharrison May 8, 2015
8b89e25
added caching of full md5 profile in shock
teharrison May 8, 2015
6f29c26
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
May 8, 2015
11c98e0
update info doc
teharrison May 8, 2015
778017a
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
May 8, 2015
4e808c5
add making public
teharrison May 8, 2015
2821272
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
May 8, 2015
45df44c
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
teharrison May 11, 2015
d309438
get feature metadata from m5nr solr and not analysisdb
teharrison May 11, 2015
e0d45c3
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
May 11, 2015
d96d92b
fix variable name
teharrison May 11, 2015
3834602
Merge branch 'develop' of [email protected]:teharrison/MG-RAST into develop
May 11, 2015
3c7a084
Merge pull request #715 from teharrison/develop
teharrison May 11, 2015
f59b2a0
modify submission status return
teharrison May 11, 2015
936e112
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
May 11, 2015
8afa465
fix syntax
teharrison May 11, 2015
e307e90
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
May 11, 2015
5cf7ece
fix output
teharrison May 11, 2015
4675aa2
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
May 11, 2015
0bac1e8
skip sequence stats if already computed
teharrison May 11, 2015
793786e
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
May 11, 2015
5bc1aee
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
May 13, 2015
f6cfef9
Merge pull request #716 from teharrison/develop
teharrison May 13, 2015
906c78f
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
May 14, 2015
b07d31e
capture submit error better
teharrison May 15, 2015
92375b5
fix error due to json encoding perl object
teharrison May 15, 2015
183009e
Merge pull request #717 from teharrison/develop
teharrison May 15, 2015
9b8f3f7
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
May 18, 2015
82cb25e
fixed flow errors
May 18, 2015
e5bdecb
added state
May 18, 2015
0093e77
add 'full' option for submission status
teharrison May 19, 2015
42cf103
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
May 19, 2015
e4a1dd5
Merge pull request #718 from teharrison/develop
teharrison May 19, 2015
a71e4c0
fixed final synch w/ google
May 20, 2015
3c95849
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
May 27, 2015
9ee7bfc
getting mgu & login for id in view inbox
May 27, 2015
a83b8dc
added login && userid compatibility
May 27, 2015
b9ebd2a
forgot to save before the last commit
May 27, 2015
fcefb02
added WUID cookie
Jun 3, 2015
512abd2
httpd.conf
sage-service-user Jun 8, 2015
e472ca6
dump and load scripts / schema for cassandra
teharrison Jun 8, 2015
8838812
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Jun 8, 2015
5a261e6
perl fixes
Jun 8, 2015
e026ec8
enable rewrite module
sage-service-user Jun 8, 2015
e839303
enable cgi
sage-service-user Jun 8, 2015
23bf1ab
Dockerfile
sage-service-user Jun 8, 2015
b6fa0d8
pipeline
sage-service-user Jun 9, 2015
e3907a5
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
teharrison Jun 9, 2015
24b9a79
fastacmd added properly
Jun 9, 2015
a42c2bc
dumper updates
Jun 9, 2015
0d0be42
Merge pull request #720 from teharrison/develop
teharrison Jun 9, 2015
948b3d6
Merge pull request #719 from paczian/develop
teharrison Jun 9, 2015
7c42a32
Merge pull request #721 from MG-RAST/develop
teharrison Jun 9, 2015
440e13f
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
teharrison Jun 9, 2015
30846de
update dependencies
teharrison Jun 9, 2015
80abc65
Merge pull request #722 from teharrison/api
wgerlach Jun 9, 2015
9e8dc99
local version of streamingupload
teharrison Jun 9, 2015
3fad735
update dockerfile
teharrison Jun 9, 2015
372f073
Merge pull request #723 from teharrison/api
teharrison Jun 9, 2015
1736b62
fix dockerfile
teharrison Jun 9, 2015
f1ed4d1
Merge pull request #724 from teharrison/api
teharrison Jun 9, 2015
b55b2ec
Update Dockerfile
teharrison Jun 9, 2015
115b2ba
added m5nr download
teharrison Jun 9, 2015
d1766b5
Merge pull request #725 from teharrison/api
teharrison Jun 9, 2015
61f87dd
Update Dockerfile
teharrison Jun 9, 2015
227c04d
Update Dockerfile
teharrison Jun 9, 2015
046c0bc
bug fix
Jun 10, 2015
b22ed3f
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
teharrison Jun 10, 2015
d6a0b31
schema updates
teharrison Jun 11, 2015
30f8003
testing changes
teharrison Jun 11, 2015
889a3de
seperate script for downloading m5nr blast files
teharrison Jun 11, 2015
e872925
Merge pull request #726 from teharrison/api
teharrison Jun 11, 2015
da099d9
fix path
sage-service-user Jun 15, 2015
0f32122
fix paths
sage-service-user Jun 15, 2015
19abf4d
Update Dockerfile
teharrison Jun 15, 2015
d6ecbeb
fix path
sage-service-user Jun 15, 2015
3e357f9
documentation
sage-service-user Jun 15, 2015
cc30a6f
abs path
sage-service-user Jun 15, 2015
dd84377
rename path
wgerlach Jun 15, 2015
37d9f29
download data instructions
wgerlach Jun 15, 2015
2139763
exec
sage-service-user Jun 15, 2015
b853f69
Update README.md
wgerlach Jun 15, 2015
875e8b3
root for cert
sage-service-user Jun 16, 2015
30409ff
Merge branch 'api' of github.com:MG-RAST/MG-RAST into api
sage-service-user Jun 16, 2015
58a6617
reverse changes, use daemon
sage-service-user Jun 16, 2015
357782d
Dockerfile draft
sage-service-user Jun 19, 2015
8a13865
daemon home directoy found
sage-service-user Jun 19, 2015
14f30fc
comment
sage-service-user Jun 19, 2015
3174431
replaced hard coded urls with appropriate config variables
Jun 24, 2015
8faee1b
Merge pull request #727 from paczian/develop
Jun 24, 2015
594dcc4
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
teharrison Jun 25, 2015
fa78bbc
add m5nr solr check before batch query
teharrison Jun 25, 2015
b0f80da
don't filter out 'unclassified' taxa
teharrison Jun 25, 2015
617a1c2
update test script
teharrison Jun 25, 2015
d40d9e8
Merge pull request #728 from teharrison/develop
teharrison Jun 25, 2015
af4924b
restructure docker files to allow multiple
teharrison Jun 25, 2015
f1649c1
Merge branch 'develop' into api
teharrison Jun 25, 2015
ba54cdb
restructure docker files to allow multiple
teharrison Jun 25, 2015
a3b683b
Merge pull request #729 from teharrison/develop
teharrison Jun 25, 2015
55a517f
Merge pull request #730 from teharrison/api
teharrison Jun 25, 2015
a75fb57
Merge pull request #731 from MG-RAST/develop
teharrison Jun 25, 2015
51ebbf2
Merge pull request #732 from teharrison/develop
teharrison Jun 25, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions bin/download_m5nr_blast.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/bash

# set a default values
# m5nr blast files - 2.6 GB & 11.7 GB
M5NR_VERSIONS="20100309 20131215"
TARGET="/m5nr"

for i in $M5NR_VERSIONS; do
M5NR_VERSION=$i
VERSION_DIR=$TARGET/$M5NR_VERSION
URL=ftp://ftp.metagenomics.anl.gov/data/MD5nr/${M5NR_VERSION}/md5nr.blast.tgz

echo ""
echo "TARGET = $TARGET"
echo "M5NR_VERSION = $M5NR_VERSION"
echo "URL = $URL"
echo ""

if [ -d ${VERSION_DIR} ]; then
echo "Files already exist, not downloading"
else
echo "Downloading files"
mkdir -p ${VERSION_DIR}
curl -s "${URL}" | tar -zxvf - -C ${VERSION_DIR}
fi
done
exit 0
Binary file added bin/fastacmd
Binary file not shown.
27 changes: 27 additions & 0 deletions conf/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@


API server
----------


Build image:
```bash
export TAG=`date +"%Y%m%d.%H%M"`
docker build --force-rm --no-cache --rm -t mgrast/api:${TAG} https://raw.githubusercontent.com/MG-RAST/MG-RAST/api/docker/Dockerfile
```

Get config: (private mcs git repo, for details see fleet unit)
```bash
if cd /home/core/mgrast-config; then git pull; else cd /home/core/ ; git clone [email protected]:mgrast-config.git ; fi
```

Download data
```bash
docker run -t -i --name api -v /media/ephemeral/api-server-data:/m5nr mgrast/api:${TAG} /MG-RAST/bin/download_m5nr_blast.sh
docker rm api
```

Start container:
```bash
docker run -t -i --name api -v /home/core/mgrast-config/services/api-server/.postgresql/:/root/.postgresql/:ro -v /home/core/mgrast-config/services/api-server:/api-server-conf -v /media/ephemeral/api-server-data:/m5nr -p 80:80 mgrast/api:${TAG} /usr/local/apache2/bin/httpd -DFOREGROUND -f /MG-RAST/conf/httpd.conf
```
Loading