miaou/miaou-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change debian-bash to miaou-bash

Browse Source
This commit is contained in:
pvincent
2024-02-22 10:23:37 +04:00
parent 6357409ec8
commit 353a553bc0
15 changed files with 57 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/functions.sh
+24 -23
View File
@@ -110,7 +110,7 @@ function prepare_nftables() {
function miaou_init() { function miaou_init() {
# shellcheck source=/dev/null # shellcheck source=/dev/null
[[ -f /opt/debian-bash/lib/functions.sh ]] && source /opt/debian-bash/lib/functions.sh [[ -f /opt/miaou-bash/lib/functions.sh ]] && source /opt/miaou-bash/lib/functions.sh
# shellcheck source=/dev/null # shellcheck source=/dev/null
. "$MIAOU_BASEDIR/lib/functions.sh" . "$MIAOU_BASEDIR/lib/functions.sh"
@@ -215,7 +215,7 @@ function container_exists() {
lxc list "$1" -c n -f csv | grep -q "^$1\$" lxc list "$1" -c n -f csv | grep -q "^$1\$"
} }
# build debian image with prebuild debian-bash and various useful settings # build debian image with prebuild miaou-bash and various useful settings
# ARG1=release [bullseye, buster] # ARG1=release [bullseye, buster]
function build_miaou_image() { function build_miaou_image() {
local RELEASE="$1" local RELEASE="$1"
@@ -230,7 +230,7 @@ function build_miaou_image() {
echo "building lxc image <$IMAGE_LABEL> ... " echo "building lxc image <$IMAGE_LABEL> ... "
echo "image will reuse same local repository <$DEB_REPOSITORY>" echo "image will reuse same local repository <$DEB_REPOSITORY>"
creation_date=$(date +%s) creation_date=$(date +%s)
sudo /opt/debian-bash/tools/idem_apt_install debootstrap sudo /opt/miaou-bash/tools/idem_apt_install debootstrap
cat <<EOF1 | sudo bash cat <<EOF1 | sudo bash
set -euo pipefail set -euo pipefail
@@ -263,8 +263,11 @@ EOF3
apt update && apt dist-upgrade -y apt update && apt dist-upgrade -y
apt install -y curl wget file git sudo bash-completion apt install -y curl wget file git sudo bash-completion
curl https://git.artcode.re/pvincent/debian-bash/raw/branch/master/install.sh | sudo bash -s -- --host curl https://git.artcode.re/miaou/miaou-bash/raw/branch/main/install.sh | sudo bash -s -- --host
ln -sf /usr/share/zoneinfo/Indian/Reunion /etc/localtime
# TODO: remove line below
# ln -sf /usr/share/zoneinfo/Indian/Reunion /etc/localtime
cat <<EOF3 >/etc/network/interfaces cat <<EOF3 >/etc/network/interfaces
# This file describes the network interfaces available on your system # This file describes the network interfaces available on your system
# and how to activate them. For more information, see interfaces(5). # and how to activate them. For more information, see interfaces(5).
@@ -418,26 +421,24 @@ function env_or_ask {
fi fi
} }
# install_debian_bash()
# grab and install related project # grab and install related project
function install_debian_bash() { function install_miaou_bash() {
local PREFIX="debian-bash:install" local PREFIX="miaou-bash:install"
if [[ ! -d /opt/debian-bash ]]; then if [[ ! -d /opt/miaou-bash ]]; then
echo "installing curl wget commands ..." echo "installing curl wget commands ..."
apt install -y curl wget apt install -y curl wget
echo "installing debian-bash..." echo "installing miaou-bash..."
curl https://git.artcode.re/pvincent/debian-bash/raw/branch/master/install.sh | sudo bash -s -- --host curl https://git.artcode.re/miaou/miaou-bash/raw/branch/main/install.sh | sudo bash -s -- --host
export PATH=$PATH:/opt/debian-bash/tools/ export PATH=$PATH:/opt/miaou-bash/tools/
echo "OK" echo "OK"
else else
# /opt/debian-bash/tools/debian_bash_upgrade echo "addon <miaou-bash> already installed!"
echo "addon <debian-bash> already installed!"
fi fi
# shellcheck source=/dev/null # shellcheck source=/dev/null
source /etc/bash.bashrc source /etc/bash.bashrc
sudo /opt/debian-bash/tools/idem_apt_install bash-completion sudo /opt/miaou-bash/tools/idem_apt_install bash-completion
} }
function add_toolbox_sudoers { function add_toolbox_sudoers {
@@ -463,7 +464,7 @@ function prepare_toolbox() {
curl -sSf https://sh.rustup.rs | sh -s -- -y curl -sSf https://sh.rustup.rs | sh -s -- -y
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "$HOME/.cargo/env" source "$HOME/.cargo/env"
/opt/debian-bash/tools/append_or_replace "^PATH=\$PATH:\$HOME/\\.cargo/bin" "PATH=\$PATH:\$HOME/.cargo/bin" ~/.bashrc /opt/miaou-bash/tools/append_or_replace "^PATH=\$PATH:\$HOME/\\.cargo/bin" "PATH=\$PATH:\$HOME/.cargo/bin" ~/.bashrc
PREFIX="" echo "OK" PREFIX="" echo "OK"
else else
echo "command <cargo> already installed!" echo "command <cargo> already installed!"
@@ -490,7 +491,7 @@ function prepare_toolbox() {
echo -n "installing <rg> alias <ripgrep> ... " echo -n "installing <rg> alias <ripgrep> ... "
if [ ! -f "/TOOLBOX/rg" ]; then if [ ! -f "/TOOLBOX/rg" ]; then
sudo /opt/debian-bash/tools/idem_apt_install ripgrep sudo /opt/miaou-bash/tools/idem_apt_install ripgrep
sudo ln /usr/bin/rg /TOOLBOX/ sudo ln /usr/bin/rg /TOOLBOX/
PREFIX="" echo "successfully installed" PREFIX="" echo "successfully installed"
else else
@@ -499,7 +500,7 @@ function prepare_toolbox() {
echo -n "installing <ag> alias <silversearcher-ag> ... " echo -n "installing <ag> alias <silversearcher-ag> ... "
if [ ! -f "/TOOLBOX/ag" ]; then if [ ! -f "/TOOLBOX/ag" ]; then
sudo /opt/debian-bash/tools/idem_apt_install silversearcher-ag sudo /opt/miaou-bash/tools/idem_apt_install silversearcher-ag
sudo ln /usr/bin/ag /TOOLBOX/ sudo ln /usr/bin/ag /TOOLBOX/
PREFIX="" echo "successfully installed" PREFIX="" echo "successfully installed"
else else
@@ -541,7 +542,7 @@ function prepare_toolbox() {
echo -n "installing <ncdu> ... " echo -n "installing <ncdu> ... "
if [ ! -f "/TOOLBOX/ncdu" ]; then if [ ! -f "/TOOLBOX/ncdu" ]; then
sudo /opt/debian-bash/tools/idem_apt_install ncdu sudo /opt/miaou-bash/tools/idem_apt_install ncdu
sudo cp /usr/bin/ncdu /TOOLBOX/ncdu sudo cp /usr/bin/ncdu /TOOLBOX/ncdu
PREFIX="" echo "successfully installed" PREFIX="" echo "successfully installed"
else else
@@ -550,7 +551,7 @@ function prepare_toolbox() {
echo -n "installing <unzip> ... " echo -n "installing <unzip> ... "
if [ ! -f "/TOOLBOX/unzip" ]; then if [ ! -f "/TOOLBOX/unzip" ]; then
sudo /opt/debian-bash/tools/idem_apt_install unzip sudo /opt/miaou-bash/tools/idem_apt_install unzip
sudo cp /usr/bin/unzip /TOOLBOX/unzip sudo cp /usr/bin/unzip /TOOLBOX/unzip
PREFIX="" echo "successfully installed" PREFIX="" echo "successfully installed"
else else
@@ -559,7 +560,7 @@ function prepare_toolbox() {
echo -n "installing <tree> ... " echo -n "installing <tree> ... "
if [ ! -f "/TOOLBOX/tree" ]; then if [ ! -f "/TOOLBOX/tree" ]; then
sudo /opt/debian-bash/tools/idem_apt_install tree sudo /opt/miaou-bash/tools/idem_apt_install tree
sudo cp /bin/tree /TOOLBOX/tree sudo cp /bin/tree /TOOLBOX/tree
PREFIX="" echo "successfully installed" PREFIX="" echo "successfully installed"
else else
@@ -568,7 +569,7 @@ function prepare_toolbox() {
echo -n "installing <duf> ... " echo -n "installing <duf> ... "
if [ ! -f "/TOOLBOX/duf" ]; then if [ ! -f "/TOOLBOX/duf" ]; then
VERSION=$(/opt/debian-bash/tools/wget_semver github muesli/duf) VERSION=$(/opt/miaou-bash/tools/wget_semver github muesli/duf)
VERSION_WITHOUT_V=${VERSION#v} VERSION_WITHOUT_V=${VERSION#v}
wget -O /tmp/duf.deb "https://github.com/muesli/duf/releases/download/${VERSION}/duf_${VERSION_WITHOUT_V}_linux_amd64.deb" wget -O /tmp/duf.deb "https://github.com/muesli/duf/releases/download/${VERSION}/duf_${VERSION_WITHOUT_V}_linux_amd64.deb"
sudo dpkg -i /tmp/duf.deb sudo dpkg -i /tmp/duf.deb
@@ -601,7 +602,7 @@ function prepare_toolbox() {
function install_mandatory_commands() { function install_mandatory_commands() {
local PREFIX="mandatory:commands" local PREFIX="mandatory:commands"
sudo /opt/debian-bash/tools/idem_apt_install dnsutils build-essential curl mariadb-client postgresql-client sudo /opt/miaou-bash/tools/idem_apt_install dnsutils build-essential curl mariadb-client postgresql-client
if ! exist_command tera; then if ! exist_command tera; then
echo "installing <tera> ..." echo "installing <tera> ..."
lib/harden.sh
+6 -6
View File
@@ -87,7 +87,7 @@ function prepare_proxy() {
if ! grep -Eq "^precedence ::ffff:0:0/96.*" /etc/gai.conf; then if ! grep -Eq "^precedence ::ffff:0:0/96.*" /etc/gai.conf; then
echo "prefer ipv4 ..." echo "prefer ipv4 ..."
sudo /opt/debian-bash/tools/append_or_replace "^precedence ::ffff:0:0/96.*" "precedence ::ffff:0:0/96 100" /etc/gai.conf sudo /opt/miaou-bash/tools/append_or_replace "^precedence ::ffff:0:0/96.*" "precedence ::ffff:0:0/96 100" /etc/gai.conf
echo "OK" echo "OK"
else else
echo "ipv4 already prefered!" echo "ipv4 already prefered!"
@@ -95,7 +95,7 @@ function prepare_proxy() {
if ! grep -Eq "^net.ipv4.ip_forward=1" /etc/sysctl.conf; then if ! grep -Eq "^net.ipv4.ip_forward=1" /etc/sysctl.conf; then
echo "allow forwarding from kernel ..." echo "allow forwarding from kernel ..."
sudo /opt/debian-bash/tools/append_or_replace "^net.ipv4.ip_forward=1.*" "net.ipv4.ip_forward=1" /etc/sysctl.conf sudo /opt/miaou-bash/tools/append_or_replace "^net.ipv4.ip_forward=1.*" "net.ipv4.ip_forward=1" /etc/sysctl.conf
sudo sysctl -p sudo sysctl -p
echo "OK" echo "OK"
else else
@@ -163,7 +163,7 @@ function mailer_alert() {
done done
echo "installing <msmtp> ..." echo "installing <msmtp> ..."
sudo /opt/debian-bash/tools/idem_apt_install msmtp msmtp-mta mailutils bsd-mailx sudo /opt/miaou-bash/tools/idem_apt_install msmtp msmtp-mta mailutils bsd-mailx
echo "OK" echo "OK"
echo "configuring </etc/aliases>" echo "configuring </etc/aliases>"
@@ -232,7 +232,7 @@ function alert_at_ssh_password() {
echo "installing alert_at_ssh_password..." echo "installing alert_at_ssh_password..."
sudo cp "$MIAOU_BASEDIR/templates/hardened/pam/alert_ssh_password.sh" /usr/local/bin/ sudo cp "$MIAOU_BASEDIR/templates/hardened/pam/alert_ssh_password.sh" /usr/local/bin/
sudo chmod 700 /usr/local/bin/alert_ssh_password.sh sudo chmod 700 /usr/local/bin/alert_ssh_password.sh
sudo /opt/debian-bash/tools/append_or_replace "^session optional pam_exec.so /usr/local/bin/alert_ssh_password.sh" "session optional pam_exec.so /usr/local/bin/alert_ssh_password.sh" /etc/pam.d/sshd sudo /opt/miaou-bash/tools/append_or_replace "^session optional pam_exec.so /usr/local/bin/alert_ssh_password.sh" "session optional pam_exec.so /usr/local/bin/alert_ssh_password.sh" /etc/pam.d/sshd
echo "OK" echo "OK"
else else
echo "alert_at_ssh_password already enabled!" echo "alert_at_ssh_password already enabled!"
@@ -243,7 +243,7 @@ function customize_motd {
local PREFIX="harden:motd:customize" local PREFIX="harden:motd:customize"
if [[ ! -f /etc/update-motd.d/80-users ]]; then if [[ ! -f /etc/update-motd.d/80-users ]]; then
echo "customizing motd..." echo "customizing motd..."
sudo /opt/debian-bash/tools/idem_apt_install figlet lsb-release sudo /opt/miaou-bash/tools/idem_apt_install figlet lsb-release
sudo rm -f /etc/motd sudo rm -f /etc/motd
sudo mkdir -p /etc/update-motd.d sudo mkdir -p /etc/update-motd.d
sudo rm -f /etc/update-motd.d/* sudo rm -f /etc/update-motd.d/*
@@ -274,7 +274,7 @@ PREFIX="harden"
: $PREFIX : $PREFIX
sudo_required sudo_required
install_debian_bash install_miaou_bash
install_mandatory_commands install_mandatory_commands
prepare_config_hardened prepare_config_hardened
set_current_user set_current_user
lib/images/bullseye-miaou.sh
+1 -1
View File
@@ -8,7 +8,7 @@ function init_strict() {
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "$MIAOU_DIR/lib/functions.sh" source "$MIAOU_DIR/lib/functions.sh"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "/opt/debian-bash/lib/functions.sh" source "/opt/miaou-bash/lib/functions.sh"
trap 'trap_error $? $LINENO $BASH_LINENO "$BASH_COMMAND" $(printf "::%s" ${FUNCNAME[@]})' ERR trap 'trap_error $? $LINENO $BASH_LINENO "$BASH_COMMAND" $(printf "::%s" ${FUNCNAME[@]})' ERR
} }
lib/images/buster-miaou.sh
+1 -1
View File
@@ -8,7 +8,7 @@ function init_strict() {
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "$MIAOU_DIR/lib/functions.sh" source "$MIAOU_DIR/lib/functions.sh"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "/opt/debian-bash/lib/functions.sh" source "/opt/miaou-bash/lib/functions.sh"
trap 'trap_error $? $LINENO $BASH_LINENO "$BASH_COMMAND" $(printf "::%s" ${FUNCNAME[@]})' ERR trap 'trap_error $? $LINENO $BASH_LINENO "$BASH_COMMAND" $(printf "::%s" ${FUNCNAME[@]})' ERR
} }
lib/install.sh
+2 -2
View File
@@ -38,7 +38,7 @@ function prepare_lxd {
echo "user <$USER> already belongs to group <lxd>!" echo "user <$USER> already belongs to group <lxd>!"
fi fi
sudo /opt/debian-bash/tools/idem_apt_install lxd btrfs-progs sudo /opt/miaou-bash/tools/idem_apt_install lxd btrfs-progs
# test lxdbr0 # test lxdbr0
if ! lxc network info lxdbr0 &>/dev/null; then if ! lxc network info lxdbr0 &>/dev/null; then
@@ -181,7 +181,7 @@ function set_alias {
function miaou_evalfrombashrc() { function miaou_evalfrombashrc() {
local PREFIX="miaou:bashrc" local PREFIX="miaou:bashrc"
output=$( output=$(
/opt/debian-bash/tools/append_or_replace \ /opt/miaou-bash/tools/append_or_replace \
"^eval \"\\$\($MIAOU_BASEDIR/lib/install.sh shellenv\)\"$" \ "^eval \"\\$\($MIAOU_BASEDIR/lib/install.sh shellenv\)\"$" \
"eval \"\$($MIAOU_BASEDIR/lib/install.sh shellenv)\"" \ "eval \"\$($MIAOU_BASEDIR/lib/install.sh shellenv)\"" \
"$HOME/.bashrc" "$HOME/.bashrc"
recipes/dolibarr/crud.sh
+1 -1
View File
@@ -39,7 +39,7 @@ function _create() {
set -Eeuo pipefail set -Eeuo pipefail
echo "install latest release ... " echo "install latest release ... "
cd /var/www cd /var/www
PATH="\$PATH:/opt/debian-bash/tools" PATH="\$PATH:/opt/miaou-bash/tools"
VERSION="\$(wget_semver github Dolibarr/dolibarr)" VERSION="\$(wget_semver github Dolibarr/dolibarr)"
if [[ ! -f "dolibarr-\$VERSION.tgz" ]]; then if [[ ! -f "dolibarr-\$VERSION.tgz" ]]; then
wget_release github Dolibarr/dolibarr wget_release github Dolibarr/dolibarr
recipes/dolibarr/install.sh
+1 -1
View File
@@ -34,7 +34,7 @@ function install() {
apt update apt update
apt install -y $MANDATORY_PACKAGES_STRING apt install -y $MANDATORY_PACKAGES_STRING
cd /var/www cd /var/www
PATH="\$PATH:/opt/debian-bash/tools" PATH="\$PATH:/opt/miaou-bash/tools"
VERSION="\$(wget_semver github Dolibarr/dolibarr)" VERSION="\$(wget_semver github Dolibarr/dolibarr)"
if [[ ! -f "dolibarr-\$VERSION.tgz" ]]; then if [[ ! -f "dolibarr-\$VERSION.tgz" ]]; then
wget_release github Dolibarr/dolibarr wget_release github Dolibarr/dolibarr
recipes/mariadb/install.sh
+5 -5
View File
@@ -30,7 +30,7 @@ function install() {
PREFIX="recipe:mariadb:install" PREFIX="recipe:mariadb:install"
: $PREFIX : $PREFIX
sudo /opt/debian-bash/tools/idem_apt_install mariadb-client sudo /opt/miaou-bash/tools/idem_apt_install mariadb-client
echowarn "initializing ..." echowarn "initializing ..."
launch_container "$CONTAINER" launch_container "$CONTAINER"
build_device_backup build_device_backup
@@ -38,16 +38,16 @@ function install() {
lxc exec "$CONTAINER" -- bash <<EOF lxc exec "$CONTAINER" -- bash <<EOF
set -Eeuo pipefail set -Eeuo pipefail
cloud-init status --wait >/dev/null cloud-init status --wait >/dev/null
. /opt/debian-bash/lib/functions.sh . /opt/miaou-bash/lib/functions.sh
apt update && apt dist-upgrade -y apt update && apt dist-upgrade -y
/opt/debian-bash/tools/idem_apt_install mariadb-server automysqlbackup /opt/miaou-bash/tools/idem_apt_install mariadb-server automysqlbackup
echo "change bind-adress" echo "change bind-adress"
/opt/debian-bash/tools/append_or_replace "^bind-address.*$" "bind-address = 0.0.0.0" /etc/mysql/mariadb.conf.d/50-server.cnf /opt/miaou-bash/tools/append_or_replace "^bind-address.*$" "bind-address = 0.0.0.0" /etc/mysql/mariadb.conf.d/50-server.cnf
systemctl restart mariadb.service systemctl restart mariadb.service
function systemctl-exists() ([ \$(systemctl list-unit-files "\${1}*" | wc -l) -gt 3 ]) function systemctl-exists() ([ \$(systemctl list-unit-files "\${1}*" | wc -l) -gt 3 ])
systemctl-exists exim4.service && systemctl stop exim4.service && systemctl disable exim4.service systemctl-exists exim4.service && systemctl stop exim4.service && systemctl disable exim4.service
/opt/debian-bash/tools/append_or_replace "^BACKUPDIR=.*$" "BACKUPDIR=\"/mnt/BACKUP/mariadb\"" /etc/default/automysqlbackup /opt/miaou-bash/tools/append_or_replace "^BACKUPDIR=.*$" "BACKUPDIR=\"/mnt/BACKUP/mariadb\"" /etc/default/automysqlbackup
exit 0 exit 0
EOF EOF
echo DONE echo DONE
recipes/odoo12/install.sh
+1 -1
View File
@@ -108,7 +108,7 @@ function install() {
fi fi
echo "community-color change to $BACKGROUND_COLOR" echo "community-color change to $BACKGROUND_COLOR"
/opt/debian-bash/tools/append_or_replace "^.*o-community-color:.*" "\\\\\\\$o-community-color: $BACKGROUND_COLOR;" /home/odoo/odoo12/addons/web/static/src/scss/primary_variables.scss /opt/miaou-bash/tools/append_or_replace "^.*o-community-color:.*" "\\\\\\\$o-community-color: $BACKGROUND_COLOR;" /home/odoo/odoo12/addons/web/static/src/scss/primary_variables.scss
EOT EOT
mkdir -p /etc/odoo12 mkdir -p /etc/odoo12
recipes/odoo15/install.sh
+1 -1
View File
@@ -92,7 +92,7 @@ function install() {
echo "git odoo15 already downloaded!" echo "git odoo15 already downloaded!"
fi fi
echo "community-color change to $BACKGROUND_COLOR" echo "community-color change to $BACKGROUND_COLOR"
/opt/debian-bash/tools/append_or_replace "^.*o-community-color:.*" "\\\\\\\$o-community-color: $BACKGROUND_COLOR !default;" /home/odoo/odoo15/addons/web/static/src/legacy/scss/primary_variables.scss /opt/miaou-bash/tools/append_or_replace "^.*o-community-color:.*" "\\\\\\\$o-community-color: $BACKGROUND_COLOR !default;" /home/odoo/odoo15/addons/web/static/src/legacy/scss/primary_variables.scss
EOT EOT
mkdir -p /etc/odoo15 mkdir -p /etc/odoo15
recipes/postgresql/install.sh
+4 -4
View File
@@ -29,8 +29,8 @@ function install() {
set -Eeuo pipefail set -Eeuo pipefail
apt update apt update
. /opt/debian-bash/lib/functions.sh . /opt/miaou-bash/lib/functions.sh
/opt/debian-bash/tools/idem_apt_install postgresql /opt/miaou-bash/tools/idem_apt_install postgresql
echo -n "start postgresql now..." echo -n "start postgresql now..."
PG_VERSION=\$(pg_lsclusters -h | cut -d' ' -f1) PG_VERSION=\$(pg_lsclusters -h | cut -d' ' -f1)
@@ -40,8 +40,8 @@ function install() {
function systemctl-exists() ([ \$(systemctl list-unit-files "\${1}*" | wc -l) -gt 3 ]) function systemctl-exists() ([ \$(systemctl list-unit-files "\${1}*" | wc -l) -gt 3 ])
systemctl-exists exim4.service && systemctl disable exim4.service systemctl-exists exim4.service && systemctl disable exim4.service
/opt/debian-bash/tools/append_or_replace "^listen_addresses = .*$" "listen_addresses = '0.0.0.0'" /etc/postgresql/\$PG_VERSION/main/postgresql.conf /opt/miaou-bash/tools/append_or_replace "^listen_addresses = .*$" "listen_addresses = '0.0.0.0'" /etc/postgresql/\$PG_VERSION/main/postgresql.conf
/opt/debian-bash/tools/append_or_replace "^host.*all.*all.*$BRIDGE_SUBNET.*md5" "host\tall\t\tall\t\t$BRIDGE_SUBNET\t\tmd5" /etc/postgresql/\$PG_VERSION/main/pg_hba.conf /opt/miaou-bash/tools/append_or_replace "^host.*all.*all.*$BRIDGE_SUBNET.*md5" "host\tall\t\tall\t\t$BRIDGE_SUBNET\t\tmd5" /etc/postgresql/\$PG_VERSION/main/pg_hba.conf
systemctl restart postgresql.service systemctl restart postgresql.service
EOF EOF
scripts/db-maria
+1 -1
View File
@@ -46,7 +46,7 @@ use() {
create() { create() {
# shellcheck disable=SC1091 # shellcheck disable=SC1091
source /opt/debian-bash/lib/functions.sh source /opt/miaou-bash/lib/functions.sh
# shellcheck disable=SC2034 # shellcheck disable=SC2034
mapfile -t DBs < <(list) mapfile -t DBs < <(list)
scripts/db-psql
+1 -1
View File
@@ -52,7 +52,7 @@ use() {
create() { create() {
echo >&2 "about to create to <${DB_NAME}> ..." echo >&2 "about to create to <${DB_NAME}> ..."
source /opt/debian-bash/lib/functions.sh source /opt/miaou-bash/lib/functions.sh
local DBs=($(list)) local DBs=($(list))
if ! $(containsElement DBs $DB_NAME); then if ! $(containsElement DBs $DB_NAME); then
local SQL="CREATE USER \\\\\\\"$DB_NAME\\\\\\\" WITH PASSWORD '$DB_PASSWORD'" local SQL="CREATE USER \\\\\\\"$DB_NAME\\\\\\\" WITH PASSWORD '$DB_PASSWORD'"
scripts/lxc-miaou-create
+6 -6
View File
@@ -105,8 +105,8 @@ EOF
lxc config device add "$CONTAINER" SHARED disk source="$HOME/LXD/SHARED/$CONTAINER" path=/mnt/SHARED -q lxc config device add "$CONTAINER" SHARED disk source="$HOME/LXD/SHARED/$CONTAINER" path=/mnt/SHARED -q
lxc config device add "$CONTAINER" TOOLBOX disk source=/TOOLBOX path=/TOOLBOX -q lxc config device add "$CONTAINER" TOOLBOX disk source=/TOOLBOX path=/TOOLBOX -q
lxc config device add "$CONTAINER" DEBIAN_BASH disk source=$(realpath /opt/debian-bash) path=/opt/debian-bash -q lxc config device add "$CONTAINER" DEBIAN_BASH disk source=$(realpath /opt/miaou-bash) path=/opt/miaou-bash -q
lxc config set "$CONTAINER" environment.PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/debian-bash/tools:/TOOLBOX -q lxc config set "$CONTAINER" environment.PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/miaou-bash/tools:/TOOLBOX -q
if [[ "$OPTION_NESTING" == true ]]; then if [[ "$OPTION_NESTING" == true ]]; then
lxc config set $CONTAINER security.nesting true -q lxc config set $CONTAINER security.nesting true -q
@@ -115,8 +115,8 @@ EOF
lxc start "$CONTAINER" -q lxc start "$CONTAINER" -q
# initializing debian-bash # initializing miaou-bash
lxc exec "$CONTAINER" -- /opt/debian-bash/init.sh lxc exec "$CONTAINER" -- /opt/miaou-bash/init.sh
# default configuration files (btm,) # default configuration files (btm,)
lxc exec "$CONTAINER" -- mkdir -p /root/.config/bottom lxc exec "$CONTAINER" -- mkdir -p /root/.config/bottom
@@ -141,12 +141,12 @@ EOF
if ! lxc exec "$CONTAINER" -- passwd -S "$miaou_user" | cut -d ' ' -f2 | grep -q ^P; then if ! lxc exec "$CONTAINER" -- passwd -S "$miaou_user" | cut -d ' ' -f2 | grep -q ^P; then
shadow_passwd=$(load_yaml_from_expanded credential.shadow) shadow_passwd=$(load_yaml_from_expanded credential.shadow)
shadow_remainder=$(lxc exec "$CONTAINER" -- bash -c "grep $miaou_user /etc/shadow | cut -d':' -f3-") shadow_remainder=$(lxc exec "$CONTAINER" -- bash -c "grep $miaou_user /etc/shadow | cut -d':' -f3-")
lxc exec "$CONTAINER" -- /opt/debian-bash/tools/append_or_replace "^$miaou_user:.*:" "$miaou_user:$shadow_passwd:$shadow_remainder" /etc/shadow >/dev/null lxc exec "$CONTAINER" -- /opt/miaou-bash/tools/append_or_replace "^$miaou_user:.*:" "$miaou_user:$shadow_passwd:$shadow_remainder" /etc/shadow >/dev/null
fi fi
fi fi
if [[ "$OPTION_SSH" == true ]]; then if [[ "$OPTION_SSH" == true ]]; then
lxc exec "$CONTAINER" -- /opt/debian-bash/tools/idem_apt_install openssh-server lxc exec "$CONTAINER" -- /opt/miaou-bash/tools/idem_apt_install openssh-server
fi fi
if [[ "$OPTION_SSH" == true && "$OPTION_SAMEUSER" == true ]]; then if [[ "$OPTION_SSH" == true && "$OPTION_SAMEUSER" == true ]]; then
scripts/lxc-miaou-enable-ssh
+2 -2
View File
@@ -34,9 +34,9 @@ EOF
miaou_user=$(whoami) miaou_user=$(whoami)
shadow_passwd=$(load_yaml_from_expanded credential.shadow) shadow_passwd=$(load_yaml_from_expanded credential.shadow)
shadow_remainder=$(lxc exec "$CONTAINER" -- bash -c "grep $SSH_USER /etc/shadow | cut -d':' -f3-") shadow_remainder=$(lxc exec "$CONTAINER" -- bash -c "grep $SSH_USER /etc/shadow | cut -d':' -f3-")
lxc exec "$CONTAINER" -- /opt/debian-bash/tools/append_or_replace "^$SSH_USER:.*:" "$SSH_USER:$shadow_passwd:$shadow_remainder" /etc/shadow >/dev/null lxc exec "$CONTAINER" -- /opt/miaou-bash/tools/append_or_replace "^$SSH_USER:.*:" "$SSH_USER:$shadow_passwd:$shadow_remainder" /etc/shadow >/dev/null
lxc exec "$CONTAINER" -- /opt/debian-bash/tools/idem_apt_install openssh-server lxc exec "$CONTAINER" -- /opt/miaou-bash/tools/idem_apt_install openssh-server
previous_users=($( previous_users=($(
lxc exec "$CONTAINER" -- bash <<EOF lxc exec "$CONTAINER" -- bash <<EOF
set -Eeuo pipefail set -Eeuo pipefail