When pushed, this commit will replace hard-coded values with calls to LookupMQM

This commit is contained in:
Stephen Marshall
2018-04-25 14:09:23 +01:00
parent bf36f8bb2c
commit 3aa46e0793
6 changed files with 42 additions and 33 deletions

View File

@@ -19,6 +19,8 @@ import (
"os"
"path"
"text/template"
"github.com/ibm-messaging/mq-container/internal/command"
)
// processTemplateFile takes a Go templateFile, and processes it with the
@@ -35,8 +37,12 @@ func processTemplateFile(templateFile, destFile string, data interface{}) error
if err != nil {
if os.IsNotExist(err) {
os.MkdirAll(dir, 0660)
// TODO: Lookup value for MQM user here?
err = os.Chown(dir, 999, 999)
mqmUID, mqmGID, err := command.LookupMQM()
if err != nil {
log.Error(err)
return err
}
err = os.Chown(dir, mqmUID, mqmGID)
if err != nil {
log.Error(err)
return err
@@ -52,8 +58,12 @@ func processTemplateFile(templateFile, destFile string, data interface{}) error
log.Error(err)
return err
}
// TODO: Lookup value for MQM user here?
err = os.Chown(destFile, 999, 999)
mqmUID, mqmGID, err := command.LookupMQM()
if err != nil {
log.Error(err)
return err
}
err = os.Chown(destFile, mqmUID, mqmGID)
if err != nil {
log.Error(err)
return err