Commit 8b882045 authored by root's avatar root
parents bbcb9f42 a3c40260
......@@ -29,6 +29,8 @@ RUN a2enmod rewrite && \
export USER=root && ./bin/int/admin_install.pl --docker && \
cp $ROOTDIR/site/cfg/apache-docker.conf /etc/apache2/sites-available/000-default.conf
RUN cd $ROOTDIR/bin/ext/ && wget https://github.com/bbuchfink/diamond/archive/v0.9.14.tar.gz -O diamond.tgz && tar xfz diamond.tgz && cd diamond-0.9.14/ && ./build_simple.sh && cp diamond $ROOTDIR/bin/ext/diamond
WORKDIR $ROOTDIR/site
CMD ["sh","-c","service apache2 start && /bin/bash && export USER=root"]
......@@ -100,7 +100,7 @@ sub Dependencies
my @a_cmd =
(
"apt-get -q update && apt-get install -yq cron at libtree-simple-perl libbio-perl-perl ncbi-blast+ sqlite liberror-perl libswitch-perl libxml-simple-perl libjson-perl libapache-session-perl libnet-ldap-perl libapache-htpasswd-perl ssmtp fasttree mafft biosquid python2.7 python-scipy python-sklearn python-numpy python-fastcluster mcl libarray-utils-perl libproc-processtable-perl liburi-encode-perl parallel"
"apt-get -q update && apt-get install -yq cron at libtree-simple-perl libbio-perl-perl ncbi-blast+ sqlite liberror-perl libswitch-perl libxml-simple-perl libjson-perl libapache-session-perl libnet-ldap-perl libapache-htpasswd-perl ssmtp fasttree mafft biosquid python2.7 python-scipy python-sklearn python-numpy python-fastcluster mcl libarray-utils-perl libproc-processtable-perl liburi-encode-perl parallel dos2unix"
);
my $at_allow_cmd = 'cp /etc/at.deny /etc/at.deny.ori && grep -v "www-data" /etc/at.deny.ori > /etc/at.deny';
......
......@@ -29,6 +29,16 @@ sub AskAccountForm
{
my ($o_webparam) = @_;
if ($O_CONF->Get('mode') eq 'local')
{
print <<END;
<div class="container-fluid">
<div class="alert alert-danger">Account creation is not available for local install</div>
<div class="alert alert-success">Use guest/guest credentials to log into family-companion</div>
</div>
END
return;
}
my $captcha = __GenerateKey();
my $md5_captcha = md5_hex($captcha);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment