saving uncommitted changes in /etc prior to apt run

This commit is contained in:
2022-07-07 12:59:16 +02:00
committed by Gitea
parent 12debc1887
commit c9459e218f
22 changed files with 2282 additions and 50 deletions
+7 -1
View File
@@ -3812,7 +3812,6 @@ maybe chmod 0644 'logcheck/violations.ignore.d/postgrey'
maybe chmod 0644 'login.defs'
maybe chmod 0644 'logrotate.conf'
maybe chmod 0755 'logrotate.d'
maybe chmod 0644 'logrotate.d/alternatives'
maybe chmod 0644 'logrotate.d/apt'
maybe chmod 0644 'logrotate.d/btmp'
maybe chmod 0644 'logrotate.d/clamav-daemon'
@@ -3873,6 +3872,7 @@ maybe chmod 0644 'mysql/mariadb.conf.d/50-server.cnf'
maybe chmod 0644 'mysql/mariadb.conf.d/60-galera.cnf'
maybe chmod 0755 'mysql/mariadb.conf.d/99-enable-encryption.cnf.preset'
maybe chmod 0644 'mysql/mariadb.conf.d/99-enable-encryption.cnf.preset/enable_encryption.preset'
maybe chmod 0644 'mysql/mariadb.conf.d/99-user.cnf'
maybe chmod 0755 'myssl'
maybe chmod 0644 'myssl/dh4096.pem'
maybe chmod 0644 'nanorc'
@@ -4022,6 +4022,7 @@ maybe chmod 0644 'php/8.0/cgi/php.ini'
maybe chmod 0755 'php/8.0/cli'
maybe chmod 0755 'php/8.0/cli/conf.d'
maybe chmod 0644 'php/8.0/cli/php.ini'
maybe chmod 0644 'php/8.0/cli/php.ini.bak'
maybe chmod 0755 'php/8.0/fpm'
maybe chmod 0755 'php/8.0/fpm/conf.d'
maybe chmod 0644 'php/8.0/fpm/php-fpm.conf'
@@ -4030,6 +4031,7 @@ maybe chmod 0755 'php/8.0/fpm/pool.d'
maybe chmod 0644 'php/8.0/fpm/pool.d/www.conf'
maybe chmod 0755 'php/8.0/mods-available'
maybe chmod 0644 'php/8.0/mods-available/apcu.ini'
maybe chmod 0644 'php/8.0/mods-available/apcu.ini.bak'
maybe chmod 0644 'php/8.0/mods-available/bcmath.ini'
maybe chmod 0644 'php/8.0/mods-available/calendar.ini'
maybe chmod 0644 'php/8.0/mods-available/ctype.ini'
@@ -4398,8 +4400,10 @@ maybe chmod 0644 'synth-shell/personal/README.md'
maybe chmod 0644 'synth-shell/personal/synth-shell-greeter.andresgongora.config'
maybe chmod 0644 'synth-shell/synth-shell-greeter.config'
maybe chmod 0644 'synth-shell/synth-shell-greeter.config.default'
maybe chmod 0644 'synth-shell/synth-shell-greeter.config.new'
maybe chmod 0644 'synth-shell/synth-shell-prompt.config'
maybe chmod 0644 'synth-shell/synth-shell-prompt.config.default'
maybe chmod 0644 'synth-shell/synth-shell-prompt.config.new'
maybe chmod 0644 'synth-shell/synth-shell-prompt.root.config'
maybe chmod 0644 'sysctl.conf'
maybe chmod 0755 'sysctl.d'
@@ -4425,6 +4429,8 @@ maybe chmod 0755 'systemd/system/mariadb.service.d'
maybe chmod 0644 'systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf'
maybe chmod 0755 'systemd/system/multi-user.target.wants'
maybe chmod 0755 'systemd/system/network-online.target.wants'
maybe chmod 0644 'systemd/system/nextcloudcron.service'
maybe chmod 0644 'systemd/system/nextcloudcron.timer'
maybe chmod 0755 'systemd/system/sockets.target.wants'
maybe chmod 0755 'systemd/system/sysinit.target.wants'
maybe chmod 0755 'systemd/system/timers.target.wants'
+1
View File
@@ -85,3 +85,4 @@ Bytecode true
BytecodeSecurity TrustSigned
BytecodeTimeout 60000
OnAccessMaxFileSize 5M
ConcurrentDatabaseReload no
+1 -1
View File
@@ -36,4 +36,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
25 1 * * * root /usr/bin/restic -r /backup/restic-repo backup /var/log/redis --password-file /root/.restic
35 1 * * * root /usr/bin/restic -r /backup/restic-repo forget --keep-daily 7 --keep-weekly 2 --password-file /root/.restic
0 2 * * * root /usr/bin/rsync -a --password-file=/root/.rsync /backup/ Gorden@realm.solusar.de::NetBackup/euve130167/
0 2 * * * root /usr/bin/rsync -a --password-file=/root/.rsync /backup/ Gorden@realm.solusar.de::NetBackup/netcup01/
+1
View File
@@ -9,4 +9,5 @@
UUID=24223d7c-5e1a-47ef-af47-97f1857da6db / ext4 errors=remount-ro 0 1
# /boot was on /dev/vda2 during installation
UUID=9872eabf-5cc6-416c-a122-518ef7f6fd05 /boot ext4 defaults 0 2
/swapfile swap swap defaults 0 0
/dev/sr0 /media/cdrom0 udf,iso9660 user,noauto 0 0
-9
View File
@@ -1,9 +0,0 @@
/var/log/alternatives.log {
monthly
rotate 12
compress
delaycompress
missingok
notifempty
create 644 root root
}
+10 -1
View File
@@ -29,7 +29,16 @@ bind-address = 127.0.0.1
#
# * Fine Tuning
#
skip-name-resolve
performance_schema = on
tmp_table_size=64M
max_heap_table_size=64M
#innodb_buffer_pool_size=3.2G
innodb_log_file_size=32M
query_cache_size=0
query_cache_type=0
wait_timeout=60
table_definition_cache=600
#key_buffer_size = 128M
#max_allowed_packet = 1G
#thread_stack = 192K
+4
View File
@@ -0,0 +1,4 @@
# tuning and optimizations
#slow-query-log=1
#slow-query-log-file=/var/lib/mysql/mysql-slow-query.log
#long-query-time=1
-5
View File
@@ -52,11 +52,6 @@ server {
try_files $uri $uri/ /index.php?q=$uri&$args;
}
#location /filtron {
# root /var/www/vhosts/solusar.de/subdomains/monitor/;
# index index.html;
#}
#location ~ \.php$ {
# try_files $uri =404;
# fastcgi_split_path_info ^(.+\.php)(/.+)$;
+6 -6
View File
@@ -223,7 +223,7 @@ precision = 14
; Development Value: 4096
; Production Value: 4096
; http://php.net/output-buffering
output_buffering = 4096
output_buffering = 'Off'
; You can redirect all of the output of your scripts to a function. For
; example, if you set output_handler to "mb_output_handler", character
@@ -406,7 +406,7 @@ expose_php = On
; Maximum execution time of each script, in seconds
; http://php.net/max-execution-time
; Note: This directive is hardcoded to 0 for the CLI SAPI
max_execution_time = 30
max_execution_time = 3600
; Maximum amount of time each script may spend parsing request data. It's a good
; idea to limit this time on productions servers in order to eliminate unexpectedly
@@ -416,7 +416,7 @@ max_execution_time = 30
; Development Value: 60 (60 seconds)
; Production Value: 60 (60 seconds)
; http://php.net/max-input-time
max_input_time = 60
max_input_time = 3600
; Maximum input variable nesting level
; http://php.net/max-input-nesting-level
@@ -700,7 +700,7 @@ auto_globals_jit = On
; Its value may be 0 to disable the limit. It is ignored if POST data reading
; is disabled through enable_post_data_reading.
; http://php.net/post-max-size
post_max_size = 8M
post_max_size = 10240M
; Automatically add files before PHP document.
; http://php.net/auto-prepend-file
@@ -852,7 +852,7 @@ file_uploads = On
; Maximum allowed size for uploaded files.
; http://php.net/upload-max-filesize
upload_max_filesize = 2M
upload_max_filesize = 10240M
; Maximum number of files that can be uploaded via a single request
max_file_uploads = 20
@@ -970,7 +970,7 @@ cli_server.color = On
[Date]
; Defines the default timezone used by the date functions
; http://php.net/date.timezone
;date.timezone =
date.timezone = Europe/Berlin
; http://php.net/date.default-latitude
;date.default_latitude = 31.7667
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -65,7 +65,7 @@ error_log = /var/log/php8.0-fpm.log
; interval set by emergency_restart_interval then FPM will restart. A value
; of '0' means 'Off'.
; Default Value: 0
;emergency_restart_threshold = 0
emergency_restart_threshold = 10
; Interval of time used by emergency_restart_interval to determine when
; a graceful restart will be initiated. This can be useful to work around
@@ -73,13 +73,13 @@ error_log = /var/log/php8.0-fpm.log
; Available Units: s(econds), m(inutes), h(ours), or d(ays)
; Default Unit: seconds
; Default Value: 0
;emergency_restart_interval = 0
emergency_restart_interval = 1m
; Time limit for child processes to wait for a reaction on signals from master.
; Available units: s(econds), m(inutes), h(ours), or d(ays)
; Default Unit: seconds
; Default Value: 0
;process_control_timeout = 0
process_control_timeout = 10
; The maximum number of processes FPM will fork. This has been designed to control
; the global number of processes when using dynamic PM within a lot of pools.
+19 -16
View File
@@ -223,7 +223,7 @@ precision = 14
; Development Value: 4096
; Production Value: 4096
; http://php.net/output-buffering
output_buffering = 4096
output_buffering = Off
; You can redirect all of the output of your scripts to a function. For
; example, if you set output_handler to "mb_output_handler", character
@@ -406,7 +406,7 @@ expose_php = Off
; Maximum execution time of each script, in seconds
; http://php.net/max-execution-time
; Note: This directive is hardcoded to 0 for the CLI SAPI
max_execution_time = 30
max_execution_time = 120
; Maximum amount of time each script may spend parsing request data. It's a good
; idea to limit this time on productions servers in order to eliminate unexpectedly
@@ -416,7 +416,7 @@ max_execution_time = 30
; Development Value: 60 (60 seconds)
; Production Value: 60 (60 seconds)
; http://php.net/max-input-time
max_input_time = 60
max_input_time = 120
; Maximum input variable nesting level
; http://php.net/max-input-nesting-level
@@ -427,7 +427,7 @@ max_input_time = 60
; Maximum amount of memory a script may consume
; http://php.net/memory-limit
memory_limit = 128M
memory_limit = 512M
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Error handling and logging ;
@@ -700,7 +700,7 @@ auto_globals_jit = On
; Its value may be 0 to disable the limit. It is ignored if POST data reading
; is disabled through enable_post_data_reading.
; http://php.net/post-max-size
post_max_size = 8M
post_max_size = 4096M
; Automatically add files before PHP document.
; http://php.net/auto-prepend-file
@@ -852,7 +852,7 @@ file_uploads = On
; Maximum allowed size for uploaded files.
; http://php.net/upload-max-filesize
upload_max_filesize = 2M
upload_max_filesize = 4096M
; Maximum number of files that can be uploaded via a single request
max_file_uploads = 20
@@ -970,7 +970,7 @@ cli_server.color = On
[Date]
; Defines the default timezone used by the date functions
; http://php.net/date.timezone
;date.timezone =
date.timezone = Europe/Berlin
; http://php.net/date.default-latitude
;date.default_latitude = 31.7667
@@ -1364,7 +1364,7 @@ session.use_strict_mode = 0
session.use_cookies = 1
; http://php.net/session.cookie-secure
;session.cookie_secure =
session.cookie_secure = True
; This option forces PHP to fetch and use a cookie for storing and maintaining
; the session id. We encourage this operation as it's very helpful in combating
@@ -1677,8 +1677,8 @@ zend.assertions = -1
; This directive specifies the regex pattern of content types for which mb_output_handler()
; is activated.
; Default: mbstring.http_output_conv_mimetypes=^(text/|application/xhtml\+xml)
;mbstring.http_output_conv_mimetypes=
; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml)
;mbstring.http_output_conv_mimetype=
; This directive specifies maximum stack depth for mbstring regular expressions. It is similar
; to the pcre.recursion_limit for PCRE.
@@ -1760,20 +1760,20 @@ ldap.max_links = -1
[opcache]
; Determines if Zend OPCache is enabled
;opcache.enable=1
opcache.enable=1
; Determines if Zend OPCache is enabled for the CLI version of PHP
;opcache.enable_cli=0
opcache.enable_cli=1
; The OPcache shared memory storage size.
;opcache.memory_consumption=128
opcache.memory_consumption=128
; The amount of memory for interned strings in Mbytes.
;opcache.interned_strings_buffer=8
opcache.interned_strings_buffer=24
; The maximum number of keys (scripts) in the OPcache hash table.
; Only numbers between 200 and 1000000 are allowed.
;opcache.max_accelerated_files=10000
opcache.max_accelerated_files=10000
; The maximum percentage of "wasted" memory until a restart is scheduled.
;opcache.max_wasted_percentage=5
@@ -1791,7 +1791,7 @@ ldap.max_links = -1
; How often (in seconds) to check file timestamps for changes to the shared
; memory storage allocation. ("1" means validate once per second, but only
; once per request. "0" means always validate)
;opcache.revalidate_freq=2
opcache.revalidate_freq=1
; Enables or disables file search in include_path optimization
;opcache.revalidate_path=0
@@ -1944,3 +1944,6 @@ ldap.max_links = -1
; List of headers files to preload, wildcard patterns allowed.
;ffi.preload=
apc.enable_cli=1
+6 -6
View File
@@ -137,7 +137,7 @@ pm.max_spare_servers = 3
; This can be useful to work around memory leaks in 3rd party libraries. For
; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
; Default Value: 0
;pm.max_requests = 500
pm.max_requests = 1000
; The URI to view the FPM status page. If this value is not set, no URI will be
; recognized as a status page. It shows the following information:
@@ -423,11 +423,11 @@ pm.max_spare_servers = 3
; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
; the current environment.
; Default Value: clean env
;env[HOSTNAME] = $HOSTNAME
;env[PATH] = /usr/local/bin:/usr/bin:/bin
;env[TMP] = /tmp
;env[TMPDIR] = /tmp
;env[TEMP] = /tmp
env[HOSTNAME] = $HOSTNAME
env[PATH] = /usr/local/bin:/usr/bin:/bin
env[TMP] = /tmp
env[TMPDIR] = /tmp
env[TEMP] = /tmp
; Additional php.ini defines, specific to this pool of workers. These settings
; overwrite the values previously defined in the php.ini. The directives are the
+1
View File
@@ -1 +1,2 @@
extension=apcu.so
apc.enable_cli=1
+1
View File
@@ -0,0 +1 @@
extension=apcu.so
+1 -1
View File
@@ -535,7 +535,7 @@ rename-command CONFIG 1142eatmyass
# limit for maxmemory so that there is some free RAM on the system for slave
# output buffers (but this is not needed if the policy is 'noeviction').
#
#maxmemory 500mb
maxmemory 256mb
# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
# is reached. You can select among five behaviors:
+2 -1
View File
@@ -9,7 +9,8 @@ SyslogFacility AUTH
LogLevel VERBOSE
# Authentication:
PermitRootLogin prohibit-password
#PermitRootLogin prohibit-password
PermitRootLogin no
MaxAuthTries 2
MaxSessions 2
IgnoreRhosts yes
+166
View File
@@ -0,0 +1,166 @@
##==============================================================================
## LOGO
##
## Configure the logo to your liking. You can either use the default or
## set your own ASCII art down below.
##
## - You can either add it as a single line, or multiline (terminated with \).
## - You have to escape backslashes if you want them to show inside your logo.
## Use \\\\ for 1 backslash, \\\\\\\\ for two. All other characters work fine.
## - You can also add individual color codes to the logo using '\e[ ··· m'.
## - For example: \e[1;31mHello World! prints in bright red.
## - If you want extra spaces between the logo and the status info, just add
## extra spaces at the last line and end it with '\n'.
##==============================================================================
logo="\e[38;5;213m __ __
_______ ______ / /_/ /_
/ ___/ / / / __ \/ __/ __ \
/__ / /_/ / / / / /_/ / / /
/____/\__ /_/ /_/\__/_/ /_/
/____/
\e[38;5;45m _____ __ __________ __
/ ___// / / / ____/ / / /
\__ \/ /_/ / __/ / / / /
___/ / __ / /___/ /___/ /___
/____/_/ /_/_____/_____/_____/\e[0;39m"
##==============================================================================
## STATUS INFO
##
## Choose what to print and in what order
## Valid options are:
##
## ## SIMPLE ONE-LINERS
## OS Linux distribution name
## KERNEL Kernel version
## CPU CPU Name
## SHELL Shell name
## DATE Current date
## UPTIME System uptime (time since boot)
## USER Current user and host names
## NUMLOGGED Show number of logged in users
## NAMELOGGED Show names of logged in users
## LOCALIPV4 IPv4
## EXTERNALIPV4 External IPv4 (might be slow)
## SERVICES Summary of failed services
## CPULOAD Sys load average(eg. 0.23, 0.26, 0.27 )
## CPUTEMP CPU temperature (requires lm-sensors)
##
## ## SYS LOAD MONITORS
## SYSLOAD_MON Current CPU load
## MEMORY_MON Occupied memory
## SWAP_MON Occupied SWAP
## HDDROOT_MON / partition occupied
## HDDHOME_MON /home/user occupied
## CPUTEMP_MON CPU temperature (requires lm-sensors)
## SYSLOAD_MON% Current CPU load in %
## MEMORY_MON% Occupied memory in %
## SWAP_MON% Occupied SWAP in %
## HDDROOT_MON% / partition occupied in %
## HDDHOME_MON% /home/user occupied in %
##
## ## MISC
## SPACER Print decorative spacer (empty line)
## PALETTE Show 16-bit palette (add SPACER before for best results)
## PALETTE_SMALL Show smaller version of 16-bit color palette
##
##==============================================================================
print_info="
OS
KERNEL
CPU
GPU
SHELL
DATE
UPTIME
LOCALIPV4
EXTERNALIPV4
SERVICES
CPUTEMP
SYSLOAD_MON%
MEMORY_MON
SWAP_MON
HDDROOT_MON
HDDHOME_MON
PALETTE"
##==============================================================================
## COLORS
##
## Control the color and format scheme of the status report.
## -c color: color name or 256bit color code
## -b background color: color name or 256bit color code
## -e effect: bold, blink, dim, underline...
##
## Valid color names (16 bit):
## white, light-gray, dark-gray, black,
## red, green, yellow, blue, magenta, cyan,
## light-red, light-green, light-yellow, light-blue, light-magenta, light-cyan
##
##==============================================================================
format_info=" -c light-gray "
format_highlight=" -c blue -e bold"
format_crit=" -c 45 -e bold"
format_deco=" -c light-gray "
format_ok=" -c blue -e bold"
format_error=" -c 45 -e bold -e blink"
format_logo=" -c blue -e bold"
##==============================================================================
## STATUS BARS
##
## These option controls the behaviour of the visual status bars that are
## plotted for CPU, Memory, Swap and HDD usage. You can set the percentage that
## determines when the current usage is deemed critical. If said percentage
## is surpassed, the color of the bars will change and extra information
## might be plotted in addition (e.g. if the CPU usage is too high, the most
## demanding processes are printed to terminal).
##==============================================================================
bar_cpu_crit_percent=40
bar_ram_crit_percent=75
bar_swap_crit_percent=25
bar_hdd_crit_percent=85
bar_home_crit_percent=85
bar_ram_units="MB"
bar_swap_units="MB"
bar_hdd_units="GB"
bar_home_units="GB"
cpu_crit_print=true
cpu_crit_print_num=3
ram_crit_print=true
ram_crit_print_num=3
bar_length=9 # Number of characters that comprise a bar
bar_num_digits=5 # Control num digits next to bar
bar_padding_after=0 # Extra spaces after bar
info_label_width=16 # Desired length of the info labels
bar_bracket_char_left='['
bar_bracket_char_right=']'
bar_fill_char='|'
bar_background_char=' '
##==============================================================================
## OTHERS
##
## For date format setup, see `man date`
##==============================================================================
print_cols_max=100 # Keep logo and info text together
print_logo_right=false # Change where the logo is plotted
date_format="%Y.%m.%d - %T" # see 'man date'
clear_before_print=false # Dangerous if true, some messages might be lost
print_extra_new_line_top=true # Extra line before logo and info
print_extra_new_line_bot=true # Extra line after logo and info
+88
View File
@@ -0,0 +1,88 @@
##==============================================================================
## COLORS
##
## Control the color and format scheme of the bash prompt.
## The prompt is divided into segments, listed below starting from the left:
## - USER: shows the user's name.
## - HOST: shows the host's name.
## - PWD: shows the current directory.
## - GIT: if inside a git repository, shows the name of current branch.
## - PYENV: if inside a Python Virtual environment.
## - TF: if inside a Terraform Workspace.
## - CLOCK: shows current time in H:M format.
## - INPUT: actual bash input.
##
## Valid color options:
## - white black light-gray dark-gray
## red green yellow blue cyan purple
## light-red light-green light-yellow light-blue light-cyan light-purple
## - Values in the range [0-255] for 256 bit colors. To check all number-color
## pairs for your terminal, you may run the following snippet by HaleTom:
## curl -s https://gist.githubusercontent.com/HaleTom/89ffe32783f89f403bba96bd7bcd1263/raw/ | bash
## or search something like "bash 256 color codes" on the internet.
##
##==============================================================================
format="USER HOST PWD GIT PYENV TF"
font_color_user="white"
background_user="blue"
texteffect_user="bold"
font_color_host="white"
background_host="light-blue"
texteffect_host="bold"
font_color_pwd="dark-gray"
background_pwd="white"
texteffect_pwd="bold"
font_color_git="light-gray"
background_git="dark-gray"
texteffect_git="bold"
font_color_pyenv="white"
background_pyenv="blue"
texteffect_pyenv="bold"
font_color_tf="purple"
background_tf="light-purple"
texteffect_tf="bold"
font_color_clock="white"
background_clock="light-blue"
texteffect_clock="bold"
font_color_input="45"
background_input="none"
texteffect_input="bold"
##==============================================================================
## BEHAVIOR
##==============================================================================
separator_char='\uE0B0' # Separation character, '\uE0B0'=triangle
separator_padding_left='' #
separator_padding_right='' #
prompt_horizontal_padding='' #
prompt_final_padding='' #
segment_padding=' ' #
enable_vertical_padding=true # Add extra new line over prompt
max_pwd_char="20"
##==============================================================================
## GIT
##==============================================================================
git_symbol_synced=''
git_symbol_unpushed=' ▲'
git_symbol_unpulled=' ▼'
git_symbol_unpushedunpulled=' ◆'
git_symbol_dirty=' ◔'
git_symbol_dirty_unpushed=' ◔ △'
git_symbol_dirty_unpulled=' ◔ ▽'
git_symbol_dirty_unpushedunpulled=' ◔ ◇'
git_update_period_minutes=15 # Use -1 to disable automatic updates
+8
View File
@@ -0,0 +1,8 @@
[Unit]
Description=Nextcloud cron.php job
[Service]
User=www-data
ExecStart=/usr/bin/php8.0 --define apc.enable_cli=1 -f /var/www/vhosts/solusar.de/subdomains/nextcloud/cron.php
KillMode=process
+10
View File
@@ -0,0 +1,10 @@
[Unit]
Description=Run Nextcloud cron.php every 5 minutes
[Timer]
OnBootSec=5min
OnUnitActiveSec=5min
Unit=nextcloudcron.service
[Install]
WantedBy=timers.target
@@ -0,0 +1 @@
/etc/systemd/system/nextcloudcron.timer