Skip to content

Commit

Permalink
Finish the migration
Browse files Browse the repository at this point in the history
  • Loading branch information
bensmrs committed Jul 27, 2020
1 parent 7d9a7f7 commit 61e8616
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions resel-nsa-0.4/debian/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ case "$1" in
chown nsa:nsa /usr/libexec/nsa/nsa-collect
chown nsa:nsa /usr/libexec/nsa/nsa-send

chown nsa:nsa /var/lib/nsa
chown nsa:nsa /var/lib/nsa/pending
chown nsa:nsa /var/lib/nsa/ready
chown nsa:nsa /var/spool/nsa
chown nsa:nsa /var/spool/nsa/pending
chown nsa:nsa /var/spool/nsa/ready
;;

abort-upgrade|abort-remove|abort-deconfigure)
Expand Down
2 changes: 1 addition & 1 deletion resel-nsa-0.4/debian/resel-nsa.install
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
etc/* etc
var/lib/* var/lib
var/spool/* var/spool
usr/* usr
2 changes: 1 addition & 1 deletion resel-nsa-0.4/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ override_dh_fixperms:
chmod 750 debian/resel-nsa/etc/nsa/profiles.d
chmod 754 debian/resel-nsa/usr/libexec/nsa/nsa-*
chmod 744 debian/resel-nsa/usr/bin/nsa-admin
chmod -R 6770 debian/resel-nsa/var/lib/nsa
chmod -R 6770 debian/resel-nsa/var/spool/nsa
4 changes: 2 additions & 2 deletions resel-nsa-0.4/usr/libexec/nsa/nsa-collect
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ process()
fi
base=$(basename $1)
category=${base%%.*}
pending_dir=/var/lib/nsa/pending/$category
ready_dir=/var/lib/nsa/ready/$category
pending_dir=/var/spool/nsa/pending/$category
ready_dir=/var/spool/nsa/ready/$category
mkdir -p $pending_dir
mkdir -p $ready_dir
chmod 6770 $pending_dir
Expand Down
4 changes: 2 additions & 2 deletions resel-nsa-0.4/usr/libexec/nsa/nsa-send
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ source /etc/nsa/config
kill $$
} &

for dir in /var/lib/nsa/ready/*
for dir in /var/spool/nsa/ready/*
do
if [ -d $dir ]
then
category=$(basename $dir)
for file in /var/lib/nsa/ready/$category/*
for file in /var/spool/nsa/ready/$category/*
do
source /etc/nsa/profiles.d/$category
if [ ! -s $file ] || ([ -f $file ] && curl -fs -H "X-Warp10-Token: $TOKEN" -H 'Transfer-Encoding: chunked' -T $file $ENDPOINT)
Expand Down

0 comments on commit 61e8616

Please sign in to comment.