@@ -16,6 +16,8 @@ Vagrant.configure("2") do |config|
1616 config . vm . network "forwarded_port" , guest : 80 , host : 8080 , host_ip : "127.0.0.1"
1717 # Code Coverage virtual host
1818 config . vm . network "forwarded_port" , guest : 81 , host : 8081 , host_ip : "127.0.0.1"
19+ # User Guide virtual host
20+ config . vm . network "forwarded_port" , guest : 82 , host : 8082 , host_ip : "127.0.0.1"
1921 # MySQL server
2022 #config.vm.network "forwarded_port", guest: 3306, host: 3307, host_ip: "127.0.0.1"
2123 # PostgreSQL server
@@ -27,7 +29,8 @@ Vagrant.configure("2") do |config|
2729 # Same path set in the $CODEIGNITER_PATH Provision
2830 # "virtualbox" type allow auto-sync host to guest and guest to host
2931 # but chmod does not work... tests will fail.
30- config . vm . synced_folder "." , "/var/www/codeigniter" , type : "rsync"
32+ # Default rsync__args except "--copy-links", to allow phpunit correctly works by symlink
33+ config . vm . synced_folder "." , "/var/www/codeigniter" , type : "rsync" , rsync__args : [ "--verbose" , "--archive" , "--delete" , "-z" ]
3134
3235 # Provider-specific configuration
3336 config . vm . provider "virtualbox" do |vb |
@@ -68,15 +71,20 @@ Vagrant.configure("2") do |config|
6871 php-memcached memcached \
6972 php-redis redis-server \
7073 php-curl curl \
71- php-gd php-imagick
74+ php-gd php-imagick \
75+ python-pip
76+
77+ pip install sphinx sphinxcontrib-phpdomain
78+ python "${CODEIGNITER_PATH}/user_guide_src/cilexer/setup.py" install
79+ pygmentize -L
7280
7381 apt-get autoclean
7482
7583 echo "================================================================================"
7684 echo "Configuring Databases"
7785 echo "================================================================================"
7886
79- mysql -e "CREATE DATABASE IF NOT EXISTS codeigniter COLLATE 'utf8_general_ci';;
87+ mysql -e "CREATE DATABASE IF NOT EXISTS codeigniter COLLATE 'utf8_general_ci';
8088 UPDATE mysql.user SET Host='%' WHERE user='root';
8189 GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
8290 FLUSH PRIVILEGES;" -uroot -p$MYSQL_ROOT_PASS
@@ -95,14 +103,15 @@ Vagrant.configure("2") do |config|
95103
96104 mkdir -p "${CODEIGNITER_PATH}/build/coverage-html"
97105 mkdir -p "${CODEIGNITER_PATH}/public"
106+ mkdir -p "${CODEIGNITER_PATH}/user_guide_src/build/html"
98107 mkdir -p "${CODEIGNITER_PATH}/writable/apache"
99108 chown -R vagrant:vagrant $CODEIGNITER_PATH
100109
101110 if [ ! -d /home/vagrant/codeigniter ]; then ln -s $CODEIGNITER_PATH /home/vagrant/codeigniter; fi
102111
103112 sed -i "s/APACHE_RUN_USER=www-data/APACHE_RUN_USER=vagrant/" /etc/apache2/envvars
104113 sed -i "s/APACHE_RUN_GROUP=www-data/APACHE_RUN_GROUP=vagrant/" /etc/apache2/envvars
105- grep -q "Listen 81" /etc/apache2/ports.conf || sed -i "s/Listen 80/Listen 80\\ nListen 81/" /etc/apache2/ports.conf
114+ grep -q "Listen 81" /etc/apache2/ports.conf || sed -i "s/Listen 80/Listen 80\\ nListen 81\\ nListen 82 /" /etc/apache2/ports.conf
106115
107116 echo "
108117<Directory ${CODEIGNITER_PATH}>
@@ -117,10 +126,10 @@ Vagrant.configure("2") do |config|
117126 CustomLog ${CODEIGNITER_PATH}/writable/apache/custom.log combined
118127</VirtualHost>
119128<VirtualHost *:81>
120- ServerAdmin vagrant@localhost
121129 DocumentRoot ${CODEIGNITER_PATH}/build/coverage-html
122- ErrorLog ${CODEIGNITER_PATH}/writable/apache/coverage-error.log
123- CustomLog ${CODEIGNITER_PATH}/writable/apache/coverage-custom.log combined
130+ </VirtualHost>
131+ <VirtualHost *:82>
132+ DocumentRoot ${CODEIGNITER_PATH}/user_guide_src/build/html
124133</VirtualHost>
125134" > /etc/apache2/sites-available/codeigniter.conf
126135
0 commit comments