Fix locale, MOTD & updates to Webmin

xeoncross / lowendscript

Bash scripts to set up/bootstrap low end virtual servers

325 stars 100 forks source link

Fix locale, MOTD & updates to Webmin #8

Closed asimzeeshan closed 12 years ago

asimzeeshan commented 12 years ago

New features

Fix locale - fixes locale on some broken Ubuntu OpenVZ templates
MOTD - configures motd showing summary even on OpenVZ / XEN VPSes

Updates/fixes

Webmin - now you don't need to run again because of some dependencies not being installed.
Updated readme.md file

Copied

copied the same wordpress install subroutine as in Xeoncross/lowendscript

asimzeeshan commented 12 years ago

Still waiting for updates

xeoncross commented 12 years ago

These changes cannot be automatically merged. You need to pull the existing code from master and merge it then update this pull request. I was going to look at this weekend when I had more time. I think you didn't pull the wordpress additions using git and instead just pasted them into your checkout.

asimzeeshan commented 12 years ago

Yes, I copied the wordpress addition. Can you tell me whats wrong here because 'git pull origin master' does not return anything :S

http://d.pr/i/mE7k

xeoncross commented 12 years ago

Ok, I think the problem is that your origin is your project. This repo (Xeoncross/lowendscript) should be pulled instead.

$ git pull xeoncross master

If that doesn't work then see what the correct origin name is.

$ git remote -v

asimzeeshan commented 12 years ago

It does not let me push unless I incorporate and commit this change https://github.com/asimzeeshan/lowendscript/commit/d65327ac423399b0818e2790baee59f123779796

Code merged, let me know if it works now

xeoncross commented 12 years ago

Thanks!