From e01e5750ecc6e54d8bdabbbf666100fdca3a7f71 Mon Sep 17 00:00:00 2001 From: Wojciech Kozlowski Date: Sun, 16 Dec 2018 20:37:50 +0000 Subject: [PATCH] Small fixes for things that came up in deployment --- ansible/main.yml | 15 ++++++ ansible/root.bashrc | 118 ++++++++++++++++++++++++++++++++++++++++++++ docker-compose.yml | 2 + proxy/Dockerfile | 2 +- 4 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 ansible/root.bashrc diff --git a/ansible/main.yml b/ansible/main.yml index cdd0fa8..03ea6b6 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -391,6 +391,11 @@ - debug: msg: "Failed to pull containers from registry - will build locally" + - name: Build locally + command: make build-all + args: + chdir: "{{ loki_dir }}" + when: loki_git is changed # Hosts file must be added after the first update as otherwise the initial @@ -417,6 +422,16 @@ dest: /etc/motd mode: 0644 + # ------------------------------------------------------------------------- + # Set root's .bashrc file. + # ------------------------------------------------------------------------- + + - name: Set root .bashrc + copy: + src: ./root.bashrc + dest: /root/.bashrc + mode: 0644 + # ------------------------------------------------------------------------- # Update rkhunter and chkrootkit databases. # ------------------------------------------------------------------------- diff --git a/ansible/root.bashrc b/ansible/root.bashrc new file mode 100644 index 0000000..cc32ce3 --- /dev/null +++ b/ansible/root.bashrc @@ -0,0 +1,118 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + +# don't put duplicate lines or lines starting with space in the history. +# See bash(1) for more options +HISTCONTROL=ignoreboth + +# append to the history file, don't overwrite it +shopt -s histappend + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTSIZE=1000 +HISTFILESIZE=2000 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# If set, the pattern "**" used in a pathname expansion context will +# match all files and zero or more directories and subdirectories. +#shopt -s globstar + +# make less more friendly for non-text input files, see lesspipe(1) +#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +case "$TERM" in + xterm-color|*-256color) color_prompt=yes;; +esac + +# uncomment for a colored prompt, if the terminal has the capability; turned +# off by default to not distract the user: the focus in a terminal window +# should be on the output of commands, not on the prompt +#force_color_prompt=yes + +if [ -n "$force_color_prompt" ]; then + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi +fi + +if [ "$color_prompt" = yes ]; then + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' +else + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' +fi +unset color_prompt force_color_prompt + +# If this is an xterm set the title to user@host:dir +case "$TERM" in +xterm*|rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +*) + ;; +esac + +# enable color support of ls and also add handy aliases +if [ -x /usr/bin/dircolors ]; then + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' + + #alias grep='grep --color=auto' + #alias fgrep='fgrep --color=auto' + #alias egrep='egrep --color=auto' +fi + +# colored GCC warnings and errors +#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' + +# some more ls aliases +#alias ll='ls -l' +#alias la='ls -A' +#alias l='ls -CF' + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +if ! shopt -oq posix; then + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi + +alias aplist="apt list --upgradable" +alias apdate="apt update && aplist" +alias apgrade="apt upgrade -y" +alias update="apdate && apgrade" diff --git a/docker-compose.yml b/docker-compose.yml index 48178c5..3010578 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,7 @@ volumes: gitlab_logs: gitlab_data: letsencrypt: + proxy_html: runner_main_etc: runner_main_home: runner_docker_etc: @@ -121,6 +122,7 @@ services: - ./proxy/nginx.conf:/etc/nginx/nginx.conf:ro - ./proxy/nginx-conf.d:/etc/nginx/conf.d:ro - letsencrypt:/etc/letsencrypt + - proxy_html:/var/www/html restart: always # --------------------------------------------------------------------------- diff --git a/proxy/Dockerfile b/proxy/Dockerfile index e85989f..e8e5532 100644 --- a/proxy/Dockerfile +++ b/proxy/Dockerfile @@ -3,7 +3,7 @@ FROM nginx ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get -y upgrade -RUN apt -y install \ +RUN apt-get -y install \ openssl \ certbot \ cron \