Both, and they are not as separate as you might think. Discipline without a system is just willpower, and willpower runs out.

Willpower is a person’s ability to control their own actions in order to pursue long-term goals. Other names for this concept include self-control, discipline, and resolve. However, psychologists have ...