Fixes on deployment

This commit is contained in:
Marc Aymerich 2015-10-01 18:02:23 +00:00
parent 8a5a1fa94f
commit 5c87c3a7d7
4 changed files with 26 additions and 8 deletions

View file

@ -417,3 +417,5 @@ Once I did this, all of my "autocomplete=off" elements were respected by Chrome.
http://makandracards.com/makandra/24933-chrome-34+-firefox-38+-ie11+-ignore-autocomplete-off http://makandracards.com/makandra/24933-chrome-34+-firefox-38+-ie11+-ignore-autocomplete-off
mkhomedir_helper or create ssh homes with bash.rc and such

View file

@ -38,7 +38,7 @@ class Command(BaseCommand):
'LOGGING': settings_parser.Remove(), 'LOGGING': settings_parser.Remove(),
}) })
setuplogrotate = textwrap.dedent("""\ setuplogrotate = textwrap.dedent("""\
mkdir %(log_dir)s && chown -reference=%(site_dir)s %(log_dir)s mkdir %(log_dir)s && chown --reference=%(site_dir)s %(log_dir)s
touch %(log_path)s touch %(log_path)s
chown --reference=%(log_dir)s %(log_path)s chown --reference=%(log_dir)s %(log_path)s
echo '%(log_dir)s/*.log { echo '%(log_dir)s/*.log {

View file

@ -1,14 +1,28 @@
FROM debian:latest FROM debian:latest
RUN apt-get -y update && apt-get install -y git screen sudo python3 python3-pip wget curl dnsutils rsyslog nano ssh-client RUN apt-get -y update && apt-get install -y \
git \
screen \
sudo \
python3 \
python3-pip \
wget \
curl \
dnsutils \
rsyslog \
nano \
ssh-client \
python3-psycopg2 \
postgresql \
nginx-full \
uwsgi \
uwsgi-plugin-python3
RUN curl https://raw.githubusercontent.com/glic3rinu/django-orchestra/master/orchestra/bin/orchestra-admin | bash -s install_requirements RUN export TERM=xterm; curl https://raw.githubusercontent.com/glic3rinu/django-orchestra/master/orchestra/bin/orchestra-admin | bash -s install_requirements
RUN apt-get -y install python3-psycopg2 postgresql nginx-full uwsgi uwsgi-plugin-python3
RUN apt-get clean RUN apt-get clean
RUN useradd orchestra --password 'orchestra' && \ RUN useradd orchestra --shell /bin/bash && \
mkdir /home/orchestra && \ echo "orchestra:orchestra" | chpasswd
chmod 750 /home/orchestra && \ mkhomedir_helper orchestra && \
chown orchestra:orchestra /home/orchestra && \
adduser orchestra sudo adduser orchestra sudo

View file

@ -3,6 +3,8 @@
set -ue set -ue
# bash <( curl https://raw.githubusercontent.com/glic3rinu/django-orchestra/master/scripts/containers/deploy.sh )
function main () { function main () {
bold=$(tput -T ${TERM:-xterm} bold) bold=$(tput -T ${TERM:-xterm} bold)
normal=$(tput -T ${TERM:-xterm} sgr0) normal=$(tput -T ${TERM:-xterm} sgr0)