Changed mkdir2 function to check if directory already exists, and updated it to raise an exception if there is a problem otherwise.

Added some text for the enduser to change apache 2.4 conf and add the project name and copyright holder.
This commit is contained in:
Shawn Kwang 2016-05-20 12:57:51 -05:00
parent b2bf23569a
commit 9e7bfa88ca
2 changed files with 13 additions and 4 deletions

View File

@ -247,9 +247,10 @@ def create_project_dirs(dest_dir):
return apply(os.path.join,(dest_dir,)+d) return apply(os.path.join,(dest_dir,)+d)
def mkdir2(d): def mkdir2(d):
try: try:
os.mkdir(d); os.makedirs(d)
except: except OSError as e:
pass if not os.path.isdir(d):
raise SystemExit(e)
map(lambda d: mkdir2(dir(d)), map(lambda d: mkdir2(dir(d)),
[ '', [ '',
'cgi-bin', 'cgi-bin',
@ -273,7 +274,6 @@ def create_project_dirs(dest_dir):
'html/ops/ffmail', 'html/ops/ffmail',
'html/ops/mass_email', 'html/ops/mass_email',
'html/ops/remind_email', 'html/ops/remind_email',
'html/ops',
'html/project', 'html/project',
'html/stats', 'html/stats',
'html/user', 'html/user',

View File

@ -456,9 +456,13 @@ print >>open(readme_filename,'w'), '''Steps to complete installation:
- Change Apache configuration (as root): - Change Apache configuration (as root):
If you are using Apache 2.4, edit the %(httpd_conf_template_filename)s
(see file for specific instructions).
cat %(httpd_conf_template_filename)s >> /etc/apache/httpd.conf cat %(httpd_conf_template_filename)s >> /etc/apache/httpd.conf
(path to httpd.conf varies; try /etc/httpd/ or /etc/apache2) (path to httpd.conf varies; try /etc/httpd/ or /etc/apache2)
Then restart the web server: Then restart the web server:
/usr/sbin/apache2ctl restart /usr/sbin/apache2ctl restart
@ -478,6 +482,11 @@ print >>open(readme_filename,'w'), '''Steps to complete installation:
htpasswd -c .htpasswd username htpasswd -c .htpasswd username
- Add the project name and copyright holder for the boinc Web site:
edit html/project/project.inc
change PROJECT and COPYRIGHT_HOLDER
---------------------------- ----------------------------
To start, show status, and stop the project, run: To start, show status, and stop the project, run: