jcarr
/
wit-network-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trying to be more specific on the variables and fail if var has not been defined, also fixing some drone stuff

This commit is contained in:
toby 2019-03-29 18:33:34 +00:00
parent 3e5b0e21a6
commit 3a08cb5182
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.drone.yml
View File

@ -8,12 +8,12 @@ pipeline:
- echo Building ${DRONE_BRANCH/master/experimental}
- apt-get update
- apt-get install -y sed strongswan frr isc-dhcp-client systemd
- echo "$DEBNAME (2.0.$(date +%Y.%m.%d.%H.%M)) unstable; urgency=low\n\n$(git log --format=" * %s")\n\n -- wit <netops@wit.com> $(date -R)" >debian/changelog
- echo "${DEBNAME} (2.0.$(date +%Y.%m.%d.%H.%M)) unstable; urgency=low\n\n$(git log --format=" * %s")\n\n -- wit <netops@wit.com> $(date -R)" >debian/changelog
- dpkg-buildpackage --no-sign
- ls -lha ../$DEBNAME_*_all.deb
- ls -lha ../${DEBNAME}_*_all.deb
- echo "$SSH_KEY" >/tmp/id_rsa
- chmod 600 /tmp/id_rsa
- scp -i /tmp/id_rsa -o StrictHostKeyChecking=no ../$DEBNAME_*_all.deb debcore@mirrors.wit.com:/data/incoming/${DRONE_BRANCH/master/experimental}
- scp -i /tmp/id_rsa -o StrictHostKeyChecking=no ../${DEBNAME}_*_all.deb debcore@mirrors.wit.com:/data/incoming/${DRONE_BRANCH/master/experimental}
secrets: [ ssh_key ]
branches:
- master

26
debian/wit-network-config.postinst vendored
View File

@ -67,8 +67,8 @@ case "$1" in
KEYFILE=${CAPATH}/private/${HOSTNAME}.key
REQFILE=${CAPATH}/reqs/${HOSTNAME}.req
CRTFILE=${CAPATH}/certs/${HOSTNAME}.crt
CRLFILE=${CAPATH}/crls/${CA}.crl
CAFILE=${CAPATH}/cacerts/${CA}.crt
CRLFILE=${CAPATH}/crls/${ROOTCA}.crl
CAFILE=${CAPATH}/cacerts/${ROOTCA}.crt
## END variables
@ -345,17 +345,17 @@ case "$1" in
# set frr config
sed -i \
-e "s/^!!! FRR_IFS/$FRR_IFS/" \
-e "s/^ !!! FRR_EDGE_NEIGH/$FRR_EDGE_NEIGH/" \
-e "s/^ !!! FRR_IPV4_EDGE_SUMMARIES_AGGREGATS/$FRR_IPV4_EDGE_SUMMARIES_AGGREGATS/" \
-e "s/^ !!! FRR_IPV6_EDGE_SUMMARIES_AGGREGATS/$FRR_IPV6_EDGE_SUMMARIES_AGGREGATS/" \
-e "s/^!!! FRR_IPV4_EDGE_SUMMARIES_PFLIST/$FRR_IPV4_EDGE_SUMMARIES_PFLIST/" \
-e "s/^!!! FRR_IPV6_EDGE_SUMMARIES_PFLIST/$FRR_IPV6_EDGE_SUMMARIES_PFLIST/" \
-e "s/^!!! FRR_IPV4_CUSTOMERS_PFLIST/$FRR_IPV4_CUSTOMERS_PFLIST/" \
-e "s/^!!! FRR_IPV6_CUSTOMERS_PFLIST/$FRR_IPV6_CUSTOMERS_PFLIST/" \
-e "s/^!!! FRR_IPV4_LOOPBACK_PFLIST/$FRR_IPV4_LOOPBACK_PFLIST/" \
-e "s/^!!! FRR_IPV6_LOOPBACK_PFLIST/$FRR_IPV6_LOOPBACK_PFLIST/" \
-e "s/BASTION-PUBLIC-IP/$BASTIONPUBLICIP/" \
-e "s/^!!! FRR_IFS/${FRR_IFS:-""}/" \
-e "s/^ !!! FRR_EDGE_NEIGH/${FRR_EDGE_NEIGH:-""}/" \
-e "s/^ !!! FRR_IPV4_EDGE_SUMMARIES_AGGREGATS/${FRR_IPV4_EDGE_SUMMARIES_AGGREGATS:-""}/" \
-e "s/^ !!! FRR_IPV6_EDGE_SUMMARIES_AGGREGATS/${FRR_IPV6_EDGE_SUMMARIES_AGGREGATS:-""}/" \
-e "s/^!!! FRR_IPV4_EDGE_SUMMARIES_PFLIST/${FRR_IPV4_EDGE_SUMMARIES_PFLIST:-""}/" \
-e "s/^!!! FRR_IPV6_EDGE_SUMMARIES_PFLIST/${FRR_IPV6_EDGE_SUMMARIES_PFLIST:-""}/" \
-e "s/^!!! FRR_IPV4_CUSTOMERS_PFLIST/${FRR_IPV4_CUSTOMERS_PFLIST:-""}/" \
-e "s/^!!! FRR_IPV6_CUSTOMERS_PFLIST/${FRR_IPV6_CUSTOMERS_PFLIST:-""}/" \
-e "s/^!!! FRR_IPV4_LOOPBACK_PFLIST/${FRR_IPV4_LOOPBACK_PFLIST:-""}/" \
-e "s/^!!! FRR_IPV6_LOOPBACK_PFLIST/${FRR_IPV6_LOOPBACK_PFLIST:-""}/" \
-e "s/BASTION-PUBLIC-IP/${BASTIONPUBLICIP:-""}/" \
-e "s/FRR_GRE_ASN/${FRR_GRE_ASN:=$NODEASN}/" \
-e "s/FRRROUTERID/${LOOPBACKv4}/" \
-e "s/LOOPBACK-IPV6/${LOOPBACKv6}/" \