diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2021-01-05 21:43:08 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-01-07 20:44:44 +0100 |
| commit | f997d7f51f0e7f4bef8dd2722f3b5a85bbed8284 (patch) | |
| tree | 60b0776d813cc83cccae49f02fe4781914b761ed | |
| parent | Initial commit (diff) | |
| download | golang-package-server-f997d7f51f0e7f4bef8dd2722f3b5a85bbed8284.tar.xz golang-package-server-f997d7f51f0e7f4bef8dd2722f3b5a85bbed8284.zip | |
Python 3 and simpler deployment
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | __init__.py | 2 | ||||
| -rw-r--r-- | server.cfg | 3 |
3 files changed, 6 insertions, 15 deletions
@@ -9,19 +9,11 @@ deploy: @ssh $(SSH_OPTS) -Nf $(WEB_SERVER) @echo " RSYNC . $(WEB_SERVER):$(SERVER_APP_PATH)" - @ssh -t $(SSH_OPTS) $(WEB_SERVER) "sudo -u $(SERVER_APP_USER) -v" - @rsync -aizm --delete-excluded --exclude=*.swp --exclude=*.pyc --exclude=.git* \ - --rsh="ssh $(SSH_OPTS)" --rsync-path="sudo -n -u $(SERVER_APP_USER) rsync" ./ "$(WEB_SERVER):$(SERVER_APP_PATH)" + @rsync -rltizm --delete-excluded --exclude=*.swp --exclude=*.pyc --exclude=.git* --exclude=.ssh-deployment.sock --exclude=Makefile --exclude=server.cfg \ + --rsh="ssh $(SSH_OPTS)" ./ "$(WEB_SERVER):$(SERVER_APP_PATH)" - @echo " CHOWN $(SERVER_APP_USER):$(SERVER_APP_USER) $(WEB_SERVER):$(SERVER_APP_PATH)" - @ssh -t $(SSH_OPTS) $(WEB_SERVER) "sudo chown -R $(SERVER_APP_USER):$(SERVER_APP_USER) '$(SERVER_APP_PATH)'" - - @echo " CHMOD 750/640 $(WEB_SERVER):$(SERVER_APP_PATH)" - @ssh -t $(SSH_OPTS) $(WEB_SERVER) "sudo find '$(SERVER_APP_PATH)' -type f -exec chmod 640 {} \;; \ - sudo find '$(SERVER_APP_PATH)' -type d -exec chmod 750 {} \;;" - - @echo " UWSGI restart $(WEB_SERVER)" - @ssh -t $(SSH_OPTS) $(WEB_SERVER) "sudo /etc/init.d/uwsgi restart" + @echo " UWSGI restart" + @ssh $(SSH_OPTS) $(WEB_SERVER) "systemctl restart uwsgi@emperor.service" @echo " SSH $(WEB_SERVER)" @ssh -O exit $(SSH_OPTS) $(WEB_SERVER) diff --git a/__init__.py b/__init__.py index b738ff5..462f382 100644 --- a/__init__.py +++ b/__init__.py @@ -29,7 +29,7 @@ def default(): if is_goget(): return abort(404) o = '<html><head><title>' + TITLE + '</title></head><body>' - for p in sorted(repos.iterkeys()): + for p in sorted(repos.keys()): o += '<p>go get ' + PACKAGE_HOST + '/' + p + '</p>' o += '</body></html>' return o @@ -1,3 +1,2 @@ -WEB_SERVER = metheny.zx2c4.com +WEB_SERVER = root@abercrombie.zx2c4.com SERVER_APP_PATH = /var/www/uwsgi/golang -SERVER_APP_USER = golang |