Skip to content

Commit 6e32eff

Browse files
committed
daily
1 parent 4018c70 commit 6e32eff

File tree

10 files changed

+35
-44
lines changed

10 files changed

+35
-44
lines changed

CV-WordPress.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Contact me: [email protected]
4444
Essentially keep every operation in memory!
4545

4646
- Modern CPU, high *memory* bandwidth as WordPress is mainly memory copying,
47-
sub-msec disk access time, use [UpCloud](https://www.upcloud.com/register/?promo=U29Q8S)
47+
sub-msec disk access time, use [UpCloud](https://signup.upcloud.com/?promo=U29Q8S)
4848
- Thin virtualization layer, use UpCloud, stay away from popular, non-enterprise providers
4949
- Fast operating system: No systemd, Enough entropy, IRQ balance, Low memory usage
5050
- Block hammering attackers: Fail2ban, permanently block hostile networks

Onboarding.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ This section contains preparations for secure registration.
7676
[RDP on Windows](https://ci.freerdp.com/job/freerdp-nightly-windows/arch=win64,label=vs2013/)
7777
or [RDP on Mac](https://itunes.apple.com/us/app/microsoft-remote-desktop/id1295203466?mt=12)
7878
- Download [Palemoon browser](https://www.palemoon.org/download.php?mirror=eu&bits=64&type=installer)
79-
- Create UpCloud shortcut on the Desktop: `palemoon.exe "https://www.upcloud.com/register/?promo=U29Q8S"`
79+
- Create UpCloud shortcut on the Desktop: `palemoon.exe "https://signup.upcloud.com/?promo=U29Q8S"`
8080
- Create AWS shortcut: `"https://portal.aws.amazon.com/gp/aws/developer/registration/index.html"`
8181
- Download [`user.js`](https://github.com/szepeviktor/windows-workstation/blob/master/upcloud/user.js) to `%APPDATA%\Moonchild Productions\Basilisk\Profiles\`
8282
- Open On-Screen Keyboard for entering passwords

Onboarding2.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Ebben a részben a biztonságos regisztrációkra készülünk fel.
8181
[RDP Windows PC-khez](https://ci.freerdp.com/job/freerdp-nightly-windows/arch=win64,label=vs2013/)
8282
vagy [RDP Mac gépekre](https://itunes.apple.com/us/app/microsoft-remote-desktop/id1295203466?mt=12)
8383
- [Palemoon böngésző](https://www.palemoon.org/download.php?mirror=eu&bits=64&type=installer) letöltése
84-
- UpCloud parancsikon kirakása az Asztalra: `basilisk.exe "https://www.upcloud.com/register/?promo=U29Q8S"`
84+
- UpCloud parancsikon kirakása az Asztalra: `palemoon.exe "https://signup.upcloud.com/?promo=U29Q8S"`
8585
- AWS parancsikon: `"https://portal.aws.amazon.com/gp/aws/developer/registration/index.html"`
8686
- [`user.js`](https://github.com/szepeviktor/windows-workstation/blob/master/upcloud/user.js)
8787
letöltése a `%APPDATA%\Moonchild Productions\Basilisk\Profiles\` mappába

debian-setup/debian-setup-functions.inc.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export -f Is_installed_regexp
2828

2929
Pkg_install_quiet()
3030
{
31-
DEBIAN_FRONTEND=noninteractive apt-get install -q -y "$@"
31+
DEBIAN_FRONTEND=noninteractive NEEDRESTART_SUSPEND=1 apt-get install -q -y "$@"
3232
}
3333
export -f Pkg_install_quiet
3434

debian-setup/packages/_package-python-pip

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
set -e -x
44

55
# Get pip
6-
Pkg_install_quiet python3-dev
7-
wget -nv "https://bootstrap.pypa.io/get-pip.py"
6+
Pkg_install_quiet python3-dev python3-pip
7+
8+
##wget -nv "https://bootstrap.pypa.io/get-pip.py"
89

910
# https://twitter.com/pear/status/1086634389465956352
1011

11-
python3 get-pip.py
12-
rm get-pip.py
12+
##python3 get-pip.py --break-system-packages
13+
##rm get-pip.py
14+
##python3 -m pip uninstall --break-system-packages pip wheel
1315

1416
# DEPRECATION: Python 2.7 reached the end of its life on January 1st, 2020.
1517
if [ "$(Data get-value package.python2.install-deprecated "False")" == True ]; then

debian-setup/packages/_resolv_conf

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
declare -i RESOLVERS="0"
44
# See resolv.conf(5)
55
declare -i MAXNS="3"
6-
declare -r EXAMPLECOM_IP="93.184.215.14"
6+
declare -r EXAMPLECOM_NS="a.iana-servers.net."
77

88
Check_resolver()
99
{
1010
local NS="$1"
1111

12-
host -v -t A example.com "$NS" \
13-
| grep -E -x "example\\.com\\.\\s+[0-9]+\\s+IN\\s+A\\s+${EXAMPLECOM_IP//./\\.}" 1>&2
12+
host -v -t NS example.com "$NS" \
13+
| grep -E -x "example\\.com\\.\\s+[0-9]+\\s+IN\\s+NS\\s+${EXAMPLECOM_NS//./\\.}" 1>&2
1414
}
1515

1616
set -e -x

debian-setup/packages/mariadb-server

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Pkg_install_quiet mariadb-server mariadb-client mariadb-backup
66

77
# Disable the binary log
88
sed -i -e 's/^log_bin/#&/' /etc/mysql/mariadb.conf.d/50-server.cnf
9+
sed -i -e 's/^expire_logs_days/#&/' /etc/mysql/mariadb.conf.d/50-server.cnf
910

1011
Dinstall mysql/mysql-optimize.sh
1112

debian-setup/packages/s3ql

+19-31
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,34 @@
11
#!/bin/bash
22
#
3-
# Install S3QL 5.2.0 on Python 3.9
3+
# Install S3QL in Python venv
44
#
55

6-
export PYTHONPATH="/opt/s3ql/lib/python3.9/site-packages"
6+
S3QL_VERSION="5.2.3"
7+
S3QL_PATH="/opt/s3ql"
78

89
set -e -x
910

10-
py_pip_install()
11-
{
12-
pip3 install --no-cache-dir --ignore-installed --no-warn-script-location --prefix "/opt/s3ql/" "$@"
13-
}
11+
Pkg_install_quiet python3-venv \
12+
python3-dev build-essential pkg-config libffi-dev libattr1-dev libsqlite3-dev libfuse3-dev fuse3 psmisc
1413

15-
py_make_launcher()
14+
python3 -m venv "${S3QL_PATH}"
1615
{
17-
local BIN_PATH="$1"
18-
local LAUNCHER_PATH="/usr/local/bin/${BIN_PATH##*/}"
19-
20-
# Generate launcher
21-
# shellcheck disable=SC2086
22-
printf '#!/bin/bash\nPYTHONPATH="%s" exec %s "$@"\n' \
23-
"${PYTHONPATH}" "${BIN_PATH}" \
24-
>"${LAUNCHER_PATH}"
25-
chmod a+x "${LAUNCHER_PATH}"
26-
}
16+
# shellcheck disable=SC1091
17+
source "${S3QL_PATH}/bin/activate"
2718

28-
Pkg_install_quiet python3-dev build-essential pkg-config libffi-dev libattr1-dev libsqlite3-dev libfuse3-dev fuse3 psmisc
19+
# S3QL needs pyfuse3, pip-distributed apsw contains sqlite3
20+
pip3 install --no-cache-dir 'pyfuse3 >= 3.2.0, < 4.0' 'apsw >= 3.42.0'
21+
pip3 install --no-cache-dir "https://github.com/s3ql/s3ql/releases/download/s3ql-${S3QL_VERSION}/s3ql-${S3QL_VERSION}.tar.gz"
2922

30-
# S3QL needs pyfuse3, pip distributed apsw contains sqlite3
31-
py_pip_install 'pyfuse3 >= 3.2.0, < 4.0' 'apsw >= 3.42.0'
32-
py_pip_install 'https://github.com/s3ql/s3ql/releases/download/s3ql-5.2.0/s3ql-5.2.0.tar.gz'
23+
# List packages
24+
pip3 list
3325

34-
# Link all S3QL commands
35-
for BIN_PATH in /opt/s3ql/bin/*s3ql*; do
36-
py_make_launcher "${BIN_PATH}"
37-
done
26+
# Link all S3QL commands
27+
for BIN_PATH in "${S3QL_PATH}/bin"/*s3ql*; do
28+
ln --symbolic "${BIN_PATH}" "/usr/local/bin/${BIN_PATH##*/}"
29+
done
3830

39-
# List packages
40-
pip3 list --no-cache-dir --path "${PYTHONPATH}"
31+
deactivate
32+
}
4133

4234
s3qlctrl --version
43-
44-
# List outdated packages
45-
# pip3 list --no-cache-dir --path "${PYTHONPATH}" --outdated
46-
# Upgrade: remove and reinstall

monitoring/monit/services/ntpdate

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
group ntpdate
1515
include /etc/monit/templates/rootbin
1616

17-
check file ntpdate_rc with path /etc/default/ntpdate
17+
check file ntpdate_rc with path /etc/default/ntpsec-ntpdate
1818
group ntpdate
1919
include /etc/monit/templates/rootrc

monitoring/monit/services/ntpdate_script

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export NTPSERVERS="${*:-0.europe.pool.ntp.org}"
2626
declare -i OFFSET_MSEC
2727

2828
OFFSET="$(/usr/sbin/ntpdate-debian -q \
29-
| sed -n -e '0,/^.*: \(adjust\|step\) time server [0-9a-f.:]\+ offset [+-]\?\([0-9.]\+\) sec$/ s//\2/p')"
29+
| sed -n -e '0,/^.*) [+-]\([0-9.]\+\) +\/- [0-9.]\+ .*$/ s//\1/p')"
3030

3131
if [ -z "$OFFSET" ]; then
3232
Error 1 "Failed to measure offset"

0 commit comments

Comments
 (0)