This commit is contained in:
Christoph 2023-04-06 11:54:25 +02:00
parent fe1339ff36
commit 77a3f34c8c
13 changed files with 74 additions and 80 deletions

View File

@ -3,30 +3,23 @@
# for examples
# If not running interactively, don't do anything
case $- in
*i*) ;;
*) return;;
esac
[ -z "$PS1" ] && return
# don't put duplicate lines or lines starting with space in the history.
# See bash(1) for more options
# don't put duplicate lines in the history. See bash(1) for more options
# don't overwrite GNU Midnight Commander's setting of `ignorespace'.
HISTCONTROL=$HISTCONTROL${HISTCONTROL+:}ignoredups
# ... or force ignoredups and ignorespace
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)"
@ -43,7 +36,7 @@ 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
force_color_prompt=yes
if [ -n "$force_color_prompt" ]; then
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
@ -60,7 +53,9 @@ __hostname="${__hostname%.*}"
__hostname="${__hostname%.*}"
if [ "$color_prompt" = yes ]; then
#PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@${__hostname}:\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
#PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@${__hostname}\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
#PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@${__hostname}\[\033[00m\]:\[\033[01;32m\]\w\[\033[00m\]\$ '
PS1='${debian_chroot:+($debian_chroot)}\[\033[32m\]\u@${__hostname}\[\033[00m\]:\[\033[37m\]\w\[\033[00m\]\$ '
else
#PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
PS1='${debian_chroot:+($debian_chroot)}\u@${__hostname}:\w\$ '
@ -109,12 +104,8 @@ 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
if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
. /etc/bash_completion
fi
fi
export EDITOR=vim

View File

@ -23,7 +23,8 @@ shopt -s checkwinsize
__hostname="$(hostname -f)"
__hostname="${__hostname%.*}"
__hostname="${__hostname%.*}"
export PS1='${__hostname}:\w \$ '
#export PS1='${__hostname}:\w \$ '
export PS1='\[\033[01;32m\]${__hostname}\[\033[00m\]:\[\033[37m\]\w\[\033[00m\] \$ '
umask 022

View File

@ -3,30 +3,23 @@
# for examples
# If not running interactively, don't do anything
case $- in
*i*) ;;
*) return;;
esac
[ -z "$PS1" ] && return
# don't put duplicate lines or lines starting with space in the history.
# See bash(1) for more options
# don't put duplicate lines in the history. See bash(1) for more options
# don't overwrite GNU Midnight Commander's setting of `ignorespace'.
HISTCONTROL=$HISTCONTROL${HISTCONTROL+:}ignoredups
# ... or force ignoredups and ignorespace
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)"
@ -43,7 +36,7 @@ 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
force_color_prompt=yes
if [ -n "$force_color_prompt" ]; then
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
@ -60,7 +53,9 @@ __hostname="${__hostname%.*}"
__hostname="${__hostname%.*}"
if [ "$color_prompt" = yes ]; then
#PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@${__hostname}:\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
#PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@${__hostname}\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
#PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@${__hostname}\[\033[00m\]:\[\033[01;32m\]\w\[\033[00m\]\$ '
PS1='${debian_chroot:+($debian_chroot)}\[\033[32m\]\u@${__hostname}\[\033[00m\]:\[\033[37m\]\w\[\033[00m\]\$ '
else
#PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
PS1='${debian_chroot:+($debian_chroot)}\u@${__hostname}:\w\$ '
@ -109,12 +104,8 @@ 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
if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
. /etc/bash_completion
fi
fi
export EDITOR=vim

View File

@ -23,7 +23,8 @@ shopt -s checkwinsize
__hostname="$(hostname -f)"
__hostname="${__hostname%.*}"
__hostname="${__hostname%.*}"
export PS1='${__hostname}:\w \$ '
#export PS1='${__hostname}:\w \$ '
export PS1='\[\033[01;32m\]${__hostname}\[\033[00m\]:\[\033[37m\]\w\[\033[00m\] \$ '
umask 022

View File

@ -3,30 +3,23 @@
# for examples
# If not running interactively, don't do anything
case $- in
*i*) ;;
*) return;;
esac
[ -z "$PS1" ] && return
# don't put duplicate lines or lines starting with space in the history.
# See bash(1) for more options
# don't put duplicate lines in the history. See bash(1) for more options
# don't overwrite GNU Midnight Commander's setting of `ignorespace'.
HISTCONTROL=$HISTCONTROL${HISTCONTROL+:}ignoredups
# ... or force ignoredups and ignorespace
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)"
@ -43,7 +36,7 @@ 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
force_color_prompt=yes
if [ -n "$force_color_prompt" ]; then
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
@ -60,7 +53,9 @@ __hostname="${__hostname%.*}"
__hostname="${__hostname%.*}"
if [ "$color_prompt" = yes ]; then
#PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@${__hostname}:\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
#PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@${__hostname}\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
#PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@${__hostname}\[\033[00m\]:\[\033[01;32m\]\w\[\033[00m\]\$ '
PS1='${debian_chroot:+($debian_chroot)}\[\033[32m\]\u@${__hostname}\[\033[00m\]:\[\033[37m\]\w\[\033[00m\]\$ '
else
#PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
PS1='${debian_chroot:+($debian_chroot)}\u@${__hostname}:\w\$ '
@ -109,12 +104,8 @@ 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
if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
. /etc/bash_completion
fi
fi
export EDITOR=vim

View File

@ -23,7 +23,8 @@ shopt -s checkwinsize
__hostname="$(hostname -f)"
__hostname="${__hostname%.*}"
__hostname="${__hostname%.*}"
export PS1='${__hostname}:\w \$ '
#export PS1='${__hostname}:\w \$ '
export PS1='\[\033[01;32m\]${__hostname}\[\033[00m\]:\[\033[37m\]\w\[\033[00m\] \$ '
umask 022

View File

@ -3,30 +3,23 @@
# for examples
# If not running interactively, don't do anything
case $- in
*i*) ;;
*) return;;
esac
[ -z "$PS1" ] && return
# don't put duplicate lines or lines starting with space in the history.
# See bash(1) for more options
# don't put duplicate lines in the history. See bash(1) for more options
# don't overwrite GNU Midnight Commander's setting of `ignorespace'.
HISTCONTROL=$HISTCONTROL${HISTCONTROL+:}ignoredups
# ... or force ignoredups and ignorespace
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)"
@ -43,7 +36,7 @@ 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
force_color_prompt=yes
if [ -n "$force_color_prompt" ]; then
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
@ -60,7 +53,9 @@ __hostname="${__hostname%.*}"
__hostname="${__hostname%.*}"
if [ "$color_prompt" = yes ]; then
#PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@${__hostname}:\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
#PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@${__hostname}\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
#PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@${__hostname}\[\033[00m\]:\[\033[01;32m\]\w\[\033[00m\]\$ '
PS1='${debian_chroot:+($debian_chroot)}\[\033[32m\]\u@${__hostname}\[\033[00m\]:\[\033[37m\]\w\[\033[00m\]\$ '
else
#PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
PS1='${debian_chroot:+($debian_chroot)}\u@${__hostname}:\w\$ '
@ -109,12 +104,8 @@ 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
if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
. /etc/bash_completion
fi
fi
export EDITOR=vim

View File

@ -23,7 +23,8 @@ shopt -s checkwinsize
__hostname="$(hostname -f)"
__hostname="${__hostname%.*}"
__hostname="${__hostname%.*}"
export PS1='${__hostname}:\w \$ '
#export PS1='${__hostname}:\w \$ '
export PS1='\[\033[01;32m\]${__hostname}\[\033[00m\]:\[\033[37m\]\w\[\033[00m\] \$ '
umask 022

View File

@ -638,6 +638,15 @@ nis_user:
is_samba_user: true
password: 'YZ_bgn_2020!'
- name: leonie.rupp
groups:
- all-users
- mbr-buero
- rias-bund
- buero-scan
is_samba_user: true
password: '3jzs.wv-4TX/'
- name: linda.giesel
groups:
- all-users
@ -995,6 +1004,7 @@ samba_shares:
- lavinia.schwedersky
- lena.mahler
- linda.giesel
- leonie.rupp
- manja.kasten
- marc.schwietring
- marco.siegmund
@ -1061,6 +1071,7 @@ samba_shares:
- kerstin.kuballa
- lavinia.schwedersky
- lena.mahler
- leonie.rupp
- manja.kasten
- marc.schwietring
- marco.siegmund
@ -1171,6 +1182,7 @@ samba_shares:
- kerstin.kuballa
- lavinia.schwedersky
- lena.mahler
- leonie.rupp
- manja.kasten
- marc.schwietring
- marco.siegmund
@ -1238,6 +1250,7 @@ samba_shares:
- laura.berner
- lavinia.schwedersky
- lena.mahler
- leonie.rupp
- manja.kasten
- marc.schwietring
- marco.siegmund
@ -1342,6 +1355,7 @@ samba_shares:
- kerstin.kuballa
- lavinia.schwedersky
- lena.mahler
- leonie.rupp
- manja.kasten
- marc.schwietring
- marco.siegmund
@ -1400,6 +1414,7 @@ samba_shares:
- chris
- christina.wendt
- isabell.wiesner
- leonie.rupp
- swetlana.nikitenko
- sysadm
@ -1464,6 +1479,7 @@ samba_shares:
- laura.berner
- lavinia.schwedersky
- lena.mahler
- leonie.rupp
- linda.giesel
- manja.kasten
- marco.siegmund
@ -1531,6 +1547,7 @@ samba_shares:
- kerstin.kuballa
- lavinia.schwedersky
- lena.mahler
- leonie.rupp
- manja.kasten
- marc.schwietring
- marco.siegmund
@ -1598,6 +1615,7 @@ samba_shares:
- kerstin.kuballa
- lavinia.schwedersky
- lena.mahler
- leonie.rupp
- manja.kasten
- marc.schwietring
- marco.siegmund

View File

@ -86,10 +86,12 @@ cron_user_entries:
- name: "Check if CUPS main daemon is up and running. Restart service if needed."
minute: "*/30"
hour: "7-22"
job: /root/bin/monitoring/check_cups.sh
- name: "Check if CUPS Browse daemon is up and running. Restart service if needed."
minute: "*/30"
hour: "7-22"
job: /root/bin/monitoring/check_cups-browsed.sh

View File

@ -86,10 +86,12 @@ cron_user_entries:
- name: "Check if CUPS main daemon is up and running. Restart service if needed."
minute: "*/30"
hour: "7-22"
job: /root/bin/monitoring/check_cups.sh
- name: "Check if CUPS Browse daemon is up and running. Restart service if needed."
minute: "*/30"
hour: "7-22"
job: /root/bin/monitoring/check_cups-browsed.sh

View File

@ -111,10 +111,12 @@ cron_user_entries:
- name: "Check if CUPS main daemon is up and running. Restart service if needed."
minute: "*/30"
hour: "7-22"
job: /root/bin/monitoring/check_cups.sh
- name: "Check if CUPS Browse daemon is up and running. Restart service if needed."
minute: "*/30"
hour: "7-22"
job: /root/bin/monitoring/check_cups-browsed.sh
- name: "cleanup camera files."

View File

@ -86,10 +86,12 @@ cron_user_entries:
- name: "Check if CUPS main daemon is up and running. Restart service if needed."
minute: "*/30"
hour: "7-22"
job: /root/bin/monitoring/check_cups.sh
- name: "Check if CUPS Browse daemon is up and running. Restart service if needed."
minute: "*/30"
hour: "7-22"
job: /root/bin/monitoring/check_cups-browsed.sh