diff options
Diffstat (limited to '.github')
-rw-r--r-- | .github/NPTest.cache | 5 | ||||
-rwxr-xr-x | .github/prepare_debian.sh | 13 | ||||
-rw-r--r-- | .github/workflows/codeql-analysis.yml | 2 | ||||
-rw-r--r-- | .github/workflows/test.yml | 12 |
4 files changed, 18 insertions, 14 deletions
diff --git a/.github/NPTest.cache b/.github/NPTest.cache index 232305a7..d488d1b9 100644 --- a/.github/NPTest.cache +++ b/.github/NPTest.cache | |||
@@ -25,8 +25,9 @@ | |||
25 | 'NP_HOST_TCP_POP' => 'pop.web.de', | 25 | 'NP_HOST_TCP_POP' => 'pop.web.de', |
26 | 'NP_HOST_TCP_PROXY' => 'localhost', | 26 | 'NP_HOST_TCP_PROXY' => 'localhost', |
27 | 'NP_HOST_TCP_SMTP' => 'localhost', | 27 | 'NP_HOST_TCP_SMTP' => 'localhost', |
28 | 'NP_HOST_TCP_SMTP_NOTLS' => '', | 28 | 'NP_HOST_TCP_SMTP_NOSTARTTLS' => '', |
29 | 'NP_HOST_TCP_SMTP_TLS' => '', | 29 | 'NP_HOST_TCP_SMTP_STARTTLS' => 'localhost', |
30 | 'NP_HOST_TCP_SMTP_TLS' => 'localhost', | ||
30 | 'NP_HOST_TLS_CERT' => 'localhost', | 31 | 'NP_HOST_TLS_CERT' => 'localhost', |
31 | 'NP_HOST_TLS_HTTP' => 'localhost', | 32 | 'NP_HOST_TLS_HTTP' => 'localhost', |
32 | 'NP_HOST_UDP_TIME' => 'none', | 33 | 'NP_HOST_UDP_TIME' => 'none', |
diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh index 7f5592b4..dcf778bc 100755 --- a/.github/prepare_debian.sh +++ b/.github/prepare_debian.sh | |||
@@ -108,12 +108,7 @@ ssh -tt localhost </dev/null >/dev/null 2>/dev/null & | |||
108 | disown %1 | 108 | disown %1 |
109 | 109 | ||
110 | # snmpd | 110 | # snmpd |
111 | for DIR in /usr/share/snmp/mibs /usr/share/mibs; do | 111 | service snmpd stop |
112 | rm -f $DIR/ietf/SNMPv2-PDU \ | ||
113 | $DIR/ietf/IPSEC-SPD-MIB \ | ||
114 | $DIR/ietf/IPATM-IPMC-MIB \ | ||
115 | $DIR/iana/IANA-IPPM-METRICS-REGISTRY-MIB | ||
116 | done | ||
117 | mkdir -p /var/lib/snmp/mib_indexes | 112 | mkdir -p /var/lib/snmp/mib_indexes |
118 | sed -e 's/^agentaddress.*/agentaddress 127.0.0.1/' -i /etc/snmp/snmpd.conf | 113 | sed -e 's/^agentaddress.*/agentaddress 127.0.0.1/' -i /etc/snmp/snmpd.conf |
119 | service snmpd start | 114 | service snmpd start |
@@ -121,7 +116,11 @@ service snmpd start | |||
121 | # start cron, will be used by check_nagios | 116 | # start cron, will be used by check_nagios |
122 | cron | 117 | cron |
123 | 118 | ||
124 | # start postfix | 119 | # postfix |
120 | cat <<EOD >> /etc/postfix/master.cf | ||
121 | smtps inet n - n - - smtpd | ||
122 | -o smtpd_tls_wrappermode=yes | ||
123 | EOD | ||
125 | service postfix start | 124 | service postfix start |
126 | 125 | ||
127 | # start ftpd | 126 | # start ftpd |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 43b35d31..0317c8c0 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml | |||
@@ -40,7 +40,7 @@ jobs: | |||
40 | 40 | ||
41 | steps: | 41 | steps: |
42 | - name: Checkout repository | 42 | - name: Checkout repository |
43 | uses: actions/checkout@v3 | 43 | uses: actions/checkout@v4 |
44 | 44 | ||
45 | # Initializes the CodeQL tools for scanning. | 45 | # Initializes the CodeQL tools for scanning. |
46 | - name: Initialize CodeQL | 46 | - name: Initialize CodeQL |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 306f21cf..77b09f43 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml | |||
@@ -16,9 +16,9 @@ jobs: | |||
16 | runs-on: ubuntu-latest | 16 | runs-on: ubuntu-latest |
17 | steps: | 17 | steps: |
18 | - name: Checkout | 18 | - name: Checkout |
19 | uses: actions/checkout@v3 | 19 | uses: actions/checkout@v4 |
20 | - name: Codespell | 20 | - name: Codespell |
21 | uses: codespell-project/actions-codespell@master | 21 | uses: codespell-project/actions-codespell@v2 |
22 | with: | 22 | with: |
23 | skip: "./.git,./.gitignore,./ABOUT-NLS,*.po,./gl,./po,./tools/squid.conf,./build-aux/ltmain.sh" | 23 | skip: "./.git,./.gitignore,./ABOUT-NLS,*.po,./gl,./po,./tools/squid.conf,./build-aux/ltmain.sh" |
24 | ignore_words_list: allright,gord,didi,hda,nd,alis,clen,scrit,ser,fot,te,parm,isnt,consol,oneliners | 24 | ignore_words_list: allright,gord,didi,hda,nd,alis,clen,scrit,ser,fot,te,parm,isnt,consol,oneliners |
@@ -31,7 +31,7 @@ jobs: | |||
31 | # runs-on: ubuntu-latest | 31 | # runs-on: ubuntu-latest |
32 | # steps: | 32 | # steps: |
33 | # - name: Checkout | 33 | # - name: Checkout |
34 | # uses: actions/checkout@v3 | 34 | # uses: actions/checkout@v4 |
35 | # - name: Lint Code Base | 35 | # - name: Lint Code Base |
36 | # uses: github/super-linter@v5.0.0 | 36 | # uses: github/super-linter@v5.0.0 |
37 | # env: | 37 | # env: |
@@ -57,7 +57,7 @@ jobs: | |||
57 | #... | 57 | #... |
58 | steps: | 58 | steps: |
59 | - name: Git clone repository | 59 | - name: Git clone repository |
60 | uses: actions/checkout@v3 | 60 | uses: actions/checkout@v4 |
61 | #- name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate | 61 | #- name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate |
62 | # uses: mxschmitt/action-tmate@v3 | 62 | # uses: mxschmitt/action-tmate@v3 |
63 | - name: Run the tests on ${{ matrix.distro }} | 63 | - name: Run the tests on ${{ matrix.distro }} |
@@ -74,6 +74,10 @@ jobs: | |||
74 | /bin/sh -c '${{ matrix.prepare }} && \ | 74 | /bin/sh -c '${{ matrix.prepare }} && \ |
75 | tools/setup && \ | 75 | tools/setup && \ |
76 | ./configure --enable-libtap --with-ipv6=no && \ | 76 | ./configure --enable-libtap --with-ipv6=no && \ |
77 | set -x && \ | ||
78 | tmp_dir=$(mktemp -d -t test-XXXX) && cp -a po/ $tmp_dir/ && \ | ||
79 | cd po && make update-po && cd .. && \ | ||
80 | diff -Nur $tmp_dir/po/*.po po/*.po | tee -a /tmp/po.diff && diff -Nur $tmp_dir/po/*.pot po/*.pot | tee -a /tmp/po.diff && if [ $(wc -l /tmp/po.diff | cut -f 1 -d" ") -gt 0 ]; then echo "Error: Translations needs to be updated with make update-po!" && exit 1; fi && \ | ||
77 | make && \ | 81 | make && \ |
78 | make test' | 82 | make test' |
79 | docker container prune -f | 83 | docker container prune -f |