Skip to content

Commit 9b1b177

Browse files
jetterojettero
authored
Merge pull request #844 from jettero/other-pkg-updates
Other pkg updates
2 parents 20e8d7d + 69bc01a commit 9b1b177

File tree

16 files changed

+337
-9
lines changed

16 files changed

+337
-9
lines changed

‎pkg/amazonlinux2016.09/entrypoint.sh

+27
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,33 @@ if [ -f /data/hubble_buildinfo ]; then
2525
cat /data/hubble_buildinfo >> /hubble_build/hubblestack/__init__.py
2626
fi 2>/dev/null
2727

28+
cat > /data/pre_packaged_certificates.py << EOF
29+
ca_crt = list()
30+
public_crt = list()
31+
EOF
32+
do_pkg_crts=0
33+
if [ -f /data/certs/ca-root.crt ]; then
34+
echo "ca_crt.append('''$(< /data/certs/ca-root.crt)''')" \
35+
>> /data/pre_packaged_certificates.py
36+
do_pkg_crts=$(( do_pkg_crts + 1 ))
37+
for item in /data/certs/int*.crt; do
38+
if [ -f "$item" ]
39+
then echo "ca_crt.append('''$(< "$item")''')" \
40+
>> /data/pre_packaged_certificates.py
41+
do_pkg_crts=$(( do_pkg_crts + 1 ))
42+
fi
43+
done
44+
fi
45+
for item in /data/certs/{pub,sign}*.crt; do
46+
if [ -f "$item" ]
47+
then echo "public_crt.append('''$(< "$item")''')" \
48+
>> /data/pre_packaged_certificates.py
49+
do_pkg_crts=$(( do_pkg_crts + 1 ))
50+
fi
51+
done
52+
if [ $do_pkg_crts -gt 0 ]
53+
then cp /data/pre_packaged_certificates.py /hubble_build/hubblestack
54+
fi
2855

2956
cd /hubble_build
3057

‎pkg/centos6/entrypoint.sh

+27
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,33 @@ if [ -f /data/hubble_buildinfo ]; then
2525
cat /data/hubble_buildinfo >> /hubble_build/hubblestack/__init__.py
2626
fi 2>/dev/null
2727

28+
cat > /data/pre_packaged_certificates.py << EOF
29+
ca_crt = list()
30+
public_crt = list()
31+
EOF
32+
do_pkg_crts=0
33+
if [ -f /data/certs/ca-root.crt ]; then
34+
echo "ca_crt.append('''$(< /data/certs/ca-root.crt)''')" \
35+
>> /data/pre_packaged_certificates.py
36+
do_pkg_crts=$(( do_pkg_crts + 1 ))
37+
for item in /data/certs/int*.crt; do
38+
if [ -f "$item" ]
39+
then echo "ca_crt.append('''$(< "$item")''')" \
40+
>> /data/pre_packaged_certificates.py
41+
do_pkg_crts=$(( do_pkg_crts + 1 ))
42+
fi
43+
done
44+
fi
45+
for item in /data/certs/{pub,sign}*.crt; do
46+
if [ -f "$item" ]
47+
then echo "public_crt.append('''$(< "$item")''')" \
48+
>> /data/pre_packaged_certificates.py
49+
do_pkg_crts=$(( do_pkg_crts + 1 ))
50+
fi
51+
done
52+
if [ $do_pkg_crts -gt 0 ]
53+
then cp /data/pre_packaged_certificates.py /hubble_build/hubblestack
54+
fi
2855

2956
cd /hubble_build
3057

‎pkg/centos7/entrypoint.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,21 @@ do_pkg_crts=0
3333
if [ -f /data/certs/ca-root.crt ]; then
3434
echo "ca_crt.append('''$(< /data/certs/ca-root.crt)''')" \
3535
>> /data/pre_packaged_certificates.py
36+
do_pkg_crts=$(( do_pkg_crts + 1 ))
3637
for item in /data/certs/int*.crt; do
3738
if [ -f "$item" ]
3839
then echo "ca_crt.append('''$(< "$item")''')" \
3940
>> /data/pre_packaged_certificates.py
41+
do_pkg_crts=$(( do_pkg_crts + 1 ))
4042
fi
4143
done
42-
do_pkg_crts=$(( do_pkg_crts + 1 ))
4344
fi
4445
for item in /data/certs/{pub,sign}*.crt; do
4546
if [ -f "$item" ]
4647
then echo "public_crt.append('''$(< "$item")''')" \
4748
>> /data/pre_packaged_certificates.py
49+
do_pkg_crts=$(( do_pkg_crts + 1 ))
4850
fi
49-
do_pkg_crts=$(( do_pkg_crts + 1 ))
5051
done
5152
if [ $do_pkg_crts -gt 0 ]
5253
then cp /data/pre_packaged_certificates.py /hubble_build/hubblestack

‎pkg/centos8/entrypoint.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,21 @@ do_pkg_crts=0
3333
if [ -f /data/certs/ca-root.crt ]; then
3434
echo "ca_crt.append('''$(< /data/certs/ca-root.crt)''')" \
3535
>> /data/pre_packaged_certificates.py
36+
do_pkg_crts=$(( do_pkg_crts + 1 ))
3637
for item in /data/certs/int*.crt; do
3738
if [ -f "$item" ]
3839
then echo "ca_crt.append('''$(< "$item")''')" \
3940
>> /data/pre_packaged_certificates.py
41+
do_pkg_crts=$(( do_pkg_crts + 1 ))
4042
fi
4143
done
42-
do_pkg_crts=$(( do_pkg_crts + 1 ))
4344
fi
4445
for item in /data/certs/{pub,sign}*.crt; do
4546
if [ -f "$item" ]
4647
then echo "public_crt.append('''$(< "$item")''')" \
4748
>> /data/pre_packaged_certificates.py
49+
do_pkg_crts=$(( do_pkg_crts + 1 ))
4850
fi
49-
do_pkg_crts=$(( do_pkg_crts + 1 ))
5051
done
5152
if [ $do_pkg_crts -gt 0 ]
5253
then cp /data/pre_packaged_certificates.py /hubble_build/hubblestack

‎pkg/coreos/entrypoint.sh

+27
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,33 @@ if [ -f /data/hubble_buildinfo ]; then
2525
cat /data/hubble_buildinfo >> /hubble_build/hubblestack/__init__.py
2626
fi 2>/dev/null
2727

28+
cat > /data/pre_packaged_certificates.py << EOF
29+
ca_crt = list()
30+
public_crt = list()
31+
EOF
32+
do_pkg_crts=0
33+
if [ -f /data/certs/ca-root.crt ]; then
34+
echo "ca_crt.append('''$(< /data/certs/ca-root.crt)''')" \
35+
>> /data/pre_packaged_certificates.py
36+
do_pkg_crts=$(( do_pkg_crts + 1 ))
37+
for item in /data/certs/int*.crt; do
38+
if [ -f "$item" ]
39+
then echo "ca_crt.append('''$(< "$item")''')" \
40+
>> /data/pre_packaged_certificates.py
41+
do_pkg_crts=$(( do_pkg_crts + 1 ))
42+
fi
43+
done
44+
fi
45+
for item in /data/certs/{pub,sign}*.crt; do
46+
if [ -f "$item" ]
47+
then echo "public_crt.append('''$(< "$item")''')" \
48+
>> /data/pre_packaged_certificates.py
49+
do_pkg_crts=$(( do_pkg_crts + 1 ))
50+
fi
51+
done
52+
if [ $do_pkg_crts -gt 0 ]
53+
then cp /data/pre_packaged_certificates.py /hubble_build/hubblestack
54+
fi
2855

2956
cd /hubble_build
3057

‎pkg/debian10/entrypoint.sh

+27
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,33 @@ if [ -f /data/hubble_buildinfo ]; then
2525
cat /data/hubble_buildinfo >> /hubble_build/hubblestack/__init__.py
2626
fi 2>/dev/null
2727

28+
cat > /data/pre_packaged_certificates.py << EOF
29+
ca_crt = list()
30+
public_crt = list()
31+
EOF
32+
do_pkg_crts=0
33+
if [ -f /data/certs/ca-root.crt ]; then
34+
echo "ca_crt.append('''$(< /data/certs/ca-root.crt)''')" \
35+
>> /data/pre_packaged_certificates.py
36+
do_pkg_crts=$(( do_pkg_crts + 1 ))
37+
for item in /data/certs/int*.crt; do
38+
if [ -f "$item" ]
39+
then echo "ca_crt.append('''$(< "$item")''')" \
40+
>> /data/pre_packaged_certificates.py
41+
do_pkg_crts=$(( do_pkg_crts + 1 ))
42+
fi
43+
done
44+
fi
45+
for item in /data/certs/{pub,sign}*.crt; do
46+
if [ -f "$item" ]
47+
then echo "public_crt.append('''$(< "$item")''')" \
48+
>> /data/pre_packaged_certificates.py
49+
do_pkg_crts=$(( do_pkg_crts + 1 ))
50+
fi
51+
done
52+
if [ $do_pkg_crts -gt 0 ]
53+
then cp /data/pre_packaged_certificates.py /hubble_build/hubblestack
54+
fi
2855

2956
cd /hubble_build
3057

‎pkg/debian8/entrypoint.sh

+27
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,33 @@ if [ -f /data/hubble_buildinfo ]; then
2525
cat /data/hubble_buildinfo >> /hubble_build/hubblestack/__init__.py
2626
fi 2>/dev/null
2727

28+
cat > /data/pre_packaged_certificates.py << EOF
29+
ca_crt = list()
30+
public_crt = list()
31+
EOF
32+
do_pkg_crts=0
33+
if [ -f /data/certs/ca-root.crt ]; then
34+
echo "ca_crt.append('''$(< /data/certs/ca-root.crt)''')" \
35+
>> /data/pre_packaged_certificates.py
36+
do_pkg_crts=$(( do_pkg_crts + 1 ))
37+
for item in /data/certs/int*.crt; do
38+
if [ -f "$item" ]
39+
then echo "ca_crt.append('''$(< "$item")''')" \
40+
>> /data/pre_packaged_certificates.py
41+
do_pkg_crts=$(( do_pkg_crts + 1 ))
42+
fi
43+
done
44+
fi
45+
for item in /data/certs/{pub,sign}*.crt; do
46+
if [ -f "$item" ]
47+
then echo "public_crt.append('''$(< "$item")''')" \
48+
>> /data/pre_packaged_certificates.py
49+
do_pkg_crts=$(( do_pkg_crts + 1 ))
50+
fi
51+
done
52+
if [ $do_pkg_crts -gt 0 ]
53+
then cp /data/pre_packaged_certificates.py /hubble_build/hubblestack
54+
fi
2855

2956
cd /hubble_build
3057

‎pkg/debian9/entrypoint.sh

+27
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,33 @@ if [ -f /data/hubble_buildinfo ]; then
2525
cat /data/hubble_buildinfo >> /hubble_build/hubblestack/__init__.py
2626
fi 2>/dev/null
2727

28+
cat > /data/pre_packaged_certificates.py << EOF
29+
ca_crt = list()
30+
public_crt = list()
31+
EOF
32+
do_pkg_crts=0
33+
if [ -f /data/certs/ca-root.crt ]; then
34+
echo "ca_crt.append('''$(< /data/certs/ca-root.crt)''')" \
35+
>> /data/pre_packaged_certificates.py
36+
do_pkg_crts=$(( do_pkg_crts + 1 ))
37+
for item in /data/certs/int*.crt; do
38+
if [ -f "$item" ]
39+
then echo "ca_crt.append('''$(< "$item")''')" \
40+
>> /data/pre_packaged_certificates.py
41+
do_pkg_crts=$(( do_pkg_crts + 1 ))
42+
fi
43+
done
44+
fi
45+
for item in /data/certs/{pub,sign}*.crt; do
46+
if [ -f "$item" ]
47+
then echo "public_crt.append('''$(< "$item")''')" \
48+
>> /data/pre_packaged_certificates.py
49+
do_pkg_crts=$(( do_pkg_crts + 1 ))
50+
fi
51+
done
52+
if [ $do_pkg_crts -gt 0 ]
53+
then cp /data/pre_packaged_certificates.py /hubble_build/hubblestack
54+
fi
2855

2956
cd /hubble_build
3057

‎pkg/dev/amazonlinux2016.09/entrypoint.sh

+27
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,33 @@ if [ -f /data/hubble_buildinfo ]; then
2525
cat /data/hubble_buildinfo >> /hubble_build/hubblestack/__init__.py
2626
fi 2>/dev/null
2727

28+
cat > /data/pre_packaged_certificates.py << EOF
29+
ca_crt = list()
30+
public_crt = list()
31+
EOF
32+
do_pkg_crts=0
33+
if [ -f /data/certs/ca-root.crt ]; then
34+
echo "ca_crt.append('''$(< /data/certs/ca-root.crt)''')" \
35+
>> /data/pre_packaged_certificates.py
36+
do_pkg_crts=$(( do_pkg_crts + 1 ))
37+
for item in /data/certs/int*.crt; do
38+
if [ -f "$item" ]
39+
then echo "ca_crt.append('''$(< "$item")''')" \
40+
>> /data/pre_packaged_certificates.py
41+
do_pkg_crts=$(( do_pkg_crts + 1 ))
42+
fi
43+
done
44+
fi
45+
for item in /data/certs/{pub,sign}*.crt; do
46+
if [ -f "$item" ]
47+
then echo "public_crt.append('''$(< "$item")''')" \
48+
>> /data/pre_packaged_certificates.py
49+
do_pkg_crts=$(( do_pkg_crts + 1 ))
50+
fi
51+
done
52+
if [ $do_pkg_crts -gt 0 ]
53+
then cp /data/pre_packaged_certificates.py /hubble_build/hubblestack
54+
fi
2855

2956
cd /hubble_build
3057

‎pkg/dev/centos6/entrypoint.sh

+28-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,33 @@ if [ -f /data/hubble_buildinfo ]; then
2525
cat /data/hubble_buildinfo >> /hubble_build/hubblestack/__init__.py
2626
fi 2>/dev/null
2727

28+
cat > /data/pre_packaged_certificates.py << EOF
29+
ca_crt = list()
30+
public_crt = list()
31+
EOF
32+
do_pkg_crts=0
33+
if [ -f /data/certs/ca-root.crt ]; then
34+
echo "ca_crt.append('''$(< /data/certs/ca-root.crt)''')" \
35+
>> /data/pre_packaged_certificates.py
36+
do_pkg_crts=$(( do_pkg_crts + 1 ))
37+
for item in /data/certs/int*.crt; do
38+
if [ -f "$item" ]
39+
then echo "ca_crt.append('''$(< "$item")''')" \
40+
>> /data/pre_packaged_certificates.py
41+
do_pkg_crts=$(( do_pkg_crts + 1 ))
42+
fi
43+
done
44+
fi
45+
for item in /data/certs/{pub,sign}*.crt; do
46+
if [ -f "$item" ]
47+
then echo "public_crt.append('''$(< "$item")''')" \
48+
>> /data/pre_packaged_certificates.py
49+
do_pkg_crts=$(( do_pkg_crts + 1 ))
50+
fi
51+
done
52+
if [ $do_pkg_crts -gt 0 ]
53+
then cp /data/pre_packaged_certificates.py /hubble_build/hubblestack
54+
fi
2855

2956
cd /hubble_build
3057

@@ -136,7 +163,7 @@ scl enable rh-ruby23 'fpm -s dir -t rpm \
136163
--after-install /hubble_build/conf/afterinstall.sh \
137164
--after-upgrade /hubble_build/conf/afterupgrade.sh \
138165
--before-remove /hubble_build/conf/beforeremove.sh \
139-
etc/hubble /etc/init.d opt usr /var/log/hubble_osquery/backuplogs'
166+
etc/hubble etc/init.d opt usr /var/log/hubble_osquery/backuplogs'
140167

141168
# edit to change iteration number, if necessary
142169
PKG_BASE_NAME=hubblestack-${HUBBLE_VERSION}-${HUBBLE_ITERATION}

‎pkg/dev/centos7/entrypoint.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,21 @@ do_pkg_crts=0
3333
if [ -f /data/certs/ca-root.crt ]; then
3434
echo "ca_crt.append('''$(< /data/certs/ca-root.crt)''')" \
3535
>> /data/pre_packaged_certificates.py
36+
do_pkg_crts=$(( do_pkg_crts + 1 ))
3637
for item in /data/certs/int*.crt; do
3738
if [ -f "$item" ]
3839
then echo "ca_crt.append('''$(< "$item")''')" \
3940
>> /data/pre_packaged_certificates.py
41+
do_pkg_crts=$(( do_pkg_crts + 1 ))
4042
fi
4143
done
42-
do_pkg_crts=$(( do_pkg_crts + 1 ))
4344
fi
4445
for item in /data/certs/{pub,sign}*.crt; do
4546
if [ -f "$item" ]
4647
then echo "public_crt.append('''$(< "$item")''')" \
4748
>> /data/pre_packaged_certificates.py
49+
do_pkg_crts=$(( do_pkg_crts + 1 ))
4850
fi
49-
do_pkg_crts=$(( do_pkg_crts + 1 ))
5051
done
5152
if [ $do_pkg_crts -gt 0 ]
5253
then cp /data/pre_packaged_certificates.py /hubble_build/hubblestack

‎pkg/dev/centos8/entrypoint.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,21 @@ do_pkg_crts=0
3333
if [ -f /data/certs/ca-root.crt ]; then
3434
echo "ca_crt.append('''$(< /data/certs/ca-root.crt)''')" \
3535
>> /data/pre_packaged_certificates.py
36+
do_pkg_crts=$(( do_pkg_crts + 1 ))
3637
for item in /data/certs/int*.crt; do
3738
if [ -f "$item" ]
3839
then echo "ca_crt.append('''$(< "$item")''')" \
3940
>> /data/pre_packaged_certificates.py
41+
do_pkg_crts=$(( do_pkg_crts + 1 ))
4042
fi
4143
done
42-
do_pkg_crts=$(( do_pkg_crts + 1 ))
4344
fi
4445
for item in /data/certs/{pub,sign}*.crt; do
4546
if [ -f "$item" ]
4647
then echo "public_crt.append('''$(< "$item")''')" \
4748
>> /data/pre_packaged_certificates.py
49+
do_pkg_crts=$(( do_pkg_crts + 1 ))
4850
fi
49-
do_pkg_crts=$(( do_pkg_crts + 1 ))
5051
done
5152
if [ $do_pkg_crts -gt 0 ]
5253
then cp /data/pre_packaged_certificates.py /hubble_build/hubblestack

0 commit comments

Comments
 (0)