diff options
| -rw-r--r-- | conf/locale/locale_en-US.ini | 1 | ||||
| -rw-r--r-- | models/login.go | 112 | ||||
| -rw-r--r-- | modules/auth/auth_form.go | 1 | ||||
| -rw-r--r-- | modules/auth/ldap/README.md | 107 | ||||
| -rw-r--r-- | modules/auth/ldap/ldap.go | 25 | ||||
| -rw-r--r-- | modules/bindata/bindata.go | 434 | ||||
| -rw-r--r-- | public/ng/js/gogs.js | 32 | ||||
| -rw-r--r-- | routers/admin/auths.go | 10 | ||||
| -rw-r--r-- | templates/admin/auth/edit.tmpl | 17 | ||||
| -rw-r--r-- | templates/admin/auth/new.tmpl | 28 |
10 files changed, 416 insertions, 351 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 71f6329c..5892a8d1 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -813,6 +813,7 @@ auths.port = Port auths.bind_dn = Bind DN auths.bind_password = Bind Password auths.user_base = User Search Base +auths.user_dn = User DN auths.attribute_name = First name attribute auths.attribute_surname = Surname attribute auths.attribute_mail = E-mail attribute diff --git a/models/login.go b/models/login.go index 78ce79cf..b4cb60ad 100644 --- a/models/login.go +++ b/models/login.go @@ -27,6 +27,7 @@ const ( NOTYPE LoginType = iota PLAIN LDAP + DLDAP SMTP PAM ) @@ -38,9 +39,10 @@ var ( ) var LoginTypes = map[LoginType]string{ - LDAP: "LDAP", - SMTP: "SMTP", - PAM: "PAM", + LDAP: "LDAP (via BindDN)", + DLDAP: "LDAP (simple auth)", + SMTP: "SMTP", + PAM: "PAM", } // Ensure structs implemented interface. @@ -106,6 +108,8 @@ func (source *LoginSource) BeforeSet(colName string, val xorm.Cell) { case "type": switch LoginType((*val).(int64)) { case LDAP: + fallthrough + case DLDAP: source.Cfg = new(LDAPConfig) case SMTP: source.Cfg = new(SMTPConfig) @@ -171,84 +175,74 @@ func DelLoginSource(source *LoginSource) error { // UserSignIn validates user name and password. func UserSignIn(uname, passwd string) (*User, error) { - u := new(User) + var u *User if strings.Contains(uname, "@") { u = &User{Email: uname} } else { u = &User{LowerName: strings.ToLower(uname)} } - has, err := x.Get(u) + userExists, err := x.Get(u) if err != nil { return nil, err } - if u.LoginType == NOTYPE && has { - u.LoginType = PLAIN - } + if userExists { + switch u.LoginType { + case NOTYPE: + fallthrough + case PLAIN: + if u.ValidatePassword(passwd) { + return u, nil + } - // For plain login, user must exist to reach this line. - // Now verify password. - if u.LoginType == PLAIN { - if !u.ValidatePassword(passwd) { return nil, ErrUserNotExist{u.Id, u.Name} + default: + var source LoginSource + hasSource, err := x.Id(u.LoginSource).Get(&source) + if err != nil { + return nil, err + } else if !hasSource { + return nil, ErrLoginSourceNotExist + } + + return ExternalUserLogin(u, u.LoginName, passwd, &source, false) } - return u, nil } - if !has { - var sources []LoginSource - if err = x.UseBool().Find(&sources, - &LoginSource{IsActived: true, AllowAutoRegister: true}); err != nil { - return nil, err - } + var sources []LoginSource + if err = x.UseBool().Find(&sources, &LoginSource{IsActived: true, AllowAutoRegister: true}); err != nil { + return nil, err + } - for _, source := range sources { - if source.Type == LDAP { - u, err := LoginUserLdapSource(nil, uname, passwd, - source.ID, source.Cfg.(*LDAPConfig), true) - if err == nil { - return u, nil - } - log.Warn("Fail to login(%s) by LDAP(%s): %v", uname, source.Name, err) - } else if source.Type == SMTP { - u, err := LoginUserSMTPSource(nil, uname, passwd, - source.ID, source.Cfg.(*SMTPConfig), true) - if err == nil { - return u, nil - } - log.Warn("Fail to login(%s) by SMTP(%s): %v", uname, source.Name, err) - } else if source.Type == PAM { - u, err := LoginUserPAMSource(nil, uname, passwd, - source.ID, source.Cfg.(*PAMConfig), true) - if err == nil { - return u, nil - } - log.Warn("Fail to login(%s) by PAM(%s): %v", uname, source.Name, err) - } + for _, source := range sources { + u, err := ExternalUserLogin(nil, uname, passwd, &source, true) + if err == nil { + return u, nil } - return nil, ErrUserNotExist{u.Id, u.Name} + log.Warn("Failed to login '%s' via '%s': %v", uname, source.Name, err) } - var source LoginSource - hasSource, err := x.Id(u.LoginSource).Get(&source) - if err != nil { - return nil, err - } else if !hasSource { - return nil, ErrLoginSourceNotExist - } else if !source.IsActived { + return nil, ErrUserNotExist{u.Id, u.Name} +} + +func ExternalUserLogin(u *User, name, passwd string, source *LoginSource, autoRegister bool) (*User, error) { + if !source.IsActived { return nil, ErrLoginSourceNotActived } - switch u.LoginType { + switch source.Type { case LDAP: - return LoginUserLdapSource(u, u.LoginName, passwd, source.ID, source.Cfg.(*LDAPConfig), false) + fallthrough + case DLDAP: + return LoginUserLdapSource(u, name, passwd, source, autoRegister) case SMTP: - return LoginUserSMTPSource(u, u.LoginName, passwd, source.ID, source.Cfg.(*SMTPConfig), false) + return LoginUserSMTPSource(u, name, passwd, source.ID, source.Cfg.(*SMTPConfig), autoRegister) case PAM: - return LoginUserPAMSource(u, u.LoginName, passwd, source.ID, source.Cfg.(*PAMConfig), false) + return LoginUserPAMSource(u, name, passwd, source.ID, source.Cfg.(*PAMConfig), autoRegister) } + return nil, ErrUnsupportedLoginType } @@ -256,8 +250,10 @@ func UserSignIn(uname, passwd string) (*User, error) { // Create a local user if success // Return the same LoginUserPlain semantic // FIXME: https://github.com/gogits/gogs/issues/672 -func LoginUserLdapSource(u *User, name, passwd string, sourceId int64, cfg *LDAPConfig, autoRegister bool) (*User, error) { - fn, sn, mail, admin, logged := cfg.Ldapsource.SearchEntry(name, passwd) +func LoginUserLdapSource(u *User, name, passwd string, source *LoginSource, autoRegister bool) (*User, error) { + cfg := source.Cfg.(*LDAPConfig) + directBind := (source.Type == DLDAP) + fn, sn, mail, admin, logged := cfg.Ldapsource.SearchEntry(name, passwd, directBind) if !logged { // User not in LDAP, do nothing return nil, ErrUserNotExist{0, name} @@ -276,8 +272,8 @@ func LoginUserLdapSource(u *User, name, passwd string, sourceId int64, cfg *LDAP LowerName: strings.ToLower(name), Name: name, FullName: fn + " " + sn, - LoginType: LDAP, - LoginSource: sourceId, + LoginType: source.Type, + LoginSource: source.ID, LoginName: name, Passwd: passwd, Email: mail, diff --git a/modules/auth/auth_form.go b/modules/auth/auth_form.go index b2d427b4..c1d49f66 100644 --- a/modules/auth/auth_form.go +++ b/modules/auth/auth_form.go @@ -19,6 +19,7 @@ type AuthenticationForm struct { BindDN string `form:"bind_dn"` BindPassword string UserBase string + UserDN string `form:"user_dn"` AttributeName string AttributeSurname string AttributeMail string diff --git a/modules/auth/ldap/README.md b/modules/auth/ldap/README.md index 9a2a6aa1..3a3e0204 100644 --- a/modules/auth/ldap/README.md +++ b/modules/auth/ldap/README.md @@ -4,61 +4,98 @@ Gogs LDAP Authentication Module ## About This authentication module attempts to authorize and authenticate a user -against an LDAP server. Like most LDAP authentication systems, this module does -this in two steps. First, it queries the LDAP server using a Bind DN and -searches for the user that is attempting to sign in. If the user is found, the -module attempts to bind to the server using the user's supplied credentials. If -this succeeds, the user has been authenticated, and his account information is -retrieved and passed to the Gogs login infrastructure. +against an LDAP server. It provides two methods of authentication: LDAP via +BindDN, and LDAP simple authentication. + +LDAP via BindDN functions like most LDAP authentication systems. First, it +queries the LDAP server using a Bind DN and searches for the user that is +attempting to sign in. If the user is found, the module attempts to bind to the +server using the user's supplied credentials. If this succeeds, the user has +been authenticated, and his account information is retrieved and passed to the +Gogs login infrastructure. + +LDAP simple authentication does not utilize a Bind DN. Instead, it binds +directly with the LDAP server using the user's supplied credentials. If the bind +succeeds and no filter rules out the user, the user is authenticated. + +LDAP via BindDN is recommended for most users. By using a Bind DN, the server +can perform authorization by restricting which entries the Bind DN account can +read. Further, using a Bind DN with reduced permissions can reduce security risk +in the face of application bugs. ## Usage To use this module, add an LDAP authentication source via the Authentications -section in the admin panel. The fields should be set as follows: +section in the admin panel. Both the LDAP via BindDN and the simple auth LDAP +share the following fields: * Authorization Name **(required)** - * A name to assign to the new method of authorization. + * A name to assign to the new method of authorization. * Host **(required)** - * The address where the LDAP server can be reached. - * Example: mydomain.com + * The address where the LDAP server can be reached. + * Example: mydomain.com * Port **(required)** - * The port to use when connecting to the server. - * Example: 636 + * The port to use when connecting to the server. + * Example: 636 * Enable TLS Encryption (optional) - * Whether to use TLS when connecting to the LDAP server. + * Whether to use TLS when connecting to the LDAP server. + +* Admin Filter (optional) + * An LDAP filter specifying if a user should be given administrator + privileges. If a user accounts passes the filter, the user will be + privileged as an administrator. + * Example: (objectClass=adminAccount) + +* First name attribute (optional) + * The attribute of the user's LDAP record containing the user's first name. + This will be used to populate their account information. + * Example: givenName + +* Surname attribute (optional) + * The attribute of the user's LDAP record containing the user's surname This + will be used to populate their account information. + * Example: sn + +* E-mail attribute **(required)** + * The attribute of the user's LDAP record containing the user's email + address. This will be used to populate their account information. + * Example: mail + +**LDAP via BindDN** adds the following fields: * Bind DN (optional) - * The DN to bind to the LDAP server with when searching for the user. - This may be left blank to perform an anonymous search. - * Example: cn=Search,dc=mydomain,dc=com + * The DN to bind to the LDAP server with when searching for the user. This + may be left blank to perform an anonymous search. + * Example: cn=Search,dc=mydomain,dc=com * Bind Password (optional) - * The password for the Bind DN specified above, if any. + * The password for the Bind DN specified above, if any. _Note: The password + is stored in plaintext at the server. As such, ensure that your Bind DN + has as few privileges as possible._ * User Search Base **(required)** - * The LDAP base at which user accounts will be searched for. - * Example: ou=Users,dc=mydomain,dc=com + * The LDAP base at which user accounts will be searched for. + * Example: ou=Users,dc=mydomain,dc=com * User Filter **(required)** - * An LDAP filter declaring how to find the user record that is attempting - to authenticate. The '%s' matching parameter will be substituted with - the user's username. - * Example: (&(objectClass=posixAccount)(uid=%s)) + * An LDAP filter declaring how to find the user record that is attempting to + authenticate. The '%s' matching parameter will be substituted with the + user's username. + * Example: (&(objectClass=posixAccount)(uid=%s)) -* First name attribute (optional) - * The attribute of the user's LDAP record containing the user's first - name. This will be used to populate their account information. - * Example: givenName +**LDAP using simple auth** adds the following fields: -* Surname name attribute (optional) - * The attribute of the user's LDAP record containing the user's surname - This will be used to populate their account information. - * Example: sn +* User DN **(required)** + * A template to use as the user's DN. The `%s` matching parameter will be + substituted with the user's username. + * Example: cn=%s,ou=Users,dc=mydomain,dc=com + * Example: uid=%s,ou=Users,dc=mydomain,dc=com -* E-mail attribute **(required)** - * The attribute of the user's LDAP record containing the user's email - address. This will be used to populate their account information. - * Example: mail +* User Filter **(required)** + * An LDAP filter declaring when a user should be allowed to log in. The `%s` + matching parameter will be substituted with the user's username. + * Example: (&(objectClass=posixAccount)(cn=%s)) + * Example: (&(objectClass=posixAccount)(uid=%s)) diff --git a/modules/auth/ldap/ldap.go b/modules/auth/ldap/ldap.go index de1108fd..61cfca90 100644 --- a/modules/auth/ldap/ldap.go +++ b/modules/auth/ldap/ldap.go @@ -22,6 +22,7 @@ type Ldapsource struct { BindDN string // DN to bind with BindPassword string // Bind DN password UserBase string // Base search path for users + UserDN string // Template for the DN of the user for simple auth AttributeName string // First name attribute AttributeSurname string // Surname attribute AttributeMail string // E-mail attribute @@ -78,10 +79,19 @@ func (ls Ldapsource) FindUserDN(name string) (string, bool) { } // searchEntry : search an LDAP source if an entry (name, passwd) is valid and in the specific filter -func (ls Ldapsource) SearchEntry(name, passwd string) (string, string, string, bool, bool) { - userDN, found := ls.FindUserDN(name) - if !found { - return "", "", "", false, false +func (ls Ldapsource) SearchEntry(name, passwd string, directBind bool) (string, string, string, bool, bool) { + var userDN string + if directBind { + log.Trace("LDAP will bind directly via UserDN template: %s", ls.UserDN) + userDN = fmt.Sprintf(ls.UserDN, name) + } else { + log.Trace("LDAP will use BindDN.") + + var found bool + userDN, found = ls.FindUserDN(name) + if !found { + return "", "", "", false, false + } } l, err := ldapDial(ls) @@ -112,7 +122,12 @@ func (ls Ldapsource) SearchEntry(name, passwd string) (string, string, string, b log.Error(4, "LDAP Search failed unexpectedly! (%v)", err) return "", "", "", false, false } else if len(sr.Entries) < 1 { - log.Error(4, "LDAP Search failed unexpectedly! (0 entries)") + if directBind { + log.Error(4, "User filter inhibited user login.") + } else { + log.Error(4, "LDAP Search failed unexpectedly! (0 entries)") + } + return "", "", "", false, false } diff --git a/modules/bindata/bindata.go b/modules/bindata/bindata.go index 6750a261..e663ee6d 100644 --- a/modules/bindata/bindata.go +++ b/modules/bindata/bindata.go @@ -299,7 +299,7 @@ func confAppIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/app.ini", size: 9731, mode: os.FileMode(420), modTime: time.Unix(1441219263, 0)} + info := bindataFileInfo{name: "conf/app.ini", size: 9731, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -319,7 +319,7 @@ func confGitignoreActionscript() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Actionscript", size: 300, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Actionscript", size: 300, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -339,7 +339,7 @@ func confGitignoreAda() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Ada", size: 51, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Ada", size: 51, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -359,7 +359,7 @@ func confGitignoreAgda() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Agda", size: 8, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Agda", size: 8, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -379,7 +379,7 @@ func confGitignoreAndroid() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Android", size: 394, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Android", size: 394, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -399,7 +399,7 @@ func confGitignoreAnjuta() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Anjuta", size: 78, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Anjuta", size: 78, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -419,7 +419,7 @@ func confGitignoreAppengine() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/AppEngine", size: 58, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/AppEngine", size: 58, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -439,7 +439,7 @@ func confGitignoreAppceleratortitanium() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/AppceleratorTitanium", size: 45, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/AppceleratorTitanium", size: 45, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -459,7 +459,7 @@ func confGitignoreArchlinuxpackages() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/ArchLinuxPackages", size: 75, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/ArchLinuxPackages", size: 75, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -479,7 +479,7 @@ func confGitignoreArchives() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Archives", size: 295, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Archives", size: 295, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -499,7 +499,7 @@ func confGitignoreAutotools() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Autotools", size: 181, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Autotools", size: 181, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -519,7 +519,7 @@ func confGitignoreBricxcc() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/BricxCC", size: 72, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/BricxCC", size: 72, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -539,7 +539,7 @@ func confGitignoreC() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/C", size: 246, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/C", size: 246, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -559,7 +559,7 @@ func confGitignoreCSharp() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/C Sharp", size: 1521, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/C Sharp", size: 1521, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -579,7 +579,7 @@ func confGitignoreC2() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/C++", size: 242, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/C++", size: 242, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -599,7 +599,7 @@ func confGitignoreCfwheels() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/CFWheels", size: 205, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/CFWheels", size: 205, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -619,7 +619,7 @@ func confGitignoreCmake() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/CMake", size: 89, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/CMake", size: 89, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -639,7 +639,7 @@ func confGitignoreCuda() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/CUDA", size: 38, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/CUDA", size: 38, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -659,7 +659,7 @@ func confGitignoreCvs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/CVS", size: 39, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/CVS", size: 39, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -679,7 +679,7 @@ func confGitignoreCakephp() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/CakePHP", size: 136, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/CakePHP", size: 136, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -699,7 +699,7 @@ func confGitignoreChefcookbook() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/ChefCookbook", size: 77, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/ChefCookbook", size: 77, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -719,7 +719,7 @@ func confGitignoreCloud9() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Cloud9", size: 45, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Cloud9", size: 45, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -739,7 +739,7 @@ func confGitignoreCodeigniter() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/CodeIgniter", size: 106, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/CodeIgniter", size: 106, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -759,7 +759,7 @@ func confGitignoreCodekit() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/CodeKit", size: 54, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/CodeKit", size: 54, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -779,7 +779,7 @@ func confGitignoreCommonlisp() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/CommonLisp", size: 26, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/CommonLisp", size: 26, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -799,7 +799,7 @@ func confGitignoreComposer() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Composer", size: 250, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Composer", size: 250, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -819,7 +819,7 @@ func confGitignoreConcrete5() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Concrete5", size: 42, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Concrete5", size: 42, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -839,7 +839,7 @@ func confGitignoreCoq() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Coq", size: 18, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Coq", size: 18, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -859,7 +859,7 @@ func confGitignoreCraftcms() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/CraftCMS", size: 120, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/CraftCMS", size: 120, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -879,7 +879,7 @@ func confGitignoreDm() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/DM", size: 29, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/DM", size: 29, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -899,7 +899,7 @@ func confGitignoreDart() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Dart", size: 234, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Dart", size: 234, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -919,7 +919,7 @@ func confGitignoreDarteditor() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/DartEditor", size: 19, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/DartEditor", size: 19, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -939,7 +939,7 @@ func confGitignoreDelphi() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Delphi", size: 1347, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Delphi", size: 1347, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -959,7 +959,7 @@ func confGitignoreDreamweaver() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Dreamweaver", size: 47, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Dreamweaver", size: 47, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -979,7 +979,7 @@ func confGitignoreDrupal() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Drupal", size: 605, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Drupal", size: 605, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -999,7 +999,7 @@ func confGitignoreEpiserver() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/EPiServer", size: 81, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/EPiServer", size: 81, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1019,7 +1019,7 @@ func confGitignoreEagle() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Eagle", size: 401, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Eagle", size: 401, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1039,7 +1039,7 @@ func confGitignoreEclipse() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Eclipse", size: 458, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Eclipse", size: 458, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1059,7 +1059,7 @@ func confGitignoreEiffelstudio() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/EiffelStudio", size: 35, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/EiffelStudio", size: 35, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1079,7 +1079,7 @@ func confGitignoreElisp() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Elisp", size: 36, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Elisp", size: 36, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1099,7 +1099,7 @@ func confGitignoreElixir() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Elixir", size: 34, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Elixir", size: 34, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1119,7 +1119,7 @@ func confGitignoreEmacs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Emacs", size: 320, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Emacs", size: 320, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1139,7 +1139,7 @@ func confGitignoreEnsime() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Ensime", size: 57, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Ensime", size: 57, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1159,7 +1159,7 @@ func confGitignoreErlang() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Erlang", size: 95, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Erlang", size: 95, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1179,7 +1179,7 @@ func confGitignoreEspresso() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Espresso", size: 9, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Espresso", size: 9, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1199,7 +1199,7 @@ func confGitignoreExpressionengine() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/ExpressionEngine", size: 342, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/ExpressionEngine", size: 342, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1219,7 +1219,7 @@ func confGitignoreExtjs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/ExtJs", size: 38, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/ExtJs", size: 38, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1239,7 +1239,7 @@ func confGitignoreFancy() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Fancy", size: 12, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Fancy", size: 12, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1259,7 +1259,7 @@ func confGitignoreFinale() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Finale", size: 184, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Finale", size: 184, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1279,7 +1279,7 @@ func confGitignoreFlexbuilder() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/FlexBuilder", size: 29, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/FlexBuilder", size: 29, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1299,7 +1299,7 @@ func confGitignoreForcedotcom() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/ForceDotCom", size: 57, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/ForceDotCom", size: 57, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1319,7 +1319,7 @@ func confGitignoreFuelphp() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/FuelPHP", size: 39, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/FuelPHP", size: 39, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1339,7 +1339,7 @@ func confGitignoreGwt() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/GWT", size: 395, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/GWT", size: 395, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1359,7 +1359,7 @@ func confGitignoreGcov() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Gcov", size: 56, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Gcov", size: 56, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1379,7 +1379,7 @@ func confGitignoreGitbook() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/GitBook", size: 353, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/GitBook", size: 353, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1399,7 +1399,7 @@ func confGitignoreGo() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Go", size: 266, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Go", size: 266, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1419,7 +1419,7 @@ func confGitignoreGradle() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Gradle", size: 157, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Gradle", size: 157, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1439,7 +1439,7 @@ func confGitignoreGrails() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Grails", size: 583, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Grails", size: 583, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1459,7 +1459,7 @@ func confGitignoreHaskell() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Haskell", size: 135, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Haskell", size: 135, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1479,7 +1479,7 @@ func confGitignoreIgorpro() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/IGORPro", size: 121, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/IGORPro", size: 121, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1499,7 +1499,7 @@ func confGitignoreIpythonnotebook() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/IPythonNotebook", size: 37, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/IPythonNotebook", size: 37, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1519,7 +1519,7 @@ func confGitignoreIdris() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Idris", size: 10, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Idris", size: 10, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1539,7 +1539,7 @@ func confGitignoreJdeveloper() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/JDeveloper", size: 255, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/JDeveloper", size: 255, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1559,7 +1559,7 @@ func confGitignoreJava() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Java", size: 189, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Java", size: 189, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1579,7 +1579,7 @@ func confGitignoreJboss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Jboss", size: 509, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Jboss", size: 509, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1599,7 +1599,7 @@ func confGitignoreJekyll() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Jekyll", size: 37, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Jekyll", size: 37, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1619,7 +1619,7 @@ func confGitignoreJetbrains() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/JetBrains", size: 860, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/JetBrains", size: 860, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1639,7 +1639,7 @@ func confGitignoreJoomla() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Joomla", size: 22387, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Joomla", size: 22387, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1659,7 +1659,7 @@ func confGitignoreKdevelop4() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/KDevelop4", size: 16, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/KDevelop4", size: 16, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1679,7 +1679,7 @@ func confGitignoreKate() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Kate", size: 34, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Kate", size: 34, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1699,7 +1699,7 @@ func confGitignoreKicad() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/KiCAD", size: 208, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/KiCAD", size: 208, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1719,7 +1719,7 @@ func confGitignoreKohana() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Kohana", size: 39, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Kohana", size: 39, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1739,7 +1739,7 @@ func confGitignoreLabview() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/LabVIEW", size: 142, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/LabVIEW", size: 142, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1759,7 +1759,7 @@ func confGitignoreLaravel() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Laravel", size: 49, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Laravel", size: 49, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1779,7 +1779,7 @@ func confGitignoreLazarus() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Lazarus", size: 407, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Lazarus", size: 407, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1799,7 +1799,7 @@ func confGitignoreLeiningen() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Leiningen", size: 138, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Leiningen", size: 138, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1819,7 +1819,7 @@ func confGitignoreLemonstand() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/LemonStand", size: 348, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/LemonStand", size: 348, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1839,7 +1839,7 @@ func confGitignoreLibreoffice() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/LibreOffice", size: 30, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/LibreOffice", size: 30, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1859,7 +1859,7 @@ func confGitignoreLilypond() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Lilypond", size: 33, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Lilypond", size: 33, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1879,7 +1879,7 @@ func confGitignoreLinux() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Linux", size: 118, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Linux", size: 118, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1899,7 +1899,7 @@ func confGitignoreLithium() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Lithium", size: 28, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Lithium", size: 28, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1919,7 +1919,7 @@ func confGitignoreLua() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Lua", size: 324, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Lua", size: 324, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1939,7 +1939,7 @@ func confGitignoreLyx() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/LyX", size: 75, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/LyX", size: 75, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1959,7 +1959,7 @@ func confGitignoreMagento() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Magento", size: 2599, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Magento", size: 2599, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1979,7 +1979,7 @@ func confGitignoreMatlab() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Matlab", size: 360, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Matlab", size: 360, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1999,7 +1999,7 @@ func confGitignoreMaven() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Maven", size: 170, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Maven", size: 170, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2019,7 +2019,7 @@ func confGitignoreMercurial() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Mercurial", size: 50, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Mercurial", size: 50, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2039,7 +2039,7 @@ func confGitignoreMercury() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Mercury", size: 93, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Mercury", size: 93, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2059,7 +2059,7 @@ func confGitignoreMetaprogrammingsystem() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/MetaProgrammingSystem", size: 391, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/MetaProgrammingSystem", size: 391, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2079,7 +2079,7 @@ func confGitignoreMicrosoftoffice() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/MicrosoftOffice", size: 88, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/MicrosoftOffice", size: 88, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2099,7 +2099,7 @@ func confGitignoreModelsim() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/ModelSim", size: 282, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/ModelSim", size: 282, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2119,7 +2119,7 @@ func confGitignoreMomentics() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Momentics", size: 76, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Momentics", size: 76, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2139,7 +2139,7 @@ func confGitignoreMonodevelop() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/MonoDevelop", size: 93, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/MonoDevelop", size: 93, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2159,7 +2159,7 @@ func confGitignoreNanoc() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Nanoc", size: 197, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Nanoc", size: 197, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2179,7 +2179,7 @@ func confGitignoreNetbeans() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/NetBeans", size: 96, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/NetBeans", size: 96, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2199,7 +2199,7 @@ func confGitignoreNim() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Nim", size: 10, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Nim", size: 10, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2219,7 +2219,7 @@ func confGitignoreNinja() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Ninja", size: 23, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Ninja", size: 23, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2239,7 +2239,7 @@ func confGitignoreNode() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Node", size: 529, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Node", size: 529, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2259,7 +2259,7 @@ func confGitignoreNotepadpp() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/NotepadPP", size: 30, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/NotepadPP", size: 30, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2279,7 +2279,7 @@ func confGitignoreOcaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/OCaml", size: 178, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/OCaml", size: 178, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2299,7 +2299,7 @@ func confGitignoreOsx() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/OSX", size: 356, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/OSX", size: 356, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2319,7 +2319,7 @@ func confGitignoreObjectiveC() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Objective-C", size: 837, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Objective-C", size: 837, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2339,7 +2339,7 @@ func confGitignoreOpa() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Opa", size: 90, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Opa", size: 90, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2359,7 +2359,7 @@ func confGitignoreOpencart() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/OpenCart", size: 115, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/OpenCart", size: 115, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2379,7 +2379,7 @@ func confGitignoreOracleforms() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/OracleForms", size: 100, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/OracleForms", size: 100, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2399,7 +2399,7 @@ func confGitignorePacker() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Packer", size: 55, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Packer", size: 55, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2419,7 +2419,7 @@ func confGitignorePerl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Perl", size: 191, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Perl", size: 191, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2439,7 +2439,7 @@ func confGitignorePhalcon() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Phalcon", size: 29, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Phalcon", size: 29, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2459,7 +2459,7 @@ func confGitignorePlayframework() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/PlayFramework", size: 170, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/PlayFramework", size: 170, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2479,7 +2479,7 @@ func confGitignorePlone() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Plone", size: 137, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Plone", size: 137, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2499,7 +2499,7 @@ func confGitignorePrestashop() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Prestashop", size: 483, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Prestashop", size: 483, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2519,7 +2519,7 @@ func confGitignoreProcessing() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Processing", size: 120, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Processing", size: 120, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2539,7 +2539,7 @@ func confGitignorePython() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Python", size: 713, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Python", size: 713, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2559,7 +2559,7 @@ func confGitignoreQooxdoo() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Qooxdoo", size: 58, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Qooxdoo", size: 58, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2579,7 +2579,7 @@ func confGitignoreQt() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Qt", size: 292, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Qt", size: 292, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2599,7 +2599,7 @@ func confGitignoreR() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/R", size: 255, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/R", size: 255, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2619,7 +2619,7 @@ func confGitignoreRos() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/ROS", size: 493, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/ROS", size: 493, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2639,7 +2639,7 @@ func confGitignoreRails() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Rails", size: 707, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Rails", size: 707, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2659,7 +2659,7 @@ func confGitignoreRedcar() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Redcar", size: 8, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Redcar", size: 8, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2679,7 +2679,7 @@ func confGitignoreRedis() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Redis", size: 51, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Redis", size: 51, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2699,7 +2699,7 @@ func confGitignoreRhodesrhomobile() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/RhodesRhomobile", size: 77, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/RhodesRhomobile", size: 77, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2719,7 +2719,7 @@ func confGitignoreRuby() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Ruby", size: 607, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Ruby", size: 607, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2739,7 +2739,7 @@ func confGitignoreRust() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Rust", size: 91, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Rust", size: 91, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2759,7 +2759,7 @@ func confGitignoreSbt() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/SBT", size: 186, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/SBT", size: 186, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2779,7 +2779,7 @@ func confGitignoreScons() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/SCons", size: 90, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/SCons", size: 90, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2799,7 +2799,7 @@ func confGitignoreSvn() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/SVN", size: 6, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/SVN", size: 6, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2819,7 +2819,7 @@ func confGitignoreSass() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Sass", size: 23, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Sass", size: 23, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2839,7 +2839,7 @@ func confGitignoreScala() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Scala", size: 185, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Scala", size: 185, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2859,7 +2859,7 @@ func confGitignoreScrivener() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Scrivener", size: 140, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Scrivener", size: 140, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2879,7 +2879,7 @@ func confGitignoreSdcc() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Sdcc", size: 55, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Sdcc", size: 55, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2899,7 +2899,7 @@ func confGitignoreSeamgen() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/SeamGen", size: 961, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/SeamGen", size: 961, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2919,7 +2919,7 @@ func confGitignoreSketchup() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/SketchUp", size: 6, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/SketchUp", size: 6, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2939,7 +2939,7 @@ func confGitignoreSlickedit() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/SlickEdit", size: 323, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/SlickEdit", size: 323, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2959,7 +2959,7 @@ func confGitignoreStella() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Stella", size: 207, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Stella", size: 207, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2979,7 +2979,7 @@ func confGitignoreSublimetext() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/SublimeText", size: 354, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/SublimeText", size: 354, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2999,7 +2999,7 @@ func confGitignoreSugarcrm() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/SugarCRM", size: 734, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/SugarCRM", size: 734, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3019,7 +3019,7 @@ func confGitignoreSwift() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Swift", size: 837, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Swift", size: 837, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3039,7 +3039,7 @@ func confGitignoreSymfony() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Symfony", size: 531, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Symfony", size: 531, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3059,7 +3059,7 @@ func confGitignoreSymphonycms() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/SymphonyCMS", size: 90, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/SymphonyCMS", size: 90, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3079,7 +3079,7 @@ func confGitignoreSynopsysvcs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/SynopsysVCS", size: 971, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/SynopsysVCS", size: 971, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3099,7 +3099,7 @@ func confGitignoreTags() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Tags", size: 177, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Tags", size: 177, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3119,7 +3119,7 @@ func confGitignoreTex() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/TeX", size: 1328, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/TeX", size: 1328, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3139,7 +3139,7 @@ func confGitignoreTextmate() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/TextMate", size: 28, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/TextMate", size: 28, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3159,7 +3159,7 @@ func confGitignoreTextpattern() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Textpattern", size: 177, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Textpattern", size: 177, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3179,7 +3179,7 @@ func confGitignoreTortoisegit() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/TortoiseGit", size: 38, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/TortoiseGit", size: 38, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3199,7 +3199,7 @@ func confGitignoreTurbogears2() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/TurboGears2", size: 202, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/TurboGears2", size: 202, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3219,7 +3219,7 @@ func confGitignoreTypo3() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Typo3", size: 466, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Typo3", size: 466, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3239,7 +3239,7 @@ func confGitignoreUmbraco() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Umbraco", size: 536, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Umbraco", size: 536, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3259,7 +3259,7 @@ func confGitignoreUnity() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Unity", size: 267, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Unity", size: 267, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3279,7 +3279,7 @@ func confGitignoreVvvv() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/VVVV", size: 57, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/VVVV", size: 57, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3299,7 +3299,7 @@ func confGitignoreVagrant() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Vagrant", size: 10, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Vagrant", size: 10, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3319,7 +3319,7 @@ func confGitignoreVim() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Vim", size: 66, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Vim", size: 66, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3339,7 +3339,7 @@ func confGitignoreVirtualenv() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/VirtualEnv", size: 151, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/VirtualEnv", size: 151, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3359,7 +3359,7 @@ func confGitignoreVisualstudio() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/VisualStudio", size: 3412, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/VisualStudio", size: 3412, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3379,7 +3379,7 @@ func confGitignoreVisualstudiocode() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/VisualStudioCode", size: 11, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/VisualStudioCode", size: 11, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3399,7 +3399,7 @@ func confGitignoreWaf() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Waf", size: 87, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Waf", size: 87, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3419,7 +3419,7 @@ func confGitignoreWebmethods() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/WebMethods", size: 424, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/WebMethods", size: 424, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3439,7 +3439,7 @@ func confGitignoreWindows() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Windows", size: 211, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Windows", size: 211, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3459,7 +3459,7 @@ func confGitignoreWordpress() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/WordPress", size: 297, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/WordPress", size: 297, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3479,7 +3479,7 @@ func confGitignoreXcode() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Xcode", size: 361, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Xcode", size: 361, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3499,7 +3499,7 @@ func confGitignoreXilinxise() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/XilinxISE", size: 566, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/XilinxISE", size: 566, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3519,7 +3519,7 @@ func confGitignoreXojo() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Xojo", size: 160, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Xojo", size: 160, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3539,7 +3539,7 @@ func confGitignoreYeoman() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Yeoman", size: 52, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Yeoman", size: 52, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3559,7 +3559,7 @@ func confGitignoreYii() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Yii", size: 120, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Yii", size: 120, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3579,7 +3579,7 @@ func confGitignoreZendframework() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/ZendFramework", size: 217, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/ZendFramework", size: 217, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3599,7 +3599,7 @@ func confGitignoreZephir() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/gitignore/Zephir", size: 387, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/gitignore/Zephir", size: 387, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3619,7 +3619,7 @@ func confLicenseAbstylesLicense() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Abstyles License", size: 730, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Abstyles License", size: 730, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3639,7 +3639,7 @@ func confLicenseAcademicFreeLicenseV11() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Academic Free License v1.1", size: 4660, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Academic Free License v1.1", size: 4660, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3659,7 +3659,7 @@ func confLicenseAcademicFreeLicenseV12() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Academic Free License v1.2", size: 4949, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Academic Free License v1.2", size: 4949, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3679,7 +3679,7 @@ func confLicenseAcademicFreeLicenseV20() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Academic Free License v2.0", size: 8937, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Academic Free License v2.0", size: 8937, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3699,7 +3699,7 @@ func confLicenseAcademicFreeLicenseV21() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Academic Free License v2.1", size: 8922, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Academic Free License v2.1", size: 8922, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3719,7 +3719,7 @@ func confLicenseAcademicFreeLicenseV30() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Academic Free License v3.0", size: 10306, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Academic Free License v3.0", size: 10306, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3739,7 +3739,7 @@ func confLicenseAfferoGeneralPublicLicenseV10() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Affero General Public License v1.0", size: 15837, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Affero General Public License v1.0", size: 15837, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3759,7 +3759,7 @@ func confLicenseApacheLicense10() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Apache License 1.0", size: 2475, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Apache License 1.0", size: 2475, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3779,7 +3779,7 @@ func confLicenseApacheLicense11() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Apache License 1.1", size: 2508, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Apache License 1.1", size: 2508, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3799,7 +3799,7 @@ func confLicenseApacheLicense20() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Apache License 2.0", size: 10261, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Apache License 2.0", size: 10261, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3819,7 +3819,7 @@ func confLicenseArtisticLicense10() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Artistic License 1.0", size: 4789, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Artistic License 1.0", size: 4789, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3839,7 +3839,7 @@ func confLicenseArtisticLicense20() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Artistic License 2.0", size: 8661, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Artistic License 2.0", size: 8661, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3859,7 +3859,7 @@ func confLicenseBsd2ClauseLicense() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/BSD 2-clause License", size: 1286, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/BSD 2-clause License", size: 1286, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3879,7 +3879,7 @@ func confLicenseBsd3ClauseLicense() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/BSD 3-clause License", size: 1480, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/BSD 3-clause License", size: 1480, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3899,7 +3899,7 @@ func confLicenseBsd4ClauseLicense() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/BSD 4-clause License", size: 1624, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/BSD 4-clause License", size: 1624, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3919,7 +3919,7 @@ func confLicenseCreativeCommonsCc010Universal() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Creative Commons CC0 1.0 Universal", size: 6894, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Creative Commons CC0 1.0 Universal", size: 6894, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3939,7 +3939,7 @@ func confLicenseCreativeCommonsZeroV10Universal() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Creative Commons Zero v1.0 Universal", size: 6894, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Creative Commons Zero v1.0 Universal", size: 6894, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3959,7 +3959,7 @@ func confLicenseEclipsePublicLicense10() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Eclipse Public License 1.0", size: 11248, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Eclipse Public License 1.0", size: 11248, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3979,7 +3979,7 @@ func confLicenseEducationalCommunityLicenseV10() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Educational Community License v1.0", size: 2394, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Educational Community License v1.0", size: 2394, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3999,7 +3999,7 @@ func confLicenseEducationalCommunityLicenseV20() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Educational Community License v2.0", size: 11085, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Educational Community License v2.0", size: 11085, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4019,7 +4019,7 @@ func confLicenseGnuAfferoGeneralPublicLicenseV30() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/GNU Affero General Public License v3.0", size: 33818, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/GNU Affero General Public License v3.0", size: 33818, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4039,7 +4039,7 @@ func confLicenseGnuFreeDocumentationLicenseV11() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/GNU Free Documentation License v1.1", size: 17912, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/GNU Free Documentation License v1.1", size: 17912, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4059,7 +4059,7 @@ func confLicenseGnuFreeDocumentationLicenseV12() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/GNU Free Documentation License v1.2", size: 20209, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/GNU Free Documentation License v1.2", size: 20209, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4079,7 +4079,7 @@ func confLicenseGnuFreeDocumentationLicenseV13() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/GNU Free Documentation License v1.3", size: 22732, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/GNU Free Documentation License v1.3", size: 22732, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4099,7 +4099,7 @@ func confLicenseGnuGeneralPublicLicenseV10() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/GNU General Public License v1.0", size: 12165, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/GNU General Public License v1.0", size: 12165, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4119,7 +4119,7 @@ func confLicenseGnuGeneralPublicLicenseV20() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/GNU General Public License v2.0", size: 17277, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/GNU General Public License v2.0", size: 17277, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4139,7 +4139,7 @@ func confLicenseGnuGeneralPublicLicenseV30() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/GNU General Public License v3.0", size: 34570, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/GNU General Public License v3.0", size: 34570, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4159,7 +4159,7 @@ func confLicenseGnuLesserGeneralPublicLicenseV21() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/GNU Lesser General Public License v2.1", size: 25885, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/GNU Lesser General Public License v2.1", size: 25885, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4179,7 +4179,7 @@ func confLicenseGnuLesserGeneralPublicLicenseV30() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/GNU Lesser General Public License v3.0", size: 7355, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/GNU Lesser General Public License v3.0", size: 7355, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4199,7 +4199,7 @@ func confLicenseGnuLibraryGeneralPublicLicenseV20() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/GNU Library General Public License v2.0", size: 24758, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/GNU Library General Public License v2.0", size: 24758, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4219,7 +4219,7 @@ func confLicenseIscLicense() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/ISC license", size: 823, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/ISC license", size: 823, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4239,7 +4239,7 @@ func confLicenseMitLicense() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/MIT License", size: 1077, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/MIT License", size: 1077, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4259,7 +4259,7 @@ func confLicenseMozillaPublicLicense10() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Mozilla Public License 1.0", size: 18026, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Mozilla Public License 1.0", size: 18026, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4279,7 +4279,7 @@ func confLicenseMozillaPublicLicense11() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Mozilla Public License 1.1", size: 23361, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Mozilla Public License 1.1", size: 23361, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4299,7 +4299,7 @@ func confLicenseMozillaPublicLicense20() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/license/Mozilla Public License 2.0", size: 14827, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/license/Mozilla Public License 2.0", size: 14827, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4319,7 +4319,7 @@ func confLocaleTranslators() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/TRANSLATORS", size: 762, mode: os.FileMode(420), modTime: time.Unix(1441373556, 0)} + info := bindataFileInfo{name: "conf/locale/TRANSLATORS", size: 762, mode: os.FileMode(420), modTime: time.Unix(1441424924, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4339,7 +4339,7 @@ func confLocaleLocale_bgBgIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_bg-BG.ini", size: 65383, mode: os.FileMode(493), modTime: time.Unix(1441457542, 0)} + info := bindataFileInfo{name: "conf/locale/locale_bg-BG.ini", size: 64314, mode: os.FileMode(493), modTime: time.Unix(1441424924, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4359,7 +4359,7 @@ func confLocaleLocale_deDeIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_de-DE.ini", size: 45690, mode: os.FileMode(493), modTime: time.Unix(1441457542, 0)} + info := bindataFileInfo{name: "conf/locale/locale_de-DE.ini", size: 45655, mode: os.FileMode(493), modTime: time.Unix(1441424924, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4379,7 +4379,7 @@ func confLocaleLocale_enUsIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 42176, mode: os.FileMode(420), modTime: time.Unix(1441638740, 0)} + info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 42325, mode: os.FileMode(420), modTime: time.Unix(1441424924, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4399,7 +4399,7 @@ func confLocaleLocale_esEsIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_es-ES.ini", size: 46689, mode: os.FileMode(493), modTime: time.Unix(1441457542, 0)} + info := bindataFileInfo{name: "conf/locale/locale_es-ES.ini", size: 45982, mode: os.FileMode(493), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4419,7 +4419,7 @@ func confLocaleLocale_frFrIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_fr-FR.ini", size: 45922, mode: os.FileMode(493), modTime: time.Unix(1441457542, 0)} + info := bindataFileInfo{name: "conf/locale/locale_fr-FR.ini", size: 45922, mode: os.FileMode(493), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4439,7 +4439,7 @@ func confLocaleLocale_itItIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_it-IT.ini", size: 44349, mode: os.FileMode(493), modTime: time.Unix(1441457542, 0)} + info := bindataFileInfo{name: "conf/locale/locale_it-IT.ini", size: 44349, mode: os.FileMode(493), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4459,7 +4459,7 @@ func confLocaleLocale_jaJpIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_ja-JP.ini", size: 49941, mode: os.FileMode(493), modTime: time.Unix(1441457542, 0)} + info := bindataFileInfo{name: "conf/locale/locale_ja-JP.ini", size: 49941, mode: os.FileMode(493), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4479,7 +4479,7 @@ func confLocaleLocale_lvLvIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_lv-LV.ini", size: 45556, mode: os.FileMode(493), modTime: time.Unix(1441457544, 0)} + info := bindataFileInfo{name: "conf/locale/locale_lv-LV.ini", size: 45556, mode: os.FileMode(493), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4499,7 +4499,7 @@ func confLocaleLocale_nlNlIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_nl-NL.ini", size: 44002, mode: os.FileMode(493), modTime: time.Unix(1441457542, 0)} + info := bindataFileInfo{name: "conf/locale/locale_nl-NL.ini", size: 44002, mode: os.FileMode(493), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4519,7 +4519,7 @@ func confLocaleLocale_plPlIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_pl-PL.ini", size: 44326, mode: os.FileMode(493), modTime: time.Unix(1441457542, 0)} + info := bindataFileInfo{name: "conf/locale/locale_pl-PL.ini", size: 44326, mode: os.FileMode(493), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4539,7 +4539,7 @@ func confLocaleLocale_ptBrIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_pt-BR.ini", size: 45002, mode: os.FileMode(493), modTime: time.Unix(1441457544, 0)} + info := bindataFileInfo{name: "conf/locale/locale_pt-BR.ini", size: 45000, mode: os.FileMode(493), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4559,7 +4559,7 @@ func confLocaleLocale_ruRuIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_ru-RU.ini", size: 58828, mode: os.FileMode(493), modTime: time.Unix(1441457542, 0)} + info := bindataFileInfo{name: "conf/locale/locale_ru-RU.ini", size: 58828, mode: os.FileMode(493), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4579,7 +4579,7 @@ func confLocaleLocale_zhCnIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_zh-CN.ini", size: 41664, mode: os.FileMode(493), modTime: time.Unix(1441457544, 0)} + info := bindataFileInfo{name: "conf/locale/locale_zh-CN.ini", size: 41664, mode: os.FileMode(493), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4599,7 +4599,7 @@ func confLocaleLocale_zhHkIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_zh-HK.ini", size: 41822, mode: os.FileMode(493), modTime: time.Unix(1441457544, 0)} + info := bindataFileInfo{name: "conf/locale/locale_zh-HK.ini", size: 41837, mode: os.FileMode(493), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4619,7 +4619,7 @@ func confReadmeDefault() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/readme/Default", size: 23, mode: os.FileMode(420), modTime: time.Unix(1441064597, 0)} + info := bindataFileInfo{name: "conf/readme/Default", size: 23, mode: os.FileMode(420), modTime: time.Unix(1441424488, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/public/ng/js/gogs.js b/public/ng/js/gogs.js index e4a0afe9..f8048162 100644 --- a/public/ng/js/gogs.js +++ b/public/ng/js/gogs.js @@ -57,10 +57,10 @@ var Gogs = {}; }); $.fn.extend({ toggleHide: function () { - $(this).addClass("hidden"); + $(this).each(function(n, v) { $(v).addClass("hidden"); }); }, toggleShow: function () { - $(this).removeClass("hidden"); + $(this).each(function(n, v) { $(v).removeClass("hidden"); }); }, toggleAjax: function (successCallback, errorCallback) { var url = $(this).data("ajax"); @@ -775,24 +775,20 @@ function initAdmin() { $form.attr('action', $form.data('delete-url')); }); - // Create authorization. + // Create authorization. Keep list in sync with models/login.go. + var all_auths = ['none', 'plain', 'ldap', 'dldap', 'smtp', 'pam']; $('#auth-type').on("change", function () { var v = $(this).val(); - if (v == 2) { - $('.ldap').toggleShow(); - $('.smtp').toggleHide(); - $('.pam').toggleHide(); - } - if (v == 3) { - $('.smtp').toggleShow(); - $('.ldap').toggleHide(); - $('.pam').toggleHide(); - } - if (v == 4) { - $('.pam').toggleShow(); - $('.smtp').toggleHide(); - $('.ldap').toggleHide(); - } + if (v >= all_auths.length) return; + + // Hide all through their class names. + $.each(all_auths, function(i, type) { + $('.' + type).toggleHide(); + }); + + // Show the selected one. + var selected = all_auths[v]; + $('.' + selected).toggleShow(); }); // Delete authorization. diff --git a/routers/admin/auths.go b/routers/admin/auths.go index 3e552082..1f4be231 100644 --- a/routers/admin/auths.go +++ b/routers/admin/auths.go @@ -61,6 +61,8 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) { var u core.Conversion switch models.LoginType(form.Type) { case models.LDAP: + fallthrough + case models.DLDAP: u = &models.LDAPConfig{ Ldapsource: ldap.Ldapsource{ Name: form.Name, @@ -68,13 +70,14 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) { Port: form.Port, UseSSL: form.UseSSL, BindDN: form.BindDN, + UserDN: form.UserDN, BindPassword: form.BindPassword, UserBase: form.UserBase, - Filter: form.Filter, - AdminFilter: form.AdminFilter, AttributeName: form.AttributeName, AttributeSurname: form.AttributeSurname, AttributeMail: form.AttributeMail, + Filter: form.Filter, + AdminFilter: form.AdminFilter, Enabled: true, }, } @@ -149,6 +152,8 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) { var config core.Conversion switch models.LoginType(form.Type) { case models.LDAP: + fallthrough + case models.DLDAP: config = &models.LDAPConfig{ Ldapsource: ldap.Ldapsource{ Name: form.Name, @@ -156,6 +161,7 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) { Port: form.Port, UseSSL: form.UseSSL, BindDN: form.BindDN, + UserDN: form.UserDN, BindPassword: form.BindPassword, UserBase: form.UserBase, AttributeName: form.AttributeName, diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 6da77f12..5569ce19 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -30,7 +30,7 @@ <input class="ipt ipt-large ipt-radius {{if .Err_AuthName}}ipt-error{{end}}" id="name" name="name" value="{{.Source.Name}}" required /> </div> - {{if eq $type 2}} + {{if eq $type 2 3}} <div class="field"> <label class="req" for="host">{{.i18n.Tr "admin.auths.host"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_Host}}ipt-error{{end}}" id="host" name="host" value="{{.Source.LDAP.Host}}" required /> @@ -43,6 +43,7 @@ <label for="use_ssl">{{.i18n.Tr "admin.auths.enable_tls"}}</label> <input name="use_ssl" type="checkbox" {{if .Source.LDAP.UseSSL}}checked{{end}}> </div> + {{if eq $type 2}} <div class="field"> <label for="bind_dn">{{.i18n.Tr "admin.auths.bind_dn"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_BindDN}}ipt-error{{end}}" id="bind_dn" name="bind_dn" value="{{.Source.LDAP.BindDN}}" /> @@ -55,6 +56,13 @@ <label class="req" for="user_base">{{.i18n.Tr "admin.auths.user_base"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_UserBase}}ipt-error{{end}}" id="user_base" name="user_base" value="{{.Source.LDAP.UserBase}}" /> </div> + {{end}} + {{if eq $type 3}} + <div class="field"> + <label class="req" for="user_dn">{{.i18n.Tr "admin.auths.user_dn"}}</label> + <input class="ipt ipt-large ipt-radius {{if .Err_UserDN}}ipt-error{{end}}" id="user_dn" name="user_dn" value="{{.Source.LDAP.UserDN}}" /> + </div> + {{end}} <div class="field"> <label class="req" for="filter">{{.i18n.Tr "admin.auths.filter"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_Filter}}ipt-error{{end}}" id="filter" name="filter" value="{{.Source.LDAP.Filter}}" /> @@ -76,7 +84,8 @@ <input class="ipt ipt-large ipt-radius {{if .Err_Attributes}}ipt-error{{end}}" id="attribute_mail" name="attribute_mail" value="{{.Source.LDAP.AttributeMail}}" /> </div> - {{else if eq $type 3}} + + {{else if eq $type 4}} <div class="field"> <label class="req">{{.i18n.Tr "admin.auths.smtp_auth"}}</label> <select name="smtp_auth"> @@ -96,7 +105,7 @@ <input class="ipt ipt-large ipt-radius {{if .Err_SmtpPort}}ipt-error{{end}}" id="smtp_port" name="smtp_port" value="{{.Source.SMTP.Port}}" /> </div> - {{else if eq $type 4}} + {{else if eq $type 5}} <div class="field"> <label class="req" for="pam_service_name">{{.i18n.Tr "admin.auths.pam_service_name"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_PAMServiceName}}ipt-error{{end}}" id="pam_service_name" name="pam_service_name" value="{{.Source.PAM.ServiceName}}" /> @@ -104,7 +113,7 @@ {{end}} <div class="field"> - {{if eq $type 3}} + {{if eq $type 4}} <label></label> <input name="tls" type="checkbox" {{if .Source.SMTP.TLS}}checked{{end}}> <strong>{{.i18n.Tr "admin.auths.enable_tls"}}</strong> diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index f16db0a5..ca5d6be1 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -26,48 +26,52 @@ <label class="req" for="name">{{.i18n.Tr "admin.auths.auth_name"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_AuthName}}ipt-error{{end}}" id="name" name="name" value="{{.name}}" required /> </div> - <div class="ldap"> - <div class="field"> + <div class="dldap ldap"> + <div class="dldap ldap field"> <label class="req" for="host">{{.i18n.Tr "admin.auths.host"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_Host}}ipt-error{{end}}" id="host" name="host" value="{{.host}}" /> </div> - <div class="field"> + <div class="dldap ldap field"> <label class="req" for="port">{{.i18n.Tr "admin.auths.port"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_Port}}ipt-error{{end}}" id="port" name="port" value="{{.port}}" /> </div> - <div class="field"> + <div class="dldap ldap field"> <label for="use_ssl">{{.i18n.Tr "admin.auths.enable_tls"}}</label> <input name="use_ssl" type="checkbox" {{if .use_ssl}}checked{{end}}> </div> - <div class="field"> + <div class="ldap field"> <label class="req" for="bind_dn">{{.i18n.Tr "admin.auths.bind_dn"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_BindDN}}ipt-error{{end}}" id="bind_dn" name="bind_dn" value="{{.bind_dn}}" /> </div> - <div class="field"> + <div class="ldap field"> <label class="req" for="bind_password">{{.i18n.Tr "admin.auths.bind_password"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_BindPassword}}ipt-error{{end}}" id="bind_password" name="bind_password" type="password" value="{{.bind_password}}" /> </div> - <div class="field"> + <div class="ldap field"> <label class="req" for="user_base">{{.i18n.Tr "admin.auths.user_base"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_UserBase}}ipt-error{{end}}" id="user_base" name="user_base" value="{{.user_base}}" /> </div> - <div class="field"> + <div class="dldap field hidden"> + <label class="req" for="user_dn">{{.i18n.Tr "admin.auths.user_dn"}}</label> + <input class="ipt ipt-large ipt-radius {{if .Err_UserDN}}ipt-error{{end}}" id="user_dn" name="user_dn" value="{{.user_dn}}" /> + </div> + <div class="dldap ldap field"> <label class="req" for="filter">{{.i18n.Tr "admin.auths.filter"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_Filter}}ipt-error{{end}}" id="filter" name="filter" value="{{.filter}}" /> </div> - <div class="field"> + <div class="dldap ldap field"> <label for="filter">{{.i18n.Tr "admin.auths.admin_filter"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_AdminFilter}}ipt-error{{end}}" id="admin_filter" name="admin_filter" value="{{.admin_filter}}" /> </div> - <div class="field"> + <div class="dldap ldap field"> <label for="attribute_name">{{.i18n.Tr "admin.auths.attribute_name"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_AttributeName}}ipt-error{{end}}" id="attribute_name" name="attribute_name" value="{{.attribute_name}}" /> </div> - <div class="field"> + <div class="dldap ldap field"> <label for="attribute_surname">{{.i18n.Tr "admin.auths.attribute_surname"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_AttributeSurname}}ipt-error{{end}}" id="attribute_surname" name="attribute_surname" value="{{.attribute_surname}}" /> </div> - <div class="field"> + <div class="dldap ldap field"> <label class="req" for="attribute_mail">{{.i18n.Tr "admin.auths.attribute_mail"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_AttributeMail}}ipt-error{{end}}" id="attribute_mail" name="attribute_mail" value="{{.attribute_mail}}" /> </div> |