1. 06 Oct, 2016 5 commits
    • Till Brehm's avatar
      Merge branch '4227' into 'stable-3.1' · 2a911896
      Till Brehm authored
      copy ispconfig_update.sh to a temp file to run, fixes #4227
      
      
      
      See merge request !462
      2a911896
    • Till Brehm's avatar
      Merge branch 'patch-1' into 'stable-3.1' · 57d4e9d0
      Till Brehm authored
      copy install/tpl/apache_ispconfig.conf.master to server/conf/apache_ispconfig.conf.master
      
      If you add/remove server IPs the file `/etc/apache2/sites-available/ispconfig.conf` gets recreated and it is missing the alias for Let's Encrypt ACME challenges. Copying over the current install template fixes that. 
      
      Maybe one could remove this template duplication completely by using `server/conf/apache_ispconfig.conf.master` in the install process?
      
      The `Header set Content-Type "text/plain"` was only in `server/conf/apache_ispconfig.conf.master` and not in `install/tpl/apache_ispconfig.conf.master` – is it necessary?
      
      See merge request !463
      57d4e9d0
    • Till Brehm's avatar
      Merge branch 'stable-3.1' into 'stable-3.1' · d1195696
      Till Brehm authored
      fixed umount backup-dir
      
      
      
      See merge request !464
      d1195696
    • Florian Schaal's avatar
      fixed umount backup-dir · 145175fd
      Florian Schaal authored
      145175fd
    • Daniel Jagszent's avatar
      copy install/tpl/apache_ispconfig.conf.master to server/conf/apache_ispconfig.conf.master · 6910f4e7
      Daniel Jagszent authored
      If you add/remove server IPs the file `/etc/apache2/sites-available/ispconfig.conf` gets recreated and it is missing the alias for Let's Encrypt ACME challenges. Copying over the current install template fixes that. 
      
      Maybe one could remove this template duplication completely by using `server/conf/apache_ispconfig.conf.master` in the install process?
      
      The `Header set Content-Type "text/plain"` was only in `server/conf/apache_ispconfig.conf.master` and not in `install/tpl/apache_ispconfig.conf.master` – is it necessary?
      6910f4e7
  2. 05 Oct, 2016 4 commits
  3. 04 Oct, 2016 2 commits
  4. 03 Oct, 2016 3 commits
  5. 02 Oct, 2016 1 commit
  6. 30 Sep, 2016 4 commits
  7. 29 Sep, 2016 3 commits
  8. 28 Sep, 2016 4 commits
  9. 27 Sep, 2016 11 commits
  10. 26 Sep, 2016 3 commits