From d67a0d05fd1461d5aee1a5eeceae57f8e7affeab Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Sun, 23 Feb 2025 21:57:06 +1000
Subject: [PATCH 01/16] Vue stuff, api, plumbing.

---
 api-docs.yml                           |  8 ++++++++
 db/Repository.go                       |  1 +
 db/sql/migrations/v0.0.0.sql           |  1 +
 db/sql/repository.go                   |  8 +++++---
 services/project/backup_test.go        |  1 +
 web/src/components/RepositoryForm.vue  | 19 +++++++++++++++++++
 web/src/lang/en.js                     |  1 +
 web/src/views/project/Repositories.vue | 13 +++++++++++--
 8 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/api-docs.yml b/api-docs.yml
index ebbe46156..acd35e6a9 100644
--- a/api-docs.yml
+++ b/api-docs.yml
@@ -231,6 +231,8 @@ definitions:
               type: string
             ssh_key:
               type: string
+            path:
+              type: string
       keys:
         type: array
         items:
@@ -672,6 +674,9 @@ definitions:
         example: master
       ssh_key_id:
         type: integer
+      path:
+        type: string
+        example: deployment/ansible
   Repository:
     type: object
     properties:
@@ -690,6 +695,9 @@ definitions:
         example: master
       ssh_key_id:
         type: integer
+      path:
+        type: string
+        example: deployment/ansible
 
   Task:
     type: object
diff --git a/db/Repository.go b/db/Repository.go
index 114d9fb8b..1f9fbc523 100644
--- a/db/Repository.go
+++ b/db/Repository.go
@@ -31,6 +31,7 @@ type Repository struct {
 	SSHKeyID  int    `db:"ssh_key_id" json:"ssh_key_id" binding:"required" backup:"-"`
 
 	SSHKey AccessKey `db:"-" json:"-" backup:"-"`
+	Path   string    `db:"path" json:"path" backup:"-"`
 }
 
 func (r Repository) ClearCache() error {
diff --git a/db/sql/migrations/v0.0.0.sql b/db/sql/migrations/v0.0.0.sql
index ed69212bf..723fe1433 100644
--- a/db/sql/migrations/v0.0.0.sql
+++ b/db/sql/migrations/v0.0.0.sql
@@ -43,6 +43,7 @@ create table `project__repository` (
 	`project_id` int not null,
 	`git_url` text not null,
 	`ssh_key_id` int not null,
+	`path` varchar(255) not null,
 
 	foreign key (`project_id`) references project(`id`) on delete cascade,
 	foreign key (`ssh_key_id`) references access_key(`id`)
diff --git a/db/sql/repository.go b/db/sql/repository.go
index 1c2ed5247..236327147 100644
--- a/db/sql/repository.go
+++ b/db/sql/repository.go
@@ -63,11 +63,12 @@ func (d *SqlDb) UpdateRepository(repository db.Repository) error {
 	}
 
 	_, err = d.exec(
-		"update project__repository set name=?, git_url=?, git_branch=?, ssh_key_id=? where id=?",
+		"update project__repository set name=?, git_url=?, git_branch=?, ssh_key_id=?, path=? where id=?",
 		repository.Name,
 		repository.GitURL,
 		repository.GitBranch,
 		repository.SSHKeyID,
+		repository.Path,
 		repository.ID)
 
 	return err
@@ -82,12 +83,13 @@ func (d *SqlDb) CreateRepository(repository db.Repository) (newRepo db.Repositor
 
 	insertID, err := d.insert(
 		"id",
-		"insert into project__repository(project_id, git_url, git_branch, ssh_key_id, name) values (?, ?, ?, ?, ?)",
+		"insert into project__repository(project_id, git_url, git_branch, ssh_key_id, name, path) values (?, ?, ?, ?, ?)",
 		repository.ProjectID,
 		repository.GitURL,
 		repository.GitBranch,
 		repository.SSHKeyID,
-		repository.Name)
+		repository.Name,
+		repository.Path)
 
 	if err != nil {
 		return
diff --git a/services/project/backup_test.go b/services/project/backup_test.go
index c33ecadb8..b5d4fd0fa 100644
--- a/services/project/backup_test.go
+++ b/services/project/backup_test.go
@@ -37,6 +37,7 @@ func TestBackupProject(t *testing.T) {
 		Name:      "Test",
 		GitURL:    "git@example.com:test/test",
 		GitBranch: "master",
+		Path:      "deployment/ansible",
 	})
 	assert.NoError(t, err)
 
diff --git a/web/src/components/RepositoryForm.vue b/web/src/components/RepositoryForm.vue
index a5a11c068..907843f80 100644
--- a/web/src/components/RepositoryForm.vue
+++ b/web/src/components/RepositoryForm.vue
@@ -93,6 +93,15 @@
         </v-tooltip>
       </template>
     </v-select>
+
+    <v-text-field
+      v-model.trim="item.path"
+      :label="$t('path')"
+      :rules="[v => isPosixPath(v) != null || $t('invalidPath')]"
+      required
+      :disabled="formSaving || type === 'local'"
+    ></v-text-field>
+
   </v-form>
 </template>
 <script>
@@ -186,6 +195,16 @@ export default {
     getSingleItemUrl() {
       return `/api/project/${this.projectId}/repositories/${this.itemId}`;
     },
+
+    isPosixPath(path) {
+      // TODO Write this.
+      // Always accept an empty path
+      if (path == null || path === '') {
+        return true;
+      }
+      // For now, always accept any path
+      return true;
+    },
   },
 };
 </script>
diff --git a/web/src/lang/en.js b/web/src/lang/en.js
index 10585c417..5cc05f353 100644
--- a/web/src/lang/en.js
+++ b/web/src/lang/en.js
@@ -306,4 +306,5 @@ export default {
   status_success: 'Success',
   status_failed: 'Failed',
   status_stopped: 'Stopped',
+  invalidPath: 'Invalid path',
 };
diff --git a/web/src/views/project/Repositories.vue b/web/src/views/project/Repositories.vue
index e5a63f243..7412f9b21 100644
--- a/web/src/views/project/Repositories.vue
+++ b/web/src/views/project/Repositories.vue
@@ -63,6 +63,10 @@
         {{ keys.find((k) => k.id === item.ssh_key_id).name }}
       </template>
 
+      <template v-slot:item.path="{ item }">
+        {{ item.path }}
+      </template>
+
       <template v-slot:item.actions="{ item }">
         <v-btn-toggle dense :value-comparator="() => false">
           <v-btn @click="askDeleteItem(item.id)">
@@ -104,7 +108,7 @@ export default {
       return [{
         text: this.$i18n.t('name'),
         value: 'name',
-        width: '25%',
+        width: '20%',
       },
       {
         text: this.$i18n.t('gitUrl'),
@@ -114,7 +118,12 @@ export default {
       {
         text: this.$i18n.t('sshKey'),
         value: 'ssh_key_id',
-        width: '25%',
+        width: '15%',
+      },
+      {
+        text: this.$i18n.t('path'),
+        value: 'path',
+        width: '15%',
       },
       {
         text: this.$i18n.t('actions'),

From 4443eafd9531d7200f948e3481fcf263fb634381 Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Sun, 23 Feb 2025 22:05:27 +1000
Subject: [PATCH 02/16] Add a TODO question.

---
 db_lib/AnsibleApp.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db_lib/AnsibleApp.go b/db_lib/AnsibleApp.go
index 93399434b..d5d251404 100644
--- a/db_lib/AnsibleApp.go
+++ b/db_lib/AnsibleApp.go
@@ -86,6 +86,7 @@ func (t *AnsibleApp) getRepoPath() string {
 		Repository: t.Repository,
 		Client:     CreateDefaultGitClient(),
 	}
+	// TODO: Should this where the path gets suffixed? Oor inside GetFullPath?
 
 	return repo.GetFullPath()
 }

From d4030897f4b4fe8e911b347d554f775694b055f0 Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Sun, 23 Feb 2025 22:16:13 +1000
Subject: [PATCH 03/16] A better name for the path validator.

---
 web/src/components/RepositoryForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/components/RepositoryForm.vue b/web/src/components/RepositoryForm.vue
index 907843f80..d2d2d5ea5 100644
--- a/web/src/components/RepositoryForm.vue
+++ b/web/src/components/RepositoryForm.vue
@@ -97,7 +97,7 @@
     <v-text-field
       v-model.trim="item.path"
       :label="$t('path')"
-      :rules="[v => isPosixPath(v) != null || $t('invalidPath')]"
+      :rules="[v => isValidPath(v) != false || $t('invalidPath')]"
       required
       :disabled="formSaving || type === 'local'"
     ></v-text-field>
@@ -196,7 +196,7 @@ export default {
       return `/api/project/${this.projectId}/repositories/${this.itemId}`;
     },
 
-    isPosixPath(path) {
+    isValidPath(path) {
       // TODO Write this.
       // Always accept an empty path
       if (path == null || path === '') {

From 3cf89e1c340cc2755926969b6eaad29a7241feaf Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Sun, 23 Feb 2025 22:27:53 +1000
Subject: [PATCH 04/16] Fixes.

---
 api-docs.yml         | 2 +-
 db/sql/repository.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api-docs.yml b/api-docs.yml
index acd35e6a9..9443143ba 100644
--- a/api-docs.yml
+++ b/api-docs.yml
@@ -3,7 +3,7 @@ swagger: '2.0'
 info:
   title: SEMAPHORE
   description: Semaphore API
-  version: "2.2.0"
+  version: "2.2.1"
 
 host: localhost:3000
 
diff --git a/db/sql/repository.go b/db/sql/repository.go
index 236327147..d10b150d2 100644
--- a/db/sql/repository.go
+++ b/db/sql/repository.go
@@ -83,7 +83,7 @@ func (d *SqlDb) CreateRepository(repository db.Repository) (newRepo db.Repositor
 
 	insertID, err := d.insert(
 		"id",
-		"insert into project__repository(project_id, git_url, git_branch, ssh_key_id, name, path) values (?, ?, ?, ?, ?)",
+		"insert into project__repository(project_id, git_url, git_branch, ssh_key_id, name, path) values (?, ?, ?, ?, ?, ?)",
 		repository.ProjectID,
 		repository.GitURL,
 		repository.GitBranch,

From 614adbe9a4272a5d0d0470024efef68b8cba2d43 Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Sun, 23 Feb 2025 22:41:48 +1000
Subject: [PATCH 05/16] Add migration stubs

---
 db/Migration.go             |  1 +
 db/bolt/migration.go        |  2 ++
 db/bolt/migration_2_12_6.go | 10 ++++++++++
 db/sql/migration.go         |  4 ++++
 db/sql/migration_2_12_6.go  | 16 ++++++++++++++++
 5 files changed, 33 insertions(+)
 create mode 100644 db/bolt/migration_2_12_6.go
 create mode 100644 db/sql/migration_2_12_6.go

diff --git a/db/Migration.go b/db/Migration.go
index 96fcb874e..ca6642986 100644
--- a/db/Migration.go
+++ b/db/Migration.go
@@ -81,6 +81,7 @@ func GetMigrations() []Migration {
 		{Version: "2.12.3"},
 		{Version: "2.12.4"},
 		{Version: "2.12.5"},
+		{Version: "2.12.6"},
 	}
 }
 
diff --git a/db/bolt/migration.go b/db/bolt/migration.go
index af18104a1..ff05dc3b9 100644
--- a/db/bolt/migration.go
+++ b/db/bolt/migration.go
@@ -49,6 +49,8 @@ func (d *BoltDb) ApplyMigration(m db.Migration) (err error) {
 		err = migration_2_10_24{migration{d.db}}.Apply()
 	case "2.10.33":
 		err = migration_2_10_33{migration{d.db}}.Apply()
+	case "2.12.6":
+		err = migration_2_12_6{migration{d.db}}.Apply()
 	}
 
 	if err != nil {
diff --git a/db/bolt/migration_2_12_6.go b/db/bolt/migration_2_12_6.go
new file mode 100644
index 000000000..f59c12d48
--- /dev/null
+++ b/db/bolt/migration_2_12_6.go
@@ -0,0 +1,10 @@
+package bolt
+
+type migration_2_12_6 struct {
+	migration
+}
+
+func (d migration_2_12_6) Apply() (err error) {
+	// Add the "path" field to the repository table
+	return
+}
diff --git a/db/sql/migration.go b/db/sql/migration.go
index 9bcc3d899..8cf61580e 100644
--- a/db/sql/migration.go
+++ b/db/sql/migration.go
@@ -145,6 +145,8 @@ func (d *SqlDb) ApplyMigration(migration db.Migration) error {
 	switch migration.Version {
 	case "2.10.24":
 		err = migration_2_10_24{db: d}.PreApply(tx)
+	case "2.12.6":
+		err = migration_2_12_6{db: d}.PreApply(tx)
 	}
 
 	if err != nil {
@@ -179,6 +181,8 @@ func (d *SqlDb) ApplyMigration(migration db.Migration) error {
 		err = migration_2_8_26{db: d}.PostApply(tx)
 	case "2.8.42":
 		err = migration_2_8_42{db: d}.PostApply(tx)
+	case "2.12.6":
+		err = migration_2_12_6{db: d}.PostApply(tx)
 	}
 
 	if err != nil {
diff --git a/db/sql/migration_2_12_6.go b/db/sql/migration_2_12_6.go
new file mode 100644
index 000000000..c159c40dd
--- /dev/null
+++ b/db/sql/migration_2_12_6.go
@@ -0,0 +1,16 @@
+package sql
+
+import "github.com/go-gorp/gorp/v3"
+
+type migration_2_12_6 struct {
+	db *SqlDb
+}
+
+func (m migration_2_12_6) PreApply(tx *gorp.Transaction) (err error) {
+	// Add the "path" field to the repository table
+	return nil
+}
+
+func (m migration_2_12_6) PostApply(tx *gorp.Transaction) error {
+	return nil
+}

From a863c467db68bc15bbbee59366329bc0f0fad10d Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Sun, 23 Feb 2025 23:00:16 +1000
Subject: [PATCH 06/16] Check in migration sql file.

---
 db/sql/migrations/v2.12.6.sql | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 db/sql/migrations/v2.12.6.sql

diff --git a/db/sql/migrations/v2.12.6.sql b/db/sql/migrations/v2.12.6.sql
new file mode 100644
index 000000000..b5681053b
--- /dev/null
+++ b/db/sql/migrations/v2.12.6.sql
@@ -0,0 +1 @@
+alter table `project__repository` add column public_key text;
\ No newline at end of file

From 0e2b2f0eb547c7ea396cf3a9ccb54337e531ff36 Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Sun, 23 Feb 2025 23:03:55 +1000
Subject: [PATCH 07/16] Duh

---
 db/sql/migrations/v2.12.6.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/migrations/v2.12.6.sql b/db/sql/migrations/v2.12.6.sql
index b5681053b..f0800cccd 100644
--- a/db/sql/migrations/v2.12.6.sql
+++ b/db/sql/migrations/v2.12.6.sql
@@ -1 +1 @@
-alter table `project__repository` add column public_key text;
\ No newline at end of file
+alter table `project__repository` add column path text;
\ No newline at end of file

From c3acc2d3b2f14ec11df88f2ef0b1e4430fa6414a Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Sun, 23 Feb 2025 13:09:37 +0000
Subject: [PATCH 08/16] Default path to blank, not null.

---
 db/sql/migrations/v2.12.6.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/migrations/v2.12.6.sql b/db/sql/migrations/v2.12.6.sql
index f0800cccd..6f7616a66 100644
--- a/db/sql/migrations/v2.12.6.sql
+++ b/db/sql/migrations/v2.12.6.sql
@@ -1 +1 @@
-alter table `project__repository` add column path text;
\ No newline at end of file
+alter table `project__repository` add column path text not null default '';
\ No newline at end of file

From 4137892f6150b4bd0b22d9c5d5ba22e2ed21ad79 Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Wed, 26 Feb 2025 10:40:22 +1000
Subject: [PATCH 09/16] Fix migration command

---
 db/sql/migrations/v2.12.6.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/migrations/v2.12.6.sql b/db/sql/migrations/v2.12.6.sql
index 6f7616a66..3d056b8f1 100644
--- a/db/sql/migrations/v2.12.6.sql
+++ b/db/sql/migrations/v2.12.6.sql
@@ -1 +1 @@
-alter table `project__repository` add column path text not null default '';
\ No newline at end of file
+alter table `project__repository` add column path text not null;
\ No newline at end of file

From c1d267f5a23da69a4fda4aa91a400cf943e3fe10 Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Wed, 26 Feb 2025 10:50:56 +1000
Subject: [PATCH 10/16] Remove redundant migration code. All handled by the
 .sql.

---
 db/bolt/migration_2_12_6.go | 10 ----------
 db/sql/migration_2_12_6.go  | 16 ----------------
 2 files changed, 26 deletions(-)
 delete mode 100644 db/bolt/migration_2_12_6.go
 delete mode 100644 db/sql/migration_2_12_6.go

diff --git a/db/bolt/migration_2_12_6.go b/db/bolt/migration_2_12_6.go
deleted file mode 100644
index f59c12d48..000000000
--- a/db/bolt/migration_2_12_6.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package bolt
-
-type migration_2_12_6 struct {
-	migration
-}
-
-func (d migration_2_12_6) Apply() (err error) {
-	// Add the "path" field to the repository table
-	return
-}
diff --git a/db/sql/migration_2_12_6.go b/db/sql/migration_2_12_6.go
deleted file mode 100644
index c159c40dd..000000000
--- a/db/sql/migration_2_12_6.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package sql
-
-import "github.com/go-gorp/gorp/v3"
-
-type migration_2_12_6 struct {
-	db *SqlDb
-}
-
-func (m migration_2_12_6) PreApply(tx *gorp.Transaction) (err error) {
-	// Add the "path" field to the repository table
-	return nil
-}
-
-func (m migration_2_12_6) PostApply(tx *gorp.Transaction) error {
-	return nil
-}

From d08fd995aa69b5d73920dc4389b117fb1c571f6f Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Wed, 26 Feb 2025 01:00:07 +0000
Subject: [PATCH 11/16] Derp

---
 db/bolt/migration.go | 2 --
 db/sql/migration.go  | 4 ----
 db_lib/AnsibleApp.go | 3 +--
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/db/bolt/migration.go b/db/bolt/migration.go
index ff05dc3b9..af18104a1 100644
--- a/db/bolt/migration.go
+++ b/db/bolt/migration.go
@@ -49,8 +49,6 @@ func (d *BoltDb) ApplyMigration(m db.Migration) (err error) {
 		err = migration_2_10_24{migration{d.db}}.Apply()
 	case "2.10.33":
 		err = migration_2_10_33{migration{d.db}}.Apply()
-	case "2.12.6":
-		err = migration_2_12_6{migration{d.db}}.Apply()
 	}
 
 	if err != nil {
diff --git a/db/sql/migration.go b/db/sql/migration.go
index 8cf61580e..9bcc3d899 100644
--- a/db/sql/migration.go
+++ b/db/sql/migration.go
@@ -145,8 +145,6 @@ func (d *SqlDb) ApplyMigration(migration db.Migration) error {
 	switch migration.Version {
 	case "2.10.24":
 		err = migration_2_10_24{db: d}.PreApply(tx)
-	case "2.12.6":
-		err = migration_2_12_6{db: d}.PreApply(tx)
 	}
 
 	if err != nil {
@@ -181,8 +179,6 @@ func (d *SqlDb) ApplyMigration(migration db.Migration) error {
 		err = migration_2_8_26{db: d}.PostApply(tx)
 	case "2.8.42":
 		err = migration_2_8_42{db: d}.PostApply(tx)
-	case "2.12.6":
-		err = migration_2_12_6{db: d}.PostApply(tx)
 	}
 
 	if err != nil {
diff --git a/db_lib/AnsibleApp.go b/db_lib/AnsibleApp.go
index d5d251404..b3a2bd4c1 100644
--- a/db_lib/AnsibleApp.go
+++ b/db_lib/AnsibleApp.go
@@ -86,9 +86,8 @@ func (t *AnsibleApp) getRepoPath() string {
 		Repository: t.Repository,
 		Client:     CreateDefaultGitClient(),
 	}
-	// TODO: Should this where the path gets suffixed? Oor inside GetFullPath?
 
-	return repo.GetFullPath()
+	return path.Join(repo.GetFullPath(), t.Repository.Path)
 }
 
 func (t *AnsibleApp) installGalaxyRequirementsFile(requirementsType GalaxyRequirementsType, requirementsFilePath string) error {

From dd113283a92eef9b884ad6a8961b09d5b7a58a88 Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Wed, 26 Feb 2025 13:36:05 +1000
Subject: [PATCH 12/16] Move the path suffixing up one call.

---
 db/Repository.go     | 4 ++--
 db_lib/AnsibleApp.go | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/db/Repository.go b/db/Repository.go
index 1f9fbc523..2799678ec 100644
--- a/db/Repository.go
+++ b/db/Repository.go
@@ -71,9 +71,9 @@ func (r Repository) GetDirName(templateID int) string {
 
 func (r Repository) GetFullPath(templateID int) string {
 	if r.GetType() == RepositoryLocal {
-		return r.GetGitURL()
+		return path.Join(r.GetGitURL(), r.Path)
 	}
-	return path.Join(util.Config.TmpPath, r.GetDirName(templateID))
+	return path.Join(util.Config.TmpPath, r.GetDirName(templateID), r.Path)
 }
 
 func (r Repository) GetGitURL() string {
diff --git a/db_lib/AnsibleApp.go b/db_lib/AnsibleApp.go
index b3a2bd4c1..1cfb76088 100644
--- a/db_lib/AnsibleApp.go
+++ b/db_lib/AnsibleApp.go
@@ -86,8 +86,7 @@ func (t *AnsibleApp) getRepoPath() string {
 		Repository: t.Repository,
 		Client:     CreateDefaultGitClient(),
 	}
-
-	return path.Join(repo.GetFullPath(), t.Repository.Path)
+	return repo.GetFullPath()
 }
 
 func (t *AnsibleApp) installGalaxyRequirementsFile(requirementsType GalaxyRequirementsType, requirementsFilePath string) error {

From 599040450582cd6755b94a766b5a0e76d93fe350 Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Wed, 26 Feb 2025 13:50:14 +1000
Subject: [PATCH 13/16] Separate method

---
 db/Repository.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/db/Repository.go b/db/Repository.go
index 2799678ec..2977e8241 100644
--- a/db/Repository.go
+++ b/db/Repository.go
@@ -69,11 +69,15 @@ func (r Repository) GetDirName(templateID int) string {
 	return r.getDirNamePrefix() + strconv.Itoa(templateID)
 }
 
+func (r Repository) GetAnsiblePath(templateID int) string {
+	return path.Join(r.GetFullPath(templateID), r.Path)
+}
+
 func (r Repository) GetFullPath(templateID int) string {
 	if r.GetType() == RepositoryLocal {
-		return path.Join(r.GetGitURL(), r.Path)
+		return r.GetGitURL()
 	}
-	return path.Join(util.Config.TmpPath, r.GetDirName(templateID), r.Path)
+	return path.Join(util.Config.TmpPath, r.GetDirName(templateID))
 }
 
 func (r Repository) GetGitURL() string {

From ae51f8c673926e58c94d4d7174c4ec10a85de2df Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Wed, 26 Feb 2025 13:51:56 +1000
Subject: [PATCH 14/16] Reduce diff noise

---
 db_lib/AnsibleApp.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db_lib/AnsibleApp.go b/db_lib/AnsibleApp.go
index 1cfb76088..93399434b 100644
--- a/db_lib/AnsibleApp.go
+++ b/db_lib/AnsibleApp.go
@@ -86,6 +86,7 @@ func (t *AnsibleApp) getRepoPath() string {
 		Repository: t.Repository,
 		Client:     CreateDefaultGitClient(),
 	}
+
 	return repo.GetFullPath()
 }
 

From f222a363d0d8e45bba260f64e9e38c9cb5be81fa Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Wed, 26 Feb 2025 14:23:17 +1000
Subject: [PATCH 15/16] Working now

---
 db/Inventory.go           | 10 ++++++++--
 db_lib/AnsibleApp.go      |  2 +-
 db_lib/AnsiblePlaybook.go |  6 +++---
 db_lib/GitRepository.go   |  4 ++++
 db_lib/TerraformApp.go    |  2 +-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/db/Inventory.go b/db/Inventory.go
index bee18ae76..888664876 100644
--- a/db/Inventory.go
+++ b/db/Inventory.go
@@ -1,5 +1,7 @@
 package db
 
+import "path"
+
 type InventoryType string
 
 const (
@@ -42,11 +44,15 @@ type Inventory struct {
 }
 
 func (e Inventory) GetFilename() string {
+	pathPrefix := ""
+	if e.Repository != nil {
+		pathPrefix = e.Repository.Path
+	}
 	if e.Type != InventoryFile {
-		return ""
+		return pathPrefix
 	}
 
-	return e.Inventory
+	return path.Join(pathPrefix, e.Inventory)
 
 	//return strings.TrimPrefix(e.Inventory, "/")
 }
diff --git a/db_lib/AnsibleApp.go b/db_lib/AnsibleApp.go
index 93399434b..3ae79e71c 100644
--- a/db_lib/AnsibleApp.go
+++ b/db_lib/AnsibleApp.go
@@ -87,7 +87,7 @@ func (t *AnsibleApp) getRepoPath() string {
 		Client:     CreateDefaultGitClient(),
 	}
 
-	return repo.GetFullPath()
+	return repo.GetAnsiblePath()
 }
 
 func (t *AnsibleApp) installGalaxyRequirementsFile(requirementsType GalaxyRequirementsType, requirementsFilePath string) error {
diff --git a/db_lib/AnsiblePlaybook.go b/db_lib/AnsiblePlaybook.go
index 43051751f..791ef313c 100644
--- a/db_lib/AnsiblePlaybook.go
+++ b/db_lib/AnsiblePlaybook.go
@@ -20,7 +20,7 @@ type AnsiblePlaybook struct {
 
 func (p AnsiblePlaybook) makeCmd(command string, args []string, environmentVars []string) *exec.Cmd {
 	cmd := exec.Command(command, args...) //nolint: gas
-	cmd.Dir = p.GetFullPath()
+	cmd.Dir = p.getAnsiblePath()
 
 	cmd.Env = append(cmd.Env, "PYTHONUNBUFFERED=1")
 	cmd.Env = append(cmd.Env, "ANSIBLE_FORCE_COLOR=True")
@@ -82,7 +82,7 @@ func (p AnsiblePlaybook) RunGalaxy(args []string) error {
 	return p.runCmd("ansible-galaxy", args)
 }
 
-func (p AnsiblePlaybook) GetFullPath() (path string) {
-	path = p.Repository.GetFullPath(p.TemplateID)
+func (p AnsiblePlaybook) getAnsiblePath() (path string) {
+	path = p.Repository.GetAnsiblePath(p.TemplateID)
 	return
 }
diff --git a/db_lib/GitRepository.go b/db_lib/GitRepository.go
index 2aabaa18f..af002b69b 100644
--- a/db_lib/GitRepository.go
+++ b/db_lib/GitRepository.go
@@ -34,6 +34,10 @@ type GitRepository struct {
 	Client     GitClient
 }
 
+func (r GitRepository) GetAnsiblePath() string {
+	return path.Join(r.GetFullPath(), r.Repository.Path)
+}
+
 func (r GitRepository) GetFullPath() string {
 	if r.TmpDirName != "" {
 		return path.Join(util.Config.TmpPath, r.TmpDirName)
diff --git a/db_lib/TerraformApp.go b/db_lib/TerraformApp.go
index 44b39f821..ddd558763 100644
--- a/db_lib/TerraformApp.go
+++ b/db_lib/TerraformApp.go
@@ -88,7 +88,7 @@ func (t *TerraformApp) runCmd(command string, args []string) error {
 }
 
 func (t *TerraformApp) GetFullPath() string {
-	return path.Join(t.Repository.GetFullPath(t.Template.ID), strings.TrimPrefix(t.Template.Playbook, "/"))
+	return path.Join(t.Repository.GetAnsiblePath(t.Template.ID), strings.TrimPrefix(t.Template.Playbook, "/"))
 }
 
 func (t *TerraformApp) SetLogger(logger task_logger.Logger) task_logger.Logger {

From b0c15c99906a9da3df39a2a510728adf8fb2da0c Mon Sep 17 00:00:00 2001
From: Travis Howse <tjhowse@gmail.com>
Date: Wed, 26 Feb 2025 14:37:26 +1000
Subject: [PATCH 16/16] Is this how this CI works?

---
 db/sql/migrations/v0.0.0.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/db/sql/migrations/v0.0.0.sql b/db/sql/migrations/v0.0.0.sql
index 723fe1433..ed69212bf 100644
--- a/db/sql/migrations/v0.0.0.sql
+++ b/db/sql/migrations/v0.0.0.sql
@@ -43,7 +43,6 @@ create table `project__repository` (
 	`project_id` int not null,
 	`git_url` text not null,
 	`ssh_key_id` int not null,
-	`path` varchar(255) not null,
 
 	foreign key (`project_id`) references project(`id`) on delete cascade,
 	foreign key (`ssh_key_id`) references access_key(`id`)