diff --git a/.gitignore b/.gitignore index 423b133..bd5c8e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ **/__pycache__/* venv/* -production/* test* logs/* -credentials.sh -deploy_key* \ No newline at end of file +token \ No newline at end of file diff --git a/deploy.sh b/deploy.sh index 52d7439..759666e 100755 --- a/deploy.sh +++ b/deploy.sh @@ -4,7 +4,11 @@ deploydir=$DEPLOYERDIR/$REPO/$BRANCH mkdir -p $deploydir/src cd $deploydir -git clone -b $BRANCH "git@gitea:$USER/$REPO.git" ./src +git clone \ + -b $BRANCH \ + "http://deployer:$(cat /home/drm/deployer/token)@localhost:3000/$USER/$REPO" \ + ./src + cd src git fetch origin $BRANCH git reset --hard origin/$BRANCH @@ -32,7 +36,7 @@ WantedBy=multi-user.target " > deploy.service service="deployer-$REPO-$BRANCH.service" -ln -s $deploydir/deploy.service /etc/systemd/system/$service +ln -sf $deploydir/deploy.service /etc/systemd/system/$service sudo systemctl daemon-reload systemctl stop $service