Merge pull request #166 from eschizoid/bugfix/inventory

Fixed url hook validation
eschizoid · Jan 19, 2019 · 8a7d067 · 8a7d067
2 parents b4c0021 + 1b7eba8
commit 8a7d067
Show file tree

Hide file tree

Showing 12 changed files with 531 additions and 597 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/aws/glacier/service.go b/aws/glacier/service.go
@@ -290,7 +290,6 @@ func getJobParameters(archiveID string) *glacier.JobParameters {
 	} else {
 		jobParameters = &glacier.JobParameters{
 			ArchiveId: aws.String(archiveID),
-			Tier:      aws.String("Expedited"),
 			Type:      aws.String(archiveRetrievalJob),
 		}
 	}

diff --git a/infrastructure/database/storm/library.db b/infrastructure/database/storm/library.db
diff --git a/infrastructure/hooks/admin.sh b/infrastructure/hooks/admin.sh
@@ -68,23 +68,23 @@ case $# in
             echo "{\"certificates_updated\": \"true\"}"
             ;;
          restart)
-            for plex_service in plexmediaservice \
+            for plex_service in plexmediaserver \
                 tautulli \
                 ombi \
                 sonarr \
                 radarr \
                 jackett \
                 nzbget \
-                transmission; do
-                sudo systemtctl service restart ${plex_service}
+                transmission-daemon; do
+                sudo systemctl restart ${plex_service}
             done
             echo "{\"services_restarted\": \"true\"}"
             ;;
          upgrade)
             rm -rf /home/webhook/go/src/github.com/eschizoid/flixctl
             /usr/local/go/bin/go get -u github.com/eschizoid/flixctl
             cd /home/webhook/go/src/github.com/eschizoid/flixctl
-            cp -r infrastructure/hooks/*.sh /opt/webhook-linux-amd64/
+            cp -r infrastructure/hooks/*.sh infrastructure/hooks/*.json /opt/webhook-linux-amd64/
             /bin/make install
             rm -rf /home/webhook/go/src/github.com/eschizoid/flixctl/infrastructure/database/storm/library.db
             /home/webhook/go/bin/flixctl version

diff --git a/infrastructure/hooks/hooks.json b/infrastructure/hooks/hooks.json
@@ -286,8 +286,8 @@
         "type": "value",
         "value": "{{getenv "SLACK_STATUS_TOKEN"}}",
         "parameter": {
-          "source": "payload",
-          "name": "url"
+          "source": "url",
+          "name": "token"
         }
       }
     }
@@ -354,7 +354,7 @@
         }
       }
     }
-  }
+  },
   {
     "id": "library-upload",
     "execute-command": "/opt/webhook-linux-amd64/library.sh",

diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/request.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go
diff --git a/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go