feat: cleans up deb installation a bit moving files to more sensible …

…places for hashbash
norwoodj · Oct 11, 2021 · e71a001 · e71a001
1 parent b9a1dcb
commit e71a001
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 35 deletions.
diff --git a/debian/dirs b/debian/dirs
@@ -1,2 +1 @@
-opt/hashbash/logs
-opt/hashbash/sockets
+etc/hashbash
diff --git a/debian/hashbash-backend.hashbash-engine.service b/debian/hashbash-backend.hashbash-engine.service
@@ -3,14 +3,12 @@ Description=hashbash engine service
 Requires=hashbash-engine-management.socket
 
 [Service]
-ExecStart=/opt/hashbash/bin/hashbash-engine
+ExecStart=/usr/bin/hashbash-engine
 Restart=always
 KillSignal=SIGQUIT
 Type=simple
-StandardError=syslog
-StandardOutput=/opt/hashbash/logs/engine.log
 NotifyAccess=all
-EnvironmentFile=/opt/hashbash/hashbash.env
+EnvironmentFile=/opt/secrets/hashbash/hashbash.env
 Environment=HASHBASH_MANAGEMENT_NAME=hashbash-engine-management
 Sockets=hashbash-engine-management.socket
 User=hashbash

diff --git a/debian/hashbash-backend.hashbash-webapp.service b/debian/hashbash-backend.hashbash-webapp.service
@@ -4,13 +4,12 @@ Requires=hashbash-webapp.socket
 Requires=hashbash-webapp-management.socket
 
 [Service]
-ExecStart=/opt/hashbash/bin/hashbash-webapp
+ExecStart=/usr/bin/hashbash-webapp
 Restart=always
 KillSignal=SIGQUIT
 Type=simple
-StandardError=syslog
 NotifyAccess=all
-EnvironmentFile=/opt/hashbash/hashbash.env
+EnvironmentFile=/opt/secrets/hashbash/hashbash.env
 Environment=HASHBASH_HTTP_NAME=hashbash-webapp
 Environment=HASHBASH_MANAGEMENT_NAME=hashbash-webapp-management
 Sockets=hashbash-webapp.socket

diff --git a/debian/hashbash-backend.hashbash-webapp.socket b/debian/hashbash-backend.hashbash-webapp.socket
@@ -3,8 +3,9 @@ Description=hashbash webapp listen socket
 PartOf=hashbash-webapp.service
 
 [Socket]
-ListenStream=/opt/hashbash/sockets/hashbash-webapp.sock
+ListenStream=/run/hashbash/webapp.sock
 FileDescriptorName=hashbash-webapp
+Service=hashbash-webapp.service
 SocketUser=hashbash
 SocketGroup=hashbash
 

diff --git a/debian/hashbash-backend.logrotate b/debian/hashbash-backend.logrotate
diff --git a/debian/install b/debian/install
@@ -1,5 +1,4 @@
-frontend /opt/hashbash
-hashbash.env /opt/hashbash
-hashbash-cli /opt/hashbash/bin
-hashbash-engine /opt/hashbash/bin
-hashbash-webapp /opt/hashbash/bin
+frontend /etc/hashbash
+hashbash-cli /usr/bin
+hashbash-engine /usr/bin
+hashbash-webapp /usr/bin
diff --git a/hashbash.env b/hashbash.env
@@ -1,6 +1,6 @@
 HASHBASH_DATABASE_HOST=0p0
 HASHBASH_DATABASE_USERNAME=hashbash-rw
-HASHBASH_FRONTEND_TEMPLATE_PATH=/opt/hashbash/frontend
+HASHBASH_FRONTEND_TEMPLATE_PATH=/etc/hashbash/frontend
 HASHBASH_GENERATE_NUM_THREADS=4
 HASHBASH_RABBITMQ_HOST=0p0
 HASHBASH_RABBITMQ_USERNAME=hashbash-rw