Compare commits

..

72 Commits

Author SHA1 Message Date
chris b4a09a7b94 feat(ipt-firewall): add ipt-firewall configuration for mm-irights, mm-nd, and mm-rav hosts 2026-08-09 23:14:08 +02:00
chris 33e8368d76 Rnaem SSH keys. 2026-08-09 23:13:48 +02:00
chris 53e17715fd feat(mm-nd): add extra user configuration and sudoers for nd-admin 2026-08-09 23:09:35 +02:00
chris 845052a9db fix(o45): correct formatting in ipt-firewall configuration for a.mx.oopen.de 2026-08-09 00:37:29 +02:00
chris d94d28ca67 feat(mm-nd): update DNS settings and add cron jobs for service monitoring 2026-08-09 00:35:57 +02:00
chris fff295759c feat(o45): add ipt-firewall configuration for a.mx.oopen.de 2026-08-09 00:35:36 +02:00
chris ed45c5596c feat(o45): add configuration files and firewall settings for o45 host 2026-08-09 00:34:20 +02:00
chris c6205045c5 feat(o45): add configuration files for o45 host and update apt tasks for compatibility 2026-08-09 00:33:51 +02:00
chris 05cb840e6d feat(redis): replace apt update task with command to ensure compatibility 2026-08-09 00:33:03 +02:00
chris 80a4e33fc2 add user bauhofer 2026-08-07 19:32:41 +02:00
chris ead9de9bac feat: add workaround for cssh/Perl-Tk under Wayland to allow local X11 access 2026-08-07 12:54:52 +02:00
chris c4acc32add feat: update apt upgrade tasks to conditionally refresh cache based on apt_update variable 2026-08-07 11:43:28 +02:00
chris 6ba7c61cb7 fix(common): avoid localhost become prompts, stabilize redis apt upgrade, and lint handlers 2026-08-06 17:09:17 +02:00
chris 88f40fe0cd feat: update apt packages for webserver and add extra Python packages 2026-08-06 14:49:53 +02:00
chris 79a38027df set become false for localhost checks in users-systemfiles to prevent sudo timeout 2026-08-06 14:48:15 +02:00
chris 55f9a6f5b8 refactot encrytion- and decryption scripts. 2026-08-03 15:43:39 +02:00
chris a318e1258c Encrypt actual hosts file - outfile: hosts.BAK. 2026-08-03 15:42:50 +02:00
chris 19eafadac4 chore: remove obsolete playbooks and scripts 2026-08-03 12:36:38 +02:00
chris 5af310e55a fix: set changed_when to false for apt update command. 2026-07-31 13:09:11 +02:00
chris 965ad5cde2 fix: specify ansible.builtin.template for service file and configuration deployments 2026-07-30 23:48:29 +02:00
chris 9c6094cef8 add host ki-fm.oopen.de 2026-07-30 12:54:19 +02:00
chris 4f8e5f4454 fix(file-ah-common.yml): correct indentation for samba user group assignments 2026-07-30 01:53:06 +02:00
chris ca02faf748 fix(sshd_config.j2): update condition for SFTP subsystem configuration to use common variable 2026-07-30 01:38:49 +02:00
chris 1c1ae9464c fix(yum.yml): change package state to 'present' for consistency and improve comment clarity 2026-07-29 23:40:23 +02:00
chris 451baa5f9a fix(sudoers.yml): improve formatting of comments for clarity in sudoers configuration tasks 2026-07-29 23:34:58 +02:00
chris b87c60c41e fix(samba-remove-user.yml): enhance command structure and error handling for samba user removal tasks 2026-07-29 23:32:24 +02:00
chris e125f9952f fix(samba-user.yml): improve command structure and enhance error handling for samba user management 2026-07-29 23:30:04 +02:00
chris 71e9cf6551 fix(show.yml): improve formatting of hostname display message for clarity 2026-07-29 23:21:15 +02:00
chris fc9c1548c3 fix(sshd.yml): standardize variable names for SSHD configuration facts and improve clarity 2026-07-29 18:08:17 +02:00
chris b5a4edc181 fix(webadmin-user.yml): standardize variable names for local template directory references 2026-07-29 18:03:07 +02:00
chris fea739f0e6 fix(webadmin-user.yml): update inventory checks and standardize variable names for clarity 2026-07-29 17:53:55 +02:00
chris e72d9aac70 fix(users.yml): replace deprecated 'authorized_key' with 'ansible.posix.authorized_key' for improved compatibility 2026-07-29 17:46:31 +02:00
chris eece49f53b fix(users-systemfiles.yml): standardize variable names and improve clarity in user file checks and backups 2026-07-29 17:44:18 +02:00
chris b14e82c6c2 fix(git.yml): improve error handling and register results for backup and samba repositories 2026-07-29 17:31:36 +02:00
chris 56ba319f2f fix(redis-server.yml): standardize variable names and improve configuration clarity 2026-07-28 22:47:20 +02:00
chris c443ce7c79 fix(yml): update SSH keypair paths for ga-al-relay and ga-st-mail configurations 2026-07-28 22:47:03 +02:00
chris dc61dfc049 fix(yml): uncomment and standardize commented configuration options for clarity 2026-07-28 22:04:09 +02:00
chris 81e1f3fb3e fix(ntp.yml): standardize variable naming and replace command with copy module for backup 2026-07-28 22:03:46 +02:00
chris 86aec11206 fix(common.yml): update SSH keypair paths for b.mx and d.mx configurations 2026-07-28 21:55:46 +02:00
chris b3babf6831 fix(mail-common.yml): update SSH keypair paths and format email messages for clarity 2026-07-28 21:28:43 +02:00
chris 4d92340f9b chore(ansible): clean up host_vars YAML and normalize mail text blocks 2026-07-28 21:24:03 +02:00
chris ae60fa01a5 refactor(mx-common.yml): update paths for SSH keypair and file configurations
delete: remove obsolete postfix configuration files for rate limiting and user info
2026-07-28 02:16:07 +02:00
chris 9181734c51 fix(systemd-services): add condition to prevent service management for specific lxc_guest items 2026-07-28 01:52:41 +02:00
chris 1849c6d72d refactor(systemd-services): streamline service checks for Debian and RedHat OS 2026-07-28 01:24:58 +02:00
chris 5525fa3e73 refactor(systemd-resolved): rename facts to common_resolved variables for consistency 2026-07-28 01:10:41 +02:00
chris 5832d0b938 chore(main.yml): clear apt_remove list and comment out previous entries 2026-07-28 01:02:48 +02:00
chris 4310ae08b0 fix(copy_files.yml): correct formatting of template files task 2026-07-28 00:48:36 +02:00
chris 385b4a6802 refactor(copy_files.yml): simplify template file handling by removing redundant tasks 2026-07-28 00:46:19 +02:00
chris c30543280b feat(git.yml): enhance error handling for backup and samba server repository installations 2026-07-28 00:36:36 +02:00
chris 7e5fe673cf feat(postfwd.cf): add final=yes to rate limiting rules for enhanced message handling 2026-07-28 00:32:28 +02:00
chris 032ea670ef chore(main.yml): remove commented-out entries for authorized SSH keys 2026-07-28 00:13:02 +02:00
chris 00457b2ac7 chore(first-run.yml): remove obsolete first-run tasks for package installation 2026-07-28 00:11:19 +02:00
chris 095f5de034 feat(git.yml): enhance version handling for git repositories to prioritize 'master' if available 2026-07-28 00:02:49 +02:00
chris e60c1b81d1 feat(git.yml): add version handling for git repository installations 2026-07-27 22:16:45 +02:00
chris eb2c7cc15a chore(main.yml): set default git branch to main; Also includes various unrelated housekeeping updates in this file. 2026-07-27 22:16:27 +02:00
chris f39babaf5d feat(common): add host-tree file/template overrides and skip global items when host overrides exist 2026-07-27 21:55:27 +02:00
chris b40d3249fb Refactor variable names in samba-config-server.yml for consistency and clarity 2026-07-21 01:28:32 +02:00
chris 720fb84fb4 Refactor variable name for clarity and update condition in nfs.yml 2026-07-21 00:55:07 +02:00
chris 70eeebe4c4 roles/common/tasks/mysql.yml: remove trailing spaces. 2026-07-21 00:53:27 +02:00
chris baba4c4b7d Refactor variable names in motd.yml for consistency and clarity 2026-07-21 00:48:33 +02:00
chris ab4ef8f831 Refactor variable names in git.yml for consistency and clarity 2026-07-21 00:42:05 +02:00
chris 618eaa0bf7 Refactor variable names in cron.yml for consistency and clarity 2026-07-21 00:25:21 +02:00
chris 924e6bbf03 Refactor variable names in copy_files.yml for consistency and clarity 2026-07-21 00:24:25 +02:00
chris 03951153c1 Refactor caching-nameserver.yml for consistency and clarity in variable naming 2026-07-21 00:22:39 +02:00
chris ee5819c82c Remove update_cache parameter from util-linux-extra installation task in basic.yml 2026-07-20 23:52:43 +02:00
chris 062d1a6fc7 Refactor variable names in apt.yml for consistency and clarity 2026-07-20 23:48:19 +02:00
chris 81398e847e Refactor Ansible tasks to use fully qualified module names and improve code consistency
- Updated all tasks to use fully qualified module names (e.g., ansible.builtin.shell, ansible.builtin.copy) for clarity and to avoid ambiguity.
- Replaced deprecated 'yum' module with 'dnf' for package management on RedHat-based systems.
- Improved formatting and consistency in task definitions, including the use of double quotes for strings and consistent indentation.
- Removed unnecessary comments and whitespace to enhance readability.
- Ensured that conditions and loops are consistently formatted across all tasks.
2026-07-20 23:09:30 +02:00
chris bc330beebf Refactor Ansible tasks in basic.yml to use module prefixes and improve variable naming consistency 2026-07-20 22:57:13 +02:00
chris ba1d600cd8 Refactor ansible tasks in apt-gateway.yml to include module prefixes and improve variable naming consistency 2026-07-20 22:49:38 +02:00
chris de82385bec Add virus filter include and exclude file configurations for Samba shares 2026-07-20 17:42:15 +02:00
chris 509dc48851 Add unprotected interface configuration for Docker network in ipt-server.yml and new Samba share for Windows-Server-2025-Backup in common.yml 2026-07-20 11:00:53 +02:00
chris 88928adddb Remove debug task for displaying cron variables in cron.yml 2026-07-17 18:37:24 +02:00
409 changed files with 7214 additions and 5195 deletions
+4 -1
View File
@@ -14,5 +14,8 @@
"ansible.ansible.path": "/home/chris/devel/git/git.oopen.de/ansible/oopen-server/.venv/bin/ansible", "ansible.ansible.path": "/home/chris/devel/git/git.oopen.de/ansible/oopen-server/.venv/bin/ansible",
"ansible.python.interpreterPath": "${workspaceFolder}/.venv/bin/python3", "ansible.python.interpreterPath": "${workspaceFolder}/.venv/bin/python3",
"ansible.validation.lint.path": "/home/chris/devel/git/git.oopen.de/ansible/oopen-server/.venv/bin/ansible-lint", "ansible.validation.lint.path": "/home/chris/devel/git/git.oopen.de/ansible/oopen-server/.venv/bin/ansible-lint",
"ansible.ansibleNavigator.path": "/home/chris/devel/git/git.oopen.de/ansible/oopen-server/.venv/bin/ansible-navigator" "ansible.ansibleNavigator.path": "/home/chris/devel/git/git.oopen.de/ansible/oopen-server/.venv/bin/ansible-navigator",
"yaml.customTags": [
"!vault scalar"
]
} }
+1 -1
View File
@@ -40,7 +40,7 @@
inventory = ./hosts inventory = ./hosts
remote_user = chris remote_user = chris
roles_path = ./roles roles_path = ./roles
vault_password_file = open_the_vault.sh vault_password_file = oopen-server_the_vault.sh
#retry_files_enabled = False #retry_files_enabled = False
#allow_world_readable_tmpfiles = True #allow_world_readable_tmpfiles = True
#interpreter_python: auto #interpreter_python: auto
+191 -14
View File
@@ -1,26 +1,203 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#
# decrypt-interactiv.sh
#
# Zweck:
# - Entschluesselt entweder:
# (A) eine komplett mit ansible-vault verschluesselte Datei (ANSIBLE_VAULT Header)
# (B) einzelne YAML "!vault |" Bloecke in einer Datei (z.B. group_vars/host_vars)
# (C) einen einzelnen verschluesselten String (Argument, Pipe oder interaktiv)
#
# Passwort wird einmalig interaktiv abgefragt.
#
# Prüfen, ob ein Dateiname als Argument übergeben wurde set -euo pipefail
if [ -z "$1" ]; then
echo "Usage: $0 <filename>" # Temporare Datei fuer das einmalig abgefragte Vault-Passwort.
exit 1 VAULT_PASS_FILE=""
cleanup() {
# Sicherheitsnetz: Temp-Datei immer entfernen, auch bei Fehler/Abbruch.
if [[ -n "${VAULT_PASS_FILE}" && -f "${VAULT_PASS_FILE}" ]]; then
rm -f "${VAULT_PASS_FILE}"
fi
}
ask_vault_password_once() {
# Passwort nur einmal pro Lauf abfragen und danach wiederverwenden.
if [[ -n "${VAULT_PASS_FILE}" && -f "${VAULT_PASS_FILE}" ]]; then
return 0
fi fi
DATEI="$1" if [[ ! -r /dev/tty ]]; then
echo "Error: No interactive TTY available for password prompt." >&2
return 1
fi
local pw1=""
# Wichtig: Passwort direkt vom Terminal lesen, nicht von stdin.
read -rsp "Vault password: " pw1 < /dev/tty
printf '\n' > /dev/tty
if [[ -z "${pw1}" ]]; then
echo "Error: Empty password is not allowed." >&2
return 1
fi
# Passwort in Datei speichern, damit ansible-vault es nicht interaktiv erwartet.
VAULT_PASS_FILE="$(mktemp)"
chmod 600 "${VAULT_PASS_FILE}"
printf '%s' "${pw1}" > "${VAULT_PASS_FILE}"
unset pw1
}
decrypt_with_prompted_password() {
# Alle decrypt-Aufrufe laufen zentral ueber diese Funktion.
ask_vault_password_once
ansible-vault decrypt --vault-password-file "${VAULT_PASS_FILE}" "$@" 2>/dev/null
}
########################################
# Hilfe anzeigen
########################################
show_help() {
cat <<EOF
Usage:
$(basename "$0") [OPTION] [INPUT]
Decrypt modes:
1) Full vault-encrypted file (ANSIBLE_VAULT header):
$(basename "$0") secrets.vault
2) YAML file containing one or multiple "!vault |" blocks:
$(basename "$0") group_vars/all.yml
3) Encrypted vault string:
$(basename "$0") 'secret: !vault | \$ANSIBLE_VAULT;1.1;AES256 ...'
echo 'secret: !vault | ...' | $(basename "$0")
4) Interactive mode (paste, then Ctrl-D):
$(basename "$0")
Options:
-h, --help Show this help and exit
Notes:
- This script prints decrypted values to stdout.
- Vault password is prompted once per script run.
EOF
}
########################################
# Hauptfunktion
########################################
vdecr() {
unset IFS
if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
show_help
return 0
fi
# Prüfen, ob ansible-vault existiert und ausführbar ist
if ! command -v ansible-vault >/dev/null 2>&1; then if ! command -v ansible-vault >/dev/null 2>&1; then
echo "Fehler: 'ansible-vault' ist nicht installiert oder nicht im PATH." echo "Error: ansible-vault not found in PATH." >&2
exit 2 return 1
fi fi
# Prüfen, ob die angegebene Datei existiert ########################################
if [ ! -f "$DATEI" ]; then # Wenn ein Argument uebergeben wurde
echo "Fehler: Datei '$DATEI' existiert nicht." ########################################
exit 3 if [[ -n "${1:-}" ]]; then
# --- Fall 1: Argument ist eine Datei ---
if [[ -f "$1" ]]; then
if [[ "$(head -n1 "$1")" == "\$ANSIBLE_VAULT;1.1;AES256" ]]; then
decrypt_with_prompted_password "$1"
return 0
fi fi
# Befehl ausführen printf 'Reading vault values from file...\n\n'
ansible-vault decrypt --ask-vault-pass "$DATEI"
local parsing=0
local result=""
local name=""
local blue
local discard
blue="$(tput setaf 4 || true)"
discard="$(tput sgr0 || true)"
# Best-effort Parsing: Datei wird in Tokens zerlegt und !vault-Bloecke
# werden gesammelt, dann rekursiv als Stringinput entschluesselt.
while IFS= read -r token; do
if [[ "$(echo "$token" | grep -c "\!vault")" -gt 0 ]] && [[ $parsing -eq 0 ]]; then
parsing=1
elif [[ $parsing -eq 1 ]] && [[ "$(echo "$token" | grep -c ":")" -eq 0 ]]; then
result="$(printf "%s\n%s" "$result" "$token")"
else
if [[ -n "$result" ]]; then
printf "\n\n%s%s%s\n" "$blue" "$name" "$discard"
printf "%s" "$result" | vdecr
name=""
result=""
parsing=0
fi
fi
if [[ "$(echo "$token" | grep -c ":")" -eq 1 ]]; then
name="$token"
fi
done < <(tr -s '[:space:]' '\n' < "$1")
return 0
fi
# --- Fall 3: Argument ist ein String ---
local str="$1"
# --- Fall 4: String kommt per Pipe (stdin ist kein TTY) ---
elif [[ ! -t 0 ]]; then
local str
str="$(cat)"
# --- Fall 5: Interaktiv ---
else
printf 'Interactive mode. Paste encrypted string and press Ctrl-D two times to confirm.\n'
local str
str="$(cat)"
printf '\n'
fi
########################################
# String entschluesseln
########################################
# YAML-Deko entfernen und den Ciphertext in ein Format bringen,
# das ansible-vault decrypt direkt verarbeiten kann.
printf -- "%s" "$str" | \
sed 's/ /\n/g' | \
sed '/---\|^.*:\|\!vault\||\|^$/d' | \
decrypt_with_prompted_password
printf '\n'
}
# Aufraeumen erfolgt automatisch beim Verlassen des Skripts.
trap cleanup EXIT
########################################
# Main
########################################
if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
show_help
exit 0 exit 0
fi
vdecr "${1:-}"
+3
View File
@@ -75,6 +75,7 @@ vdecr() {
if [[ "$(head -n1 "$1")" == "\$ANSIBLE_VAULT;1.1;AES256" ]]; then if [[ "$(head -n1 "$1")" == "\$ANSIBLE_VAULT;1.1;AES256" ]]; then
# Vollständige Datei entschlüsseln und ausgeben # Vollständige Datei entschlüsseln und ausgeben
ansible-vault decrypt "$1" 2>/dev/null ansible-vault decrypt "$1" 2>/dev/null
echo "Decrypted file: $1" >&2
return 0 return 0
fi fi
@@ -133,6 +134,8 @@ vdecr() {
# Tokenisierung nach Whitespace (ähnlich dem Original) # Tokenisierung nach Whitespace (ähnlich dem Original)
done < <(tr -s '[:space:]' '\n' < "$1") done < <(tr -s '[:space:]' '\n' < "$1")
echo "Processed vault values from file: $1" >&2
return 0 return 0
fi fi
-55
View File
@@ -1,55 +0,0 @@
#!/usr/bin/env bash
vdecr() {
unset IFS
if [[ -n "$1" ]]; then
if [[ -f "$1" ]]; then
if [[ $(head -n1 "$1") == "\$ANSIBLE_VAULT;1.1;AES256" ]]; then
cat "$1" | ansible-vault decrypt 2> /dev/null
return 0
fi
printf 'Reading vault values from file...\n\n'
local parsing=0
local result=""
local name=""
local blue=$(tput setaf 4)
local discard=$(tput sgr0)
for line in $(cat $1); do
if [[ $(echo "$line" | grep -c "\!vault") -gt 0 ]] && [[ $parsing -eq 0 ]]; then
parsing=1
elif [[ $parsing -eq 1 ]] && [[ $( echo $line | grep -c ":") -eq 0 ]]; then
result=$(printf "${result}\n${line}")
else
if [[ $result != "" ]]; then
printf "\n\n${blue}$name${discard}\n"
printf "$result" | vdecr
name=""
result=""
parsing=0
fi
fi
if [[ $( echo "$line" | grep -c ":") -eq 1 ]]; then
name="$line"
fi
done
return 0
fi
local str="$1"
elif [[ ! -t 0 ]]; then
local str=$(cat)
else
printf 'Interactive mode. Paste encrypted string and press Ctrl-D two times to confirm.\n'
local str=$(cat)
printf '\n'
fi
printf -- "$str" | sed 's/ /\n/g' | \
sed '/---\|^.*:\|\!vault\||\|^$/d' | \
#ansible-vault decrypt --vault-password-file ~/.vault-pass 2> /dev/null
ansible-vault decrypt 2> /dev/null
printf '\n'
}
vdecr $1
+233 -15
View File
@@ -1,26 +1,244 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#
# encrypt-interactiv.sh
#
# Zweck:
# - Verschluesselt entweder:
# (A) ein komplettes File mit ansible-vault encrypt
# (B) YAML key: value Zeilen als key: !vault | Block
# (C) einen einzelnen String (Argument, Pipe oder interaktiv)
#
# Passwort wird einmalig interaktiv abgefragt.
#
# Prüfen, ob ein Dateiname als Argument übergeben wurde set -euo pipefail
if [ -z "$1" ]; then
echo "Usage: $0 <filename>" # Temp-Datei fuer das einmalig abgefragte Passwort.
exit 1 VAULT_PASS_FILE=""
# Vault-ID fuer Encrypt-Operationen (bei Bedarf per ENV ueberschreibbar).
VAULT_ID_LABEL="${VAULT_ID_LABEL:-default}"
cleanup() {
# Temp-Datei immer entfernen, auch bei Fehler/Abbruch.
if [[ -n "${VAULT_PASS_FILE}" && -f "${VAULT_PASS_FILE}" ]]; then
rm -f "${VAULT_PASS_FILE}"
fi
}
ask_vault_password_once() {
# Passwort nur einmal pro Skriptlauf abfragen.
if [[ -n "${VAULT_PASS_FILE}" && -f "${VAULT_PASS_FILE}" ]]; then
return 0
fi fi
DATEI="$1" if [[ ! -r /dev/tty ]]; then
echo "Error: No interactive TTY available for password prompt." >&2
return 1
fi
local pw1=""
local pw2=""
# Wichtig: Passwort immer direkt vom Terminal lesen,
# nicht von stdin (stdin kann String/Pipe-Daten enthalten).
read -rsp "Vault password: " pw1 < /dev/tty
printf '\n' > /dev/tty
read -rsp "Confirm password: " pw2 < /dev/tty
printf '\n' > /dev/tty
if [[ -z "${pw1}" ]]; then
echo "Error: Empty password is not allowed." >&2
return 1
fi
if [[ "${pw1}" != "${pw2}" ]]; then
echo "Error: Password confirmation does not match." >&2
return 1
fi
VAULT_PASS_FILE="$(mktemp)"
chmod 600 "${VAULT_PASS_FILE}"
printf '%s' "${pw1}" > "${VAULT_PASS_FILE}"
unset pw1 pw2
}
encrypt_with_prompted_password() {
ask_vault_password_once
ansible-vault encrypt \
--encrypt-vault-id "${VAULT_ID_LABEL}" \
--vault-password-file "${VAULT_PASS_FILE}" \
"$@"
}
encrypt_string_with_prompted_password() {
ask_vault_password_once
ansible-vault encrypt_string \
--encrypt-vault-id "${VAULT_ID_LABEL}" \
--vault-password-file "${VAULT_PASS_FILE}" \
"$@"
}
########################################
# Hilfe anzeigen
########################################
show_help() {
cat <<EOF
Usage:
$(basename "$0") [OPTION] [INPUT]
Modes:
1) File encrypt (in-place):
$(basename "$0") secrets.txt
2) YAML file (key: value -> !vault block):
$(basename "$0") vars.yml
$(basename "$0") -o output.yml vars.yml
3) String encrypt:
$(basename "$0") 'mySecret'
echo 'mySecret' | $(basename "$0")
$(basename "$0") (interactive mode)
Options:
-o FILE Write YAML output to FILE instead of stdout
-h, --help Show this help and exit
Notes:
- Simple "key: value" YAML lines will be converted.
- Already encrypted (!vault) entries are preserved.
- Full vault-encrypted files (ANSIBLE_VAULT header) are detected.
- Vault password is prompted once per script run.
- Vault ID defaults to "default" and can be changed via VAULT_ID_LABEL.
EOF
}
########################################
# Hauptfunktion
########################################
vencr() {
unset IFS
if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
show_help
return 0
fi
# Prüfen, ob ansible-vault existiert und ausführbar ist
if ! command -v ansible-vault >/dev/null 2>&1; then if ! command -v ansible-vault >/dev/null 2>&1; then
echo "Fehler: 'ansible-vault' ist nicht installiert oder nicht im PATH." echo "Error: ansible-vault not found in PATH." >&2
exit 2 return 1
fi fi
# Prüfen, ob die angegebene Datei existiert ########################################
if [ ! -f "$DATEI" ]; then # Optionales Output-File (-o)
echo "Fehler: Datei '$DATEI' existiert nicht." ########################################
exit 3 local out_file=""
if [[ "${1:-}" == "-o" && -n "${2:-}" ]]; then
out_file="$2"
shift 2
fi fi
# Befehl ausführen ########################################
ansible-vault encrypt --ask-vault-pass "$DATEI" # 1) File als Argument
########################################
if [[ -n "${1:-}" && -f "$1" ]]; then
local f="$1"
exit 0 if [[ "$(head -n1 "$f")" == "\$ANSIBLE_VAULT;1.1;AES256"* ]]; then
echo "File already encrypted (ANSIBLE_VAULT header found): $f" >&2
return 0
fi
if grep -Eq '^[[:space:]]*[A-Za-z0-9_.-]+:[[:space:]]*[^#].*$' "$f"; then
local tmpout
tmpout="$(mktemp)"
while IFS= read -r line || [[ -n "$line" ]]; do
if [[ -z "$line" || "$line" =~ ^[[:space:]]*# ]]; then
printf '%s\n' "$line" >> "$tmpout"
continue
fi
if echo "$line" | grep -q '\!vault'; then
printf '%s\n' "$line" >> "$tmpout"
continue
fi
if [[ "$line" =~ ^([[:space:]]*)([A-Za-z0-9_.-]+):[[:space:]]*(.+)$ ]]; then
local indent="${BASH_REMATCH[1]}"
local key="${BASH_REMATCH[2]}"
local value="${BASH_REMATCH[3]}"
if [[ "$value" == "|" || "$value" == ">" || "$value" == "" ]]; then
printf '%s\n' "$line" >> "$tmpout"
continue
fi
value="${value%\"}"; value="${value#\"}"
value="${value%\'}"; value="${value#\'}"
# Aus key: value wird ein key: !vault |-Block.
while IFS= read -r enc_line; do
printf '%s%s\n' "$indent" "$enc_line" >> "$tmpout"
done < <(
printf '%s' "$value" |
encrypt_string_with_prompted_password --stdin-name "$key"
)
else
printf '%s\n' "$line" >> "$tmpout"
fi
done < "$f"
if [[ -n "$out_file" ]]; then
mv "$tmpout" "$out_file"
echo "Encrypted YAML written to: $out_file" >&2
else
cat "$tmpout"
rm -f "$tmpout"
fi
return 0
fi
encrypt_with_prompted_password "$f"
echo "Encrypted file in-place: $f" >&2
return 0
fi
########################################
# 2) String-Verschluesselung
########################################
local str=""
local name="secret"
if [[ -n "${1:-}" ]]; then
str="$1"
elif [[ ! -t 0 ]]; then
str="$(cat)"
else
echo "Interactive mode."
read -r -p "Variable name (default: secret): " name_in
if [[ -n "$name_in" ]]; then
name="$name_in"
fi
echo "Paste plaintext and press Ctrl-D to confirm:"
str="$(cat)"
echo
fi
printf '%s' "$str" | encrypt_string_with_prompted_password --stdin-name "$name"
}
trap cleanup EXIT
########################################
# Script starten
########################################
vencr "$@"
-7
View File
@@ -1,7 +0,0 @@
#!/usr/bin/env bash
set -euo pipefail
read -r -s -p "String zum Verschlüsseln: " PLAINTEXT
echo
printf '%s' "$PLAINTEXT" | ansible-vault encrypt_string --stdin-name 'secret'
+34 -5
View File
@@ -31,6 +31,9 @@ Modes:
$(basename "$0") vars.yml $(basename "$0") vars.yml
$(basename "$0") -o output.yml vars.yml $(basename "$0") -o output.yml vars.yml
Force whole-file encryption for a YAML file:
$(basename "$0") --full-file vars.yml
3) String encrypt: 3) String encrypt:
$(basename "$0") 'mySecret' $(basename "$0") 'mySecret'
echo 'mySecret' | $(basename "$0") echo 'mySecret' | $(basename "$0")
@@ -38,6 +41,7 @@ Modes:
Options: Options:
-o FILE Write YAML output to FILE instead of stdout -o FILE Write YAML output to FILE instead of stdout
--full-file Encrypt the given file in-place, even if it is .yml/.yaml
-h, --help Show this help and exit -h, --help Show this help and exit
Notes: Notes:
@@ -62,13 +66,37 @@ vencr() {
fi fi
######################################## ########################################
# Optionales Output-File (-o) # Optionen: Ausgabe-Datei und Vollverschluesselung fuer YAML-Dateien.
######################################## ########################################
local out_file="" local out_file=""
if [[ "${1:-}" == "-o" && -n "${2:-}" ]]; then local force_full_file=0
while [[ -n "${1:-}" && "${1:-}" == -* ]]; do
case "$1" in
-o)
if [[ -z "${2:-}" ]]; then
echo "Error: -o requires a file name." >&2
return 1
fi
out_file="$2" out_file="$2"
shift 2 shift 2
fi ;;
--full-file)
force_full_file=1
shift
;;
-h|--help)
show_help
exit 0
;;
--)
shift
break
;;
*)
break
;;
esac
done
######################################## ########################################
# --- 1) File als Argument --- # --- 1) File als Argument ---
@@ -82,8 +110,9 @@ vencr() {
return 0 return 0
fi fi
# Fall B: YAML mit key: value Zeilen # Fall B: YAML mit key: value Zeilen nur fuer typische YAML-Dateien
if grep -Eq '^[[:space:]]*[A-Za-z0-9_.-]+:[[:space:]]*[^#].*$' "$f"; then # (damit z.B. README.md als normale Datei komplett verschluesselt wird).
if [[ $force_full_file -eq 0 ]] && [[ "$f" =~ \.(yml|yaml)$ ]] && grep -Eq '^[[:space:]]*[A-Za-z0-9_.-]+:[[:space:]]*[^#].*$' "$f"; then
local tmpout local tmpout
tmpout="$(mktemp)" tmpout="$(mktemp)"
+6
View File
@@ -116,3 +116,9 @@ export EDITOR=vim
# turn off the beep (only in bash tab-complete ?) # turn off the beep (only in bash tab-complete ?)
# only if interactiv shell # only if interactiv shell
[[ "$-" =~ "i" ]] && bind 'set bell-style none' [[ "$-" =~ "i" ]] && bind 'set bell-style none'
# Workaround für cssh/Perl-Tk unter Wayland: "Authorization required, but
# no authorization protocol specified" (Debian Bug #1028370). Erlaubt dem
# lokalen User pauschalen X11-Zugriff, ohne fehlerhaftes Cookie-Verfahren.
#
#xhost +SI:localuser:$(whoami) >/dev/null 2>&1
-1
View File
@@ -416,4 +416,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
+87 -81
View File
@@ -125,7 +125,6 @@ copy_plain_files_journald:
dest_path: /etc/systemd/journald.conf.d/50-MaxFileSec.conf dest_path: /etc/systemd/journald.conf.d/50-MaxFileSec.conf
# copy_plain_files_sysctl: [] # copy_plain_files_sysctl: []
copy_plain_files_sysctl: copy_plain_files_sysctl:
@@ -159,7 +158,7 @@ apt_manage_sources_list: true
apt_src_enable: true apt_src_enable: true
apt_backports_enable: true apt_backports_enable: true
apt_debian_mirror: http://ftp2.de.debian.org/debian/ apt_debian_mirror: http://ftp.de.debian.org/debian/
apt_debian_contrib_nonfree_enable: true apt_debian_contrib_nonfree_enable: true
# Ubuntu mirror # Ubuntu mirror
@@ -1729,87 +1728,88 @@ apt_webserver_pkgs:
apt_webserver_pkgs_trixie: apt_webserver_pkgs_trixie:
- libdb-dev - build-essential
- zlib1g
- zlib1g-dev
- libssl-dev
- libneon27-dev
- libxml2
- libxml2-dev
- curl - curl
- libcurl4-openssl-dev
- libqdbm-dev
- libgdbm-dev
- libpspell-dev
- libjpeg-dev
- libpng-dev
- libxpm-dev
- libfreetype6-dev
- libwmf-dev
- libtiff-dev
- libpaper-dev
- libmagic-dev
- libgraphics-magick-perl
- libgraphicsmagick++1-dev
- libgraphicsmagick-q16-3
- libgraphicsmagick1-dev
- libgraphviz-dev
- libgsf-1-dev
- libilmbase-dev
- libvpx-dev
- vpx-tools
- libgpm-dev
- libkpathsea-dev
- libopenexr-dev
- librsvg2-dev
- libdjvulibre-dev
- libatm-dev
- libexpat-dev
- imagemagick
- graphicsmagick
- exif
- libexiv2-dev
- re2c
- netpbm
- libnetpbm-dev
- libmcrypt-dev
- mcrypt
- default-libmysqlclient-dev - default-libmysqlclient-dev
- libpq-dev - exif
- postgresql-client - expect
- libreadline-dev - expect-dev
- libncurses-dev - ffmpeg
- graphicsmagick
- imagemagick
- libaio-dev
- libapr1-dev
- libaprutil1-dev
- libatm-dev
- libcrypto++-dev
- libcurl4-openssl-dev
- libdb5.3 - libdb5.3
- libdb5.3++ - libdb5.3++
- libdb5.3++-dev - libdb5.3++-dev
- libdb5.3-dev - libdb5.3-dev
- libxslt1-dev - libdb-dev
- libpcre2-dev - libdjvulibre-dev
- libicu-dev - libexiv2-dev
- libtidy-dev - libexpat-dev
- libmm-dev - libexpect-perl
- libfreetype6-dev
- libgdbm-dev
- libgd-dev
- libgeoip-dev
- libgmp-dev - libgmp-dev
- libgpm-dev
- libgraphicsmagick++1-dev
- libgraphicsmagick1-dev
- libgraphics-magick-perl
- libgraphicsmagick-q16-3
- libgraphviz-dev
- libgsf-1-dev
- libicu-dev
- libilmbase-dev
- libjpeg-dev
- libkpathsea-dev
- libkrb5-dev - libkrb5-dev
- libldap-dev - libldap-dev
- libmhash-dev
- libgd-dev
- liblua5.3-dev - liblua5.3-dev
- libapr1-dev - libmagic-dev
- libaprutil1-dev
- libsctp-dev
- libcrypto++-dev
- ffmpeg
- libmagickwand-dev - libmagickwand-dev
- libgeoip-dev - libmcrypt-dev
- libaio-dev - libmhash-dev
- tk-dev - libmm-dev
- libncurses-dev
- libneon27-dev
- libnetpbm-dev
- libopenexr-dev
- libpaper-dev
- libpcre2-dev
- libpng-dev
- libpq-dev
- libpspell-dev
- libqdbm-dev
- libreadline-dev
- librsvg2-dev
- libsctp-dev
- libssl-dev
- libtidy-dev
- libtiff-dev
- libvpx-dev
- libwmf-dev
- libxml2
- libxml2-dev
- libxpm-dev
- libxslt1-dev
- mcrypt
- netpbm
- poppler-utils
- postgresql-client
- re2c
- tcl-dev - tcl-dev
- tclreadline - tclreadline
- expect - tk-dev
- expect-dev - vpx-tools
- libexpect-perl
- poppler-utils
- weasyprint - weasyprint
- zlib1g
- zlib1g-dev
# - libc-client2007e-dev # - libc-client2007e-dev
# - libc-client-dev # - libc-client-dev
@@ -1918,11 +1918,12 @@ apt_extra_pkgs: []
apt_install: {} apt_install: {}
apt_install_state: latest apt_install_state: latest
apt_remove: apt_remove: []
- apt-transport-tor # apt_remove:
- tor # - apt-transport-tor
- tor-geoipdb # - tor
- torsocks # - tor-geoipdb
# - torsocks
apt_remove_purge: false apt_remove_purge: false
@@ -2380,9 +2381,6 @@ extra_system_user: []
entries_authorized_key: [] entries_authorized_key: []
#entries_authorized_key:
# - user: root
# - key: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDcc4brtgGW0xP2KiZGq5xsyUKcNiYF72zQ49Z0lqx3iu0zj9oz79oGZY1N9jCeKG30AsbwL+4H6/l2hAekFZu6fIwuiRgCVRAwYrnnlOGDAnYOGHfks23pk2BU0/fb2VnxiK967FvpJ/xDP49t1UC5voX/O2MTkz6NROJPwIClHgnwN1bg+C09UpJNmmdROi8myhiu1/aYbAWDfQzVUnHio0q3vBM16ZUQkoIHxQT4fF8elS408n0jd9WJHyRtLB/mCMI6O3G2yHdPVciqKwgRwRtJ8hDjmFfyeLtxb4ADpa2Q/f6MuJI0elxbxjp8l2XKjVSwPJ8GKomC16HfgFMrnUNQcx9YMrXB26f+lperf9NlwbQtXZffj9M+BxTAFvh+1Q/iIHqRat2Bb/8OUY9JI2zuWUliffqb5Kbzjik4vMqZvI2ED2zphsPcpLST7u+4z40vZliBf1F4P2vDBfIRK87ldfJQQw6saMZznjZPNV7CA+K7IFCpOz0wuoVE3wOka8hdYmMIMno34Zf6P+xuTaAPXJOCubKuhicUlhtX7q72Pln5kuvbO3ZRgEK3XnyIWeAd2rkaU6XVo7W19043e9HkkbG8nZETYu7TGFhufXyloinde5XLyW295BS8fKa1AteJPDLY4ClF2PZiWbxWRjAhlRAlgXgup09rN2HHjw== root@b.ns'
create_sftp_group: false create_sftp_group: false
@@ -2601,7 +2599,7 @@ bind9_notify_source: {}
bind9_gateway_allow_query: bind9_gateway_allow_query:
- local-net - local-net
#bind9_gateway_allow_query_cache: {} # ind9_gateway_allow_query_cache: {}
bind9_gateway_allow_query_cache: bind9_gateway_allow_query_cache:
- local-net - local-net
@@ -2628,6 +2626,8 @@ ntp_server: {}
# Firewall repository # Firewall repository
# --- # ---
git_default_branch: main
git_firewall_repository: {} git_firewall_repository: {}
# --- # ---
@@ -2990,6 +2990,14 @@ copy_plain_files_postfwd:
src_path: mailserver/etc/postfix/postfwd.bl-user src_path: mailserver/etc/postfix/postfwd.bl-user
dest_path: /etc/postfix/postfwd.bl-user dest_path: /etc/postfix/postfwd.bl-user
- name: postfwd.high_rate_ip
src_path: mailserver/etc/postfix/postfwd.high_rate_ip
dest_path: /etc/postfix/postfwd.high_rate_ip
- name: postfwd.high_rate_hostname
src_path: mailserver/etc/postfix/postfwd.high_rate_hostname
dest_path: /etc/postfix/postfwd.high_rate_hostname
- name: postfwd.bl-recipient-exeeds-msg-size-20mb - name: postfwd.bl-recipient-exeeds-msg-size-20mb
src_path: mailserver/etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb src_path: mailserver/etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb
dest_path: /etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb dest_path: /etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb
@@ -3105,7 +3113,7 @@ website_name_postfixadmin:
# --\n # --\n
# O.OPEN | Phone: +49 30 / 290 484 91\n # O.OPEN | Phone: +49 30 / 290 484 91\n
# Erkelenzdamm 21 | Fax: +49 30 / 290 484 99\n # Erkelenzdamm 21 | Fax: +49 30 / 290 484 99\n
#D-10999 Berlin | E-MAIL: oo@oopen.de\n # -10999 Berlin | E-MAIL: oo@oopen.de\n
# " # "
email_welcome_message: email_welcome_message:
@@ -3288,8 +3296,6 @@ redhat_services_active_and_started:
- tor - tor
# ============================== # ==============================
+19 -65
View File
@@ -107,14 +107,14 @@ insert_root_ssh_keypair: true
root_ssh_keypair: root_ssh_keypair:
- name: id-rsa-dehydrated - name: id-rsa-dehydrated
priv_key_src: a.mx/root/.ssh/a.mx-id_rsa-dehydrated priv_key_src: a.mx.oopen.de/root/.ssh/a.mx-id_rsa-dehydrated
priv_key_dest: /root/.ssh/id_rsa-dehydrated priv_key_dest: /root/.ssh/id_rsa-dehydrated
pub_key_src: a.mx/root/.ssh/a.mx-id_rsa-dehydrated.pub pub_key_src: a.mx.oopen.de/root/.ssh/a.mx-id_rsa-dehydrated.pub
pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub
- name: id-rsa-opendkim - name: id-rsa-opendkim
priv_key_src: a.mx/root/.ssh/a.mx-id_rsa-opendkim priv_key_src: a.mx.oopen.de/root/.ssh/a.mx-id_rsa-opendkim
priv_key_dest: /root/.ssh/id_rsa-opendkim priv_key_dest: /root/.ssh/id_rsa-opendkim
pub_key_src: a.mx/root/.ssh/a.mx-id_rsa-opendkim.pub pub_key_src: a.mx.oopen.de/root/.ssh/a.mx-id_rsa-opendkim.pub
pub_key_dest: /root/.ssh/id_rsa-opendkim.pub pub_key_dest: /root/.ssh/id_rsa-opendkim.pub
@@ -151,53 +151,6 @@ root_ssh_keypair:
# vars used by roles/common/tasks/copy_files.yml # vars used by roles/common/tasks/copy_files.yml
# --- # ---
copy_plain_files:
# /root/bin/monitoring
#
- name: monitoring_check_cert_for_dovecot.conf
src_path: a.mx/root/bin/monitoring/conf/check_cert_for_dovecot.conf
dest_path: /root/bin/monitoring/conf/check_cert_for_dovecot.conf
# /root/bin/postfix
#
- name: postfix_create_opendkim_key.conf
src_path: a.mx/root/bin/postfix/conf/create_opendkim_key.conf
dest_path: /root/bin/postfix/conf/create_opendkim_key.conf
- name: postfix_postfix_add_mailboxes.conf
src_path: a.mx/root/bin/postfix/conf/postfix_add_mailboxes.conf
dest_path: /root/bin/postfix/conf/postfix_add_mailboxes.conf
- name: postfix_sent_userinfo_postfix.conf
src_path: a.mx/root/bin/postfix/conf/sent_userinfo_postfix.conf
dest_path: /root/bin/postfix/conf/sent_userinfo_postfix.conf
- name: postfix_whitelist_mb_sigs.conf
src_path: a.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf
dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf
copy_plain_files_postfwd_host_specific:
# Postfix Firewall postfwd
#
- name: postfwd.wl-user
src_path: a.mx/etc/postfix/postfwd.wl-user
dest_path: /etc/postfix/postfwd.wl-user
- name: postfwd.bl-recipient-exeeds-msg-size-20mb
src_path: a.mx/etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb
dest_path: /etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb
#copy_template_files: []
#
# - name: mailsystem_install_amavis.conf
# src_path: usr/local/src/mailsystem/conf/install_amavis.conf.j2
# dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf
# --- # ---
# vars used by roles/common/tasks/config_files_mailsystem_scripts.yml # vars used by roles/common/tasks/config_files_mailsystem_scripts.yml
@@ -231,30 +184,31 @@ si_authorisation_signature: abb4ec6b194639f3d123154f1b971843a3b8751d8c1bcdc7d07e
# #
website_name_postfixadmin: adm.oopen.de website_name_postfixadmin: adm.oopen.de
email_welcome_message: "\n email_welcome_message: |
Hallo,\n
Ihre/Deine neue E-Mail Adresse ist eingerichtet.\n Hallo,
O.OPEN\n Ihre/Deine neue E-Mail Adresse ist eingerichtet.
--\n O.OPEN
O.OPEN | Phone: +49 30 / 290 484 91\n
Erkelenzdamm 21 | Fax: +49 30 / 290 484 99\n --
D-10999 Berlin | E-MAIL: oo@oopen.de\n O.OPEN | Phone: +49 30 / 290 484 91
" Erkelenzdamm 21 | Fax: +49 30 / 290 484 99
D-10999 Berlin | E-MAIL: oo@oopen.de
# install_update_dovecot.conf # install_update_dovecot.conf
# #
dovecot_from_address: "o.open <oo@oopen.de>" dovecot_from_address: "o.open <oo@oopen.de>"
dovecot_reply_to: "oo@oopen.de" dovecot_reply_to: "oo@oopen.de"
webmailer_address: "https://webmail.oopen.de" webmailer_address: "https://webmail.oopen.de"
salutation: "O.OPEN\n salutation: |
O.OPEN
--\n --
O.OPEN | Phone: +49 30 / 290 484 91\n O.OPEN | Phone: +49 30 / 290 484 91
Erkelenzdamm 21 | Fax: +49 30 / 290 484 99\n Erkelenzdamm 21 | Fax: +49 30 / 290 484 99
D-10999 Berlin | http://oopen.de\n" D-10999 Berlin | http://oopen.de
# install_upgrade_roundcube-webmail.conf # install_upgrade_roundcube-webmail.conf
# #
+1 -1
View File
@@ -42,4 +42,4 @@ fw_jitsi_dovecot_auth: true
fw_rsync_out_ips: $ext_1_ip fw_rsync_out_ips: $ext_1_ip
# --- Protection / limits # --- Protection / limits
fw_per_IP_connection_limit: 250 fw_per_IP_connection_limit: 250 # noqa: var-naming[pattern]
+1 -4
View File
@@ -1,4 +1,5 @@
--- ---
# yamllint disable rule:line-length
# --- # ---
# vars used by roles/ansible_dependencies # vars used by roles/ansible_dependencies
@@ -244,13 +245,9 @@ symlink_files:
# --- # ---
# ============================== # ==============================
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -139,4 +139,3 @@ resolved_fallback_nameserver:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
+1 -1
View File
@@ -1,4 +1,5 @@
--- ---
# yamllint disable rule:line-length
# --- # ---
# vars used by roles/ansible_dependencies # vars used by roles/ansible_dependencies
@@ -290,4 +291,3 @@ samba_shares:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -145,7 +145,6 @@ cron_user_special_time_entries:
insertafter: PATH insertafter: PATH
# --- # ---
# vars used by roles/common/tasks/users.yml # vars used by roles/common/tasks/users.yml
# --- # ---
+4 -37
View File
@@ -105,14 +105,14 @@ insert_root_ssh_keypair: true
root_ssh_keypair: root_ssh_keypair:
- name: id-rsa-dehydrated - name: id-rsa-dehydrated
priv_key_src: b.mx/root/.ssh/b.mx-id_rsa-dehydrated priv_key_src: b.mx.oopen.de/root/.ssh/b.mx-id_rsa-dehydrated
priv_key_dest: /root/.ssh/id_rsa-dehydrated priv_key_dest: /root/.ssh/id_rsa-dehydrated
pub_key_src: b.mx/root/.ssh/b.mx-id_rsa-dehydrated.pub pub_key_src: b.mx.oopen.de/root/.ssh/b.mx-id_rsa-dehydrated.pub
pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub
- name: id-rsa-opendkim - name: id-rsa-opendkim
priv_key_src: b.mx/root/.ssh/b.mx-id_rsa-opendkim priv_key_src: b.mx.oopen.de/root/.ssh/b.mx-id_rsa-opendkim
priv_key_dest: /root/.ssh/id_rsa-opendkim priv_key_dest: /root/.ssh/id_rsa-opendkim
pub_key_src: b.mx/root/.ssh/b.mx-id_rsa-opendkim.pub pub_key_src: b.mx.oopen.de/root/.ssh/b.mx-id_rsa-opendkim.pub
pub_key_dest: /root/.ssh/id_rsa-opendkim.pub pub_key_dest: /root/.ssh/id_rsa-opendkim.pub
@@ -149,38 +149,6 @@ root_ssh_keypair:
# vars used by roles/common/tasks/copy_files.yml # vars used by roles/common/tasks/copy_files.yml
# --- # ---
copy_plain_files:
# /root/bin/postfix
#
- name: postfix_create_opendkim_key.conf
src_path: b.mx/root/bin/postfix/conf/create_opendkim_key.conf
dest_path: /root/bin/postfix/conf/create_opendkim_key.conf
- name: postfix_whitelist_mb_sigs.conf
src_path: b.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf
dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf
copy_plain_files_postfix_host_specific:
- name: relay_domains
src_path: b.mx/etc/postfix/relay_domains
dest_path: /etc/postfix/relay_domains
copy_plain_files_postfwd_host_specific:
# Postfix Firewall postfwd
#
- name: postfwd.wl-nets
src_path: b.mx/etc/postfix/postfwd.wl-nets
dest_path: /etc/postfix/postfwd.wl-nets
- name: postfwd.wl-sender
src_path: b.mx/etc/postfix/postfwd.wl-sender
dest_path: /etc/postfix/postfwd.wl-sender
copy_template_files: [] copy_template_files: []
# #
@@ -189,7 +157,6 @@ copy_template_files: []
# dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf # dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf
# --- # ---
# vars used by roles/common/tasks/config_files_mailsystem_scripts.yml # vars used by roles/common/tasks/config_files_mailsystem_scripts.yml
# --- # ---
+1 -1
View File
@@ -1,4 +1,5 @@
--- ---
# yamllint disable rule:line-length
# --- # ---
# vars used by roles/ansible_dependencies # vars used by roles/ansible_dependencies
@@ -240,4 +241,3 @@ symlink_files:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
+2 -1
View File
@@ -299,6 +299,7 @@ default_user:
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDNIGI5HpfYnZCvDM3bf3UQti8SRhgL7wLu8LfxZLqwB root@meet.akweb.de' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDNIGI5HpfYnZCvDM3bf3UQti8SRhgL7wLu8LfxZLqwB root@meet.akweb.de'
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINoLG5tE0tHh+iFRzellU80eJTxZfqDB3e6Dg4XRKBrA root@meet.oopen.de' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINoLG5tE0tHh+iFRzellU80eJTxZfqDB3e6Dg4XRKBrA root@meet.oopen.de'
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF2bxZZNXrlsvERYo0VyXzdW1AZuGmsTNjgF4oQJNfnn root@mm-irights' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF2bxZZNXrlsvERYo0VyXzdW1AZuGmsTNjgF4oQJNfnn root@mm-irights'
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINy+3uf7VKQBQuXPeFSlSG4lcNbkCTysMhIideNTyMKr root@mm-nd'
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpKuS8DFuHHvfQZCHOGiurOvzlFkx1unnMfZWEM3wUY root@mm-rav' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpKuS8DFuHHvfQZCHOGiurOvzlFkx1unnMfZWEM3wUY root@mm-rav'
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMnwSzzSrAQJN3I0Y3xRU0rjlrO2KlHD3tFMgCqEyk0i root@mm' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMnwSzzSrAQJN3I0Y3xRU0rjlrO2KlHD3tFMgCqEyk0i root@mm'
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILXSGiRst5AQ396FQY6jrr1jTCpwGDLWv5akw6SiMUGq root@nd-gate' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILXSGiRst5AQ396FQY6jrr1jTCpwGDLWv5akw6SiMUGq root@nd-gate'
@@ -337,6 +338,7 @@ default_user:
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDW54VI+M5SjV6dQLew/IA31RI1GOneIqg5dI1/VZQgJ root@o42' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDW54VI+M5SjV6dQLew/IA31RI1GOneIqg5dI1/VZQgJ root@o42'
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII2b60T/OXKCoze083GsHXuMFtm8Zo3WnCFb9Q9ofGie root@o43' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII2b60T/OXKCoze083GsHXuMFtm8Zo3WnCFb9Q9ofGie root@o43'
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPytU2q7RmehrJyRnXRIZp7qcoswSANsClJP8v3zv6D7 root@o44' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPytU2q7RmehrJyRnXRIZp7qcoswSANsClJP8v3zv6D7 root@o44'
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFS0XtUKLgDqciQLr64VbtQSTlz7eHuvA8x9QZiAg9RA root@o45'
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMUnxlKIffm8a5BmoQE40h8ut0R6eCxcm+Iewv3evmE9 root@oolm-shop' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMUnxlKIffm8a5BmoQE40h8ut0R6eCxcm+Iewv3evmE9 root@oolm-shop'
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF4ylglAkPst7G6kES2lE96ECp0AGXGjzCVkZSqGVru6 root@oolm-shop-dev' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF4ylglAkPst7G6kES2lE96ECp0AGXGjzCVkZSqGVru6 root@oolm-shop-dev'
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIUZ0WNd3rTqHH1tiXAELwssGw6xUP1ROdhgxKbMinYY root@oolm-web' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIUZ0WNd3rTqHH1tiXAELwssGw6xUP1ROdhgxKbMinYY root@oolm-web'
@@ -410,4 +412,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -188,8 +188,6 @@ cron_user_entries:
insert_ssh_keypair_backup_server: false insert_ssh_keypair_backup_server: false
default_user: default_user:
- name: chris - name: chris
@@ -308,4 +306,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -156,7 +156,6 @@ cron_user_special_time_entries:
insertafter: PATH insertafter: PATH
# --- # ---
# vars used by roles/common/tasks/users.yml # vars used by roles/common/tasks/users.yml
# --- # ---
+19 -63
View File
@@ -107,19 +107,19 @@ insert_root_ssh_keypair: true
root_ssh_keypair: root_ssh_keypair:
- name: id-rsa-dehydrated - name: id-rsa-dehydrated
priv_key_src: c.mx/root/.ssh/c.mx-id_rsa-dehydrated priv_key_src: c.mx.oopen.de/root/.ssh/c.mx-id_rsa-dehydrated
priv_key_dest: /root/.ssh/id_rsa-dehydrated priv_key_dest: /root/.ssh/id_rsa-dehydrated
pub_key_src: c.mx/root/.ssh/c.mx-id_rsa-dehydrated.pub pub_key_src: c.mx.oopen.de/root/.ssh/c.mx-id_rsa-dehydrated.pub
pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub
- name: id-rsa-opendkim - name: id-rsa-opendkim
priv_key_src: c.mx/root/.ssh/c.mx-id_rsa-opendkim priv_key_src: c.mx.oopen.de/root/.ssh/c.mx-id_rsa-opendkim
priv_key_dest: /root/.ssh/id_rsa-opendkim priv_key_dest: /root/.ssh/id_rsa-opendkim
pub_key_src: c.mx/root/.ssh/c.mx-id_rsa-opendkim.pub pub_key_src: c.mx.oopen.de/root/.ssh/c.mx-id_rsa-opendkim.pub
pub_key_dest: /root/.ssh/id_rsa-opendkim.pub pub_key_dest: /root/.ssh/id_rsa-opendkim.pub
- name: id-rsa - name: id-rsa
priv_key_src: c.mx/root/.ssh/c.mx-id_rsa priv_key_src: c.mx.oopen.de/root/.ssh/c.mx-id_rsa
priv_key_dest: /root/.ssh/id_rsa priv_key_dest: /root/.ssh/id_rsa
pub_key_src: c.mx/root/.ssh/c.mx-id_rsa.pub pub_key_src: c.mx.oopen.de/root/.ssh/c.mx-id_rsa.pub
pub_key_dest: /root/.ssh/id_rsa.pub pub_key_dest: /root/.ssh/id_rsa.pub
@@ -156,49 +156,6 @@ root_ssh_keypair:
# vars used by roles/common/tasks/copy_files.yml # vars used by roles/common/tasks/copy_files.yml
# --- # ---
copy_plain_files:
# /root/bin/monitoring
#
- name: monitoring_check_cert_for_dovecot.conf
src_path: c.mx/root/bin/monitoring/conf/check_cert_for_dovecot.conf
dest_path: /root/bin/monitoring/conf/check_cert_for_dovecot.conf
# /root/bin/postfix
#
- name: postfix_create_opendkim_key.conf
src_path: c.mx/root/bin/postfix/conf/create_opendkim_key.conf
dest_path: /root/bin/postfix/conf/create_opendkim_key.conf
- name: postfix_postfix_add_mailboxes.conf
src_path: c.mx/root/bin/postfix/conf/postfix_add_mailboxes.conf
dest_path: /root/bin/postfix/conf/postfix_add_mailboxes.conf
- name: postfix_sent_userinfo_postfix.conf
src_path: c.mx/root/bin/postfix/conf/sent_userinfo_postfix.conf
dest_path: /root/bin/postfix/conf/sent_userinfo_postfix.conf
- name: postfix_whitelist_mb_sigs.conf
src_path: c.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf
dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf
copy_plain_files_postfwd_host_specific: []
# Postfix Firewall postfwd
#
#- name: postfwd.wl-user
# src_path: c.mx/etc/postfix/postfwd.wl-user
# dest_path: /etc/postfix/postfwd.wl-user
#copy_template_files: []
#
# - name: mailsystem_install_amavis.conf
# src_path: usr/local/src/mailsystem/conf/install_amavis.conf.j2
# dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf
# --- # ---
# vars used by roles/common/tasks/config_files_mailsystem_scripts.yml # vars used by roles/common/tasks/config_files_mailsystem_scripts.yml
@@ -230,30 +187,30 @@ si_authorisation_signature: abb4ec6b194639f3d123154f1b971843a3b8751d8c1bcdc7d07e
# #
website_name_postfixadmin: adm.initiativenserver.de website_name_postfixadmin: adm.initiativenserver.de
email_welcome_message: "\n email_welcome_message: |
Hallo,\n Hallo,
Ihre/Deine neue E-Mail Adresse ist eingerichtet.\n Ihre/Deine neue E-Mail Adresse ist eingerichtet.
Aktionsbündnis gegen Gewalt, Rechtsextremismus und Fremdenfeindlichkeit Aktionsbündnis gegen Gewalt, Rechtsextremismus und Fremdenfeindlichkeit
--\n --
Initiativenserver | phone: 0331 505824-28\n Initiativenserver | phone: 0331 505824-28
Mittelstraße 38/39 | fax: 0331 505824-29\n Mittelstraße 38/39 | fax: 0331 505824-29
14467 Potsdam | email: kontakt@initiativenserver.de\n 14467 Potsdam | email: kontakt@initiativenserver.de
"
# install_update_dovecot.conf # install_update_dovecot.conf
# #
dovecot_from_address: "Admin Initiativenserver <admin@initiativenserver.de>" dovecot_from_address: "Admin Initiativenserver <admin@initiativenserver.de>"
dovecot_reply_to: "admin@initiativenserver.de" dovecot_reply_to: "admin@initiativenserver.de"
webmailer_address: "https://webmail.initiativenserver.de" webmailer_address: "https://webmail.initiativenserver.de"
salutation: "Aktionsbündnis gegen Gewalt, Rechtsextremismus und FremdenfeindlichkeitN\n salutation: |
Aktionsbündnis gegen Gewalt, Rechtsextremismus und Fremdenfeindlichkeit
--\n --
Initiativenserver | phone: 0331 505824-28\n Initiativenserver | phone: 0331 505824-28
Mittelstraße 38/39 | fax: 0331 505824-29\n Mittelstraße 38/39 | fax: 0331 505824-29
14467 Potsdam | email: kontakt@initiativenserver.de\n" 14467 Potsdam | email: kontakt@initiativenserver.de
# install_upgrade_roundcube-webmail.conf # install_upgrade_roundcube-webmail.conf
# #
@@ -295,4 +252,3 @@ template_files_mailsystem_script:
- name: mailsystem_install_upgrade_roundcube-webmail.conf - name: mailsystem_install_upgrade_roundcube-webmail.conf
src_path: usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail.conf.j2 src_path: usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail.conf.j2
dest_path: /usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail.conf dest_path: /usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail.conf
@@ -163,4 +163,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -150,4 +150,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -148,4 +148,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -148,4 +148,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -232,4 +232,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -232,4 +232,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -149,4 +149,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -22,3 +22,7 @@ fw_http_server_ips: $ext_1_ip
# --- Mail # --- Mail
fw_mail_client_ips: $ext_1_ip fw_mail_client_ips: $ext_1_ip
# - Docker-Netzwerk nicht firewallen
#
fw_unprotected_ifs: br-euroffice
@@ -232,4 +232,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -232,4 +232,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -143,4 +143,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -140,4 +140,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -70,4 +70,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -70,4 +70,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -144,4 +144,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -158,4 +158,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -156,4 +156,3 @@ sudoers_file_user_privileges:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
+4 -26
View File
@@ -107,14 +107,14 @@ insert_root_ssh_keypair: true
root_ssh_keypair: root_ssh_keypair:
- name: id-rsa-dehydrated - name: id-rsa-dehydrated
priv_key_src: d.mx/root/.ssh/d.mx-id_rsa-dehydrated priv_key_src: d.mx.oopen.de/root/.ssh/d.mx-id_rsa-dehydrated
priv_key_dest: /root/.ssh/id_rsa-dehydrated priv_key_dest: /root/.ssh/id_rsa-dehydrated
pub_key_src: d.mx/root/.ssh/d.mx-id_rsa-dehydrated.pub pub_key_src: d.mx.oopen.de/root/.ssh/d.mx-id_rsa-dehydrated.pub
pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub
- name: id-rsa-opendkim - name: id-rsa-opendkim
priv_key_src: d.mx/root/.ssh/d.mx-id_rsa-opendkim priv_key_src: d.mx.oopen.de/root/.ssh/d.mx-id_rsa-opendkim
priv_key_dest: /root/.ssh/id_rsa-opendkim priv_key_dest: /root/.ssh/id_rsa-opendkim
pub_key_src: d.mx/root/.ssh/d.mx-id_rsa-opendkim.pub pub_key_src: d.mx.oopen.de/root/.ssh/d.mx-id_rsa-opendkim.pub
pub_key_dest: /root/.ssh/id_rsa-opendkim.pub pub_key_dest: /root/.ssh/id_rsa-opendkim.pub
@@ -151,28 +151,6 @@ root_ssh_keypair:
# vars used by roles/common/tasks/copy_files.yml # vars used by roles/common/tasks/copy_files.yml
# --- # ---
copy_plain_files:
- name: postfix_create_opendkim_key.conf
src_path: d.mx/root/bin/postfix/conf/create_opendkim_key.conf
dest_path: /root/bin/postfix/conf/create_opendkim_key.conf
- name: postfix_whitelist_mb_sigs.conf
src_path: d.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf
dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf
- name: install_sympa.conf
src_path: lists.mx.warenform/usr/local/src/sympa/conf/install_sympa.conf
dest_path: /usr/local/src/sympa/conf/install_sympa.conf
copy_template_files: []
#
# - name: mailsystem_install_amavis.conf
# src_path: usr/local/src/mailsystem/conf/install_amavis.conf.j2
# dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf
# --- # ---
# vars used by roles/common/tasks/config_files_mailsystem_scripts.yml # vars used by roles/common/tasks/config_files_mailsystem_scripts.yml
@@ -139,4 +139,3 @@ resolved_fallback_nameserver:
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -1,4 +1,5 @@
--- ---
# yamllint disable rule:line-length
# --- # ---
# vars used by roles/ansible_dependencies # vars used by roles/ansible_dependencies
@@ -150,4 +151,3 @@ sudo_users:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -142,15 +142,12 @@ resolved_fallback_nameserver:
# --- # ---
# --- # ---
# vars used by roles/common/tasks/samba-config-server.yml # vars used by roles/common/tasks/samba-config-server.yml
# vars used by roles/common/tasks/samba-user.yml # vars used by roles/common/tasks/samba-user.yml
# --- # ---
# ============================== # ==============================
@@ -149,15 +149,12 @@ resolved_fallback_nameserver:
# --- # ---
# --- # ---
# vars used by roles/common/tasks/samba-config-server.yml # vars used by roles/common/tasks/samba-config-server.yml
# vars used by roles/common/tasks/samba-user.yml # vars used by roles/common/tasks/samba-user.yml
# --- # ---
# ============================== # ==============================
@@ -142,15 +142,12 @@ resolved_fallback_nameserver:
# --- # ---
# --- # ---
# vars used by roles/common/tasks/samba-config-server.yml # vars used by roles/common/tasks/samba-config-server.yml
# vars used by roles/common/tasks/samba-user.yml # vars used by roles/common/tasks/samba-user.yml
# --- # ---
# ============================== # ==============================
@@ -142,15 +142,12 @@ resolved_fallback_nameserver:
# --- # ---
# --- # ---
# vars used by roles/common/tasks/samba-config-server.yml # vars used by roles/common/tasks/samba-config-server.yml
# vars used by roles/common/tasks/samba-user.yml # vars used by roles/common/tasks/samba-user.yml
# --- # ---
# ============================== # ==============================
@@ -142,15 +142,12 @@ resolved_fallback_nameserver:
# --- # ---
# --- # ---
# vars used by roles/common/tasks/samba-config-server.yml # vars used by roles/common/tasks/samba-config-server.yml
# vars used by roles/common/tasks/samba-user.yml # vars used by roles/common/tasks/samba-user.yml
# --- # ---
# ============================== # ==============================
@@ -121,4 +121,3 @@ git_firewall_repository: {}
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
@@ -138,4 +138,3 @@ git_firewall_repository: {}
# --- # ---
# vars used by scripts/reset_root_passwd.yml # vars used by scripts/reset_root_passwd.yml
# --- # ---
+26 -55
View File
@@ -105,17 +105,17 @@ resolved_fallback_nameserver:
insert_root_ssh_keypair: true insert_root_ssh_keypair: true
root_ssh_keypair: # root_ssh_keypair:
- name: id-rsa-dehydrated # - name: id-rsa-dehydrated
priv_key_src: e.mx/root/.ssh/e.mx-id_rsa-dehydrated # priv_key_src: e.mx.oopen.de/root/.ssh/e.mx-id_rsa-dehydrated
priv_key_dest: /root/.ssh/id_rsa-dehydrated # priv_key_dest: /root/.ssh/id_rsa-dehydrated
pub_key_src: e.mx/root/.ssh/e.mx-id_rsa-dehydrated.pub # pub_key_src: e.mx.oopen.de/root/.ssh/e.mx-id_rsa-dehydrated.pub
pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub # pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub
- name: id-rsa-opendkim # - name: id-rsa-opendkim
priv_key_src: e.mx/root/.ssh/e.mx-id_rsa-opendkim # priv_key_src: e.mx.oopen.de/root/.ssh/e.mx-id_rsa-opendkim
priv_key_dest: /root/.ssh/id_rsa-opendkim # priv_key_dest: /root/.ssh/id_rsa-opendkim
pub_key_src: e.mx/root/.ssh/e.mx-id_rsa-opendkim.pub # pub_key_src: e.mx.oopen.de/root/.ssh/e.mx-id_rsa-opendkim.pub
pub_key_dest: /root/.ssh/id_rsa-opendkim.pub # pub_key_dest: /root/.ssh/id_rsa-opendkim.pub
# --- # ---
@@ -151,36 +151,6 @@ root_ssh_keypair:
# vars used by roles/common/tasks/copy_files.yml # vars used by roles/common/tasks/copy_files.yml
# --- # ---
copy_plain_files:
- name: monitoring_check_cert_for_dovecot.conf
src_path: e.mx/root/bin/monitoring/conf/check_cert_for_dovecot.conf
dest_path: /root/bin/monitoring/conf/check_cert_for_dovecot.conf
- name: postfix_create_opendkim_key.conf
src_path: e.mx/root/bin/postfix/conf/create_opendkim_key.conf
dest_path: /root/bin/postfix/conf/create_opendkim_key.conf
- name: postfix_postfix_add_mailboxes.conf
src_path: e.mx/root/bin/postfix/conf/postfix_add_mailboxes.conf
dest_path: /root/bin/postfix/conf/postfix_add_mailboxes.conf
- name: postfix_sent_userinfo_postfix.conf
src_path: e.mx/root/bin/postfix/conf/sent_userinfo_postfix.conf
dest_path: /root/bin/postfix/conf/sent_userinfo_postfix.conf
- name: postfix_whitelist_mb_sigs.conf
src_path: e.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf
dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf
copy_template_files: []
#
# - name: mailsystem_install_amavis.conf
# src_path: usr/local/src/mailsystem/conf/install_amavis.conf.j2
# dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf
# --- # ---
# vars used by roles/common/tasks/config_files_mailsystem_scripts.yml # vars used by roles/common/tasks/config_files_mailsystem_scripts.yml
@@ -211,30 +181,31 @@ si_authorisation_signature: abb4ec6b194639f3d123154f1b971843a3b8751d8c1bcdc7d07e
# #
website_name_postfixadmin: adm-e.oopen.de website_name_postfixadmin: adm-e.oopen.de
email_welcome_message: "\n email_welcome_message: |
Hallo,\n
Ihre/Deine neue E-Mail Adresse ist eingerichtet.\n Hallo,
O.OPEN\n Ihre/Deine neue E-Mail Adresse ist eingerichtet.
--\n O.OPEN
O.OPEN | Phone: +49 30 / 290 484 91\n
Erkelenzdamm 21 | Fax: +49 30 / 290 484 99\n --
D-10999 Berlin | E-MAIL: oo@oopen.de\n O.OPEN | Phone: +49 30 / 290 484 91
" Erkelenzdamm 21 | Fax: +49 30 / 290 484 99
D-10999 Berlin | E-MAIL: oo@oopen.de
# install_update_dovecot.conf # install_update_dovecot.conf
# #
dovecot_from_address: "o.open <oo@oopen.de>" dovecot_from_address: "o.open <oo@oopen.de>"
dovecot_reply_to: "oo@oopen.de" dovecot_reply_to: "oo@oopen.de"
webmailer_address: "https://webmail-e.oopen.de" webmailer_address: "https://webmail-e.oopen.de"
salutation: "O.OPEN\n salutation: |
O.OPEN
--\n --
O.OPEN | Phone: +49 30 / 290 484 91\n O.OPEN | Phone: +49 30 / 290 484 91
Erkelenzdamm 21 | Fax: +49 30 / 290 484 99\n Erkelenzdamm 21 | Fax: +49 30 / 290 484 99
D-10999 Berlin | http://oopen.de" D-10999 Berlin | http://oopen.de
# install_upgrade_roundcube-webmail.conf # install_upgrade_roundcube-webmail.conf
# #
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -233,7 +233,6 @@ default_user:
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIItQLQ7lhBY2USF4Jcp4teF+1NydI73VeHYbQW8q4Mcw root@gw-ah' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIItQLQ7lhBY2USF4Jcp4teF+1NydI73VeHYbQW8q4Mcw root@gw-ah'
# --- # ---
# vars used by roles/common/tasks/cron.yml # vars used by roles/common/tasks/cron.yml
# --- # ---
@@ -281,7 +280,6 @@ cron_user_special_time_entries:
# insertafter: PATH # insertafter: PATH
# --- # ---
# vars used by roles/common/tasks/users.yml # vars used by roles/common/tasks/users.yml
# --- # ---
@@ -474,6 +472,13 @@ samba_user:
- gubitz-partner - gubitz-partner
password: '20-heckert.22%' password: '20-heckert.22%'
- name: bauhofer
groups:
- buero
- intern
- verwaltung
password: '20-bau.hofer-26'
- name: schultheis - name: schultheis
groups: groups:
- intern - intern
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -177,7 +177,6 @@ cron_user_special_time_entries:
insertafter: PATH insertafter: PATH
# --- # ---
# vars used by roles/common/tasks/users.yml # vars used by roles/common/tasks/users.yml
# --- # ---
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -177,7 +177,6 @@ cron_user_special_time_entries:
insertafter: PATH insertafter: PATH
# --- # ---
# vars used by roles/common/tasks/users.yml # vars used by roles/common/tasks/users.yml
# --- # ---
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -247,7 +247,6 @@ cron_user_special_time_entries:
insertafter: PATH insertafter: PATH
# --- # ---
# vars used by roles/common/tasks/users.yml # vars used by roles/common/tasks/users.yml
# --- # ---
@@ -305,7 +304,6 @@ nfs_exports:
use_fsid_option: true use_fsid_option: true
# --- # ---
# vars used by roles/common/tasks/samba-config-server.yml # vars used by roles/common/tasks/samba-config-server.yml
# vars used by roles/common/tasks/samba-user.yml # vars used by roles/common/tasks/samba-user.yml
@@ -557,7 +555,6 @@ samba_shares:
vfs_object_recycle: false vfs_object_recycle: false
# ============================== # ==============================
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -156,7 +156,6 @@ cron_user_special_time_entries:
insertafter: PATH insertafter: PATH
# --- # ---
# vars used by roles/common/tasks/users.yml # vars used by roles/common/tasks/users.yml
# --- # ---
@@ -225,7 +224,6 @@ nfs_exports:
use_fsid_option: true use_fsid_option: true
# --- # ---
# vars used by roles/common/tasks/samba-config-server.yml # vars used by roles/common/tasks/samba-config-server.yml
# vars used by roles/common/tasks/samba-user.yml # vars used by roles/common/tasks/samba-user.yml
@@ -963,7 +961,6 @@ samba_shares:
recycle_path: '@Recycle' recycle_path: '@Recycle'
# ============================== # ==============================
+2 -2
View File
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -73,7 +73,6 @@ install_compiler_pkgs: true
# dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf # dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf
# --- # ---
# vars used by roles/common/tasks/config_files_mailsystem_scripts.yml # vars used by roles/common/tasks/config_files_mailsystem_scripts.yml
# --- # ---
@@ -112,7 +112,6 @@ cron_user_special_time_entries:
insertafter: PATH insertafter: PATH
# --- # ---
# vars used by roles/common/tasks/users.yml # vars used by roles/common/tasks/users.yml
# --- # ---
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -214,7 +214,6 @@ cron_user_entries:
job: /root/bin/monitoring/check_ntpsec_service.sh job: /root/bin/monitoring/check_ntpsec_service.sh
# --- # ---
# vars used by roles/common/tasks/users.yml # vars used by roles/common/tasks/users.yml
# --- # ---
@@ -287,7 +286,6 @@ samba_groups:
group_id: 1190 group_id: 1190
samba_user: samba_user:
- name: advoware - name: advoware
@@ -591,7 +589,6 @@ samba_user:
password: 'uJ5gF/m53p.P' password: 'uJ5gF/m53p.P'
- name: aphex2 - name: aphex2
groups: groups:
- alle - alle
@@ -4,10 +4,10 @@
# --- # ---
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -630,7 +630,6 @@ samba_user:
password: "uJ5gF/m53p.P" password: "uJ5gF/m53p.P"
- name: aphex2 - name: aphex2
groups: groups:
- alle - alle
@@ -843,6 +842,8 @@ samba_shares:
file_create_mask: !!str 660 file_create_mask: !!str 660
dir_create_mask: !!str 2770 dir_create_mask: !!str 2770
vfs_object_virusfilter: true vfs_object_virusfilter: true
vfs_object_virusfilter_include_files:
- eml
vfs_object_recycle: false vfs_object_recycle: false
- name: eibelshaeuser - name: eibelshaeuser
@@ -901,6 +902,10 @@ samba_shares:
file_create_mask: !!str 660 file_create_mask: !!str 660
dir_create_mask: !!str 2770 dir_create_mask: !!str 2770
vfs_object_virusfilter: true vfs_object_virusfilter: true
vfs_object_virusfilter_include_files:
- eml
- exe
- msi
vfs_object_recycle: true vfs_object_recycle: true
recycle_path: "@Recycle" recycle_path: "@Recycle"
vfs_object_recycle_is_visible: true vfs_object_recycle_is_visible: true
@@ -925,6 +930,9 @@ samba_shares:
file_create_mask: !!str 660 file_create_mask: !!str 660
dir_create_mask: !!str 2770 dir_create_mask: !!str 2770
vfs_object_virusfilter: true vfs_object_virusfilter: true
vfs_object_virusfilter_exclude_files:
- docx
- pdf
vfs_object_recycle: true vfs_object_recycle: true
recycle_path: "@Recycle" recycle_path: "@Recycle"
vfs_object_recycle_is_visible: true vfs_object_recycle_is_visible: true
@@ -965,6 +973,16 @@ samba_shares:
recycle_path: "@Recycle" recycle_path: "@Recycle"
vfs_object_recycle_is_visible: true vfs_object_recycle_is_visible: true
- name: Windows-Server-2025-Backup
comment: Windows-Server-2025-Backup on Fileserver
path: /data/samba/Windows-Server-2025-Backup
group_valid_users: sysadm
group_write_list: sysadm
file_create_mask: !!str 664
dir_create_mask: !!str 2775
guest_ok: !!str yes
vfs_object_recycle: false
# - name: web # - name: web
# comment: Web auf Fileserver # comment: Web auf Fileserver
# path: /data/samba/Web # path: /data/samba/Web
@@ -132,7 +132,6 @@ cron_user_entries:
job: /root/bin/monitoring/check_ssh.sh job: /root/bin/monitoring/check_ssh.sh
# --- # ---
# vars used by roles/common/tasks/users.yml # vars used by roles/common/tasks/users.yml
# --- # ---
@@ -197,4 +196,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
+4 -40
View File
@@ -105,14 +105,14 @@ resolved_fallback_nameserver:
# #
# root_ssh_keypair: # root_ssh_keypair:
# - name: id-rsa-dehydrated # - name: id-rsa-dehydrated
# priv_key_src: b.mx/root/.ssh/b.mx-id_rsa-dehydrated # priv_key_src: g.mx.oopen.de/root/.ssh/b.mx-id_rsa-dehydrated
# priv_key_dest: /root/.ssh/id_rsa-dehydrated # priv_key_dest: /root/.ssh/id_rsa-dehydrated
# pub_key_src: b.mx/root/.ssh/b.mx-id_rsa-dehydrated.pub # pub_key_src: g.mx.oopen.de/root/.ssh/b.mx-id_rsa-dehydrated.pub
# pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub # pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub
# - name: id-rsa-opendkim # - name: id-rsa-opendkim
# priv_key_src: b.mx/root/.ssh/b.mx-id_rsa-opendkim # priv_key_src: g.mx.oopen.de/root/.ssh/b.mx-id_rsa-opendkim
# priv_key_dest: /root/.ssh/id_rsa-opendkim # priv_key_dest: /root/.ssh/id_rsa-opendkim
# pub_key_src: b.mx/root/.ssh/b.mx-id_rsa-opendkim.pub # pub_key_src: g.mx.oopen.de/root/.ssh/b.mx-id_rsa-opendkim.pub
# pub_key_dest: /root/.ssh/id_rsa-opendkim.pub # pub_key_dest: /root/.ssh/id_rsa-opendkim.pub
@@ -149,42 +149,6 @@ resolved_fallback_nameserver:
# vars used by roles/common/tasks/copy_files.yml # vars used by roles/common/tasks/copy_files.yml
# --- # ---
copy_plain_files:
# /root/bin/postfix
#
- name: postfix_create_opendkim_key.conf
src_path: g.mx/root/bin/postfix/conf/create_opendkim_key.conf
dest_path: /root/bin/postfix/conf/create_opendkim_key.conf
- name: postfix_whitelist_mb_sigs.conf
src_path: g.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf
dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf
copy_plain_files_postfix_host_specific:
- name: relay_domains
src_path: g.mx/etc/postfix/relay_domains
dest_path: /etc/postfix/relay_domains
copy_plain_files_postfwd_host_specific:
# Postfix Firewall postfwd
#
- name: postfwd.wl-nets
src_path: g.mx/etc/postfix/postfwd.wl-nets
dest_path: /etc/postfix/postfwd.wl-nets
copy_template_files: []
#
# - name: mailsystem_install_amavis.conf
# src_path: usr/local/src/mailsystem/conf/install_amavis.conf.j2
# dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf
# --- # ---
# vars used by roles/common/tasks/config_files_mailsystem_scripts.yml # vars used by roles/common/tasks/config_files_mailsystem_scripts.yml
@@ -5,10 +5,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -482,7 +482,6 @@ bind9_gateway_acl:
- 192.168.10.2 - 192.168.10.2
bind9_gateway_listen_on_v6: bind9_gateway_listen_on_v6:
- none - none
@@ -529,4 +528,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -123,7 +123,6 @@ sshd_permit_root_login: !!str "prohibit-password"
# --- # ---
# ============================== # ==============================
@@ -123,7 +123,6 @@ sshd_permit_root_login: !!str "prohibit-password"
# --- # ---
# ============================== # ==============================
@@ -163,14 +163,14 @@ insert_root_ssh_keypair: true
root_ssh_keypair: root_ssh_keypair:
- name: id-rsa-dehydrated - name: id-rsa-dehydrated
priv_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-dehydrated priv_key_src: ga-al-relay.ga.netz/root/.ssh/ga-st-mail-id_rsa-dehydrated
priv_key_dest: /root/.ssh/id_rsa-dehydrated priv_key_dest: /root/.ssh/id_rsa-dehydrated
pub_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-dehydrated.pub pub_key_src: ga-al-relay.ga.netz/root/.ssh/ga-st-mail-id_rsa-dehydrated.pub
pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub
- name: id-rsa-opendkim - name: id-rsa-opendkim
priv_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-opendkim priv_key_src: ga-al-relay.ga.netz/root/.ssh/ga-st-mail-id_rsa-opendkim
priv_key_dest: /root/.ssh/id_rsa-opendkim priv_key_dest: /root/.ssh/id_rsa-opendkim
pub_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-opendkim.pub pub_key_src: ga-al-relay.ga.netz/root/.ssh/ga-st-mail-id_rsa-opendkim.pub
pub_key_dest: /root/.ssh/id_rsa-opendkim.pub pub_key_dest: /root/.ssh/id_rsa-opendkim.pub
@@ -233,7 +233,6 @@ bind9_gateway_acl:
- 192.168.10.2 - 192.168.10.2
bind9_gateway_listen_on_v6: bind9_gateway_listen_on_v6:
- none - none
@@ -273,21 +272,6 @@ bind9_gateway_allow_recursion:
# --- # ---
copy_plain_files_postfix_host_specific:
- name: relay_domains
src_path: ga-al-relay/etc/postfix/relay_domains
dest_path: /etc/postfix/relay_domains
copy_template_files: []
#
# - name: mailsystem_install_amavis.conf
# src_path: usr/local/src/mailsystem/conf/install_amavis.conf.j2
# dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf
# --- # ---
# vars used by roles/common/tasks/config_files_mailsystem_scripts.yml # vars used by roles/common/tasks/config_files_mailsystem_scripts.yml
# --- # ---
@@ -301,7 +285,6 @@ is_relay_host: !!str "false"
sasl_auth_enable: !!str "yes" sasl_auth_enable: !!str "yes"
template_files_mailsystem_script: template_files_mailsystem_script:
- name: mailsystem_install_postfix_advanced.conf - name: mailsystem_install_postfix_advanced.conf
@@ -5,10 +5,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -45,7 +45,6 @@ network_interfaces:
- /sbin/ip route add 10.9.131.0/24 via 192.168.100.253 - /sbin/ip route add 10.9.131.0/24 via 192.168.100.253
- device: eno3 - device: eno3
family: inet family: inet
method: manual method: manual
@@ -109,7 +108,6 @@ network_interfaces:
netmask: 24 netmask: 24
# --- # ---
# vars used by roles/ansible_dependencies # vars used by roles/ansible_dependencies
# --- # ---
@@ -391,4 +389,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -5,10 +5,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -404,4 +404,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -5,10 +5,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -408,4 +408,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -102,7 +102,6 @@ resolved_fallback_nameserver:
- 127.0.0.1 - 127.0.0.1
# --- # ---
# vars used by roles/common/tasks/users.yml # vars used by roles/common/tasks/users.yml
# --- # ---
@@ -285,4 +284,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -5,10 +5,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -451,7 +451,6 @@ cron_user_special_time_entries:
insertafter: PATH insertafter: PATH
# --- # ---
# vars used by roles/common/tasks/users.yml # vars used by roles/common/tasks/users.yml
# --- # ---
@@ -632,4 +631,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -123,7 +123,6 @@ sshd_permit_root_login: !!str "prohibit-password"
# --- # ---
# ============================== # ==============================
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -195,7 +195,6 @@ sshd_permit_root_login: !!str "prohibit-password"
# --- # ---
# ============================== # ==============================
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -311,4 +311,3 @@ sudo_users:
# --- # ---
root_user: {} root_user: {}
@@ -108,14 +108,14 @@ insert_root_ssh_keypair: true
root_ssh_keypair: root_ssh_keypair:
- name: id-rsa-dehydrated - name: id-rsa-dehydrated
priv_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-dehydrated priv_key_src: ga-st-mail.ga.netz/root/.ssh/ga-st-mail-id_rsa-dehydrated
priv_key_dest: /root/.ssh/id_rsa-dehydrated priv_key_dest: /root/.ssh/id_rsa-dehydrated
pub_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-dehydrated.pub pub_key_src: ga-st-mail.ga.netz/root/.ssh/ga-st-mail-id_rsa-dehydrated.pub
pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub
- name: id-rsa-opendkim - name: id-rsa-opendkim
priv_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-opendkim priv_key_src: ga-st-mail.ga.netz/root/.ssh/ga-st-mail-id_rsa-opendkim
priv_key_dest: /root/.ssh/id_rsa-opendkim priv_key_dest: /root/.ssh/id_rsa-opendkim
pub_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-opendkim.pub pub_key_src: ga-st-mail.ga.netz/root/.ssh/ga-st-mail-id_rsa-opendkim.pub
pub_key_dest: /root/.ssh/id_rsa-opendkim.pub pub_key_dest: /root/.ssh/id_rsa-opendkim.pub
default_user: default_user:
@@ -206,49 +206,6 @@ sudo_users:
# vars used by roles/common/tasks/copy_files.yml # vars used by roles/common/tasks/copy_files.yml
# --- # ---
copy_plain_files:
# /root/bin/monitoring
#
- name: monitoring_check_cert_for_dovecot.conf
src_path: ga-st-mail/root/bin/monitoring/conf/check_cert_for_dovecot.conf
dest_path: /root/bin/monitoring/conf/check_cert_for_dovecot.conf
# /root/bin/postfix
#
- name: postfix_create_opendkim_key.conf
src_path: ga-st-mail/root/bin/postfix/conf/create_opendkim_key.conf
dest_path: /root/bin/postfix/conf/create_opendkim_key.conf
- name: postfix_postfix_add_mailboxes.conf
src_path: ga-st-mail/root/bin/postfix/conf/postfix_add_mailboxes.conf
dest_path: /root/bin/postfix/conf/postfix_add_mailboxes.conf
- name: postfix_sent_userinfo_postfix.conf
src_path: ga-st-mail/root/bin/postfix/conf/sent_userinfo_postfix.conf
dest_path: /root/bin/postfix/conf/sent_userinfo_postfix.conf
- name: postfix_whitelist_mb_sigs.conf
src_path: ga-st-mail/root/bin/postfix/conf/whitelist_mb_sigs.conf
dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf
copy_plain_files_postfwd_host_specific:
# Postfix Firewall postfwd
#
- name: postfwd.wl-user
src_path: ga-st-mail/etc/postfix/postfwd.cf
dest_path: /etc/postfix/postfwd.cf
#copy_template_files: []
#
# - name: mailsystem_install_amavis.conf
# src_path: usr/local/src/mailsystem/conf/install_amavis.conf.j2
# dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf
# --- # ---
# vars used by roles/common/tasks/config_files_mailsystem_scripts.yml # vars used by roles/common/tasks/config_files_mailsystem_scripts.yml
@@ -282,31 +239,33 @@ si_authorisation_signature: abb4ec6b194639f3d123154f1b971843a3b8751d8c1bcdc7d07e
# #
website_name_postfixadmin: adm.gemeinschaft-altenschlirf.de website_name_postfixadmin: adm.gemeinschaft-altenschlirf.de
email_welcome_message: "\n email_welcome_message: |
Hallo,\n
Ihre/Deine neue E-Mail Adresse ist eingerichtet.\n Hallo,
IT Team Gemeinschaft Altenschlirf\n Ihre/Deine neue E-Mail Adresse ist eingerichtet.
--\n IT Team Gemeinschaft Altenschlirf
Gemeinschaft Altenschlirf | Phone: +49 6647 / 9606 0\n
Müser Straße 1 | Fax: +49 6647 / 9606 179\n --
D-36358 Herbstein | E-Mail: it@gemeinschaft-altenschlirf.de\n
" Gemeinschaft Altenschlirf | Phone: +49 6647 / 9606 0
Müser Straße 1 | Fax: +49 6647 / 9606 179
D-36358 Herbstein | E-Mail: it@gemeinschaft-altenschlirf.de
# install_update_dovecot.conf # install_update_dovecot.conf
# #
dovecot_from_address: "Administrator E-Mail <postmaster@gemeinschaft-altenschlirf.de>" dovecot_from_address: "Administrator E-Mail <postmaster@gemeinschaft-altenschlirf.de>"
dovecot_reply_to: "postmaster@gemeinschaft-altenschlirf.de" dovecot_reply_to: "postmaster@gemeinschaft-altenschlirf.de"
webmailer_address: "https://webmail.gemeinschaft-altenschlirf.de" webmailer_address: "https://webmail.gemeinschaft-altenschlirf.de"
salutation: "IT Team Gemeinschaft Altenschlirf\n salutation: |
IT Team Gemeinschaft Altenschlirf
--\n --
Gemeinschaft Altenschlirf | Phone: +49 6647 / 9606 0\n
Müser Straße 1 | Fax: +49 6647 / 9606 179\n Gemeinschaft Altenschlirf | Phone: +49 6647 / 9606 0
D-36358 Herbstein | E-Mail: it@gemeinschaft-altenschlirf.de\n Müser Straße 1 | Fax: +49 6647 / 9606 179
" D-36358 Herbstein | E-Mail: it@gemeinschaft-altenschlirf.de
# install_upgrade_roundcube-webmail.conf # install_upgrade_roundcube-webmail.conf
# #
@@ -209,7 +209,6 @@ sudo_users:
# --- # ---
# --- # ---
# vars used by roles/common/tasks/config_files_mailsystem_scripts.yml # vars used by roles/common/tasks/config_files_mailsystem_scripts.yml
# --- # ---
@@ -207,7 +207,6 @@ sudo_users:
# dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf # dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf
# --- # ---
# vars used by roles/common/tasks/config_files_mailsystem_scripts.yml # vars used by roles/common/tasks/config_files_mailsystem_scripts.yml
# --- # ---
-1
View File
@@ -145,4 +145,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -83,7 +83,6 @@ resolved_nameserver:
- 2a01:4f8:0:1::add:9999 - 2a01:4f8:0:1::add:9999
# --- # ---
# vars used by roles/common/tasks/users.yml # vars used by roles/common/tasks/users.yml
# --- # ---
@@ -133,4 +132,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
+1 -1
View File
@@ -1,4 +1,5 @@
--- ---
# yamllint disable rule:line-length
# --- # ---
# vars used by role firewall # vars used by role firewall
@@ -272,4 +273,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -219,4 +219,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $y$j9T$IVBTpn.OrI6YiQ9q3fA8b1$Y1bmID5yXJbKfoLFt1VmQs6LezeTj5/1M9ppZBD2Pn4 password: $y$j9T$IVBTpn.OrI6YiQ9q3fA8b1$Y1bmID5yXJbKfoLFt1VmQs6LezeTj5/1M9ppZBD2Pn4
@@ -271,4 +271,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
+2 -3
View File
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -244,4 +244,3 @@ bind9_gateway_listen_on:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -214,4 +214,3 @@ bind9_gateway_listen_on:
root_user: root_user:
name: root name: root
password: $y$j9T$IVBTpn.OrI6YiQ9q3fA8b1$Y1bmID5yXJbKfoLFt1VmQs6LezeTj5/1M9ppZBD2Pn4 password: $y$j9T$IVBTpn.OrI6YiQ9q3fA8b1$Y1bmID5yXJbKfoLFt1VmQs6LezeTj5/1M9ppZBD2Pn4
@@ -166,8 +166,6 @@ cron_user_special_time_entries:
insertafter: PATH insertafter: PATH
# --- # ---
# vars used by roles/common/tasks/users.yml # vars used by roles/common/tasks/users.yml
# --- # ---
@@ -204,4 +202,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $y$j9T$IVBTpn.OrI6YiQ9q3fA8b1$Y1bmID5yXJbKfoLFt1VmQs6LezeTj5/1M9ppZBD2Pn4 password: $y$j9T$IVBTpn.OrI6YiQ9q3fA8b1$Y1bmID5yXJbKfoLFt1VmQs6LezeTj5/1M9ppZBD2Pn4
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -287,4 +287,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -5,10 +5,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -45,7 +45,6 @@ network_interfaces:
- /sbin/ip route add 10.9.131.0/24 via 192.168.100.253 - /sbin/ip route add 10.9.131.0/24 via 192.168.100.253
- device: eno3 - device: eno3
family: inet family: inet
method: manual method: manual
@@ -109,7 +108,6 @@ network_interfaces:
netmask: 24 netmask: 24
# --- # ---
# vars used by roles/ansible_dependencies # vars used by roles/ansible_dependencies
# --- # ---
@@ -441,4 +439,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -149,7 +149,6 @@ cron_user_entries:
job: /root/bin/admin-stuff/speedtest.sh job: /root/bin/admin-stuff/speedtest.sh
cron_user_special_time_entries: cron_user_special_time_entries:
- name: "Restart NTP service 'ntpsec'" - name: "Restart NTP service 'ntpsec'"
@@ -214,4 +213,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -215,4 +215,3 @@ bind9_gateway_listen_on:
root_user: root_user:
name: root name: root
password: $y$j9T$IVBTpn.OrI6YiQ9q3fA8b1$Y1bmID5yXJbKfoLFt1VmQs6LezeTj5/1M9ppZBD2Pn4 password: $y$j9T$IVBTpn.OrI6YiQ9q3fA8b1$Y1bmID5yXJbKfoLFt1VmQs6LezeTj5/1M9ppZBD2Pn4
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -356,4 +356,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
+2 -3
View File
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -319,4 +319,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -222,7 +222,6 @@ resolved_fallback_nameserver:
- 194.150.168.168 - 194.150.168.168
# --- # ---
# vars used by roles/common/tasks/users.yml # vars used by roles/common/tasks/users.yml
# --- # ---
@@ -331,4 +330,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -274,4 +274,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
+2 -3
View File
@@ -5,10 +5,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -286,4 +286,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
+2 -3
View File
@@ -6,10 +6,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -295,4 +295,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
@@ -5,10 +5,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -282,4 +282,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
+2 -3
View File
@@ -5,10 +5,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -274,4 +274,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
+2 -3
View File
@@ -5,10 +5,10 @@
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted # If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True network_manage_devices: true
# Should the interfaces be reloaded after config change? # Should the interfaces be reloaded after config change?
network_interface_reload: False network_interface_reload: false
network_interface_path: /etc/network/interfaces.d network_interface_path: /etc/network/interfaces.d
network_interface_required_packages: network_interface_required_packages:
@@ -273,4 +273,3 @@ git_firewall_repository:
root_user: root_user:
name: root name: root
password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.

Some files were not shown because too many files have changed in this diff Show More