Merge branch 'devel'

cmd/backend/config.go

@@ -18,7 +18,7 @@ type Config struct {
 	DBName          string
 	Description     string
 	Domain          string
-	AtomFile        string
+	AtomFeed        string
 	FirebaseKey     string
 	GOBKeyFile      string
 	Link            string
@@ -39,7 +39,7 @@ func newConfig() *Config {
 	return &Config{
 		AESKeyFile:      "/var/www/cpolis/aes.key",
 		ArticleDir:      "/var/www/cpolis/articles",
-		AtomFile:        "/var/www/cpolis/cpolis.atom",
+		AtomFeed:        "/var/www/cpolis/cpolis.atom",
 		ConfigFile:      "/etc/cpolis/config.toml",
 		DBName:          "cpolis",
 		FirebaseKey:     "/var/www/cpolis/serviceAccountKey.json",
@@ -110,7 +110,7 @@ func (c *Config) handleCliArgs() error {
 
 	flag.StringVar(&c.AESKeyFile, "aes", c.AESKeyFile, "aes key file")
 	flag.StringVar(&c.ArticleDir, "articles", c.ArticleDir, "articles directory")
-	flag.StringVar(&c.AtomFile, "feed", c.AtomFile, "atom feed file")
+	flag.StringVar(&c.AtomFeed, "feed", c.AtomFeed, "atom feed file")
 	flag.StringVar(&c.ConfigFile, "config", c.ConfigFile, "config file")
 	flag.StringVar(&c.DBName, "db", c.DBName, "DB name")
 	flag.StringVar(&c.Description, "desc", c.Description, "channel description")
@@ -187,10 +187,10 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 		c.Domain = "https://" + c.Domain
 	}
 
-	if cliConfig.AtomFile != defaultConfig.AtomFile {
+	if cliConfig.AtomFeed != defaultConfig.AtomFeed {
-		c.AtomFile = cliConfig.AtomFile
+		c.AtomFeed = cliConfig.AtomFeed
 	}
-	c.AtomFile, err = mkFile(c.AtomFile, 0644, 0744)
+	c.AtomFeed, err = mkFile(c.AtomFeed, 0644, 0744)
 	if err != nil {
 		return fmt.Errorf("error setting up file: %v", err)
 	}