Sfoglia il codice sorgente

Don't remove htdocs

Bob Mottram 10 anni fa
parent
commit
06544bcdd3
1 ha cambiato i file con 2 aggiunte e 4 eliminazioni
  1. 2
    4
      install-freedombone.sh

+ 2
- 4
install-freedombone.sh Vedi File

@@ -1870,6 +1870,8 @@ function install_wiki {
1870 1870
 
1871 1871
   if [ ! -d /var/www/$WIKI_DOMAIN_NAME ]; then
1872 1872
       mkdir /var/www/$WIKI_DOMAIN_NAME
1873
+  fi
1874
+  if [ ! -d /var/www/$WIKI_DOMAIN_NAME/htdocs ]; then
1873 1875
       mkdir /var/www/$WIKI_DOMAIN_NAME/htdocs
1874 1876
   fi
1875 1877
 
@@ -1897,10 +1899,6 @@ function install_wiki {
1897 1899
 
1898 1900
   tar -xzvf $WIKI_ARCHIVE
1899 1901
   cd dokuwiki-*
1900
-
1901
-  if [ -f "/var/www/$WIKI_DOMAIN_NAME/htdocs" ]; then
1902
-      rm -rf /var/www/$WIKI_DOMAIN_NAME/htdocs
1903
-  fi
1904 1902
   mv * /var/www/$WIKI_DOMAIN_NAME/htdocs/
1905 1903
   chmod -R 755 /var/www/$WIKI_DOMAIN_NAME/htdocs
1906 1904
   chown -R www-data:www-data /var/www/$WIKI_DOMAIN_NAME/htdocs