diff options
| -rw-r--r-- | roles/install_admin_packages/files/bashrc | 82 | ||||
| -rw-r--r-- | roles/install_admin_packages/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/install_dhcp/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/install_fastd/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/install_php/tasks/main.yml | 11 | ||||
| -rw-r--r-- | setup_fastd.yml | 1 |
6 files changed, 99 insertions, 10 deletions
diff --git a/roles/install_admin_packages/files/bashrc b/roles/install_admin_packages/files/bashrc new file mode 100644 index 0000000..42a8181 --- /dev/null +++ b/roles/install_admin_packages/files/bashrc @@ -0,0 +1,82 @@ +# Ansible managed: /home/niyawe/ansible/roles/home_directory/templates/bashrc.j2 modified on 2016-09-18 20:59:30 by niyawe on NiYaWe-T61 +# If not running interactively, don't do anything +[ -z "$PS1" ] && return + +# don't put duplicate lines in the history. See bash(1) for more options +# ... or force ignoredups and ignorespace +HISTCONTROL=ignoredups:ignorespace + +# append to the history file, don't overwrite it +shopt -s histappend + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTFILESIZE=99999999 +HISTSIZE=99999999 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# make less more friendly for non-text input files, see lesspipe(1) +[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +parse_git_branch() { + git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/[\1]/' +} + +function timer_start { + timer=${timer:-$SECONDS} +} + +function timer_stop { + timer_show=$(($SECONDS - $timer)) + unset timer +} + +trap 'timer_start' DEBUG + +if [ "$PROMPT_COMMAND" == "" ]; then + PROMPT_COMMAND="timer_stop" +else + PROMPT_COMMAND="$PROMPT_COMMAND; timer_stop" +fi + +PS1='\[\e[0m\][\h][last: ${timer_show}s][\w]$(parse_git_branch)\n\[\033[01;35m\]\$ \[\033[00m\]' + +# If this is an xterm set the title to [host][dir] +case "$TERM" in + xterm*|rxvt*) + PS1="\[\e]0;[\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 grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + +# some more ls aliases +alias ll='ls -alF' +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 + +export EDITOR=vim + +[ -e "$HOME/bin" ] && PATH="$HOME/bin:$PATH" + diff --git a/roles/install_admin_packages/tasks/main.yml b/roles/install_admin_packages/tasks/main.yml index e6715e0..7c55187 100644 --- a/roles/install_admin_packages/tasks/main.yml +++ b/roles/install_admin_packages/tasks/main.yml @@ -15,3 +15,8 @@ - screen - tmux - vim + +- name: copy bashrc + copy: + src: bashrc + dest: /root/.bashrc diff --git a/roles/install_dhcp/tasks/main.yml b/roles/install_dhcp/tasks/main.yml index c8912be..1bca76f 100644 --- a/roles/install_dhcp/tasks/main.yml +++ b/roles/install_dhcp/tasks/main.yml @@ -9,11 +9,6 @@ path: /etc/dhcpd.hosts.conf state: touch -- name: install php - pacman: - name: php - state: present - - name: copy fastd-services-api.php copy: src: fastd-services-api.php diff --git a/roles/install_fastd/tasks/main.yml b/roles/install_fastd/tasks/main.yml index 3bdd59e..b5c8671 100644 --- a/roles/install_fastd/tasks/main.yml +++ b/roles/install_fastd/tasks/main.yml @@ -58,11 +58,6 @@ path: /etc/fastd/ffmyk/peers state: directory -- name: install php for api script - pacman: - name: php - state: present - - name: add fastd peer api script copy: src: fastd-api.php diff --git a/roles/install_php/tasks/main.yml b/roles/install_php/tasks/main.yml new file mode 100644 index 0000000..0d8e05a --- /dev/null +++ b/roles/install_php/tasks/main.yml @@ -0,0 +1,11 @@ +--- +- name: install php + pacman: + name: php + state: present + +- name: set default_socket_timeout + lineinfile: + path: /etc/php/php.ini + regexp: '^;?default_socket_timeout' + line: 'default_socket_timeout = 10' diff --git a/setup_fastd.yml b/setup_fastd.yml index 0c114be..72bb431 100644 --- a/setup_fastd.yml +++ b/setup_fastd.yml @@ -8,6 +8,7 @@ - configure_sysctl - configure_iptables - install_ssmtp + - install_php - install_nginx - install_ntp - install_haveged |